Added unit test when working