clean up for the tests

This mostly corrects file and class names for PSR-2. Function names have
not been adjusted yet