Add id methods and update test runner