Updates to syntax/more tests

some updates to the syntax plus more tests!