Wrote more Tests