Add test coverage

Brings the old tests up to date