Adding more tests to boost coverage of this file to 100%