initial refactoring of tests for like class