Add if statement to simplify functionaltests
remove link on flippage front
fix compile error