Tweaked tests and other small changes