Added locationconverter and tests