Add new and update existing tests