adapted existing functional tests & fixtures