updates and making the test work