some more intermittent restructuring, added some unsupported test cases