More fixups
Final fixups, all tests now passing
Updated TinyIoC