more progress on tests suite/lib