reorganize and get tests passing again