Refactored crash test binary a little