My personal modifications to shunit2