Clean up tests, add runner cmd to package.json