Finish importing Simple expression specs from development version