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