Fixing tests and adding hash options.