Changed test to handle different key sizes better