Fixed the tests and update the steps