Improved tests
Cleaner setUp