refactored test suite. added alias to expressions