Clean up some of the functions and tests