Fixed functional tests continued