improve weapons and constructions unit tests