Fix EntityCollection not returning specified object
Remove Test resources from build.