Tests and their fixes