Working through failing tests, especially firebird integration tests