Adding more specificity to tests