Adding annotation linking for new test types