Forgot to remove useless tests and add new ones