adding tests and entity collection class.