clean up ctors and test factories