- Fix test and remove factory since it's not actually needed.