Added stuff for testmod