Working on tests and semantics