Cleaning up the syntax and gettings tests into shape