Stronger test

Improvements for tests.