case tweaks and new tests