expression tests & bugfixes