Reorganize and rework tests
Initial integration with creof/geo