Revert "delete and find (by id) are broken currently"

This reverts commit e78724bd0ab4a1e06cbae2920c9db545fa4712eb.
fix tests