duty night and updated JUnit tests