- added testcases
- align entities to testcases