Add fancy tests