small progress on tests