Fixed basictests; updated w/ annotate