tests: some fixes