More tests and fixes per tests.