Remove test output from repository; add asserts
Streamline logic, independent output paths for test data