more work and more tests