test cleanup, added more test data factories