Added and changed tests