integration tests bugs fixed