Fix display and clean test