Fixed expression index and last unit tests