Switched over some ad hoc tests to check tests.