Night Unit Test 2

Second part of the unit review