More work for Enable these tests @ CircleCI #1368