Test coverage

Just a few more tests