Added a few more special cases.
Minor refactoring.
Added a few more assertions to the Addables test.
Restored tests.
Fixed some tests, added support for return type super-types.