introduced spring and made integration tests more "black box"