As I mentioned, I think we could benefit from _not_ limiting the test id to be an integer.