Removing changes unrelated to new tests