Added Some Tests