More test, fixes.