working on tests for restructuring