Added more options and tests, removed passthrough