Changed functional tests to use unit test function. All makes sense.