Updated tests to reflect relocation of functions.