Minor updates, basic test run code