test: some fixes