Merge "Add tests exceptions"