More options and tests