updated more tests to use class factories