Finished additional sweep for PSR standards.
Update cwtest to standards.