More tests
more tests
More tests. Fix bug