refactoring tests with before and after filters
adding item rewards
updating weapon graphic
updating todos