Switch specs over to #expect syntax