Add check mode test
Fix a check mode bug
Add another check test
Fix a misleadingly broken test
Added check mode unit test