Added and updated several tests