Fix some of dem tests