Refactor tests a bit to get more obvious test fail messages