Fix should failures in tests.
Merge pull request #1 from SilasX/test-should-fixes

Fix should failures in tests.