Removing wrongly named test runner
Merging with master
Merging in changes with head