Added admin and mass-assignment test
tidy up