update of my code and test file