fixed errors in the save process, fixed errors in the test, moved admin classes