more tests
more progress