Add additional test coverage