PunishmentForm tests
Merge branch 'jm' of https://github.com/Upplication/The-Punisher into jm