code for @expects was simplified