Fixed some tests... or more accurately, updated some tests :)