Merge "Rewrite battery saver location tests and add bypass tests"