Simplified copmposite keys test cases
Code style