Added factory methods for the start of cleaning up tests