fixing imports
better tests
using a proxy to get the raw query of jpa
moving orm implementations to orm package, CountQueryCreator