Tweaks and a different test suite