Fixed issue #25 and issue #35 - expectations can be defined in different scopes