Refactor: moved PojoTest from core to Services package