Modifying to add the annotations and to change the test mechanisms to match.
Authored by: ranx0r0x 2013-03-25
Parent: [r24]
Child: [r26]