More tests on impacts + bug fixes