Added Binary and Uri properties.

Fixed a bunch of bugs, and all tests are completing again.