small improvements on tests
Improved tests and helpers