adjusted a few tests, improving coverage