few fixes and edits to test files