Remove changes unrelated to new tests and reformat for code style