This reverts commit 12093976a4842a795491cfd2b1d3b71e18503f2d.
Move the test-runner source into a separate src folder to accommodate the test move.