Minor bug fix
More tests.