Improved expected tests
Skipping to push