Added working unit test