Tests, fixes.