added test util class to generate entities
clean up unnecessary deps.
corrected proxy mode to interface
added usage of entityGenerator
corrected implementation
added tests