changed to the lame spring syntax
removed some test files