Updated typeaheads to use criterion and updated tests for status