Remove superfluous do statements
Separate tests into groups

Also test content of insert redirect