Combined Jason's integration testing changes to one commit, didn't include Spring upgrade
Modification of test context
Autowiring/simplification effort