Add non-spring based test
Add non-spring based test