Updated spec tests