Fixed tests :P (and ye godz, the dev world is pushing travis-ci to its limits tonight :/)