Finished porting tests to spring