Add additional test coverage

Adding tests to cover existing functionality