Some debugging and tests. #186