Stubs are removed and tests are working