Revert "Removed default classes / tests"

This reverts commit 1d818f8c6b8075f4b0a9d56f743d858a79407c20.