Added more tests; fixed bugs and added missing stuff in the lexer and parser (merged the different expressions in one type)