Revert "Transition to JUnit4 tests"

This reverts commit 8dce4bb1e4ec7f8c4f6b8b375366bffbea3aa07d.