Modifications to Tests