Added tests and entities