Updates to PUG and tests