Added a few more tests to functional_test.py