Small changes in testing (will be refactored a lot)