A few more tests, still incomplete
3 files changed