Improved tests
Tweaked test generation