Update with start of basic spec tests