fix the import problem
convert tests to use the functions.py hack