Fixed last remaining bugs in the current test suite