Fix for failing router/hash tests