Fix more tests.
Fix more tests.
Fix final tests and related code. Build dist.