Improving tests
Fix on setup options