Refactor of a couple tests
- Made error checking more generic
- Removed un-needed set of property in profile class