Finished test suite

CL 123457