Fix a problem with detecting self-spec introduced in one of the previous commits
Small test improvement
README formatting