added unit testing entities and services
added better error reporting