additional reshape testing and cleanup