tests and model changes
Merge remote-tracking branch 'origin/adminPanel' into subjectManagementFixup
Rewritten adding subjects