working tests - and admin code to reflect passing tests