tests are green again
change files according to the pullrequest #805
using find instead of where to raise an error if entities could not be found