Adds some tests and factories