Start adding test coverage