Fixed failing tests - cleanup after merge and US506 - Employment