update tests and complete all expression constructs