Make non constructor params go through options

Added tests for this as well.