derby tests now pass (some disabled)