Improving coverage

Adding more tests. It's a slow afternoon.