removed unused variable, added whitespaces and fixed integration tests