More tests and fixes thanks to those tests!