Fix mock, fixture enhancements, bump surtax ver