Add non-spring based test