spec: fix & improve test cases