Fix offline tests..