Added more tests and factory calls