Fixed some style issues in some PURAP features.
Fixed a broken test.
Fixed a broken test.
Removed an extraneous @wip.