Modifications to allow naive mutation testing