removed unused class
un-ignored tests
first shot on handling entities outside collections