Issue #389 completed. Integration tests for ABM was fixed.

Issue #403 broke some integration test. So they were fixed