Fixed all tests :-)