add tests and upgrade Spring version
Merge branch 'tests'