Add new test fixing #233 and clean up file indent and whitespace