make tests integrationy at the expense of log puke :older_man: