This works for creating tests to an extent
This is the merge