Improved entities and passing tests