Wrote tests for ABM-255
Merge branch 'feature-255' into develop