Fixing functional tests

Working on taking tests