Cleaned up default classes, and added simple test