Implementing further entities and corresponding test cases