Fixed functional tests 1 and 2