Add Several tests