Use multiple tests in the diag parser - Fixes #24