More tests and querying, started parser