More testing changes