Fixing merge bugs
Temporarily removing integration tests