Added expression tests