Fix bugs with integration test
Initial features and specs pass