Fixed tests, deleted old generator tests