More tests, little improvements