Don't need spring for these unit tests
Add tests for issues #60 and #61