Fix for commit dd239f3

Forgot to commit the edits to the tests for the
reorganization in the last commit.
Remove unused require in class-prims