Fixed tests from the viewmode removal