some good progress on tests