Changed test text file
Merge branch 'm-delta' into s-delta
Refactored the factory to support better testing
Merge branch 'm-delta' into s-delta
Merge branch 's-delta' into m-delta