Added a failing test
Removed failing test
Merge branch 'develop'