Finished test suite

CL 123457
Merge pull request #2 from rithessa/cdewitt-4/24/14

Finished test suite