Add cleanup to tests and fix default rect prop