Fix #37 - migrate specs to expect syntax