Fixed all tests
Merge branch 'algorithm' into development