Statement update 2

Update the StatementTest further with the many fixes of the last two days. More bugs fixed means more tests run.