Make tests pass again. Confused about how to handle state.
Extract Wrapper for slalom function value & type