More tests~
Fix a bug found by tests