Refactor test into new syntax and start testing outputs