Small changes, added an implicit wait in the functional_test