Bug 1022064 - fix messed up test annotations