fix some spec issues after zmachien refactoring