Added A Couple More Tests