More spec tests done