more work on test and code