Fixes and more tests.