More specs 1

This might eventually the start of a series of PRs dedicated to better test coverage.