Remove remaining assertTrue/assertFalses