Major changes to syntax for new setup blocks and prep for junit tests