Reshape enhancements and tests
tidying