updated test suite and factories