- Use class loading facilities in order to make tests work again
Revert "- Use class loading facilities in order to make tests work again"

This reverts commit 624e8a446f9e92c0f25b34ac5a62920ebe26194c.
- Use class loading facilities in order to make tests work again
Merge remote-tracking branch 'upstream/master'