Modified functional tests, quick bug fix..
Fixed two failed functional tests