Copy tests from old branch. Fix tests.