Organise tests better and add more contexts