Moved from tests to regular classes.