Changed more tests to do assertions inside transactions