Issue #2216531 by Jalandhar, Mile23: Improve unit test annotation for SimpleTest.