Test coverage

Some tests added.