some more working of the unit test draft