[WIP] Clean up specs

Out of curiosity I started to look how `bundler` specs are written and I found several places which can be refactored/improved just a little bit.

I will try to push some more commits in near future.