Merge master and use correct FunctionalTest class