Changed old should syntax for specs to the new expect syntax
Use new one-liner syntax for expectations where possible