turn some experimental code into tests...