Added more basic tests to help clean up with redone factories