Added location service checks and test check