entity tests
- completed tests
- directive cleaning