Removed default classes / tests