Revise tests a bit