#26 Added some unit tests for entities