Adding new tests

also fixing generated tests