Add additional test coverage and Fixes