Update and add tests to match restructured codebase; remove poorly-designed tests 3c98117 vxa8502 commited on Jun 23