Finish early work on sources, tests are running again