Updating tests, fixed trait race condition, updated docs to match, added trait options