habres - fixed broken tests
Merge branch 'development-habres-work' into development-habres