Fix bug. More tests.