Broke out tests into separate lines