Made some changes so the tests will runs