Fixed the unittest - now it should be clean to merge upstream.