changes to test files, Test harness, uhhhh duke swag?