Added test-classes to avoid merge conflicts