Fixed last missing assertion
Some more test cleanup