Updates to Butler Test