Progress commit.
Added more tests.