Fixed some tests to reflect last changes