fix up specs, switch to expect syntax