Updated to make the test code not depend on all the normal code.