Extra specs with uncommitted changes

@charlierudolph I added all missing specs for situations with uncommitted changes. Please take a look.
Agreed. Let's do this everywhere.