Fix tests #104

*Fix tests afeter merging