simplify aborting messages/tests

part of #46