Add more test coverage!