Updated class maps, removed some test files
minor fix with sql syntax