Revert change to test, reformat some & revive needed pieces of Galago