Added additional tests, department and group