Correcting test functions and generic_functions