updates to fix some tests and push the project along