bug fix for combination keys, also added more tests for combination keys