Modified some tests to get coverage