Changing name of main file
Pull battery-query listener out to the component for easy manual battery status requests
Fixing tests