more tests, some passing