Add more testing (and correct the ids)