Moved Pivotal extensions of test file so that tags are in correct order
for schema validation