Add some Typeability, more test-framework tweaks.