Jcs department controller tests

Some fixes to the Department controller