Removed obsolete unit tests
Merge branch '4254' into develop