Added some spec tests