Minor Test Additions and fixes