Changed the trap from weapon to armor

Also i added some additional test using sikuli