additional fixes according the test files