Add support for improved and greater two-weapon fighting plus tests for same