Various testing changes