Minor refactor to Functional Tests base