Fixed tests for better fresh state