Add some tests for obsolete code, sugar used in appropriate ways.