Moved Wealthy sphinx test to use optimiser, and minor fixes