maint - updates to tests