Improve the generic attack calculator testing