Updating tests, formatting, structure (#2) bd3f7ed unverified Matthew Kutarna commited on Jul 5, 2022