Got rid of the DTOs, properly created the Authorization and MasterKey objects, wrote tests and refactored other tests