test fix and other fixes.