First framework commit.
Fixing tests.