jebyrnes re-write tests to speed things up.