Fix contenttest and comment out broken test