removed useless entity classes/tests, and created environment test units
added predicate test suite