Fixing functional tests. Im not proud.