Add new tests, update old ones