Fixed tests

There's something wrong with the parser, but it'll have to wait.