Tests and lint fixes.