changes for Spring testing framework