Options param now optional, fixes unit tests