refactored to allow both props and object options
refactored tests to allow both props and object options, added a test to verify that object options are being used instead of the props
empty line