Fix mock, fixture enhancements, bump surtax ver

Use .nil? and .empty?