Added entities and adjusted the tests