Added additional tests, and fixes to address feedback on PR