Implement ability to run timed or untimed tests
Work around merging nonsense