clean up, beef up test and spring support