Revert "Updating new spring unit tests"

This reverts commit 9aae5fe60bf36f6d54f8e2d97641b8f4617d391e.