always use normalized session data keys
moved test to correct location