moved to lower case m, removing spring crap and a little other test cleanup
Merge remote-tracking branch 'origin/master'