Fixed tests to match coverage results