Fixed some tests...