Simplified test further for offline use #302