Refactored test code and added a few more mortality tests.