Fix test runner and add argument option for testing.