Returned unit test made by Boyan