Modified tests to pass.