Added profile, removed employment join model, fixed some tests