More tests. More conditional logic :dash: