started adding tests for restructuring