Actually commit filename/class name changes

Not sure what happened there...
Simple square and 'C'-shape tests