Added new integration test
removed files from commit
fixed merge