move some classes to test files; small fixes
added spring data