Got termination assert working
Full test suite is back to being operational =D