Increase test coverage

More tests! More!