added more to the functional tests