fix issues found in testing, fix changes to test