move test classes into test directory
updates for springframework 3.2 test framework
Fixed integration tests.
Merge pull request #1 from scottfrederick/forScott

Fixed integration tests.