fixed 2 funcitonal tests