Fix broken tests
Merge branch 'develop' of https://github.com/sourceLair/opendevelop into develop