diff --git a/.editorconfig b/.editorconfig
index 3e013bb..cf3a7e8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,21 +4,13 @@
 root = true
 # All files
 [*]
-indent_style = space
-
-# XML project files
-[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
-indent_size = 2
-
-# XML config files
-[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
-indent_size = 2
-
-# Code files
-[*.{cs,csx,vb,vbx}]
-indent_size = 4
+indent_style = tab
+tab_width = 4
 insert_final_newline = true
-charset = utf-8-bom
+trim_trailing_whitespace = true
+charset = utf-8
+end_of_line = crlf
+
 ###############################
 # .NET Coding Conventions     #
 ###############################
@@ -139,4 +131,4 @@ csharp_style_expression_bodied_local_functions = false:silent
 ###############################
 [*.vb]
 # Modifier preferences
-visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion
\ No newline at end of file
+visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion
diff --git a/LastenradBayern/TINK.Android/MainActivity.cs b/LastenradBayern/TINK.Android/MainActivity.cs
index 033c3dd..1eea213 100644
--- a/LastenradBayern/TINK.Android/MainActivity.cs
+++ b/LastenradBayern/TINK.Android/MainActivity.cs
@@ -13,96 +13,96 @@ using Xamarin.Forms.Platform.Android.AppLinks;
 
 namespace TINK.Droid
 {
-    [Activity(Label = "LastenradBayern", Icon = "@drawable/sharee", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
+	[Activity(Label = "LastenradBayern", Icon = "@drawable/sharee", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
 
-    [IntentFilter(new[] { Intent.ActionView },
-              Categories = new[] { Intent.ActionView, Intent.CategoryBrowsable, Intent.CategoryDefault },
-              DataScheme = "https",
-              DataHost = "sharee.bike",
-              DataPathPrefix = "/lastenrad",
-              AutoVerify = true)]
+	[IntentFilter(new[] { Intent.ActionView },
+			  Categories = new[] { Intent.ActionView, Intent.CategoryBrowsable, Intent.CategoryDefault },
+			  DataScheme = "https",
+			  DataHost = "sharee.bike",
+			  DataPathPrefix = "/lastenrad",
+			  AutoVerify = true)]
 
-    [IntentFilter(new[] { Intent.ActionView },
-              Categories = new[] { Intent.ActionView, Intent.CategoryBrowsable, Intent.CategoryDefault },
-              DataScheme = "http",
-              DataHost = "sharee.bike",
-              DataPathPrefix = "/lastenrad",
-              AutoVerify = true)]
+	[IntentFilter(new[] { Intent.ActionView },
+			  Categories = new[] { Intent.ActionView, Intent.CategoryBrowsable, Intent.CategoryDefault },
+			  DataScheme = "http",
+			  DataHost = "sharee.bike",
+			  DataPathPrefix = "/lastenrad",
+			  AutoVerify = true)]
 
-    public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
-    {
-        private void initFontScale()
-        {
-            Configuration configuration = Resources.Configuration;
-            configuration.FontScale = (float)1;
-            //0.85 small, 1 standard, 1.15 big，1.3 more bigger ，1.45 supper big 
-            DisplayMetrics metrics = new DisplayMetrics();
-            WindowManager.DefaultDisplay.GetMetrics(metrics);
-            metrics.ScaledDensity = configuration.FontScale * metrics.Density;
-            BaseContext.Resources.UpdateConfiguration(configuration, metrics);
-        }
-        protected override void OnCreate(Bundle bundle)
-        {
-            initFontScale();
+	public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
+	{
+		private void initFontScale()
+		{
+			Configuration configuration = Resources.Configuration;
+			configuration.FontScale = (float)1;
+			//0.85 small, 1 standard, 1.15 big，1.3 more bigger ，1.45 supper big 
+			DisplayMetrics metrics = new DisplayMetrics();
+			WindowManager.DefaultDisplay.GetMetrics(metrics);
+			metrics.ScaledDensity = configuration.FontScale * metrics.Density;
+			BaseContext.Resources.UpdateConfiguration(configuration, metrics);
+		}
+		protected override void OnCreate(Bundle bundle)
+		{
+			initFontScale();
 
-            TabLayoutResource = Resource.Layout.Tabbar;
-            ToolbarResource = Resource.Layout.Toolbar;
+			TabLayoutResource = Resource.Layout.Tabbar;
+			ToolbarResource = Resource.Layout.Toolbar;
 
-            base.OnCreate(bundle);
+			base.OnCreate(bundle);
 
-            global::Xamarin.Forms.Forms.Init(this, bundle);
+			global::Xamarin.Forms.Forms.Init(this, bundle);
 
-            FirebaseApp.InitializeApp(this);
-            AndroidAppLinks.Init(this);
+			FirebaseApp.InitializeApp(this);
+			AndroidAppLinks.Init(this);
 
-            // Initialize xamarin.essentials, see https://docs.microsoft.com/en-us/xamarin/essentials/get-started?tabs=macos%2Candroid.
-            Xamarin.Essentials.Platform.Init(this, bundle);
+			// Initialize xamarin.essentials, see https://docs.microsoft.com/en-us/xamarin/essentials/get-started?tabs=macos%2Candroid.
+			Xamarin.Essentials.Platform.Init(this, bundle);
 
-            // Required for initialization of Maps, see https://developer.xamarin.com/guides/xamarin-forms/user-interface/map/
-            Xamarin.FormsGoogleMaps.Init(this, bundle);
+			// Required for initialization of Maps, see https://developer.xamarin.com/guides/xamarin-forms/user-interface/map/
+			Xamarin.FormsGoogleMaps.Init(this, bundle);
 
-            // Required for initialization of binding package, see  https://github.com/nuitsjp/Xamarin.Forms.GoogleMaps.Bindings.
-            Xamarin.FormsGoogleMapsBindings.Init();
+			// Required for initialization of binding package, see  https://github.com/nuitsjp/Xamarin.Forms.GoogleMaps.Bindings.
+			Xamarin.FormsGoogleMapsBindings.Init();
 
-            // Get version name of app.
-            Context context = ApplicationContext;
-            new Model.Device.AppInfo(context.PackageManager.GetPackageInfo(context.PackageName, 0).VersionName);
+			// Get version name of app.
+			Context context = ApplicationContext;
+			new Model.Device.AppInfo(context.PackageManager.GetPackageInfo(context.PackageName, 0).VersionName);
 
-            Xamarin.Forms.Forms.ViewInitialized += (object sender, Xamarin.Forms.ViewInitializedEventArgs e) =>
-            {
-                if (!string.IsNullOrWhiteSpace(e.View.AutomationId))
-                {
-                    e.NativeView.ContentDescription = e.View.AutomationId;
-                }
-            };
+			Xamarin.Forms.Forms.ViewInitialized += (object sender, Xamarin.Forms.ViewInitializedEventArgs e) =>
+			{
+				if (!string.IsNullOrWhiteSpace(e.View.AutomationId))
+				{
+					e.NativeView.ContentDescription = e.View.AutomationId;
+				}
+			};
 
-            LoadApplication(new App());
-        }
+			LoadApplication(new App());
+		}
 
-        /// <summary>
-        /// Handles opening the dialog to request for permissions.
-        /// </summary>
-        public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Android.Content.PM.Permission[] grantResults)
-        {
-            if (App.PermissionsService.GetType() == typeof(TINK.Services.Permissions.Essentials.Permissions))
-            {
-                Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-            }
-            else if (App.PermissionsService.GetType() == typeof(TINK.Services.Permissions.Plugin.Permissions))
-            {
-                // Bug in 3.0.244 and earlier versions of sharee.bike app: Call of PermissionsImplementation.Current.OnRequestedPermission result was missing.
-                // see https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/136 for further details.
-                PermissionsImplementation.Current.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-            }
+		/// <summary>
+		/// Handles opening the dialog to request for permissions.
+		/// </summary>
+		public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Android.Content.PM.Permission[] grantResults)
+		{
+			if (App.PermissionsService.GetType() == typeof(TINK.Services.Permissions.Essentials.Permissions))
+			{
+				Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+			}
+			else if (App.PermissionsService.GetType() == typeof(TINK.Services.Permissions.Plugin.Permissions))
+			{
+				// Bug in 3.0.244 and earlier versions of sharee.bike app: Call of PermissionsImplementation.Current.OnRequestedPermission result was missing.
+				// see https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/136 for further details.
+				PermissionsImplementation.Current.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+			}
 
-            base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-        }
+			base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+		}
 
-        [Export("TapStation")]
-        public void TapStation(string stationNr)
-        {
-            BackdoorMethodHelpers.DoTapPage(stationNr);
-        }
-    }
+		[Export("TapStation")]
+		public void TapStation(string stationNr)
+		{
+			BackdoorMethodHelpers.DoTapPage(stationNr);
+		}
+	}
 }
 
diff --git a/LastenradBayern/TINK.Android/Model/Device/AppInfo.cs b/LastenradBayern/TINK.Android/Model/Device/AppInfo.cs
index 58b23f0..8febfc6 100644
--- a/LastenradBayern/TINK.Android/Model/Device/AppInfo.cs
+++ b/LastenradBayern/TINK.Android/Model/Device/AppInfo.cs
@@ -6,40 +6,40 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(AppInfo))]
 namespace TINK.Droid.Model.Device
 {
-    /// <summary> Holds information about the TINK- app. </summary>
-    public class AppInfo : IAppInfo
-    {
-        /// <summary> Holds the the version of the app.</summary>
-        private static Version m_oVersion = null;
+	/// <summary> Holds information about the TINK- app. </summary>
+	public class AppInfo : IAppInfo
+	{
+		/// <summary> Holds the the version of the app.</summary>
+		private static Version m_oVersion = null;
 
-        /// <summary> Constructs a app info object. </summary>
-        public AppInfo()
-        {
-        }
+		/// <summary> Constructs a app info object. </summary>
+		public AppInfo()
+		{
+		}
 
-        /// <summary> Constructs a app info object for initialization. </summary>
-        /// <param name="p_strVersionText"> Version to initializ object with.</param>
-        internal AppInfo(string p_strVersionText)
-        {
-            if (m_oVersion != null)
-            {
-                // Set version only once.
-                return;
-            }
+		/// <summary> Constructs a app info object for initialization. </summary>
+		/// <param name="p_strVersionText"> Version to initializ object with.</param>
+		internal AppInfo(string p_strVersionText)
+		{
+			if (m_oVersion != null)
+			{
+				// Set version only once.
+				return;
+			}
 
-            if (!Version.TryParse(p_strVersionText, out Version l_oVersion))
-            {
-                m_oVersion = new Version(0, 8);
-            }
+			if (!Version.TryParse(p_strVersionText, out Version l_oVersion))
+			{
+				m_oVersion = new Version(0, 8);
+			}
 
-            m_oVersion = l_oVersion;
-        }
+			m_oVersion = l_oVersion;
+		}
 
-        /// <summary> Get the version of the app. </summary>
-        public Version Version => m_oVersion ?? new Version(0, 9);
+		/// <summary> Get the version of the app. </summary>
+		public Version Version => m_oVersion ?? new Version(0, 9);
 
-        /// <summary> Gets the URL to the app store. </summary>
-        /// <value>The store URL.</value>
-        public string StoreUrl => $"https://play.google.com/store/apps/details?id={Android.App.Application.Context.PackageName}";
-    }
+		/// <summary> Gets the URL to the app store. </summary>
+		/// <value>The store URL.</value>
+		public string StoreUrl => $"https://play.google.com/store/apps/details?id={Android.App.Application.Context.PackageName}";
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK.Android/Model/Device/Device.cs b/LastenradBayern/TINK.Android/Model/Device/Device.cs
index d01840b..d4c162b 100644
--- a/LastenradBayern/TINK.Android/Model/Device/Device.cs
+++ b/LastenradBayern/TINK.Android/Model/Device/Device.cs
@@ -5,19 +5,19 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(TINK.Droid.Model.Device.Device))]
 namespace TINK.Droid.Model.Device
 {
-    public class Device : ISmartDevice
-    {
-        public string Manufacturer => DeviceInfo.Manufacturer;
+	public class Device : ISmartDevice
+	{
+		public string Manufacturer => DeviceInfo.Manufacturer;
 
-        public string Model => DeviceInfo.Model;
+		public string Model => DeviceInfo.Model;
 
-        public DevicePlatform Platform => DeviceInfo.Platform;
+		public DevicePlatform Platform => DeviceInfo.Platform;
 
-        public string VersionText => DeviceInfo.VersionString;
+		public string VersionText => DeviceInfo.VersionString;
 
-        /// <summary> Gets unitque device identifier. </summary>
-        /// <returns>Gets the identifies specifying device.</returns>
-        public string Identifier
-            => Android.Provider.Settings.Secure.GetString(Android.App.Application.Context.ContentResolver, Android.Provider.Settings.Secure.AndroidId);
-    }
+		/// <summary> Gets unitque device identifier. </summary>
+		/// <returns>Gets the identifies specifying device.</returns>
+		public string Identifier
+			=> Android.Provider.Settings.Secure.GetString(Android.App.Application.Context.ContentResolver, Android.Provider.Settings.Secure.AndroidId);
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK.Android/Model/Device/ExternalBrowseService.cs b/LastenradBayern/TINK.Android/Model/Device/ExternalBrowseService.cs
index a971c11..15bb1e6 100644
--- a/LastenradBayern/TINK.Android/Model/Device/ExternalBrowseService.cs
+++ b/LastenradBayern/TINK.Android/Model/Device/ExternalBrowseService.cs
@@ -6,18 +6,18 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(ExternalBrowseService))]
 namespace TINK.Droid.Model.Device
 {
-    public class ExternalBrowseService : IExternalBrowserService
-    {
-        /// <summary> Opens an external browser. </summary>
-        /// <param name="p_strUrl">Url to open.</param>
-        public void OpenUrl(string p_strUrl)
-        {
-            var uri = Android.Net.Uri.Parse(p_strUrl);
-            var intent = new Intent(Intent.ActionView, uri);
+	public class ExternalBrowseService : IExternalBrowserService
+	{
+		/// <summary> Opens an external browser. </summary>
+		/// <param name="p_strUrl">Url to open.</param>
+		public void OpenUrl(string p_strUrl)
+		{
+			var uri = Android.Net.Uri.Parse(p_strUrl);
+			var intent = new Intent(Intent.ActionView, uri);
 
-            intent.AddFlags(ActivityFlags.NewTask);
+			intent.AddFlags(ActivityFlags.NewTask);
 
-            Android.App.Application.Context.StartActivity(intent);
-        }
-    }
+			Android.App.Application.Context.StartActivity(intent);
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK.Android/Model/Device/Gps.cs b/LastenradBayern/TINK.Android/Model/Device/Gps.cs
index dfa055f..9087413 100644
--- a/LastenradBayern/TINK.Android/Model/Device/Gps.cs
+++ b/LastenradBayern/TINK.Android/Model/Device/Gps.cs
@@ -16,15 +16,15 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(TINK.Droid.Model.Device.Gps))]
 namespace TINK.Droid.Model.Device
 {
-    public class Gps : IGeolodationDependent
-    {
-        public bool IsGeolcationEnabled
-        {
-            get
-            {
-                LocationManager locationManager = (LocationManager)Android.App.Application.Context.GetSystemService(Context.LocationService);
-                return locationManager.IsProviderEnabled(LocationManager.GpsProvider);
-            }
-        }
-    }
+	public class Gps : IGeolodationDependent
+	{
+		public bool IsGeolcationEnabled
+		{
+			get
+			{
+				LocationManager locationManager = (LocationManager)Android.App.Application.Context.GetSystemService(Context.LocationService);
+				return locationManager.IsProviderEnabled(LocationManager.GpsProvider);
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK.Android/Model/Device/SpecialFolder.cs b/LastenradBayern/TINK.Android/Model/Device/SpecialFolder.cs
index 3ca8eae..d07b4cb 100644
--- a/LastenradBayern/TINK.Android/Model/Device/SpecialFolder.cs
+++ b/LastenradBayern/TINK.Android/Model/Device/SpecialFolder.cs
@@ -6,44 +6,44 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(TINK.Droid.Model.Device.SpecialFolder))]
 namespace TINK.Droid.Model.Device
 {
-    public class SpecialFolder : ISpecialFolder
-    {
-        /// <summary> Get the folder name of external folder to write to. </summary>
-        /// <returns> Name of the external folder. </returns>
-        public string GetExternalFilesDir()
-        {
-            string baseFolderPath = string.Empty;
-            try
-            {
-                var context = Android.App.Application.Context;
-                Java.IO.File[] dirs = context.GetExternalFilesDirs(null);
+	public class SpecialFolder : ISpecialFolder
+	{
+		/// <summary> Get the folder name of external folder to write to. </summary>
+		/// <returns> Name of the external folder. </returns>
+		public string GetExternalFilesDir()
+		{
+			string baseFolderPath = string.Empty;
+			try
+			{
+				var context = Android.App.Application.Context;
+				Java.IO.File[] dirs = context.GetExternalFilesDirs(null);
 
-                foreach (Java.IO.File folder in dirs)
-                {
-                    bool IsRemovable = Android.OS.Environment.InvokeIsExternalStorageRemovable(folder);
-                    bool IsEmulated = Android.OS.Environment.InvokeIsExternalStorageEmulated(folder);
+				foreach (Java.IO.File folder in dirs)
+				{
+					bool IsRemovable = Android.OS.Environment.InvokeIsExternalStorageRemovable(folder);
+					bool IsEmulated = Android.OS.Environment.InvokeIsExternalStorageEmulated(folder);
 
-                    if (IsRemovable
-                        && !IsEmulated)
-                    {
-                        baseFolderPath = folder.Path;
-                    }
-                }
-            }
+					if (IsRemovable
+						&& !IsEmulated)
+					{
+						baseFolderPath = folder.Path;
+					}
+				}
+			}
 
-            catch (Exception l_oException)
-            {
-                Log.Error("Getting external files directory failed. {@l_oException}", l_oException);
-            }
+			catch (Exception l_oException)
+			{
+				Log.Error("Getting external files directory failed. {@l_oException}", l_oException);
+			}
 
-            return baseFolderPath;
-        }
+			return baseFolderPath;
+		}
 
-        /// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
-        /// <returns>Directory name.</returns>
-        public string GetInternalPersonalDir()
-        {
-            return Environment.GetFolderPath(Environment.SpecialFolder.Personal);
-        }
-    }
+		/// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
+		/// <returns>Directory name.</returns>
+		public string GetInternalPersonalDir()
+		{
+			return Environment.GetFolderPath(Environment.SpecialFolder.Personal);
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK.Android/Model/Device/WebView.cs b/LastenradBayern/TINK.Android/Model/Device/WebView.cs
index dacf5dd..409c1c9 100644
--- a/LastenradBayern/TINK.Android/Model/Device/WebView.cs
+++ b/LastenradBayern/TINK.Android/Model/Device/WebView.cs
@@ -4,13 +4,13 @@ using TINK.Model.Device;
 [assembly: Xamarin.Forms.Dependency(typeof(TINK.Droid.Model.Device.WebView))]
 namespace TINK.Droid.Model.Device
 {
-    public class WebView : IWebView
-    {
-        /// <summary> Clears the cookie cache for all web views. </summary>
-        public void ClearCookies()
-        {
-            var cookieManager = CookieManager.Instance;
-            cookieManager.RemoveAllCookie();
-        }
-    }
+	public class WebView : IWebView
+	{
+		/// <summary> Clears the cookie cache for all web views. </summary>
+		public void ClearCookies()
+		{
+			var cookieManager = CookieManager.Instance;
+			cookieManager.RemoveAllCookie();
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
index d8a024c..3a74495 100644
--- a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
+++ b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.337" android:versionCode="337">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.338" android:versionCode="338">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
 	<!-- Google Maps related permissions -->
 	<!-- Permission to receive remote notifications from Google Play Services -->
diff --git a/LastenradBayern/TINK.iOS/AppDelegate.cs b/LastenradBayern/TINK.iOS/AppDelegate.cs
index 03eaae8..6e4119a 100644
--- a/LastenradBayern/TINK.iOS/AppDelegate.cs
+++ b/LastenradBayern/TINK.iOS/AppDelegate.cs
@@ -4,45 +4,45 @@ using Xamarin.Forms;
 
 namespace TINK.iOS
 {
-    // The UIApplicationDelegate for the application. This class is responsible for launching the 
-    // User Interface of the application, as well as listening (and optionally responding) to 
-    // application events from iOS.
-    [Register("AppDelegate")]
-    public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate
-    {
-        //
-        // This method is invoked when the application has loaded and is ready to run. In this 
-        // method you should instantiate the window, load the UI into it and then make the window
-        // visible.
-        //
-        // You have 17 seconds to return from this method, or iOS will terminate your application.
-        //
-        public override bool FinishedLaunching(UIApplication app, NSDictionary options)
-        {
-            global::Xamarin.Forms.Forms.Init();
+	// The UIApplicationDelegate for the application. This class is responsible for launching the 
+	// User Interface of the application, as well as listening (and optionally responding) to 
+	// application events from iOS.
+	[Register("AppDelegate")]
+	public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate
+	{
+		//
+		// This method is invoked when the application has loaded and is ready to run. In this 
+		// method you should instantiate the window, load the UI into it and then make the window
+		// visible.
+		//
+		// You have 17 seconds to return from this method, or iOS will terminate your application.
+		//
+		public override bool FinishedLaunching(UIApplication app, NSDictionary options)
+		{
+			global::Xamarin.Forms.Forms.Init();
 
-            //Color of Icons in Navigation bar (e.g. burger menu and back arrow)
-            //UINavigationBar.Appearance.TintColor = Color.White.ToUIColor();
+			//Color of Icons in Navigation bar (e.g. burger menu and back arrow)
+			//UINavigationBar.Appearance.TintColor = Color.White.ToUIColor();
 
-            new iOS.Device.AppInfo(NSBundle.MainBundle.InfoDictionary[new NSString("CFBundleShortVersionString")]?.ToString() ?? string.Empty);
+			new iOS.Device.AppInfo(NSBundle.MainBundle.InfoDictionary[new NSString("CFBundleShortVersionString")]?.ToString() ?? string.Empty);
 
-            Forms.ViewInitialized += (object sender, ViewInitializedEventArgs e) =>
-            {
-                // http://developer.xamarin.com/recipes/testcloud/set-accessibilityidentifier-ios/
-                if (null != e.View.AutomationId)
-                {
-                    e.NativeView.AccessibilityIdentifier = e.View.AutomationId;
-                }
-            };
-            LoadApplication(new TINK.App());
+			Forms.ViewInitialized += (object sender, ViewInitializedEventArgs e) =>
+			{
+				// http://developer.xamarin.com/recipes/testcloud/set-accessibilityidentifier-ios/
+				if (null != e.View.AutomationId)
+				{
+					e.NativeView.AccessibilityIdentifier = e.View.AutomationId;
+				}
+			};
+			LoadApplication(new TINK.App());
 
-            // Required for initialization of Maps, see https://developer.xamarin.com/guides/xamarin-forms/user-interface/map/
-            Xamarin.FormsGoogleMaps.Init("000000000000000000000000000000000000000");
+			// Required for initialization of Maps, see https://developer.xamarin.com/guides/xamarin-forms/user-interface/map/
+			Xamarin.FormsGoogleMaps.Init("000000000000000000000000000000000000000");
 
-            // Required for initialization of binding package, see  https://github.com/nuitsjp/Xamarin.Forms.GoogleMaps.Bindings.
-            Xamarin.FormsGoogleMapsBindings.Init();
+			// Required for initialization of binding package, see  https://github.com/nuitsjp/Xamarin.Forms.GoogleMaps.Bindings.
+			Xamarin.FormsGoogleMapsBindings.Init();
 
-            return base.FinishedLaunching(app, options);
-        }
-    }
+			return base.FinishedLaunching(app, options);
+		}
+	}
 }
diff --git a/LastenradBayern/TINK.iOS/Device/AppInfo.cs b/LastenradBayern/TINK.iOS/Device/AppInfo.cs
index 22cec2a..8c62628 100644
--- a/LastenradBayern/TINK.iOS/Device/AppInfo.cs
+++ b/LastenradBayern/TINK.iOS/Device/AppInfo.cs
@@ -7,41 +7,41 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(AppInfo))]
 namespace TINK.iOS.Device
 {
-    /// <summary> Holds information about the TINK- app. </summary>
-    public class AppInfo : IAppInfo
-    {
-        /// <summary> Holds the the version of the app.</summary>
-        private static Version m_oVersion = null;
+	/// <summary> Holds information about the TINK- app. </summary>
+	public class AppInfo : IAppInfo
+	{
+		/// <summary> Holds the the version of the app.</summary>
+		private static Version m_oVersion = null;
 
-        /// <summary> Constructs a app info object. </summary>
-        public AppInfo()
-        {
-        }
+		/// <summary> Constructs a app info object. </summary>
+		public AppInfo()
+		{
+		}
 
-        /// <summary> Constructs a app info object for initialization. </summary>
-        /// <param name="p_strVersionText"> Version to initializ object with.</param>
-        internal AppInfo(string p_strVersionText)
-        {
-            if (m_oVersion != null)
-            {
-                // Set version only once.
-                return;
-            }
+		/// <summary> Constructs a app info object for initialization. </summary>
+		/// <param name="p_strVersionText"> Version to initializ object with.</param>
+		internal AppInfo(string p_strVersionText)
+		{
+			if (m_oVersion != null)
+			{
+				// Set version only once.
+				return;
+			}
 
-            if (!Version.TryParse(p_strVersionText, out Version l_oVersion))
-            {
-                m_oVersion = new Version(0, 8);
-            }
+			if (!Version.TryParse(p_strVersionText, out Version l_oVersion))
+			{
+				m_oVersion = new Version(0, 8);
+			}
 
-            m_oVersion = l_oVersion;
-        }
+			m_oVersion = l_oVersion;
+		}
 
-        /// <summary> Get the version of the app. </summary>
-        public Version Version => m_oVersion ?? new Version(0, 9);
+		/// <summary> Get the version of the app. </summary>
+		public Version Version => m_oVersion ?? new Version(0, 9);
 
-        /// <summary> Gets the URL to the app store. </summary>
-        /// <remarks> TINK Url was @"http://itunes.apple.com/de/app/tink-konstanz/id1181519270?mt=8"</remarks>
-        /// <value>The store URL.</value>
-        public string StoreUrl => $"https://itunes.apple.com/de/app/apple-store/{NSBundle.MainBundle.BundleIdentifier}?mt=8";
-    }
+		/// <summary> Gets the URL to the app store. </summary>
+		/// <remarks> TINK Url was @"http://itunes.apple.com/de/app/tink-konstanz/id1181519270?mt=8"</remarks>
+		/// <value>The store URL.</value>
+		public string StoreUrl => $"https://itunes.apple.com/de/app/apple-store/{NSBundle.MainBundle.BundleIdentifier}?mt=8";
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK.iOS/Device/Device.cs b/LastenradBayern/TINK.iOS/Device/Device.cs
index a715f2b..9fc0b4a 100644
--- a/LastenradBayern/TINK.iOS/Device/Device.cs
+++ b/LastenradBayern/TINK.iOS/Device/Device.cs
@@ -6,30 +6,30 @@ using Xamarin.Essentials;
 [assembly: Xamarin.Forms.Dependency(typeof(TINK.iOS.Device.Device))]
 namespace TINK.iOS.Device
 {
-    public class Device : ISmartDevice
-    {
-        [DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
-        private static extern uint IOServiceGetMatchingService(uint masterPort, IntPtr matching);
+	public class Device : ISmartDevice
+	{
+		[DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
+		private static extern uint IOServiceGetMatchingService(uint masterPort, IntPtr matching);
 
-        [DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
-        private static extern IntPtr IOServiceMatching(string s);
+		[DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
+		private static extern IntPtr IOServiceMatching(string s);
 
-        [DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
-        private static extern IntPtr IORegistryEntryCreateCFProperty(uint entry, IntPtr key, IntPtr allocator, uint options);
+		[DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
+		private static extern IntPtr IORegistryEntryCreateCFProperty(uint entry, IntPtr key, IntPtr allocator, uint options);
 
-        [DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
-        private static extern int IOObjectRelease(uint o);
+		[DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
+		private static extern int IOObjectRelease(uint o);
 
-        public string Manufacturer => DeviceInfo.Manufacturer;
+		public string Manufacturer => DeviceInfo.Manufacturer;
 
-        public string Model => DeviceInfo.Model;
+		public string Model => DeviceInfo.Model;
 
-        public DevicePlatform Platform => DeviceInfo.Platform;
+		public DevicePlatform Platform => DeviceInfo.Platform;
 
-        public string VersionText => DeviceInfo.VersionString;
-        /// <summary> Gets unitque device identifier. </summary>
-        /// <returns>Gets the identifies specifying device.</returns>
-        public string Identifier
-            => UIKit.UIDevice.CurrentDevice?.IdentifierForVendor?.AsString() ?? string.Empty;
-    }
+		public string VersionText => DeviceInfo.VersionString;
+		/// <summary> Gets unitque device identifier. </summary>
+		/// <returns>Gets the identifies specifying device.</returns>
+		public string Identifier
+			=> UIKit.UIDevice.CurrentDevice?.IdentifierForVendor?.AsString() ?? string.Empty;
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK.iOS/Device/ExternalBrowseService.cs b/LastenradBayern/TINK.iOS/Device/ExternalBrowseService.cs
index c9a7998..b0ac186 100644
--- a/LastenradBayern/TINK.iOS/Device/ExternalBrowseService.cs
+++ b/LastenradBayern/TINK.iOS/Device/ExternalBrowseService.cs
@@ -7,17 +7,17 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(ExternalBrowseService))]
 namespace TINK.iOS.Device
 {
-    public class ExternalBrowseService : IExternalBrowserService
-    {
-        /// <summary> Opens an external browser. </summary>
-        /// <param name="p_strUrl">Url to open.</param>
-        public void OpenUrl(string p_strUrl)
-        {
-            var l_oUrl = NSUrl.FromString(p_strUrl);
-            if (l_oUrl == null)
-                return;
+	public class ExternalBrowseService : IExternalBrowserService
+	{
+		/// <summary> Opens an external browser. </summary>
+		/// <param name="p_strUrl">Url to open.</param>
+		public void OpenUrl(string p_strUrl)
+		{
+			var l_oUrl = NSUrl.FromString(p_strUrl);
+			if (l_oUrl == null)
+				return;
 
-            UIApplication.SharedApplication.OpenUrl(l_oUrl);
-        }
-    }
+			UIApplication.SharedApplication.OpenUrl(l_oUrl);
+		}
+	}
 }
diff --git a/LastenradBayern/TINK.iOS/Device/Gps.cs b/LastenradBayern/TINK.iOS/Device/Gps.cs
index 6728593..21c425b 100644
--- a/LastenradBayern/TINK.iOS/Device/Gps.cs
+++ b/LastenradBayern/TINK.iOS/Device/Gps.cs
@@ -3,8 +3,8 @@
 [assembly: Xamarin.Forms.Dependency(typeof(TINK.iOS.Device.Gps))]
 namespace TINK.iOS.Device
 {
-    public class Gps : IGeolodationDependent
-    {
-        public bool IsGeolcationEnabled => true;
-    }
+	public class Gps : IGeolodationDependent
+	{
+		public bool IsGeolcationEnabled => true;
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK.iOS/Device/SpecialFolder.cs b/LastenradBayern/TINK.iOS/Device/SpecialFolder.cs
index 9434b04..5230371 100644
--- a/LastenradBayern/TINK.iOS/Device/SpecialFolder.cs
+++ b/LastenradBayern/TINK.iOS/Device/SpecialFolder.cs
@@ -5,23 +5,23 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(TINK.iOS.Device.SpecialFolder))]
 namespace TINK.iOS.Device
 {
-    public class SpecialFolder : ISpecialFolder
-    {
-        /// <summary>
-        /// Get the folder name of external folder to write to.
-        /// </summary>
-        /// <returns></returns>
-        public string GetExternalFilesDir()
-        {
-            return Environment.GetFolderPath(Environment.SpecialFolder.Personal);
-        }
+	public class SpecialFolder : ISpecialFolder
+	{
+		/// <summary>
+		/// Get the folder name of external folder to write to.
+		/// </summary>
+		/// <returns></returns>
+		public string GetExternalFilesDir()
+		{
+			return Environment.GetFolderPath(Environment.SpecialFolder.Personal);
+		}
 
-        /// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
-        /// <returns>Directory name.</returns>
-        public string GetInternalPersonalDir()
-        {
-            return Environment.GetFolderPath(Environment.SpecialFolder.Personal);
-        }
+		/// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
+		/// <returns>Directory name.</returns>
+		public string GetInternalPersonalDir()
+		{
+			return Environment.GetFolderPath(Environment.SpecialFolder.Personal);
+		}
 
-    }
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK.iOS/Device/WebView.cs b/LastenradBayern/TINK.iOS/Device/WebView.cs
index 5a5a5cb..f490266 100644
--- a/LastenradBayern/TINK.iOS/Device/WebView.cs
+++ b/LastenradBayern/TINK.iOS/Device/WebView.cs
@@ -5,14 +5,14 @@ using TINK.Model.Device;
 [assembly: Xamarin.Forms.Dependency(typeof(TINK.iOS.Device.WebView))]
 namespace TINK.iOS.Device
 {
-    public class WebView : IWebView
-    {
-        /// <summary> Clears the cookie cache for all web views. </summary>
-        public void ClearCookies()
-        {
-            NSHttpCookieStorage CookieStorage = NSHttpCookieStorage.SharedStorage;
-            foreach (var cookie in CookieStorage.Cookies)
-                CookieStorage.DeleteCookie(cookie);
-        }
-    }
+	public class WebView : IWebView
+	{
+		/// <summary> Clears the cookie cache for all web views. </summary>
+		public void ClearCookies()
+		{
+			NSHttpCookieStorage CookieStorage = NSHttpCookieStorage.SharedStorage;
+			foreach (var cookie in CookieStorage.Cookies)
+				CookieStorage.DeleteCookie(cookie);
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK.iOS/Device/iOSCipher.cs b/LastenradBayern/TINK.iOS/Device/iOSCipher.cs
index 4dc6464..fa4a22e 100644
--- a/LastenradBayern/TINK.iOS/Device/iOSCipher.cs
+++ b/LastenradBayern/TINK.iOS/Device/iOSCipher.cs
@@ -5,24 +5,24 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(TINK.iOS.Device.IOSCipher))]
 namespace TINK.iOS.Device
 {
-    public class IOSCipher : ICipher
-    {
-        /// <summary> Encrypt data.</summary>
-        /// <param name="key">Key to encrypt data.</param>
-        /// <param name="clear">Data to entrycpt.</param>
-        /// <returns></returns>
-        public byte[] Encrypt(byte[] key, byte[] clear)
-        {
-            throw new NotSupportedException();
-        }
+	public class IOSCipher : ICipher
+	{
+		/// <summary> Encrypt data.</summary>
+		/// <param name="key">Key to encrypt data.</param>
+		/// <param name="clear">Data to entrycpt.</param>
+		/// <returns></returns>
+		public byte[] Encrypt(byte[] key, byte[] clear)
+		{
+			throw new NotSupportedException();
+		}
 
-        /// <summary> Decrypt data. </summary>
-        /// <param name="key">Key to decrypt data with.</param>
-        /// <param name="encrypted">Encrpyted data to decrypt.</param>
-        /// <returns>Decrypted data.</returns>
-        public byte[] Decrypt(byte[] key, byte[] encrypted)
-        {
-            throw new NotSupportedException();
-        }
-    }
+		/// <summary> Decrypt data. </summary>
+		/// <param name="key">Key to decrypt data with.</param>
+		/// <param name="encrypted">Encrpyted data to decrypt.</param>
+		/// <returns>Decrypted data.</returns>
+		public byte[] Decrypt(byte[] key, byte[] encrypted)
+		{
+			throw new NotSupportedException();
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK.iOS/Info.plist b/LastenradBayern/TINK.iOS/Info.plist
index ba26e6a..1df5dc7 100644
--- a/LastenradBayern/TINK.iOS/Info.plist
+++ b/LastenradBayern/TINK.iOS/Info.plist
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
@@ -6,8 +6,8 @@
 	<array>
 		<string>bluetooth-peripheral</string>
 	</array>
-        <key>UIUserInterfaceStyle</key>
-        <string>Light</string>
+	<key>UIUserInterfaceStyle</key>
+	<string>Light</string>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>1</integer>
@@ -47,7 +47,7 @@
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
 	<string>Location access is needed to show map at current position and pass position to server when returning bikes.</string>
 	<key>MinimumOSVersion</key>
-	<string>9.0</string>
+	<string>13.0</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Location access is needed to show map at current position and pass position to server when returning bikes.</string>
 	<key>CFBundleIdentifier</key>
@@ -55,8 +55,8 @@
 	<key>CFBundleDisplayName</key>
 	<string>LastenradBayern</string>
 	<key>CFBundleVersion</key>
-	<string>337</string>
+	<string>338</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.337</string>
+	<string>3.0.338</string>
 </dict>
 </plist>
diff --git a/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj b/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj
index 7a335e8..3d6a35d 100644
--- a/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj
+++ b/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj
@@ -24,7 +24,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchArch>i386, x86_64</MtouchArch>
+    <MtouchArch>x86_64</MtouchArch>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>true</MtouchDebug>
     <CodesignProvision>VS: com.TeilRad.LastenradBayern Development</CodesignProvision>
@@ -37,8 +37,8 @@
     <DefineConstants>__IOS__;__MOBILE__;__UNIFIED__</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <MtouchLink>None</MtouchLink>
-    <MtouchArch>i386, x86_64</MtouchArch>
+    <MtouchLink>SdkOnly</MtouchLink>
+    <MtouchArch>x86_64</MtouchArch>
     <ConsolePause>false</ConsolePause>
     <CodesignProvision>VS: com.TeilRad.LastenradBayern Development</CodesignProvision>
     <CodesignKey>Apple Development: Oliver Hauff (8SZ7J9P24J)</CodesignKey>
@@ -52,11 +52,11 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
+    <MtouchArch>ARM64</MtouchArch>
     <CodesignKey>Apple Development: Oliver Hauff (8SZ7J9P24J)</CodesignKey>
     <MtouchDebug>true</MtouchDebug>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-    <MtouchLink>None</MtouchLink>
+    <MtouchLink>SdkOnly</MtouchLink>
     <MtouchInterpreter>-all</MtouchInterpreter>
     <CodesignProvision>VS: com.TeilRad.LastenradBayern Development</CodesignProvision>
   </PropertyGroup>
@@ -67,7 +67,7 @@
     <DefineConstants>__IOS__;__MOBILE__;__UNIFIED__</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
+    <MtouchArch>ARM64</MtouchArch>
     <ConsolePause>false</ConsolePause>
     <CodesignKey>Apple Development: Oliver Hauff (8SZ7J9P24J)</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
@@ -77,6 +77,7 @@
     <CrashReportingApiKey>
     </CrashReportingApiKey>
     <MtouchLink>SdkOnly</MtouchLink>
+    <MtouchSdkVersion>15.5</MtouchSdkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
     <DebugType>none</DebugType>
@@ -202,10 +203,10 @@
       <Version>1.7.3</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Forms.GoogleMaps">
-      <Version>3.3.0</Version>
+      <Version>5.0.0</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Forms.GoogleMaps.Bindings" Version="3.0.0" />
-    <PackageReference Include="Xamarin.Google.iOS.Maps" Version="3.9.0" />
+    <PackageReference Include="Xamarin.Google.iOS.Maps" Version="6.0.1.1" />
     <PackageReference Include="PInvoke.BCrypt">
       <Version>0.7.124</Version>
     </PackageReference>
diff --git a/LastenradBayern/TINK.iOS/Main.cs b/LastenradBayern/TINK.iOS/Main.cs
index c766ee2..7a40150 100644
--- a/LastenradBayern/TINK.iOS/Main.cs
+++ b/LastenradBayern/TINK.iOS/Main.cs
@@ -2,14 +2,14 @@
 
 namespace TINK.iOS
 {
-    public class Application
-    {
-        // This is the main entry point of the application.
-        static void Main(string[] args)
-        {
-            // if you want to use a different Application Delegate class from "AppDelegate"
-            // you can specify it here.
-            UIApplication.Main(args, null, "AppDelegate");
-        }
-    }
+	public class Application
+	{
+		// This is the main entry point of the application.
+		static void Main(string[] args)
+		{
+			// if you want to use a different Application Delegate class from "AppDelegate"
+			// you can specify it here.
+			UIApplication.Main(args, null, "AppDelegate");
+		}
+	}
 }
diff --git a/LastenradBayern/TINK/App.xaml.cs b/LastenradBayern/TINK/App.xaml.cs
index 4e05571..b5d306d 100644
--- a/LastenradBayern/TINK/App.xaml.cs
+++ b/LastenradBayern/TINK/App.xaml.cs
@@ -30,166 +30,166 @@ using Arendi.BleLibrary.Local;
 [assembly: XamlCompilation(XamlCompilationOptions.Compile)]
 namespace TINK
 {
-    public partial class App : Application
-    {
-        /// <summary>Title of the attachment file.</summary>
-        private const string ATTACHMENTTITLE = "Diagnostics.txt";
+	public partial class App : Application
+	{
+		/// <summary>Title of the attachment file.</summary>
+		private const string ATTACHMENTTITLE = "Diagnostics.txt";
 
-        /// <summary> Model root. </summary>
-        private static TinkApp m_oModelRoot;
+		/// <summary> Model root. </summary>
+		private static TinkApp m_oModelRoot;
 
-        /// <summary>
-        /// Gets the model root.
-        /// </summary>
-        public static TinkApp ModelRoot
-        {
-            get
-            {
-                if (m_oModelRoot != null)
-                {
-                    // Root model already exists, nothing to do.
-                    return m_oModelRoot;
-                }
+		/// <summary>
+		/// Gets the model root.
+		/// </summary>
+		public static TinkApp ModelRoot
+		{
+			get
+			{
+				if (m_oModelRoot != null)
+				{
+					// Root model already exists, nothing to do.
+					return m_oModelRoot;
+				}
 
-                // Get folder where to read settings from
-                var specialFolders = DependencyService.Get<ISpecialFolder>();
-                var internalPersonalDir = specialFolders.GetInternalPersonalDir();
+				// Get folder where to read settings from
+				var specialFolders = DependencyService.Get<ISpecialFolder>();
+				var internalPersonalDir = specialFolders.GetInternalPersonalDir();
 
-                // Delete attachtment from previous session.
-                DeleteAttachment(internalPersonalDir);
+				// Delete attachtment from previous session.
+				DeleteAttachment(internalPersonalDir);
 
-                // Setup logger using default settings.
-                TinkApp.SetupLogging(
-                    new LoggingLevelSwitch(Model.Settings.Settings.DEFAULTLOGGINLEVEL),
-                    internalPersonalDir);
+				// Setup logger using default settings.
+				TinkApp.SetupLogging(
+					new LoggingLevelSwitch(Model.Settings.Settings.DEFAULTLOGGINLEVEL),
+					internalPersonalDir);
 
-                // Subscribe to any unhandled/ unobserved exceptions.
-                AppDomain.CurrentDomain.UnhandledException += (sender, unobservedTaskExceptionEventArgs) => { Log.Fatal("Unobserved task exception: {Exception}", unobservedTaskExceptionEventArgs.ExceptionObject); };
-                TaskScheduler.UnobservedTaskException += (sender, unhandledExceptionEventArgs) => { Log.Fatal("Unhandled exception: {Exception}", unhandledExceptionEventArgs.Exception); };
+				// Subscribe to any unhandled/ unobserved exceptions.
+				AppDomain.CurrentDomain.UnhandledException += (sender, unobservedTaskExceptionEventArgs) => { Log.Fatal("Unobserved task exception: {Exception}", unobservedTaskExceptionEventArgs.ExceptionObject); };
+				TaskScheduler.UnobservedTaskException += (sender, unhandledExceptionEventArgs) => { Log.Fatal("Unhandled exception: {Exception}", unhandledExceptionEventArgs.Exception); };
 
-                // Restore last model state from json- file.
-                Dictionary<string, string> settingsJSON = new Dictionary<string, string>();
-                try
-                {
-                    settingsJSON = JsonSettingsDictionary.Deserialize(internalPersonalDir);
-                }
-                catch (Exception exception)
-                {
-                    Log.Error("Reading application settings from file failed.", exception);
-                }
+				// Restore last model state from json- file.
+				Dictionary<string, string> settingsJSON = new Dictionary<string, string>();
+				try
+				{
+					settingsJSON = JsonSettingsDictionary.Deserialize(internalPersonalDir);
+				}
+				catch (Exception exception)
+				{
+					Log.Error("Reading application settings from file failed.", exception);
+				}
 
-                Model.Settings.Settings settings;
-                try
-                {
-                    settings = new Model.Settings.Settings(
-                        null,  // Turn off filtering for LastenradBayern- context
-                        null,  // Turn off filtering for LastenradBayern- context
-                        JsonSettingsDictionary.GetCopriHostUri(settingsJSON),
-                        JsonSettingsDictionary.GetPollingParameters(settingsJSON),
-                        JsonSettingsDictionary.GetMinimumLoggingLevel(settingsJSON),
-                        JsonSettingsDictionary.GetIsReportLevelVerbose(settingsJSON),
-                        JsonSettingsDictionary.GetExpiresAfter(settingsJSON),
-                        JsonSettingsDictionary.GetActiveLockService(settingsJSON),
-                        JsonSettingsDictionary.GetConnectTimeout(settingsJSON),
-                        JsonSettingsDictionary.GetActiveGeolocationService(settingsJSON),
-                        JsonSettingsDictionary.GetCenterMapToCurrentLocation(settingsJSON),
-                        Xamarin.Forms.GoogleMaps.MapSpan.FromCenterAndRadius(new Xamarin.Forms.GoogleMaps.Position(49.30881083492271, 11.358449625922889), Xamarin.Forms.GoogleMaps.Distance.FromKilometers(2.9)),
-                        JsonSettingsDictionary.GetLogToExternalFolder(settingsJSON),
-                        JsonSettingsDictionary.GetIsSiteCachingOn(settingsJSON),
-                        JsonSettingsDictionary.GetActiveTheme(settingsJSON) ?? typeof(Themes.LastenradBayern).Name);
-                }
-                catch (Exception exception)
-                {
-                    Log.Error("Deserializing application settings from dictionary failed.", exception);
-                    settings = new Model.Settings.Settings();
-                }
+				Model.Settings.Settings settings;
+				try
+				{
+					settings = new Model.Settings.Settings(
+						null,  // Turn off filtering for LastenradBayern- context
+						null,  // Turn off filtering for LastenradBayern- context
+						JsonSettingsDictionary.GetCopriHostUri(settingsJSON),
+						JsonSettingsDictionary.GetPollingParameters(settingsJSON),
+						JsonSettingsDictionary.GetMinimumLoggingLevel(settingsJSON),
+						JsonSettingsDictionary.GetIsReportLevelVerbose(settingsJSON),
+						JsonSettingsDictionary.GetExpiresAfter(settingsJSON),
+						JsonSettingsDictionary.GetActiveLockService(settingsJSON),
+						JsonSettingsDictionary.GetConnectTimeout(settingsJSON),
+						JsonSettingsDictionary.GetActiveGeolocationService(settingsJSON),
+						JsonSettingsDictionary.GetCenterMapToCurrentLocation(settingsJSON),
+						Xamarin.Forms.GoogleMaps.MapSpan.FromCenterAndRadius(new Xamarin.Forms.GoogleMaps.Position(49.30881083492271, 11.358449625922889), Xamarin.Forms.GoogleMaps.Distance.FromKilometers(2.9)),
+						JsonSettingsDictionary.GetLogToExternalFolder(settingsJSON),
+						JsonSettingsDictionary.GetIsSiteCachingOn(settingsJSON),
+						JsonSettingsDictionary.GetActiveTheme(settingsJSON) ?? typeof(Themes.LastenradBayern).Name);
+				}
+				catch (Exception exception)
+				{
+					Log.Error("Deserializing application settings from dictionary failed.", exception);
+					settings = new Model.Settings.Settings();
+				}
 
-                if (settings.MinimumLogEventLevel != Model.Settings.Settings.DEFAULTLOGGINLEVEL
-                    || settings.LogToExternalFolder)
-                {
-                    // Eigher
-                    // - logging is not set to default value or
-                    // - logging is performed to external folder.
-                    // Need to reconfigure.
-                    Log.CloseAndFlush(); // Close before modifying logger configuration. Otherwise a sharing vialation occurs.
+				if (settings.MinimumLogEventLevel != Model.Settings.Settings.DEFAULTLOGGINLEVEL
+					|| settings.LogToExternalFolder)
+				{
+					// Eigher
+					// - logging is not set to default value or
+					// - logging is performed to external folder.
+					// Need to reconfigure.
+					Log.CloseAndFlush(); // Close before modifying logger configuration. Otherwise a sharing vialation occurs.
 
-                    TinkApp.SetupLogging(
-                        new LoggingLevelSwitch(settings.MinimumLogEventLevel),
-                        !settings.LogToExternalFolder
-                            ? internalPersonalDir
-                            : specialFolders.GetExternalFilesDir());
-                }
+					TinkApp.SetupLogging(
+						new LoggingLevelSwitch(settings.MinimumLogEventLevel),
+						!settings.LogToExternalFolder
+							? internalPersonalDir
+							: specialFolders.GetExternalFilesDir());
+				}
 
-                // Get auth cookie
-                Log.Debug("Get auth cookie.");
-                IStore store = null;
+				// Get auth cookie
+				Log.Debug("Get auth cookie.");
+				IStore store = null;
 
-                var lastVersion = JsonSettingsDictionary.GetAppVersion(settingsJSON);
-                if (new Version(3, 0, 290) <= lastVersion)
-                {
-                    // App versions newer than 3.0.173 stored geolocation service in configuration.
-                    // Version 3.0.290: Geolocation service "GeolocationService" is no more supported.
-                    // For this reasons a swich of geolocation service is forced when loading configurations from ealier versions.
-                    LocationServicesContainer.SetActive(settings.ActiveGeolocationService);
-                }
+				var lastVersion = JsonSettingsDictionary.GetAppVersion(settingsJSON);
+				if (new Version(3, 0, 290) <= lastVersion)
+				{
+					// App versions newer than 3.0.173 stored geolocation service in configuration.
+					// Version 3.0.290: Geolocation service "GeolocationService" is no more supported.
+					// For this reasons a swich of geolocation service is forced when loading configurations from ealier versions.
+					LocationServicesContainer.SetActive(settings.ActiveGeolocationService);
+				}
 
-                store = new Store();
+				store = new Store();
 
-                Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
+				Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
 
-                var context = SynchronizationContext.Current;
+				var context = SynchronizationContext.Current;
 
-                var appInfoService = DependencyService.Get<IAppInfo>();
+				var appInfoService = DependencyService.Get<IAppInfo>();
 
-                const string MERCHANTID = "0000000000";
+				const string MERCHANTID = "0000000000";
 
-                // Create new app instnace.
-                Log.Debug("Constructing main model...");
-                m_oModelRoot = new TinkApp(
-                    settings,
-                    store, // Manages user account
-                    isConnectedFunc: () => CrossConnectivity.Current.IsConnected,
-                    connectorFactory: (isConnected, activeUri, sessionCookie, mail, expiresAfter) => ConnectorFactory.Create(
-                        isConnected,
-                        activeUri,
-                        new Repository.AppContextInfo(MERCHANTID, AppFlavor.LastenradBayern.GetDisplayName().Replace(" ", ""), appInfoService.Version),
-                        CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
-                        sessionCookie,
-                        mail,
-                        expiresAfter),
-                    merchantId: MERCHANTID,
-                    bluetoothService: BluetoothService, /* locksService */
-                    locationPermissionsService: PermissionsService,
-                    locationServicesContainer: LocationServicesContainer,
-                    locksService: null,
-                    device: DependencyService.Get<ISmartDevice>(),
-                    specialFolder: specialFolders,
-                    cipher: new Cipher(),
-                    new TINK.Services.ThemeNS.Theme(Application.Current.Resources.MergedDictionaries),
-                    arendiCentral:
+				// Create new app instnace.
+				Log.Debug("Constructing main model...");
+				m_oModelRoot = new TinkApp(
+					settings,
+					store, // Manages user account
+					isConnectedFunc: () => CrossConnectivity.Current.IsConnected,
+					connectorFactory: (isConnected, activeUri, sessionCookie, mail, expiresAfter) => ConnectorFactory.Create(
+						isConnected,
+						activeUri,
+						new Repository.AppContextInfo(MERCHANTID, AppFlavor.LastenradBayern.GetDisplayName().Replace(" ", ""), appInfoService.Version),
+						CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
+						sessionCookie,
+						mail,
+						expiresAfter),
+					merchantId: MERCHANTID,
+					bluetoothService: BluetoothService, /* locksService */
+					locationPermissionsService: PermissionsService,
+					locationServicesContainer: LocationServicesContainer,
+					locksService: null,
+					device: DependencyService.Get<ISmartDevice>(),
+					specialFolder: specialFolders,
+					cipher: new Cipher(),
+					new TINK.Services.ThemeNS.Theme(Application.Current.Resources.MergedDictionaries),
+					arendiCentral:
 #if ARENDI
                     DependencyService.Get<ICentral>(),
 #else
 
-                    null,
+					null,
 #endif
-                    postAction: (d, obj) => context.Post(d, obj),
-                    currentVersion: appInfoService.Version,
-                    lastVersion: lastVersion,
-                    whatsNewShownInVersion: JsonSettingsDictionary.GetWhatsNew(settingsJSON) ?? settingsJSON.GetAppVersion(),
-                    appFlavor: AppFlavor.LastenradBayern);
+					postAction: (d, obj) => context.Post(d, obj),
+					currentVersion: appInfoService.Version,
+					lastVersion: lastVersion,
+					whatsNewShownInVersion: JsonSettingsDictionary.GetWhatsNew(settingsJSON) ?? settingsJSON.GetAppVersion(),
+					flavor: AppFlavor.LastenradBayern);
 
-                Log.Debug("Main model successfully constructed.");
-                return m_oModelRoot;
-            }
-        }
+				Log.Debug("Main model successfully constructed.");
+				return m_oModelRoot;
+			}
+		}
 
-        /// <summary>
-        /// Entry point of application.
-        /// </summary>
-        public App()
-        {
-            InitializeComponent();
+		/// <summary>
+		/// Entry point of application.
+		/// </summary>
+		public App()
+		{
+			InitializeComponent();
 
 #if USEFLYOUT
             // Use flyout page.
@@ -197,147 +197,147 @@ namespace TINK
                 ? new View.WhatsNew.WhatsNewPage(() => MainPage = new View.Root.RootPage()) // Show whats new info.
                 : (Page)new View.Root.RootPage(); // Just start sharee- app            
 #else
-            // Use shell.
-            MainPage = ModelRoot.WhatsNew.IsShowRequired
-            ? new View.WhatsNew.WhatsNewPage(() => MainPage = new View.RootShell.AppShell()) // Show whats new info.
-                : (Page)new View.RootShell.AppShell(); // Just start sharee- app
+			// Use shell.
+			MainPage = ModelRoot.WhatsNew.IsShowRequired
+			? new View.WhatsNew.WhatsNewPage(() => MainPage = new View.RootShell.AppShell()) // Show whats new info.
+				: (Page)new View.RootShell.AppShell(); // Just start sharee- app
 
 #endif
-        }
+		}
 
-        /// <summary> Concatenates all log files to a single one. </summary>
-        /// <returns>Full file name of attachment.</returns>
-        public static string CreateAttachment()
-        {
-            var sessionLogFiles = Log.Logger.GetLogFiles().ToArray();
+		/// <summary> Concatenates all log files to a single one. </summary>
+		/// <returns>Full file name of attachment.</returns>
+		public static string CreateAttachment()
+		{
+			var sessionLogFiles = Log.Logger.GetLogFiles().ToArray();
 
-            if (sessionLogFiles.Length < 1)
-            {
-                // Either
-                // - there is no logging file 
-                // - an error occurred getting list of log files.
-                return string.Empty;
-            }
+			if (sessionLogFiles.Length < 1)
+			{
+				// Either
+				// - there is no logging file 
+				// - an error occurred getting list of log files.
+				return string.Empty;
+			}
 
-            var fullLogFileName = System.IO.Path.Combine(ModelRoot.LogFileParentFolder, ATTACHMENTTITLE);
+			var fullLogFileName = System.IO.Path.Combine(ModelRoot.LogFileParentFolder, ATTACHMENTTITLE);
 
-            // Stop logging to avoid file access exception.
-            Log.CloseAndFlush();
+			// Stop logging to avoid file access exception.
+			Log.CloseAndFlush();
 
-            System.IO.File.WriteAllLines(
-                fullLogFileName,
-                sessionLogFiles.SelectMany(name =>
-                     (new List<string> { $"{{\"SessionFileName\":\"{name}\"}}" })
-                        .Concat(System.IO.File.ReadLines(name).ToArray())));
+			System.IO.File.WriteAllLines(
+				fullLogFileName,
+				sessionLogFiles.SelectMany(name =>
+					 (new List<string> { $"{{\"SessionFileName\":\"{name}\"}}" })
+						.Concat(System.IO.File.ReadLines(name).ToArray())));
 
-            // Resume logging
-            TinkApp.SetupLogging(
-                ModelRoot.Level,
-                ModelRoot.LogFileParentFolder);
+			// Resume logging
+			TinkApp.SetupLogging(
+				ModelRoot.Level,
+				ModelRoot.LogFileParentFolder);
 
-            return fullLogFileName;
-        }
+			return fullLogFileName;
+		}
 
-        /// <summary>Deletes an attachment if there is one.</summary>
-        /// <param name="folder">Folder to delete, is null folder is queried from model.</param>
-        private static void DeleteAttachment(string folder = null)
-        {
-            var attachment = System.IO.Path.Combine(folder ?? ModelRoot.LogFileParentFolder, ATTACHMENTTITLE);
-            if (!System.IO.File.Exists(attachment))
-            {
-                // No attachment found.
-                return;
-            }
+		/// <summary>Deletes an attachment if there is one.</summary>
+		/// <param name="folder">Folder to delete, is null folder is queried from model.</param>
+		private static void DeleteAttachment(string folder = null)
+		{
+			var attachment = System.IO.Path.Combine(folder ?? ModelRoot.LogFileParentFolder, ATTACHMENTTITLE);
+			if (!System.IO.File.Exists(attachment))
+			{
+				// No attachment found.
+				return;
+			}
 
-            System.IO.File.Delete(attachment);
-        }
+			System.IO.File.Delete(attachment);
+		}
 
-        protected override void OnSleep()
-        {
-            // Handle when your app sleeps
-            Log.CloseAndFlush();
-        }
+		protected override void OnSleep()
+		{
+			// Handle when your app sleeps
+			Log.CloseAndFlush();
+		}
 
-        protected override void OnResume()
-        {
-            DeleteAttachment();
+		protected override void OnResume()
+		{
+			DeleteAttachment();
 
-            TinkApp.SetupLogging(
-                ModelRoot.Level,
-                ModelRoot.LogFileParentFolder);
-        }
+			TinkApp.SetupLogging(
+				ModelRoot.Level,
+				ModelRoot.LogFileParentFolder);
+		}
 
-        /// <param name="uri">The URI for the request.</param>
-        /// <summary>Overriden to respond when the user initiates an app link request.</summary>
-        protected override void OnAppLinkRequestReceived(Uri uri)
-        {
-            base.OnAppLinkRequestReceived(uri);
-            if (uri.Host.ToLower() == "sharee.bike")
-            {
-                // Input e.g. sharee.bike/sharee?lat=49.921&long=32.51
-                Array segments = Array.ConvertAll(uri.Segments, segment => segment.Replace("/", "")).Skip(1).ToArray();
-                if (uri.Query.Length > 0)
-                {
-                    Dictionary<string, string> queryDict = uri.Query
-                        .Substring(1)
-                        .Split("&")
-                        .Select(query => query.Split('='))
-                        .ToDictionary(query => query.FirstOrDefault(), query => query.Skip(1).FirstOrDefault());
-                }
-                // segments == ["sharee"]
-                // queryDict == [{["lat", "49.921"]}], {["long", "32.51"]}]
-                // => Navigate and pass params depending on linkinput
-                // If no custom navigation is configured, the app just opens as if the user opened it
-            }
-        }
+		/// <param name="uri">The URI for the request.</param>
+		/// <summary>Overriden to respond when the user initiates an app link request.</summary>
+		protected override void OnAppLinkRequestReceived(Uri uri)
+		{
+			base.OnAppLinkRequestReceived(uri);
+			if (uri.Host.ToLower() == "sharee.bike")
+			{
+				// Input e.g. sharee.bike/sharee?lat=49.921&long=32.51
+				Array segments = Array.ConvertAll(uri.Segments, segment => segment.Replace("/", "")).Skip(1).ToArray();
+				if (uri.Query.Length > 0)
+				{
+					Dictionary<string, string> queryDict = uri.Query
+						.Substring(1)
+						.Split("&")
+						.Select(query => query.Split('='))
+						.ToDictionary(query => query.FirstOrDefault(), query => query.Skip(1).FirstOrDefault());
+				}
+				// segments == ["sharee"]
+				// queryDict == [{["lat", "49.921"]}], {["long", "32.51"]}]
+				// => Navigate and pass params depending on linkinput
+				// If no custom navigation is configured, the app just opens as if the user opened it
+			}
+		}
 
-        /// <summary> Gets the current logging level.</summary>
-        /// <returns></returns>
-        private static LogEventLevel GetCurrentLogEventLevel()
-        {
-            foreach (LogEventLevel level in Enum.GetValues(typeof(LogEventLevel)))
-            {
-                if (Log.IsEnabled(level))
-                    return level;
-            }
+		/// <summary> Gets the current logging level.</summary>
+		/// <returns></returns>
+		private static LogEventLevel GetCurrentLogEventLevel()
+		{
+			foreach (LogEventLevel level in Enum.GetValues(typeof(LogEventLevel)))
+			{
+				if (Log.IsEnabled(level))
+					return level;
+			}
 
-            return LogEventLevel.Error;
-        }
+			return LogEventLevel.Error;
+		}
 
-        /// <summary>
-        /// Holds the permission service instance.
-        /// </summary>
-        private static ILocationPermission _PermissionsService = null;
+		/// <summary>
+		/// Holds the permission service instance.
+		/// </summary>
+		private static ILocationPermission _PermissionsService = null;
 
-        /// <summary>
-        /// Service to manage permissions (location) of the app.
-        /// </summary>
-        public static ILocationPermission PermissionsService
-        {
-            get
-            {
-                if (_PermissionsService != null)
-                    return _PermissionsService;
+		/// <summary>
+		/// Service to manage permissions (location) of the app.
+		/// </summary>
+		public static ILocationPermission PermissionsService
+		{
+			get
+			{
+				if (_PermissionsService != null)
+					return _PermissionsService;
 
-                _PermissionsService = new TINK.Services.Permissions.Essentials.Permissions();
-                return _PermissionsService;
-            }
-        }
+				_PermissionsService = new TINK.Services.Permissions.Essentials.Permissions();
+				return _PermissionsService;
+			}
+		}
 
-        /// <summary> Service to manage bluetooth stack.</summary>
-        public static Plugin.BLE.Abstractions.Contracts.IBluetoothLE BluetoothService => Plugin.BLE.CrossBluetoothLE.Current;
+		/// <summary> Service to manage bluetooth stack.</summary>
+		public static Plugin.BLE.Abstractions.Contracts.IBluetoothLE BluetoothService => Plugin.BLE.CrossBluetoothLE.Current;
 
-        /// <summary>
-        /// Service container to manage geolocation services.
-        /// </summary>
-        public static IServicesContainer<IGeolocation> LocationServicesContainer { get; }
-            = new ServicesContainerMutableT<IGeolocation>(
-                    new HashSet<IGeolocation> {
-                        new LastKnownGeolocationService(DependencyService.Get<IGeolodationDependent>()),
-                        new SimulatedGeolocationService(DependencyService.Get<IGeolodationDependent>()),
-                        new GeolocationAccuracyMediumService(DependencyService.Get<IGeolodationDependent>()),
-                        new GeolocationAccuracyHighService(DependencyService.Get<IGeolodationDependent>()),
-                        new GeolocationAccuracyBestService(DependencyService.Get<IGeolodationDependent>())},
-                    Model.Settings.Settings.DefaultLocationService.FullName);
-    }
+		/// <summary>
+		/// Service container to manage geolocation services.
+		/// </summary>
+		public static IServicesContainer<IGeolocation> LocationServicesContainer { get; }
+			= new ServicesContainerMutableT<IGeolocation>(
+					new HashSet<IGeolocation> {
+						new LastKnownGeolocationService(DependencyService.Get<IGeolodationDependent>()),
+						new SimulatedGeolocationService(DependencyService.Get<IGeolodationDependent>()),
+						new GeolocationAccuracyMediumService(DependencyService.Get<IGeolodationDependent>()),
+						new GeolocationAccuracyHighService(DependencyService.Get<IGeolodationDependent>()),
+						new GeolocationAccuracyBestService(DependencyService.Get<IGeolodationDependent>())},
+					Model.Settings.Settings.DefaultLocationService.FullName);
+	}
 }
diff --git a/LastenradBayern/TINK/BackdoorMethodHelpers.cs b/LastenradBayern/TINK/BackdoorMethodHelpers.cs
index 068f5ac..f8dd015 100644
--- a/LastenradBayern/TINK/BackdoorMethodHelpers.cs
+++ b/LastenradBayern/TINK/BackdoorMethodHelpers.cs
@@ -5,34 +5,34 @@ using Xamarin.Forms;
 
 namespace TINK
 {
-    public static class BackdoorMethodHelpers
-    {
-        public static void DoTapPage(string stationId)
-        {
-            Serilog.Log.Information($"Request via backdoor to tap station {stationId}.");
-            var currentPage = GetCurrentPage();
-            var mapPageViewModel = (currentPage as MapPage)?.BindingContext as MapPageViewModel;
-            if (mapPageViewModel == null)
-            {
-                Serilog.Log.Error($"Request via backdoor to tap station {stationId} aborted because current page is not of expected type {typeof(MapPage).Name}. Type detected is {currentPage.GetType().Name}.");
-                return;
-            }
+	public static class BackdoorMethodHelpers
+	{
+		public static void DoTapPage(string stationId)
+		{
+			Serilog.Log.Information($"Request via backdoor to tap station {stationId}.");
+			var currentPage = GetCurrentPage();
+			var mapPageViewModel = (currentPage as MapPage)?.BindingContext as MapPageViewModel;
+			if (mapPageViewModel == null)
+			{
+				Serilog.Log.Error($"Request via backdoor to tap station {stationId} aborted because current page is not of expected type {typeof(MapPage).Name}. Type detected is {currentPage.GetType().Name}.");
+				return;
+			}
 
-            Serilog.Log.Information($"Invoking member to tap.");
-            mapPageViewModel?.OnStationClicked(stationId);
-        }
+			Serilog.Log.Information($"Invoking member to tap.");
+			mapPageViewModel?.OnStationClicked(stationId);
+		}
 
-        /// <summary> Gets the current page assumed that app is master detail page.</summary>
-        /// <returns></returns>
-        static Page GetCurrentPage()
-        {
+		/// <summary> Gets the current page assumed that app is master detail page.</summary>
+		/// <returns></returns>
+		static Page GetCurrentPage()
+		{
 
 #if USEFLYOUT
             return (Application.Current.MainPage as FlyoutPage)?.Detail.Navigation.NavigationStack.LastOrDefault();
 #else
-            return Shell.Current.CurrentPage;
+			return Shell.Current.CurrentPage;
 #endif
-        }
+		}
 
-    }
+	}
 }
diff --git a/LastenradBayern/TINK/Model/Device/SpecialFolder.cs b/LastenradBayern/TINK/Model/Device/SpecialFolder.cs
index 811664e..3a90f3f 100644
--- a/LastenradBayern/TINK/Model/Device/SpecialFolder.cs
+++ b/LastenradBayern/TINK/Model/Device/SpecialFolder.cs
@@ -3,22 +3,22 @@ using Xamarin.Forms;
 
 namespace TINK.Model.Device
 {
-    public class SpecialFolder : ISpecialFolder
-    {
-        /// <summary>
-        /// Get the folder name of external folder to write to.
-        /// </summary>
-        /// <returns></returns>
-        public string GetExternalFilesDir()
-        {
-            return DependencyService.Get<ISpecialFolder>().GetExternalFilesDir();
-        }
+	public class SpecialFolder : ISpecialFolder
+	{
+		/// <summary>
+		/// Get the folder name of external folder to write to.
+		/// </summary>
+		/// <returns></returns>
+		public string GetExternalFilesDir()
+		{
+			return DependencyService.Get<ISpecialFolder>().GetExternalFilesDir();
+		}
 
-        /// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
-        /// <returns>Directory name.</returns>
-        public string GetInternalPersonalDir()
-        {
-            return DependencyService.Get<ISpecialFolder>().GetInternalPersonalDir();
-        }
-    }
+		/// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
+		/// <returns>Directory name.</returns>
+		public string GetInternalPersonalDir()
+		{
+			return DependencyService.Get<ISpecialFolder>().GetInternalPersonalDir();
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/Account/AccountPage.xaml.cs b/LastenradBayern/TINK/View/Account/AccountPage.xaml.cs
index 4216b3e..d470451 100644
--- a/LastenradBayern/TINK/View/Account/AccountPage.xaml.cs
+++ b/LastenradBayern/TINK/View/Account/AccountPage.xaml.cs
@@ -12,80 +12,80 @@ using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 
 namespace TINK.View.Account
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class AccountPage : ContentPage, IViewService, IDetailPage
 #else
-    public partial class AccountPage : ContentPage, IViewService
+	public partial class AccountPage : ContentPage, IViewService
 #endif
-    {
-        /// <summary> Refernce to view model. </summary>
-        AccountPageViewModel m_oViewModel = null;
+	{
+		/// <summary> Refernce to view model. </summary>
+		AccountPageViewModel m_oViewModel = null;
 
-        /// <summary> Constructs a account page. </summary>
-        public AccountPage()
-        {
-            InitializeComponent();
+		/// <summary> Constructs a account page. </summary>
+		public AccountPage()
+		{
+			InitializeComponent();
 
-            var l_oModel = App.ModelRoot;
+			var l_oModel = App.ModelRoot;
 
-            m_oViewModel = new AccountPageViewModel(
-                l_oModel,
-                (url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url),
-                this);
+			m_oViewModel = new AccountPageViewModel(
+				l_oModel,
+				(url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url),
+				this);
 
-            BindingContext = m_oViewModel;
-        }
+			BindingContext = m_oViewModel;
+		}
 
-        /// <summary> Displays alert message. </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string title, string message, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, cancel);
+		/// <summary> Displays alert message. </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string title, string message, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, cancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary>
-        /// Displays an action sheet.
-        /// </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="cancel">Text of button.</param>
-        /// <param name="destruction"></param>
-        /// <param name="p_oButtons">Buttons holding options to select.</param>
-        /// <returns>Text selected</returns>
-        public new async Task<string> DisplayActionSheet(String title, String cancel, String destruction, params String[] p_oButtons)
-                => await base.DisplayActionSheet(title, cancel, destruction, p_oButtons);
+		/// <summary>
+		/// Displays an action sheet.
+		/// </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="cancel">Text of button.</param>
+		/// <param name="destruction"></param>
+		/// <param name="p_oButtons">Buttons holding options to select.</param>
+		/// <returns>Text selected</returns>
+		public new async Task<string> DisplayActionSheet(String title, String cancel, String destruction, params String[] p_oButtons)
+				=> await base.DisplayActionSheet(title, cancel, destruction, p_oButtons);
 
 #if USEFLYOUT
         /// <summary>
@@ -95,19 +95,19 @@ namespace TINK.View.Account
         public void ShowPage(ViewTypes p_oType, string title = null)
             => m_oNavigation.ShowPage(p_oType.GetViewType(), title);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushModalAsync(ViewTypes typeOfPage)
-            => Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushModalAsync(ViewTypes typeOfPage)
+			=> Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync()
-            => throw new NotSupportedException();
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync()
+			=> throw new NotSupportedException();
 
 #if USEFLYOUT
 
@@ -123,34 +123,34 @@ namespace TINK.View.Account
         }
 
 #endif
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        protected async override void OnAppearing()
-            => await m_oViewModel.OnAppearing();
-        /// <summary>
-        /// Invoked when pages is closed/ hidden. 
-        /// Stops update process.
-        /// </summary>
-        protected async override void OnDisappearing()
-        {
-            if (m_oViewModel == null)
-            {
-                // View model might be null.
-                return;
-            }
-            await m_oViewModel.OnDisappearing();
-        }
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		protected async override void OnAppearing()
+			=> await m_oViewModel.OnAppearing();
+		/// <summary>
+		/// Invoked when pages is closed/ hidden. 
+		/// Stops update process.
+		/// </summary>
+		protected async override void OnDisappearing()
+		{
+			if (m_oViewModel == null)
+			{
+				// View model might be null.
+				return;
+			}
+			await m_oViewModel.OnDisappearing();
+		}
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public async Task PushAsync(ViewTypes p_oTypeOfPage)
-            => await Navigation.PushAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public async Task PushAsync(ViewTypes p_oTypeOfPage)
+			=> await Navigation.PushAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/Bike/BCBike.xaml.cs b/LastenradBayern/TINK/View/Bike/BCBike.xaml.cs
index 99225d0..b3d8cf4 100644
--- a/LastenradBayern/TINK/View/Bike/BCBike.xaml.cs
+++ b/LastenradBayern/TINK/View/Bike/BCBike.xaml.cs
@@ -9,12 +9,12 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Bike
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class BCBike : ViewCell
-    {
-        public BCBike()
-        {
-            InitializeComponent();
-        }
-    }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class BCBike : ViewCell
+	{
+		public BCBike()
+		{
+			InitializeComponent();
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/Bike/BikeViewCellTemplateSelector.cs b/LastenradBayern/TINK/View/Bike/BikeViewCellTemplateSelector.cs
index f77e9f5..215d21d 100644
--- a/LastenradBayern/TINK/View/Bike/BikeViewCellTemplateSelector.cs
+++ b/LastenradBayern/TINK/View/Bike/BikeViewCellTemplateSelector.cs
@@ -2,24 +2,24 @@
 
 namespace TINK.View.Bike
 {
-    /// <summary>
-    /// Selects different templates for different bike types (BordComputer bikes, iLockIt bikes).
-    /// </summary>
-    public class BikeViewCellTemplateSelector : DataTemplateSelector
-    {
-        DataTemplate bCBike;
-        DataTemplate iLockIBike;
+	/// <summary>
+	/// Selects different templates for different bike types (BordComputer bikes, iLockIt bikes).
+	/// </summary>
+	public class BikeViewCellTemplateSelector : DataTemplateSelector
+	{
+		DataTemplate bCBike;
+		DataTemplate iLockIBike;
 
-        public BikeViewCellTemplateSelector()
-        {
-            bCBike = new DataTemplate(typeof(BCBike));
-            iLockIBike = new DataTemplate(typeof(ILockItBike));
-        }
+		public BikeViewCellTemplateSelector()
+		{
+			bCBike = new DataTemplate(typeof(BCBike));
+			iLockIBike = new DataTemplate(typeof(ILockItBike));
+		}
 
-        protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
-            => item is TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel ||
-                item is TINK.ViewModel.Bikes.Bike.CopriLock.BikeViewModel
-                    ? iLockIBike
-                    : bCBike;
-    }
+		protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
+			=> item is TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel ||
+				item is TINK.ViewModel.Bikes.Bike.CopriLock.BikeViewModel
+					? iLockIBike
+					: bCBike;
+	}
 }
diff --git a/LastenradBayern/TINK/View/Bike/ILockItBike.xaml.cs b/LastenradBayern/TINK/View/Bike/ILockItBike.xaml.cs
index bdd09dd..ff2a14f 100644
--- a/LastenradBayern/TINK/View/Bike/ILockItBike.xaml.cs
+++ b/LastenradBayern/TINK/View/Bike/ILockItBike.xaml.cs
@@ -9,36 +9,36 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Bike
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class ILockItBike : ViewCell
-    {
-        public ILockItBike()
-        {
-            InitializeComponent();
-        }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class ILockItBike : ViewCell
+	{
+		public ILockItBike()
+		{
+			InitializeComponent();
+		}
 
-        protected override void OnBindingContextChanged()
-        {
-            base.OnBindingContextChanged();
+		protected override void OnBindingContextChanged()
+		{
+			base.OnBindingContextChanged();
 
-            if (Device.RuntimePlatform != Device.iOS)
-                // Update of size is only required for iOS.
-                return;
+			if (Device.RuntimePlatform != Device.iOS)
+				// Update of size is only required for iOS.
+				return;
 
-            var viewModel = BindingContext as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            if (viewModel == null)
-                return;
+			var viewModel = BindingContext as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			if (viewModel == null)
+				return;
 
-            viewModel.PropertyChanged += (sender, e) =>
-            {
-                if (e.PropertyName == nameof(TINK.ViewModel.Bikes.Bike.BC.RequestHandler.Base<IBikeInfoMutable>.IsButtonVisible)
-                || e.PropertyName == nameof(TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler.Base.IsLockitButtonVisible))
-                {
-                    // Force update of view cell on iOS.
-                    // https://hausource.visualstudio.com/TINK/_workitems/edit/132
-                    ForceUpdateSize();
-                }
-            };
-        }
-    }
+			viewModel.PropertyChanged += (sender, e) =>
+			{
+				if (e.PropertyName == nameof(TINK.ViewModel.Bikes.Bike.BC.RequestHandler.Base<IBikeInfoMutable>.IsButtonVisible)
+				|| e.PropertyName == nameof(TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler.Base.IsLockitButtonVisible))
+				{
+					// Force update of view cell on iOS.
+					// https://hausource.visualstudio.com/TINK/_workitems/edit/132
+					ForceUpdateSize();
+				}
+			};
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs b/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
index 9312d9f..5cf8817 100644
--- a/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
+++ b/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
@@ -5,38 +5,38 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.BikesAtStation
 {
-    using System;
-    using System.Linq;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using TINK.Model.Device;
+	using System;
+	using System.Linq;
+	using System.Threading;
+	using System.Threading.Tasks;
+	using TINK.Model.Device;
 #if USEFLYOUT
     using TINK.View.MasterDetail;
 #endif
-    using TINK.ViewModel;
-    using TINK.Model;
-    using TINK.Services.BluetoothLock.Tdo;
-    using System.Collections.Generic;
-    using Serilog;
-    using TINK.Services.BluetoothLock;
-    using Plugin.BLE;
-    using TINK.ViewModel.BikesAtStation;
-    using TINK.ViewModel.Bikes;
-    using Xamarin.CommunityToolkit.Extensions;
-    using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
+	using TINK.ViewModel;
+	using TINK.Model;
+	using TINK.Services.BluetoothLock.Tdo;
+	using System.Collections.Generic;
+	using Serilog;
+	using TINK.Services.BluetoothLock;
+	using Plugin.BLE;
+	using TINK.ViewModel.BikesAtStation;
+	using TINK.ViewModel.Bikes;
+	using Xamarin.CommunityToolkit.Extensions;
+	using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class BikesAtStationPage : ContentPage, IViewService, IDetailPage
 #else
-    public partial class BikesAtStationPage : ContentPage, IViewService
+	public partial class BikesAtStationPage : ContentPage, IViewService
 #endif
-    {
+	{
 
-        private BikesAtStationPageViewModel m_oViewModel;
+		private BikesAtStationPageViewModel m_oViewModel;
 
-        /// <summary> Initialization status to ensure initialization logic is not called multiple times. </summary>
-        private bool isInitializationStarted = false;
+		/// <summary> Initialization status to ensure initialization logic is not called multiple times. </summary>
+		private bool isInitializationStarted = false;
 #if TRYNOTBACKSTYLE
         public BikesAtStationPage()
         {
@@ -55,140 +55,140 @@ namespace TINK.View.BikesAtStation
         }
 
 #else
-        public BikesAtStationPage()
-        {
-        }
+		public BikesAtStationPage()
+		{
+		}
 #endif
 
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        protected async override void OnAppearing()
-        {
-            // Don't repeat the initialization if it has been completed already.
-            if (isInitializationStarted) return;
-            isInitializationStarted = true;
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		protected async override void OnAppearing()
+		{
+			// Don't repeat the initialization if it has been completed already.
+			if (isInitializationStarted) return;
+			isInitializationStarted = true;
 
-            if (m_oViewModel != null)
-            {
+			if (m_oViewModel != null)
+			{
 #if BACKSTYLE
                 // Hide master- detail menu to force user to navigate using back button.
                 m_oNavigation.IsGestureEnabled = false;
 #endif
 
-                // No need to create view model, set binding context an items source if already done.
-                // If done twice tap events are fired multiple times (when hiding page using home button).
-                await m_oViewModel.OnAppearing();
-                isInitializationStarted = false;
-                return;
-            }
+				// No need to create view model, set binding context an items source if already done.
+				// If done twice tap events are fired multiple times (when hiding page using home button).
+				await m_oViewModel.OnAppearing();
+				isInitializationStarted = false;
+				return;
+			}
 
-            try
-            {
-                var model = App.ModelRoot;
+			try
+			{
+				var model = App.ModelRoot;
 
-                // Backup synchronization context when called from GUI-thread.
-                var synchronizationContext = SynchronizationContext.Current;
+				// Backup synchronization context when called from GUI-thread.
+				var synchronizationContext = SynchronizationContext.Current;
 
-                m_oViewModel = new BikesAtStationPageViewModel(
-                        model.ActiveUser,
-                        App.PermissionsService,
-                        App.BluetoothService,
-                        Device.RuntimePlatform,
-                        model.SelectedStation,
-                        () => model.GetIsConnected(),
-                        (isConnected) => model.GetConnector(isConnected),
-                        App.LocationServicesContainer.Active,
-                        model.LocksServices.Active,
-                        model.Polling,
-                        (url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url),
-                        (d, obj) => synchronizationContext.Post(d, obj),
-                        model.SmartDevice,
-                        this)
-                {
-                    IsReportLevelVerbose = model.IsReportLevelVerbose
-                };
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<BikesAtStationPage>().Error("Displaying bikes at station page failed. {Exception}", exception);
-                await DisplayAlert("Fehler", $"Seite Räder an Station kann nicht angezeigt werden. ${exception.Message}", "OK");
-                isInitializationStarted = false;
-                return;
-            }
+				m_oViewModel = new BikesAtStationPageViewModel(
+						model.ActiveUser,
+						App.PermissionsService,
+						App.BluetoothService,
+						Device.RuntimePlatform,
+						model.SelectedStation,
+						() => model.GetIsConnected(),
+						(isConnected) => model.GetConnector(isConnected),
+						App.LocationServicesContainer.Active,
+						model.LocksServices.Active,
+						model.Polling,
+						(url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url),
+						(d, obj) => synchronizationContext.Post(d, obj),
+						model.SmartDevice,
+						this)
+				{
+					IsReportLevelVerbose = model.IsReportLevelVerbose
+				};
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<BikesAtStationPage>().Error("Displaying bikes at station page failed. {Exception}", exception);
+				await DisplayAlert("Fehler", $"Seite Räder an Station kann nicht angezeigt werden. ${exception.Message}", "OK");
+				isInitializationStarted = false;
+				return;
+			}
 
-            InitializeComponent();
+			InitializeComponent();
 
 #if BACKSTYLE
             // Hide master- detail menu to force user to navigate using back button.
             m_oNavigation.IsGestureEnabled = false;
 #endif
 
-            BindingContext = m_oViewModel;
-            BikesAtStationListView.ItemsSource = m_oViewModel;
+			BindingContext = m_oViewModel;
+			BikesAtStationListView.ItemsSource = m_oViewModel;
 
-            await m_oViewModel.OnAppearing();
-            isInitializationStarted = false;
-        }
+			await m_oViewModel.OnAppearing();
+			isInitializationStarted = false;
+		}
 
-        /// <summary>
-        /// Invoked when pages is closed/ hidden. 
-        /// Stops update process.
-        /// </summary>
-        protected async override void OnDisappearing()
-        {
-            if (m_oViewModel != null)
-            {
-                // View model might be null.
-                await m_oViewModel?.OnDisappearing();
-            }
+		/// <summary>
+		/// Invoked when pages is closed/ hidden. 
+		/// Stops update process.
+		/// </summary>
+		protected async override void OnDisappearing()
+		{
+			if (m_oViewModel != null)
+			{
+				// View model might be null.
+				await m_oViewModel?.OnDisappearing();
+			}
 
 #if BACKSTYLE
             if (m_oNavigation!= null)
                 m_oNavigation.IsGestureEnabled = true; // Enables master- detail menu navigation again when page is unloaded.
 #endif
-        }
+		}
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string title, string message, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string title, string message, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, cancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
 
 #if USEFLYOUT
@@ -198,27 +198,27 @@ namespace TINK.View.BikesAtStation
         public void ShowPage(ViewTypes p_oType, string title = null)
             => m_oNavigation.ShowPage(p_oType.GetViewType(), title);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="typeOfPage">Page to display.</param>
-        public async Task PushModalAsync(ViewTypes typeOfPage)
-            => await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="typeOfPage">Page to display.</param>
+		public async Task PushModalAsync(ViewTypes typeOfPage)
+			=> await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync()
-        {
-            throw new NotSupportedException();
-        }
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync()
+		{
+			throw new NotSupportedException();
+		}
 
-        public Task PushAsync(ViewTypes p_oTypeOfPage)
-        {
-            throw new NotImplementedException();
-        }
+		public Task PushAsync(ViewTypes p_oTypeOfPage)
+		{
+			throw new NotImplementedException();
+		}
 
 #if USEFLYOUT
         /// <summary>
@@ -239,10 +239,10 @@ namespace TINK.View.BikesAtStation
 #if USCSHARP9
         public async Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup());
 #else
-        /// <summary> Displays user feedback popup.</summary>
-        /// <param name="co2Saving"> Co2 saving information.</param>
-        /// <returns>User feedback.</returns>
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
+		/// <summary> Displays user feedback popup.</summary>
+		/// <param name="co2Saving"> Co2 saving information.</param>
+		/// <returns>User feedback.</returns>
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/BoolInverterConverter.cs b/LastenradBayern/TINK/View/BoolInverterConverter.cs
index bbd7296..9fc95cd 100644
--- a/LastenradBayern/TINK/View/BoolInverterConverter.cs
+++ b/LastenradBayern/TINK/View/BoolInverterConverter.cs
@@ -4,16 +4,16 @@ using Xamarin.Forms;
 
 namespace TINK.View
 {
-    /// <summary> Inverts a bool.</summary>
-    public class BoolInverterConverter : IValueConverter
-    {
-        /// <summary> Inverts a bool.</summary>
-        /// <param name="value">Bool to invert.</param>
-        /// <returns>Inverted bool.</returns>
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-            => value is bool flag && !flag;
+	/// <summary> Inverts a bool.</summary>
+	public class BoolInverterConverter : IValueConverter
+	{
+		/// <summary> Inverts a bool.</summary>
+		/// <param name="value">Bool to invert.</param>
+		/// <returns>Inverted bool.</returns>
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+			=> value is bool flag && !flag;
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-            => value is bool flag && !flag;
-    }
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+			=> value is bool flag && !flag;
+	}
 }
diff --git a/LastenradBayern/TINK/View/Contact/ContactPage.xaml b/LastenradBayern/TINK/View/Contact/ContactPage.xaml
index 04f6a90..eca477a 100644
--- a/LastenradBayern/TINK/View/Contact/ContactPage.xaml
+++ b/LastenradBayern/TINK/View/Contact/ContactPage.xaml
@@ -50,7 +50,7 @@
                                 IsVisible="{Binding MailAddressText, Converter={StaticResource StringNotNullOrEmpty_Converter}}"
                                 Text="{Binding MailAddressText}"
                                 IsEnabled="{Binding IsSendMailAvailable}"
-                                Command="{Binding OnMailRequest}"/>
+                                Command="{Binding OnMailToOperatorRequest}"/>
                             <!--- Phone -->
                             <Label 
                                 IsVisible="{Binding PhoneNumberText, Converter={StaticResource StringNotNullOrEmpty_Converter}}"
diff --git a/LastenradBayern/TINK/View/Contact/ContactPage.xaml.cs b/LastenradBayern/TINK/View/Contact/ContactPage.xaml.cs
index 451d443..accc94c 100644
--- a/LastenradBayern/TINK/View/Contact/ContactPage.xaml.cs
+++ b/LastenradBayern/TINK/View/Contact/ContactPage.xaml.cs
@@ -10,116 +10,117 @@ using TINK.ViewModel.Info;
 using Xamarin.Essentials;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
+using TINK.Model;
 
 namespace TINK.View.Contact
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class ContactPage : ContentPage, IViewService, IDetailPage
 #else
-    public partial class ContactPage : ContentPage, IViewService
+	public partial class ContactPage : ContentPage, IViewService
 #endif
-    {
-        /// <summary> View model to notify view model if page appears. </summary>
-        private ContactPageViewModel ViewModel { get; set; }
+	{
+		/// <summary> View model to notify view model if page appears. </summary>
+		private ContactPageViewModel ViewModel { get; set; }
 
-        public ContactPage()
-        {
-            InitializeComponent();
+		public ContactPage()
+		{
+			InitializeComponent();
 
-            ViewModel = new ContactPageViewModel(App.ModelRoot.Uris.ActiveUri,
-                AppInfo.Name,
-                () => App.CreateAttachment(),
-                () => DependencyService.Get<IExternalBrowserService>().OpenUrl(DependencyService.Get<IAppInfo>().StoreUrl),
-                this);
+			ViewModel = new ContactPageViewModel(
+				App.ModelRoot.Flavor.GetDisplayName(),
+				() => App.CreateAttachment(),
+				() => DependencyService.Get<IExternalBrowserService>().OpenUrl(DependencyService.Get<IAppInfo>().StoreUrl),
+				this);
 
-            ContactPageView.BindingContext = ViewModel;
-        }
+			ContactPageView.BindingContext = ViewModel;
+		}
 
-        /// <summary> Invoked when page is shown. </summary>
-        protected async override void OnAppearing()
-        {
-            try
-            {
-                Log.ForContext<ContentPage>().Verbose("OnAppearing...");
+		/// <summary> Invoked when page is shown. </summary>
+		protected async override void OnAppearing()
+		{
+			try
+			{
+				Log.ForContext<ContentPage>().Verbose("OnAppearing...");
 
-                await ViewModel.OnAppearing(App.ModelRoot.SelectedStation);
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<ContentPage>().Error("Invoking OnAppearing on view model failed. {Exception}", exception);
-                return;
-            }
-        }
+				await ViewModel.OnAppearing(App.ModelRoot.SelectedStation);
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<ContentPage>().Error("Invoking OnAppearing on view model failed. {Exception}", exception);
+				return;
+			}
+		}
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-        string title,
-        string message,
-        string details,
-        string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+		string title,
+		string message,
+		string details,
+		string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
 #if USEFLYOUT
         public void ShowPage(ViewTypes p_oType, string title = null)
             => NavigationMasterDetail.ShowPage(p_oType.GetViewType(), title);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushModalAsync(ViewTypes p_oTypeOfPage)
-        {
-            throw new NotSupportedException();
-        }
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushModalAsync(ViewTypes p_oTypeOfPage)
+		{
+			throw new NotSupportedException();
+		}
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync()
-        {
-            throw new NotSupportedException();
-        }
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync()
+		{
+			throw new NotSupportedException();
+		}
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="typeOfPage">Page to display.</param>
-        public async Task PushAsync(ViewTypes typeOfPage)
-        {
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="typeOfPage">Page to display.</param>
+		public async Task PushAsync(ViewTypes typeOfPage)
+		{
 #if USEFLYOUT
             var page = Activator.CreateInstance(typeOfPage.GetViewType()) as IDetailPage;
 #else
-            var page = Activator.CreateInstance(typeOfPage.GetViewType());
+			var page = Activator.CreateInstance(typeOfPage.GetViewType());
 #endif
-            if (page == null)
-            {
-                return;
-            }
+			if (page == null)
+			{
+				return;
+			}
 
 #if USEFLYOUT
             page.NavigationMasterDetail = NavigationMasterDetail;
 #endif
-            await Navigation.PushAsync((Page)page);
-        }
+			await Navigation.PushAsync((Page)page);
+		}
 
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
 
 #if USEFLYOUT
@@ -129,5 +130,5 @@ namespace TINK.View.Contact
         /// </summary>
         public INavigationMasterDetail NavigationMasterDetail { set; private get; }
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/Contact/SelectStationPage.xaml.cs b/LastenradBayern/TINK/View/Contact/SelectStationPage.xaml.cs
index 08f0319..c9a7d51 100644
--- a/LastenradBayern/TINK/View/Contact/SelectStationPage.xaml.cs
+++ b/LastenradBayern/TINK/View/Contact/SelectStationPage.xaml.cs
@@ -8,67 +8,67 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Contact
 {
-    using Serilog;
-    using TINK.Model;
-    using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
-    using TINK.ViewModel.Contact;
+	using Serilog;
+	using TINK.Model;
+	using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
+	using TINK.ViewModel.Contact;
 
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class SelectStationPage : ContentPage, IViewService, IDetailPage
 #else
-    public partial class SelectStationPage : ContentPage, IViewService
+	public partial class SelectStationPage : ContentPage, IViewService
 #endif
-    {
-        /// <summary> View model to notify about whether page appears or hides. </summary>
-        private SelectStationPageViewModel SelectStationPageViewModel { get; set; }
+	{
+		/// <summary> View model to notify about whether page appears or hides. </summary>
+		private SelectStationPageViewModel SelectStationPageViewModel { get; set; }
 
-        public SelectStationPage()
-        {
-            InitializeComponent();
-        }
+		public SelectStationPage()
+		{
+			InitializeComponent();
+		}
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string title, string message, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, cancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string title, string message, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, cancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
 
 #if USEFLYOUT
         /// <summary>
@@ -78,45 +78,45 @@ namespace TINK.View.Contact
         public void ShowPage(ViewTypes type, string title = null)
             => NavigationMasterDetail.ShowPage(type.GetViewType(), title);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="typeOfPage">Type of page to display.</param>
-        public async Task PushModalAsync(ViewTypes typeOfPage)
-            => await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="typeOfPage">Type of page to display.</param>
+		public async Task PushModalAsync(ViewTypes typeOfPage)
+			=> await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public async Task PopModalAsync()
-            => await Navigation.PopModalAsync();
+		/// <summary> Pops a page from the modal stack. </summary>
+		public async Task PopModalAsync()
+			=> await Navigation.PopModalAsync();
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="typeOfPage">Page to display.</param>
-        public async Task PushAsync(ViewTypes typeOfPage)
-        {
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="typeOfPage">Page to display.</param>
+		public async Task PushAsync(ViewTypes typeOfPage)
+		{
 #if USEFLYOUT
             var page = Activator.CreateInstance(typeOfPage.GetViewType()) as IDetailPage;
 #else
-            var page = Activator.CreateInstance(typeOfPage.GetViewType());
+			var page = Activator.CreateInstance(typeOfPage.GetViewType());
 #endif
-            if (page == null)
-            {
-                return;
-            }
+			if (page == null)
+			{
+				return;
+			}
 
 #if USEFLYOUT
             page.NavigationMasterDetail = NavigationMasterDetail;
 #endif
 
-            await Navigation.PushAsync((Page)page);
-        }
+			await Navigation.PushAsync((Page)page);
+		}
 
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
 
 #if USEFLYOUT
@@ -124,86 +124,86 @@ namespace TINK.View.Contact
         public INavigationMasterDetail NavigationMasterDetail { private get; set; }
 
 #endif
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        protected async override void OnAppearing()
-        {
-            // Pass reference to member Navigation to show bikes at station x dialog.
-            try
-            {
-                Log.ForContext<SelectStationPageViewModel>().Verbose("Constructing select station view model.");
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		protected async override void OnAppearing()
+		{
+			// Pass reference to member Navigation to show bikes at station x dialog.
+			try
+			{
+				Log.ForContext<SelectStationPageViewModel>().Verbose("Constructing select station view model.");
 
 #if TRYNOTBACKSTYLE
                 SelectStationPageViewModel = new SelectStationPageViewModel();
 #else
-                SelectStationPageViewModel = new SelectStationPageViewModel(
-                    App.ModelRoot,
-                    App.PermissionsService,
-                    App.BluetoothService,
-                    App.LocationServicesContainer.Active,
-                    (mapspan) => MyMap.MoveToRegion(mapspan),
-                    this,
-                    Navigation);
+				SelectStationPageViewModel = new SelectStationPageViewModel(
+					App.ModelRoot,
+					App.PermissionsService,
+					App.BluetoothService,
+					App.LocationServicesContainer.Active,
+					(mapspan) => MyMap.MoveToRegion(mapspan),
+					this,
+					Navigation);
 #endif
-            }
-            catch (Exception exception)
-            {
+			}
+			catch (Exception exception)
+			{
 
-                Log.ForContext<SelectStationPageViewModel>().Error("Constructing select station view model failed. {Exception}", exception);
-                return;
-            }
+				Log.ForContext<SelectStationPageViewModel>().Error("Constructing select station view model failed. {Exception}", exception);
+				return;
+			}
 
-            try
-            {
-                BindingContext = SelectStationPageViewModel;
+			try
+			{
+				BindingContext = SelectStationPageViewModel;
 
 #if USEFLYOUT
                 SelectStationPageViewModel.NavigationMasterDetail = NavigationMasterDetail;
 #endif
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<SelectStationPageViewModel>().Error("Setting binding/ navigaton on select station failed. {Exception}", exception);
-                return;
-            }
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<SelectStationPageViewModel>().Error("Setting binding/ navigaton on select station failed. {Exception}", exception);
+				return;
+			}
 
-            try
-            {
-                base.OnAppearing();
-            }
-            catch (Exception exception)
-            {
-                // Continue because styling is not essential.
-                Log.ForContext<SelectStationPageViewModel>().Error("Invoking OnAppearing of base failed. {Exception}", exception);
-                return;
-            }
+			try
+			{
+				base.OnAppearing();
+			}
+			catch (Exception exception)
+			{
+				// Continue because styling is not essential.
+				Log.ForContext<SelectStationPageViewModel>().Error("Invoking OnAppearing of base failed. {Exception}", exception);
+				return;
+			}
 
-            try
-            {
-                // Pre move and scanle maps to avoid initial display of map in Rome.
-                Log.ForContext<SelectStationPageViewModel>().Verbose("Moving and scaling map.");
-                SelectStationPageViewModel.MoveAndScale(
-                    (mapSpan) => MyMap.MoveToRegion(mapSpan),
-                    App.ModelRoot.Uris.ActiveUri);
-            }
-            catch (Exception exception)
-            {
-                // Continue because a map not beeing moved/ scaled is no reason for aborting startup.
-                Log.ForContext<SelectStationPageViewModel>().Error("Moving and scaling map failed. {Exception}", exception);
-            }
+			try
+			{
+				// Pre move and scanle maps to avoid initial display of map in Rome.
+				Log.ForContext<SelectStationPageViewModel>().Verbose("Moving and scaling map.");
+				SelectStationPageViewModel.MoveAndScale(
+					(mapSpan) => MyMap.MoveToRegion(mapSpan),
+					App.ModelRoot.Uris.ActiveUri);
+			}
+			catch (Exception exception)
+			{
+				// Continue because a map not beeing moved/ scaled is no reason for aborting startup.
+				Log.ForContext<SelectStationPageViewModel>().Error("Moving and scaling map failed. {Exception}", exception);
+			}
 
-            try
-            {
-                Log.ForContext<SelectStationPageViewModel>().Verbose("Invoking OnAppearing on select station view model.");
-                await SelectStationPageViewModel.OnAppearing();
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<SelectStationPageViewModel>().Error("Invoking OnAppearing on select station view model failed. {Exception}", exception);
-                return;
-            }
-        }
-    }
+			try
+			{
+				Log.ForContext<SelectStationPageViewModel>().Verbose("Invoking OnAppearing on select station view model.");
+				await SelectStationPageViewModel.OnAppearing();
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<SelectStationPageViewModel>().Error("Invoking OnAppearing on select station view model failed. {Exception}", exception);
+				return;
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml.cs b/LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml.cs
index 7469312..68feb69 100644
--- a/LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml.cs
+++ b/LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml.cs
@@ -7,53 +7,53 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.CopriWebView
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class ManageAccountPage : ContentPage
-    {
-        public ManageAccountPage()
-        {
-            InitializeComponent();
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class ManageAccountPage : ContentPage
+	{
+		public ManageAccountPage()
+		{
+			InitializeComponent();
 
-            ManageAccount.Navigating += (sender, ev) =>
-            {
-                if (!ev.Url.ToUpper().EndsWith(".PDF"))
-                {
-                    // Stay inside web view except for downloading pdf- files.
-                    this.IsEnabled = false;
-                    ActivityIndicatorLoading.IsVisible = true;
-                    ActivityIndicatorLoading.IsRunning = true;
-                    return;
-                }
+			ManageAccount.Navigating += (sender, ev) =>
+			{
+				if (!ev.Url.ToUpper().EndsWith(".PDF"))
+				{
+					// Stay inside web view except for downloading pdf- files.
+					this.IsEnabled = false;
+					ActivityIndicatorLoading.IsVisible = true;
+					ActivityIndicatorLoading.IsRunning = true;
+					return;
+				}
 
-                DependencyService.Get<IExternalBrowserService>().OpenUrl(ev.Url);
-            };
+				DependencyService.Get<IExternalBrowserService>().OpenUrl(ev.Url);
+			};
 
-            ManageAccount.Navigated += (sender, ev) =>
-            {
-                if (ev.Result == WebNavigationResult.Success)
-                {
-                    this.IsEnabled = true;
-                    ActivityIndicatorLoading.IsVisible = false;
-                    ActivityIndicatorLoading.IsRunning = false;
-                    return;
-                }
+			ManageAccount.Navigated += (sender, ev) =>
+			{
+				if (ev.Result == WebNavigationResult.Success)
+				{
+					this.IsEnabled = true;
+					ActivityIndicatorLoading.IsVisible = false;
+					ActivityIndicatorLoading.IsRunning = false;
+					return;
+				}
 
-                Log.ForContext<ManageAccountPage>().Error("Navigation did not succeed.{@Event}{@Sender}", ev, sender);
-                ManageAccount.Source = new HtmlWebViewSource
-                {
-                    Html = "<html><b>Kann persönliche Daten nicht anzeigen/ verwalten!</b><br>Verbindung mit Internet ok?</html>"
-                };
+				Log.ForContext<ManageAccountPage>().Error("Navigation did not succeed.{@Event}{@Sender}", ev, sender);
+				ManageAccount.Source = new HtmlWebViewSource
+				{
+					Html = "<html><b>Kann persönliche Daten nicht anzeigen/ verwalten!</b><br>Verbindung mit Internet ok?</html>"
+				};
 
-                this.IsEnabled = true;
-                ActivityIndicatorLoading.IsVisible = false;
-                ActivityIndicatorLoading.IsRunning = false;
-            };
+				this.IsEnabled = true;
+				ActivityIndicatorLoading.IsVisible = false;
+				ActivityIndicatorLoading.IsRunning = false;
+			};
 
-            ManageAccount.BindingContext = new ManageAccountViewModel(
-                App.ModelRoot.ActiveUser.SessionCookie,
-                Model.TinkApp.MerchantId,
-                CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
-                App.ModelRoot.NextActiveUri.Host);
-        }
-    }
+			ManageAccount.BindingContext = new ManageAccountViewModel(
+				App.ModelRoot.ActiveUser.SessionCookie,
+				Model.TinkApp.MerchantId,
+				CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
+				App.ModelRoot.NextActiveUri.Host);
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs b/LastenradBayern/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs
index 666b74c..c906c33 100644
--- a/LastenradBayern/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs
+++ b/LastenradBayern/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs
@@ -7,45 +7,45 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.CopriWebView
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class PasswordForgottenPage : ContentPage
-    {
-        public PasswordForgottenPage()
-        {
-            InitializeComponent();
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class PasswordForgottenPage : ContentPage
+	{
+		public PasswordForgottenPage()
+		{
+			InitializeComponent();
 
-            PasswordForgottenWebView.Navigating += (sender, ev) =>
-            {
-                this.IsEnabled = false;
-                ActivityIndicatorLoading.IsVisible = true;
-                ActivityIndicatorLoading.IsRunning = true;
-            };
+			PasswordForgottenWebView.Navigating += (sender, ev) =>
+			{
+				this.IsEnabled = false;
+				ActivityIndicatorLoading.IsVisible = true;
+				ActivityIndicatorLoading.IsRunning = true;
+			};
 
-            PasswordForgottenWebView.Navigated += (sender, ev) =>
-            {
-                if (ev.Result == WebNavigationResult.Success)
-                {
-                    this.IsEnabled = true;
-                    ActivityIndicatorLoading.IsVisible = false;
-                    ActivityIndicatorLoading.IsRunning = false;
-                    return;
-                }
+			PasswordForgottenWebView.Navigated += (sender, ev) =>
+			{
+				if (ev.Result == WebNavigationResult.Success)
+				{
+					this.IsEnabled = true;
+					ActivityIndicatorLoading.IsVisible = false;
+					ActivityIndicatorLoading.IsRunning = false;
+					return;
+				}
 
-                Log.ForContext<PasswordForgottenPage>().Error("Navigation did not succeed. {@Event}", ev);
-                PasswordForgottenWebView.Source = new HtmlWebViewSource
-                {
-                    Html = "<html><b>Kann Passwort vergessen Seite nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>"
-                };
+				Log.ForContext<PasswordForgottenPage>().Error("Navigation did not succeed. {@Event}", ev);
+				PasswordForgottenWebView.Source = new HtmlWebViewSource
+				{
+					Html = "<html><b>Kann Passwort vergessen Seite nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>"
+				};
 
-                this.IsEnabled = true;
-                ActivityIndicatorLoading.IsVisible = false;
-                ActivityIndicatorLoading.IsRunning = false;
-            };
+				this.IsEnabled = true;
+				ActivityIndicatorLoading.IsVisible = false;
+				ActivityIndicatorLoading.IsRunning = false;
+			};
 
-            PasswordForgottenWebView.BindingContext = new PasswordForgottonViewModel(
-                Model.TinkApp.MerchantId,
-                CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
-                App.ModelRoot.NextActiveUri.Host);
-        }
-    }
+			PasswordForgottenWebView.BindingContext = new PasswordForgottonViewModel(
+				Model.TinkApp.MerchantId,
+				CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
+				App.ModelRoot.NextActiveUri.Host);
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/CopriWebView/RegisterPage.xaml.cs b/LastenradBayern/TINK/View/CopriWebView/RegisterPage.xaml.cs
index 6d5fd7b..e69cd6b 100644
--- a/LastenradBayern/TINK/View/CopriWebView/RegisterPage.xaml.cs
+++ b/LastenradBayern/TINK/View/CopriWebView/RegisterPage.xaml.cs
@@ -8,48 +8,48 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.CopriWebView
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class RegisterPage : ContentPage
-    {
-        public RegisterPage()
-        {
-            DependencyService.Get<IWebView>().ClearCookies();
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class RegisterPage : ContentPage
+	{
+		public RegisterPage()
+		{
+			DependencyService.Get<IWebView>().ClearCookies();
 
-            InitializeComponent();
+			InitializeComponent();
 
-            RegisterView.Navigating += (sender, ev) =>
-            {
-                this.IsEnabled = false;
-                ActivityIndicatorLoading.IsVisible = true;
-                ActivityIndicatorLoading.IsRunning = true;
-            };
+			RegisterView.Navigating += (sender, ev) =>
+			{
+				this.IsEnabled = false;
+				ActivityIndicatorLoading.IsVisible = true;
+				ActivityIndicatorLoading.IsRunning = true;
+			};
 
-            RegisterView.Navigated += (sender, ev) =>
-            {
-                if (ev.Result == WebNavigationResult.Success)
-                {
-                    this.IsEnabled = true;
-                    ActivityIndicatorLoading.IsVisible = false;
-                    ActivityIndicatorLoading.IsRunning = false;
-                    return;
-                }
+			RegisterView.Navigated += (sender, ev) =>
+			{
+				if (ev.Result == WebNavigationResult.Success)
+				{
+					this.IsEnabled = true;
+					ActivityIndicatorLoading.IsVisible = false;
+					ActivityIndicatorLoading.IsRunning = false;
+					return;
+				}
 
-                Log.ForContext<RegisterPage>().Error("Navigation did not succeed. {@Event}", ev);
-                RegisterView.Source = new HtmlWebViewSource
-                {
-                    Html = "<html><b>Kann Anmeldeseite nicht anzeigen</b>!<br>Verbindung mit Internet ok?</html>"
-                };
+				Log.ForContext<RegisterPage>().Error("Navigation did not succeed. {@Event}", ev);
+				RegisterView.Source = new HtmlWebViewSource
+				{
+					Html = "<html><b>Kann Anmeldeseite nicht anzeigen</b>!<br>Verbindung mit Internet ok?</html>"
+				};
 
-                this.IsEnabled = true;
-                ActivityIndicatorLoading.IsVisible = false;
-                ActivityIndicatorLoading.IsRunning = false;
-            };
+				this.IsEnabled = true;
+				ActivityIndicatorLoading.IsVisible = false;
+				ActivityIndicatorLoading.IsRunning = false;
+			};
 
-            RegisterView.BindingContext = new RegisterPageViewModel(
-                Model.TinkApp.MerchantId,
-                CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
-                App.ModelRoot.NextActiveUri.Host);
+			RegisterView.BindingContext = new RegisterPageViewModel(
+				Model.TinkApp.MerchantId,
+				CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
+				App.ModelRoot.NextActiveUri.Host);
 
-        }
-    }
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/FeedbackPopup.xaml b/LastenradBayern/TINK/View/FeedbackPopup.xaml
index d83d3b7..b1c903b 100644
--- a/LastenradBayern/TINK/View/FeedbackPopup.xaml
+++ b/LastenradBayern/TINK/View/FeedbackPopup.xaml
@@ -10,105 +10,75 @@
     <xct:Popup.Resources>
         <x:String x:Key="check_circle">&#xf058;</x:String>
     </xct:Popup.Resources>
-    <Grid>
-        <Grid.RowDefinitions>
-            <!-- Head and title row -->
-            <RowDefinition Height="auto"/>
-            <!--- Co2saving-->
-            <RowDefinition Height="auto"/>
-            <!--- checkbox and input elements-->
-            <RowDefinition Height="*"/>
-            <!--- ok button-->
-            <RowDefinition Height="auto"/>
-        </Grid.RowDefinitions>
-        
-        <!-- Head and title - Grid.Row 0 -->
-        <Grid Grid.Row="0"
+    <StackLayout>
+
+        <!-- Head and title -->
+        <StackLayout
             Padding="30"
             BackgroundColor="{DynamicResource primary-back-title-color}">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="auto"/>
-                <RowDefinition Height="auto"/>
-            </Grid.RowDefinitions>
-            <Label Grid.Row="0"
+            <Label
                     HorizontalTextAlignment="Center"
                     FontSize="Large"
                     TextColor="White"
                     Text="{x:Static resources:AppResources.MarkingReturnBikeMainMessage}"/>
-            <Image Grid.Row="1">
+            <Image>
                 <Image.Source>
-                    <FontImageSource Size="Title" Glyph="{StaticResource check_circle}" FontFamily="FA-S"/>
+                    <FontImageSource Size="60" Glyph="{StaticResource check_circle}" FontFamily="FA-S" Color="White"/>
                 </Image.Source>
             </Image>
-        </Grid>
-        
-        <!-- Co2saving - Grid.Row 1 -->
+        </StackLayout>
+
+        <!-- Co2saving -->
         <Frame 
-            x:Name="Co2SavingFrame"
-            Grid.Row="1">
+            x:Name="Co2SavingFrame">
             <Label 
                 x:Name="Co2SavingLabel"            
                 Text=""/>
         </Frame>
-        
-        <!-- Checkbox and input elements - Grid.Row 2-->
-        <ScrollView Grid.Row="2">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <!--- Battery charge level -->
-                    <RowDefinition Height="Auto"/>
-                    <!--- Bike is ok GUI -->
-                    <RowDefinition Height="Auto"/>
-                    <!--- Feedback edit GUI -->
-                    <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
+
+        <!-- Checkbox and input elements -->
+        <ScrollView>
+            <StackLayout>
                 <!-- Battery level -->
-                <sharedGui:BarLevelInputView Grid.Row="0"
+                <sharedGui:BarLevelInputView 
                             x:Name="BarLevelInputView"
                             HorizontalOptions="Center"
                             IsVisible="False"/>
-                <Grid Grid.Row="1">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-                        <!-- Checkbox Is Broken -->
-                        <CheckBox x:Name="brockenCheckBox" IsChecked="True" Grid.Column="0"/>
-                        <Label 
-                            Grid.Column="1" 
+                <!-- Checkbox Is Broken -->
+                <StackLayout Orientation="Horizontal">
+                    <CheckBox x:Name="brockenCheckBox" IsChecked="True" HeightRequest="20"/>
+                    <Label 
                             FontSize="Medium"
                             Text= "{x:Static resources:AppResources.MarkingReturnBikeBikeStateIsOK}"/>
-                    </Grid>
-                    <Editor 
-                        Grid.Row="2"
+                </StackLayout>
+                <Editor 
                         x:Name="feedbackMessage"
                         AutoSize="TextChanges"  
                         Placeholder="{x:Static resources:AppResources.MarkingReturnBikeFeedbackInputPlaceholder}"
                         Text="">
-                        <Editor.Triggers>
-                            <DataTrigger TargetType="Editor"
+                    <Editor.Triggers>
+                        <DataTrigger TargetType="Editor"
                                         Binding="{Binding Source={x:Reference brockenCheckBox}, Path=IsChecked}"
                                         Value="true">
-                                <Setter Property="Placeholder"
+                            <Setter Property="Placeholder"
                                             Value="{x:Static resources:AppResources.MarkingReturnBikeFeedbackInputPlaceholder}" />
-                            </DataTrigger>
-                            <DataTrigger TargetType="Editor"
+                        </DataTrigger>
+                        <DataTrigger TargetType="Editor"
                                         Binding="{Binding Source={x:Reference brockenCheckBox}, Path=IsChecked}"
                                         Value="false">
-                                <Setter Property="Placeholder"
+                            <Setter Property="Placeholder"
                                             Value="{x:Static resources:AppResources.MarkingReturnBikeErrorDescriptionInputPlaceholder}" />
-                            </DataTrigger>
-                        </Editor.Triggers>
-                    </Editor>
-            </Grid>
+                        </DataTrigger>
+                    </Editor.Triggers>
+                </Editor>
+            </StackLayout>
         </ScrollView>
-        
-        <!-- Buttons - Grid.Row 3 -->
+
+        <!-- Buttons -->
         <Button 
-                Grid.Row="3"
                 WidthRequest="100"
                 Clicked="OnOkClicked"
                 Text="OK"
                 Margin="0,0,0,3"/>
-    </Grid>
+    </StackLayout>
 </xct:Popup>
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/FeedbackPopup.xaml.cs b/LastenradBayern/TINK/View/FeedbackPopup.xaml.cs
index 4ae1f98..2c73611 100644
--- a/LastenradBayern/TINK/View/FeedbackPopup.xaml.cs
+++ b/LastenradBayern/TINK/View/FeedbackPopup.xaml.cs
@@ -5,86 +5,86 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class FeedbackPopup : Popup<FeedbackPopup.Result>
-    {
-        /// <summary> Constructs user feedback popup.</summary>
-        /// <param name="battery">Object holding info about battery. For some batteries charging level might need to be updated by user.</param>
-        /// <param name="co2Saving"> Co2 saving information.</param>
-        public FeedbackPopup(
-            IBattery battery = null,
-            string co2Saving = null)
-        {
-            InitializeComponent();
-            if (string.IsNullOrEmpty(co2Saving))
-                Co2SavingFrame.IsVisible = false;
-            else
-                Co2SavingLabel.Text = co2Saving;
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class FeedbackPopup : Popup<FeedbackPopup.Result>
+	{
+		/// <summary> Constructs user feedback popup.</summary>
+		/// <param name="battery">Object holding info about battery. For some batteries charging level might need to be updated by user.</param>
+		/// <param name="co2Saving"> Co2 saving information.</param>
+		public FeedbackPopup(
+			IBattery battery = null,
+			string co2Saving = null)
+		{
+			InitializeComponent();
+			if (string.IsNullOrEmpty(co2Saving))
+				Co2SavingFrame.IsVisible = false;
+			else
+				Co2SavingLabel.Text = co2Saving;
 
-            if (battery == null
-                || (battery.IsBackendAccessible.HasValue && battery.IsBackendAccessible.Value))
-            {
-                // Either 
-                // - bike has no engine or
-                // - backend can access battery level information
-                // No need to ask user for input.
-                return;
-            }
+			if (battery == null
+				|| (battery.IsBackendAccessible.HasValue && battery.IsBackendAccessible.Value))
+			{
+				// Either 
+				// - bike has no engine or
+				// - backend can access battery level information
+				// No need to ask user for input.
+				return;
+			}
 
-            BarLevelInputView.IsVisible = battery?.MaxChargeBars != null;
-            BarLevelInputView.Current = battery?.CurrentChargeBars?.ToString() ?? string.Empty;
-            BarLevelInputView.Maximum = battery?.MaxChargeBars != null ? battery?.MaxChargeBars.ToString() : String.Empty;
+			BarLevelInputView.IsVisible = battery?.MaxChargeBars != null;
+			BarLevelInputView.Current = battery?.CurrentChargeBars?.ToString() ?? string.Empty;
+			BarLevelInputView.Maximum = battery?.MaxChargeBars != null ? battery?.MaxChargeBars.ToString() : String.Empty;
 
-        }
+		}
 
-        protected override FeedbackPopup.Result GetLightDismissResult()
-        {
-            return new Result
-            {
-                CurrentChargeBars = int.TryParse(BarLevelInputView.Current, out int current) ? (int?)current : null,
-                IsBikeBroken = brockenCheckBox.IsChecked,
-                Message = feedbackMessage.Text
-            };
-        }
+		protected override FeedbackPopup.Result GetLightDismissResult()
+		{
+			return new Result
+			{
+				CurrentChargeBars = int.TryParse(BarLevelInputView.Current, out int current) ? (int?)current : null,
+				IsBikeBroken = brockenCheckBox.IsChecked,
+				Message = feedbackMessage.Text
+			};
+		}
 
-        private void OnOkClicked(object sender, EventArgs eventArgs)
-        {
-            var result = new Result
-            {
-                CurrentChargeBars = int.TryParse(BarLevelInputView.Current, out int current) ? (int?)current : null,
-                IsBikeBroken = brockenCheckBox.IsChecked,
-                Message = feedbackMessage.Text
-            };
+		private void OnOkClicked(object sender, EventArgs eventArgs)
+		{
+			var result = new Result
+			{
+				CurrentChargeBars = int.TryParse(BarLevelInputView.Current, out int current) ? (int?)current : null,
+				IsBikeBroken = brockenCheckBox.IsChecked,
+				Message = feedbackMessage.Text
+			};
 
-            Dismiss(result);
-        }
+			Dismiss(result);
+		}
 
-        /// <summary>
-        /// Feedback given by user when returning bike.
-        /// </summary>
+		/// <summary>
+		/// Feedback given by user when returning bike.
+		/// </summary>
 #if USCSHARP9
 		public class Result : IViewService.IUserFeedback
 #else
-        public new class Result : IUserFeedback
+		public new class Result : IUserFeedback
 #endif
-        {
-            /// <summary>
-            /// Holds the current chargeing level of the battery entered by user in bars, null if unkonwn.
-            /// </summary>
-            public int? CurrentChargeBars { get; set; }
+		{
+			/// <summary>
+			/// Holds the current chargeing level of the battery entered by user in bars, null if unkonwn.
+			/// </summary>
+			public int? CurrentChargeBars { get; set; }
 
-            /// <summary>
-            /// Holds whether bike is broken or not.
-            /// </summary>
-            public bool IsBikeBroken { get; set; }
+			/// <summary>
+			/// Holds whether bike is broken or not.
+			/// </summary>
+			public bool IsBikeBroken { get; set; }
 
-            /// <summary>
-            /// Holds either 
-            /// - general feedback
-            /// - error description of broken bike 
-            /// or both.
-            /// </summary>
-            public string Message { get; set; }
-        }
-    }
+			/// <summary>
+			/// Holds either 
+			/// - general feedback
+			/// - error description of broken bike 
+			/// or both.
+			/// </summary>
+			public string Message { get; set; }
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml.cs b/LastenradBayern/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml.cs
index 7379ff7..b2e564f 100644
--- a/LastenradBayern/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml.cs
+++ b/LastenradBayern/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml.cs
@@ -5,34 +5,34 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Contact
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class FeesAndBikesPage : TabbedPage
-    {
-        public FeesAndBikesPageViewModel ViewModel { get; }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class FeesAndBikesPage : TabbedPage
+	{
+		public FeesAndBikesPageViewModel ViewModel { get; }
 
-        public FeesAndBikesPage()
-        {
-            InitializeComponent();
+		public FeesAndBikesPage()
+		{
+			InitializeComponent();
 
-            ViewModel = new FeesAndBikesPageViewModel(
-                App.ModelRoot.NextActiveUri.Host,
-                App.ModelRoot.ResourceUrls.FeesResourcePath,
-                App.ModelRoot.ResourceUrls.BikesResourcePath,
-                App.ModelRoot.IsSiteCachingOn);
+			ViewModel = new FeesAndBikesPageViewModel(
+				App.ModelRoot.NextActiveUri.Host,
+				App.ModelRoot.ResourceUrls.FeesResourcePath,
+				App.ModelRoot.ResourceUrls.BikesResourcePath,
+				App.ModelRoot.IsSiteCachingOn);
 
-            BindingContext = ViewModel;
+			BindingContext = ViewModel;
 
-            /// Info about renting.
-            InfoRentBikeWebView.Navigating += ViewModelHelper.OnNavigating;
+			/// Info about renting.
+			InfoRentBikeWebView.Navigating += ViewModelHelper.OnNavigating;
 
-            /// Info about types of bikes.
-            InfoTypesOfBikesWebView.Navigating += ViewModelHelper.OnNavigating;
-        }
+			/// Info about types of bikes.
+			InfoTypesOfBikesWebView.Navigating += ViewModelHelper.OnNavigating;
+		}
 
-        /// <summary> Called when page is shown. </summary>
-        protected override void OnAppearing()
-        {
-            ViewModel.OnAppearing();
-        }
-    }
+		/// <summary> Called when page is shown. </summary>
+		protected override void OnAppearing()
+		{
+			ViewModel.OnAppearing();
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml.cs b/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml.cs
index 8d3c226..f6aa134 100644
--- a/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml.cs
+++ b/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml.cs
@@ -12,141 +12,141 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.FindBike
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class FindBikePage : ContentPage, IViewService
-    {
-        /// <summary> Refernce to view model. </summary>
-        FindBikePageViewModel m_oViewModel = null;
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class FindBikePage : ContentPage, IViewService
+	{
+		/// <summary> Refernce to view model. </summary>
+		FindBikePageViewModel m_oViewModel = null;
 
-        public FindBikePage() { }
+		public FindBikePage() { }
 
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        protected async override void OnAppearing()
-        {
-            if (m_oViewModel != null)
-            {
-                // No need to create view model, set binding context an items source if already done.
-                // If done twice tap events are fired multiple times (when hiding page using home button).
-                await m_oViewModel.OnAppearing();
-                return;
-            }
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		protected async override void OnAppearing()
+		{
+			if (m_oViewModel != null)
+			{
+				// No need to create view model, set binding context an items source if already done.
+				// If done twice tap events are fired multiple times (when hiding page using home button).
+				await m_oViewModel.OnAppearing();
+				return;
+			}
 
-            try
-            {
-                var model = App.ModelRoot;
+			try
+			{
+				var model = App.ModelRoot;
 
-                // Backup synchronization context when called from GUI-thread.
-                var synchronizationContext = SynchronizationContext.Current;
+				// Backup synchronization context when called from GUI-thread.
+				var synchronizationContext = SynchronizationContext.Current;
 
-                m_oViewModel = new FindBikePageViewModel(
-                    model.ActiveUser,
-                    App.PermissionsService,
-                    App.BluetoothService,
-                    Device.RuntimePlatform,
-                    () => model.GetIsConnected(),
-                    (isConnected) => model.GetConnector(isConnected),
-                    App.LocationServicesContainer.Active,
-                    model.LocksServices.Active,
-                    model.Stations,
-                    model.Polling,
-                    (d, obj) => synchronizationContext.Post(d, obj),
-                    model.SmartDevice,
-                    this,
-                    (url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url))
-                {
-                    IsReportLevelVerbose = model.IsReportLevelVerbose
-                };
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<FindBikePage>().Error("Displaying bikes at station page failed. {Exception}", exception);
-                await DisplayAlert("Fehler", $"Seite Fahrrad Wählen kann nicht angezeigt werden. ${exception.Message}", "OK");
-                return;
+				m_oViewModel = new FindBikePageViewModel(
+					model.ActiveUser,
+					App.PermissionsService,
+					App.BluetoothService,
+					Device.RuntimePlatform,
+					() => model.GetIsConnected(),
+					(isConnected) => model.GetConnector(isConnected),
+					App.LocationServicesContainer.Active,
+					model.LocksServices.Active,
+					model.Stations,
+					model.Polling,
+					(d, obj) => synchronizationContext.Post(d, obj),
+					model.SmartDevice,
+					this,
+					(url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url))
+				{
+					IsReportLevelVerbose = model.IsReportLevelVerbose
+				};
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<FindBikePage>().Error("Displaying bikes at station page failed. {Exception}", exception);
+				await DisplayAlert("Fehler", $"Seite Fahrrad Wählen kann nicht angezeigt werden. ${exception.Message}", "OK");
+				return;
 
-            }
+			}
 
-            InitializeComponent();
+			InitializeComponent();
 
-            BindingContext = m_oViewModel;
-            FindBikeListView.ItemsSource = m_oViewModel;
+			BindingContext = m_oViewModel;
+			FindBikeListView.ItemsSource = m_oViewModel;
 
-            await m_oViewModel.OnAppearing();
-        }
+			await m_oViewModel.OnAppearing();
+		}
 
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strCancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strCancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strAccept">Text of accept button.</param>
-        /// <param name="p_strCancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strAccept">Text of accept button.</param>
+		/// <param name="p_strCancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
 
 #if USEFLYOUT
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => throw new NotImplementedException();
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="typeOfPage">Page to display.</param>
-        public async Task PushModalAsync(ViewTypes typeOfPage)
-            => await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="typeOfPage">Page to display.</param>
+		public async Task PushModalAsync(ViewTypes typeOfPage)
+			=> await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync() => throw new NotSupportedException();
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync() => throw new NotSupportedException();
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
 
 #if USCSHARP9
         public async Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup());
 #else
-        /// <summary> Displays user feedback popup.</summary>
-        /// <param name="co2Saving"> Co2 saving information.</param>
-        /// <returns>User feedback.</returns>
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
+		/// <summary> Displays user feedback popup.</summary>
+		/// <param name="co2Saving"> Co2 saving information.</param>
+		/// <returns>User feedback.</returns>
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs b/LastenradBayern/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs
index 8aa6c88..49a938b 100644
--- a/LastenradBayern/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs
+++ b/LastenradBayern/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs
@@ -11,65 +11,65 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Info.BikeInfo
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class BikeInfoCarouselPage : CarouselPage, IViewService, IDetailPage
 #else
-    public partial class BikeInfoCarouselPage : CarouselPage, IViewService
+	public partial class BikeInfoCarouselPage : CarouselPage, IViewService
 #endif
-    {
-        public BikeInfoCarouselPage()
-        {
-            InitializeComponent();
+	{
+		public BikeInfoCarouselPage()
+		{
+			InitializeComponent();
 
-            ItemsSource = new BikeInfoViewModel(
-                resourceName => ImageSource.FromResource($"{ViewModelResourceHelper.RessourcePrefix}Images.{resourceName}"),
-                this).CarouselItems;
-        }
+			ItemsSource = new BikeInfoViewModel(
+				resourceName => ImageSource.FromResource($"{ViewModelResourceHelper.RessourcePrefix}Images.{resourceName}"),
+				this).CarouselItems;
+		}
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strCancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
-             => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strCancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
+			 => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strAccept">Text of accept button.</param>
-        /// <param name="p_strCancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
-        {
-            return await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
-        }
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strAccept">Text of accept button.</param>
+		/// <param name="p_strCancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
+		{
+			return await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
+		}
 
 #if USEFLYOUT
         /// <summary>
@@ -79,31 +79,31 @@ namespace TINK.View.Info.BikeInfo
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => m_oNavigation.ShowPage(p_oType.GetViewType(), p_strTitle);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushModalAsync(ViewTypes p_oTypeOfPage)
-        {
-            throw new NotSupportedException();
-        }
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushModalAsync(ViewTypes p_oTypeOfPage)
+		{
+			throw new NotSupportedException();
+		}
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync()
-        {
-            throw new NotSupportedException();
-        }
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync()
+		{
+			throw new NotSupportedException();
+		}
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushAsync(ViewTypes p_oTypeOfPage)
-        {
-            throw new NotImplementedException();
-        }
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushAsync(ViewTypes p_oTypeOfPage)
+		{
+			throw new NotImplementedException();
+		}
 
 #if USEFLYOUT
         /// <summary>
@@ -123,7 +123,7 @@ namespace TINK.View.Info.BikeInfo
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/Info/InfoTabbedPage.xaml.cs b/LastenradBayern/TINK/View/Info/InfoTabbedPage.xaml.cs
index e4ca437..17f0bba 100644
--- a/LastenradBayern/TINK/View/Info/InfoTabbedPage.xaml.cs
+++ b/LastenradBayern/TINK/View/Info/InfoTabbedPage.xaml.cs
@@ -6,36 +6,36 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Info
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class InfoPage : TabbedPage
-    {
-        public InfoPageViewModel ViewModel { get; }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class InfoPage : TabbedPage
+	{
+		public InfoPageViewModel ViewModel { get; }
 
-        public InfoPage()
-        {
-            InitializeComponent();
+		public InfoPage()
+		{
+			InitializeComponent();
 
-            ViewModel = new InfoPageViewModel(
-                App.ModelRoot.NextActiveUri.Host,
-                App.ModelRoot.ResourceUrls.AgbResourcePath,
-                App.ModelRoot.ResourceUrls.PrivacyResourcePath,
-                App.ModelRoot.ResourceUrls.ImpressResourcePath,
-                App.ModelRoot.IsSiteCachingOn,
-                CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
-                resourceName => ViewModelResourceHelper.GetSource(resourceName));
-            TabbedInfoPage.BindingContext = ViewModel;
+			ViewModel = new InfoPageViewModel(
+				App.ModelRoot.NextActiveUri.Host,
+				App.ModelRoot.ResourceUrls.AgbResourcePath,
+				App.ModelRoot.ResourceUrls.PrivacyResourcePath,
+				App.ModelRoot.ResourceUrls.ImpressResourcePath,
+				App.ModelRoot.IsSiteCachingOn,
+				CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
+				resourceName => ViewModelResourceHelper.GetSource(resourceName));
+			TabbedInfoPage.BindingContext = ViewModel;
 
-            InfoLicenses.Navigating += ViewModelHelper.OnNavigating;
-            InfoDatenschutz.Navigating += ViewModelHelper.OnNavigating;
-            InfoABG.Navigating += ViewModelHelper.OnNavigating;
+			InfoLicenses.Navigating += ViewModelHelper.OnNavigating;
+			InfoDatenschutz.Navigating += ViewModelHelper.OnNavigating;
+			InfoABG.Navigating += ViewModelHelper.OnNavigating;
 
-            InfoImpressum.Navigating += ViewModelHelper.OnNavigating;
-        }
+			InfoImpressum.Navigating += ViewModelHelper.OnNavigating;
+		}
 
-        /// <summary> Called when page is shown. </summary>
-        protected override void OnAppearing()
-        {
-            ViewModel.OnAppearing();
-        }
-    }
+		/// <summary> Called when page is shown. </summary>
+		protected override void OnAppearing()
+		{
+			ViewModel.OnAppearing();
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/ListViewAttachedBehavior.cs b/LastenradBayern/TINK/View/ListViewAttachedBehavior.cs
index 0b13485..ec0cc89 100644
--- a/LastenradBayern/TINK/View/ListViewAttachedBehavior.cs
+++ b/LastenradBayern/TINK/View/ListViewAttachedBehavior.cs
@@ -3,33 +3,33 @@ using Xamarin.Forms;
 
 namespace TINK.View
 {
-    public static class ListViewAttachedBehavior
-    {
-        public static readonly BindableProperty CommandProperty =
-            BindableProperty.CreateAttached(
-                "Command",
-                typeof(ICommand),
-                typeof(ListViewAttachedBehavior),
-                null,
-                propertyChanged: OnCommandChanged);
+	public static class ListViewAttachedBehavior
+	{
+		public static readonly BindableProperty CommandProperty =
+			BindableProperty.CreateAttached(
+				"Command",
+				typeof(ICommand),
+				typeof(ListViewAttachedBehavior),
+				null,
+				propertyChanged: OnCommandChanged);
 
-        static void OnCommandChanged(BindableObject view, object oldValue, object newValue)
-        {
-            var entry = view as ListView;
-            if (entry == null)
-                return;
+		static void OnCommandChanged(BindableObject view, object oldValue, object newValue)
+		{
+			var entry = view as ListView;
+			if (entry == null)
+				return;
 
-            entry.ItemTapped += (sender, e) =>
-            {
-                var command = (newValue as ICommand);
-                if (command == null)
-                    return;
+			entry.ItemTapped += (sender, e) =>
+			{
+				var command = (newValue as ICommand);
+				if (command == null)
+					return;
 
-                if (command.CanExecute(e.Item))
-                {
-                    command.Execute(e.Item);
-                }
-            };
-        }
-    }
+				if (command.CanExecute(e.Item))
+				{
+					command.Execute(e.Item);
+				}
+			};
+		}
+	}
 }
diff --git a/LastenradBayern/TINK/View/Login/LoginPage.xaml.cs b/LastenradBayern/TINK/View/Login/LoginPage.xaml.cs
index 03e860c..b1e85fb 100644
--- a/LastenradBayern/TINK/View/Login/LoginPage.xaml.cs
+++ b/LastenradBayern/TINK/View/Login/LoginPage.xaml.cs
@@ -11,60 +11,60 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Login
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class LoginPage : ContentPage, IViewService, IDetailPage
 #else
-    public partial class LoginPage : ContentPage, IViewService
+	public partial class LoginPage : ContentPage, IViewService
 #endif
-    {
-        public LoginPage()
-        {
-            InitializeComponent();
+	{
+		public LoginPage()
+		{
+			InitializeComponent();
 
-            var l_oModel = App.ModelRoot;
+			var l_oModel = App.ModelRoot;
 #if !BACKSTYLE
-            var l_oViewModel = new LoginPageViewModel(
-                l_oModel,
-                (url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url),
-                this);
+			var l_oViewModel = new LoginPageViewModel(
+				l_oModel,
+				(url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url),
+				this);
 
-            LoginPageView.BindingContext = l_oViewModel;
+			LoginPageView.BindingContext = l_oViewModel;
 #else
             LoginPageView.BindingContext = new LoginPageViewModel(l_oModel.ActiveUser, this, Navigation);
 #endif
-        }
+		}
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strCancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strCancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
 #if USEFLYOUT
         /// <summary>
@@ -74,30 +74,30 @@ namespace TINK.View.Login
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => m_oNavigation.ShowPage(p_oType.GetViewType(), p_strTitle);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public async Task PushModalAsync(ViewTypes typeOfPage)
-            => await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public async Task PushModalAsync(ViewTypes typeOfPage)
+			=> await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
 
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync()
-        {
-            throw new NotSupportedException();
-        }
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync()
+		{
+			throw new NotSupportedException();
+		}
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public async Task PushAsync(ViewTypes p_oTypeOfPage)
-        {
-            await Navigation.PushAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
-        }
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public async Task PushAsync(ViewTypes p_oTypeOfPage)
+		{
+			await Navigation.PushAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
+		}
 
 #if USEFLYOUT
         /// <summary>
@@ -117,7 +117,7 @@ namespace TINK.View.Login
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/Map/MapPage.xaml.cs b/LastenradBayern/TINK/View/Map/MapPage.xaml.cs
index e512d74..5f147bf 100644
--- a/LastenradBayern/TINK/View/Map/MapPage.xaml.cs
+++ b/LastenradBayern/TINK/View/Map/MapPage.xaml.cs
@@ -8,72 +8,72 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Map
 {
-    using Serilog;
-    using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
-    using TINK.ViewModel.Map;
+	using Serilog;
+	using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
+	using TINK.ViewModel.Map;
 
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class MapPage : ContentPage, IViewService, IDetailPage
 #else
-    public partial class MapPage : ContentPage, IViewService
+	public partial class MapPage : ContentPage, IViewService
 #endif
-    {
-        /// <summary> View model to notify about whether page appears or hides. </summary>
-        private MapPageViewModel MapPageViewModel { get; set; }
+	{
+		/// <summary> View model to notify about whether page appears or hides. </summary>
+		private MapPageViewModel MapPageViewModel { get; set; }
 
-        /// <summary> Initialization status to ensure initialization logic is not called multiple times. </summary>
-        private bool isInitializationStarted = false;
+		/// <summary> Initialization status to ensure initialization logic is not called multiple times. </summary>
+		private bool isInitializationStarted = false;
 
-        /// <summary>
-        /// Constructs map page instance.
-        /// </summary>
-        public MapPage()
-        {
-            InitializeComponent();
-        }
+		/// <summary>
+		/// Constructs map page instance.
+		/// </summary>
+		public MapPage()
+		{
+			InitializeComponent();
+		}
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string title, string message, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, cancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string title, string message, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, cancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
 
 #if USEFLYOUT
         /// <summary>
@@ -83,45 +83,45 @@ namespace TINK.View.Map
         public void ShowPage(ViewTypes type, string title = null)
             => NavigationMasterDetail.ShowPage(type.GetViewType(), title);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="typeOfPage">Type of page to display.</param>
-        public async Task PushModalAsync(ViewTypes typeOfPage)
-            => await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="typeOfPage">Type of page to display.</param>
+		public async Task PushModalAsync(ViewTypes typeOfPage)
+			=> await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public async Task PopModalAsync()
-            => await Navigation.PopModalAsync();
+		/// <summary> Pops a page from the modal stack. </summary>
+		public async Task PopModalAsync()
+			=> await Navigation.PopModalAsync();
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="typeOfPage">Page to display.</param>
-        public async Task PushAsync(ViewTypes typeOfPage)
-        {
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="typeOfPage">Page to display.</param>
+		public async Task PushAsync(ViewTypes typeOfPage)
+		{
 #if USEFLYOUT
             var page = Activator.CreateInstance(typeOfPage.GetViewType()) as IDetailPage;
 #else
-            var page = Activator.CreateInstance(typeOfPage.GetViewType());
+			var page = Activator.CreateInstance(typeOfPage.GetViewType());
 #endif
-            if (page == null)
-            {
-                return;
-            }
+			if (page == null)
+			{
+				return;
+			}
 
 #if USEFLYOUT
             page.NavigationMasterDetail = NavigationMasterDetail;
 #endif
 
-            await Navigation.PushAsync((Page)page);
-        }
+			await Navigation.PushAsync((Page)page);
+		}
 
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
 
 #if USEFLYOUT
@@ -129,153 +129,153 @@ namespace TINK.View.Map
         public INavigationMasterDetail NavigationMasterDetail { private get; set; }
 
 #endif
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        protected async override void OnAppearing()
-        {
-            // Don't repeat the initialization if it has been completed already.
-            if (isInitializationStarted) return;
-            isInitializationStarted = true;
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		protected async override void OnAppearing()
+		{
+			// Don't repeat the initialization if it has been completed already.
+			if (isInitializationStarted) return;
+			isInitializationStarted = true;
 
-            // Pass reference to member Navigation to show bikes at station x dialog.
-            try
-            {
-                Log.ForContext<MapPage>().Verbose("Constructing map page view model.");
+			// Pass reference to member Navigation to show bikes at station x dialog.
+			try
+			{
+				Log.ForContext<MapPage>().Verbose("Constructing map page view model.");
 
 #if TRYNOTBACKSTYLE
                 MapPageViewModel = new MapPageViewModel();
 #else
-                MapPageViewModel = CreateMapPageViewModel();
+				MapPageViewModel = CreateMapPageViewModel();
 #endif
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<MapPage>().Error("Constructing map page view model failed. {Exception}", exception);
-                isInitializationStarted = false;
-                return;
-            }
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<MapPage>().Error("Constructing map page view model failed. {Exception}", exception);
+				isInitializationStarted = false;
+				return;
+			}
 
-            try
-            {
-                BindingContext = MapPageViewModel;
+			try
+			{
+				BindingContext = MapPageViewModel;
 
 #if USEFLYOUT
                 MapPageViewModel.NavigationMasterDetail = NavigationMasterDetail;
 #endif
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<MapPage>().Error("Setting binding/ navigaton on map page failed. {Exception}", exception);
-                isInitializationStarted = false;
-                return;
-            }
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<MapPage>().Error("Setting binding/ navigaton on map page failed. {Exception}", exception);
+				isInitializationStarted = false;
+				return;
+			}
 
-            try
-            {
-                ApplyCustomiOSStyling();
-            }
-            catch (Exception exception)
-            {
-                // Continue because styling is not essential.
-                Log.ForContext<MapPage>().Error("IOS specific styling of map page failed. {Exception}", exception);
-            }
+			try
+			{
+				ApplyCustomiOSStyling();
+			}
+			catch (Exception exception)
+			{
+				// Continue because styling is not essential.
+				Log.ForContext<MapPage>().Error("IOS specific styling of map page failed. {Exception}", exception);
+			}
 
-            try
-            {
-                base.OnAppearing();
-            }
-            catch (Exception exception)
-            {
-                // Continue because styling is not essential.
-                Log.ForContext<MapPage>().Error("Invoking OnAppearing of base failed. {Exception}", exception);
-                isInitializationStarted = false;
-                return;
-            }
+			try
+			{
+				base.OnAppearing();
+			}
+			catch (Exception exception)
+			{
+				// Continue because styling is not essential.
+				Log.ForContext<MapPage>().Error("Invoking OnAppearing of base failed. {Exception}", exception);
+				isInitializationStarted = false;
+				return;
+			}
 
-            try
-            {
-                // Pre move and scanle maps to avoid initial display of map in Rome.
-                PremoveAndScaleMap();
-            }
-            catch (Exception exception)
-            {
-                // Continue because a map not beeing moved/ scaled is no reason for aborting startup.
-                Log.ForContext<MapPage>().Error("Moving and scaling map failed. {Exception}", exception);
-            }
+			try
+			{
+				// Pre move and scanle maps to avoid initial display of map in Rome.
+				PremoveAndScaleMap();
+			}
+			catch (Exception exception)
+			{
+				// Continue because a map not beeing moved/ scaled is no reason for aborting startup.
+				Log.ForContext<MapPage>().Error("Moving and scaling map failed. {Exception}", exception);
+			}
 
-            try
-            {
-                Log.ForContext<MapPage>().Verbose("Invoking OnAppearing on map page view model.");
-                await MapPageViewModel.OnAppearing();
+			try
+			{
+				Log.ForContext<MapPage>().Verbose("Invoking OnAppearing on map page view model.");
+				await MapPageViewModel.OnAppearing();
 
-                isInitializationStarted = false;
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<MapPage>().Error("Invoking OnAppearing on map page view model failed. {Exception}", exception);
-                isInitializationStarted = false;
-                return;
-            }
-        }
+				isInitializationStarted = false;
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<MapPage>().Error("Invoking OnAppearing on map page view model failed. {Exception}", exception);
+				isInitializationStarted = false;
+				return;
+			}
+		}
 
-        /// <summary>
-        /// Premoves the Map to a certain location.
-        /// </summary>
-        private void PremoveAndScaleMap()
-        {
-            Log.ForContext<MapPage>().Verbose("Moving and scaling map.");
-            MapPageViewModel.MoveAndScale(
-                (mapSpan) => MyMap.MoveToRegion(mapSpan),
-                App.ModelRoot.ActiveMapSpan);
-        }
+		/// <summary>
+		/// Premoves the Map to a certain location.
+		/// </summary>
+		private void PremoveAndScaleMap()
+		{
+			Log.ForContext<MapPage>().Verbose("Moving and scaling map.");
+			MapPageViewModel.MoveAndScale(
+				(mapSpan) => MyMap.MoveToRegion(mapSpan),
+				App.ModelRoot.ActiveMapSpan);
+		}
 
-        /// <summary>
-        /// Creates the Map Page's view model.
-        /// </summary>
-        private MapPageViewModel CreateMapPageViewModel()
-        {
-            Log.ForContext<MapPage>().Verbose("Constructing map page view model.");
-            return new MapPageViewModel(
-                App.ModelRoot,
-                App.PermissionsService,
-                App.BluetoothService,
-                App.LocationServicesContainer.Active,
-                (mapspan) => MyMap.MoveToRegion(mapspan),
-                this,
-                Navigation);
-        }
+		/// <summary>
+		/// Creates the Map Page's view model.
+		/// </summary>
+		private MapPageViewModel CreateMapPageViewModel()
+		{
+			Log.ForContext<MapPage>().Verbose("Constructing map page view model.");
+			return new MapPageViewModel(
+				App.ModelRoot,
+				App.PermissionsService,
+				App.BluetoothService,
+				App.LocationServicesContainer.Active,
+				(mapspan) => MyMap.MoveToRegion(mapspan),
+				this,
+				Navigation);
+		}
 
-        /// <summary>
-        /// Applies iOS specific styling to branded Buttons.
-        /// </summary>
-        private void ApplyCustomiOSStyling()
-        {
-            if (Device.RuntimePlatform == Device.iOS)
-            {
-                TINKButton.BackgroundColor = Color.LightGray;
-                TINKButton.BorderColor = Color.Black;
-                TINKButton.Margin = new Thickness(10, 10, 10, 10);
-                KonradButton.BackgroundColor = Color.LightGray;
-                KonradButton.BorderColor = Color.Black;
-                KonradButton.Margin = new Thickness(10, 10, 10, 10);
-            }
-        }
+		/// <summary>
+		/// Applies iOS specific styling to branded Buttons.
+		/// </summary>
+		private void ApplyCustomiOSStyling()
+		{
+			if (Device.RuntimePlatform == Device.iOS)
+			{
+				TINKButton.BackgroundColor = Color.LightGray;
+				TINKButton.BorderColor = Color.Black;
+				TINKButton.Margin = new Thickness(10, 10, 10, 10);
+				KonradButton.BackgroundColor = Color.LightGray;
+				KonradButton.BorderColor = Color.Black;
+				KonradButton.Margin = new Thickness(10, 10, 10, 10);
+			}
+		}
 
-        /// <summary>
-        /// Invoked when pages is closed/ hidden. 
-        /// Stops update process.
-        /// </summary>
-        protected override async void OnDisappearing()
-        {
-            if (MapPageViewModel != null)
-            {
-                // View model might be null.
-                await MapPageViewModel?.OnDisappearing();
-            }
+		/// <summary>
+		/// Invoked when pages is closed/ hidden. 
+		/// Stops update process.
+		/// </summary>
+		protected override async void OnDisappearing()
+		{
+			if (MapPageViewModel != null)
+			{
+				// View model might be null.
+				await MapPageViewModel?.OnDisappearing();
+			}
 
-            base.OnDisappearing();
-        }
-    }
+			base.OnDisappearing();
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs b/LastenradBayern/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs
index 921e19f..f231968 100644
--- a/LastenradBayern/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs
+++ b/LastenradBayern/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs
@@ -8,93 +8,93 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.MiniSurvey
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class MiniSurveyPage : ContentPage, IViewService
-    {
-        public MiniSurveyPage()
-        {
-            var model = App.ModelRoot;
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class MiniSurveyPage : ContentPage, IViewService
+	{
+		public MiniSurveyPage()
+		{
+			var model = App.ModelRoot;
 
-            var vm = new MiniSurveyViewModel(
-                () => model.GetIsConnected(),
-                (isConnected) => model.GetConnector(isConnected),
-                this);
+			var vm = new MiniSurveyViewModel(
+				() => model.GetIsConnected(),
+				(isConnected) => model.GetConnector(isConnected),
+				this);
 
-            InitializeComponent();
+			InitializeComponent();
 
-            BindingContext = vm;
-            MiniSurveyListView.ItemsSource = vm;
-        }
+			BindingContext = vm;
+			MiniSurveyListView.ItemsSource = vm;
+		}
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strCancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strCancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strAccept">Text of accept button.</param>
-        /// <param name="p_strCancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strAccept">Text of accept button.</param>
+		/// <param name="p_strCancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
 
 #if USEFLYOUT
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => throw new NotImplementedException();
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushModalAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushModalAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync() => Navigation.PopModalAsync();
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync() => Navigation.PopModalAsync();
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
 
 #if USCSHARP9
         public async Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup());
 #else
-        /// <summary> Displays user feedback popup.</summary>
-        /// <param name="co2Saving"> Co2 saving information.</param>
-        /// <returns>User feedback.</returns>
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
+		/// <summary> Displays user feedback popup.</summary>
+		/// <param name="co2Saving"> Co2 saving information.</param>
+		/// <returns>User feedback.</returns>
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/MiniSurvey/Question/CheckOneViewCell.xaml.cs b/LastenradBayern/TINK/View/MiniSurvey/Question/CheckOneViewCell.xaml.cs
index d18c3dd..fd88eff 100644
--- a/LastenradBayern/TINK/View/MiniSurvey/Question/CheckOneViewCell.xaml.cs
+++ b/LastenradBayern/TINK/View/MiniSurvey/Question/CheckOneViewCell.xaml.cs
@@ -3,12 +3,12 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.MiniSurvey.Question
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class CheckOneViewCell : ViewCell
-    {
-        public CheckOneViewCell()
-        {
-            InitializeComponent();
-        }
-    }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class CheckOneViewCell : ViewCell
+	{
+		public CheckOneViewCell()
+		{
+			InitializeComponent();
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/MiniSurvey/Question/FreeTextViewCell.xaml.cs b/LastenradBayern/TINK/View/MiniSurvey/Question/FreeTextViewCell.xaml.cs
index 2f7c71e..e1304d9 100644
--- a/LastenradBayern/TINK/View/MiniSurvey/Question/FreeTextViewCell.xaml.cs
+++ b/LastenradBayern/TINK/View/MiniSurvey/Question/FreeTextViewCell.xaml.cs
@@ -4,12 +4,12 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.MiniSurvey.Question
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class FreeTextViewCell : ViewCell
-    {
-        public FreeTextViewCell()
-        {
-            InitializeComponent();
-        }
-    }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class FreeTextViewCell : ViewCell
+	{
+		public FreeTextViewCell()
+		{
+			InitializeComponent();
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/MiniSurvey/Question/QuestionViewCellTemplateSelector.cs b/LastenradBayern/TINK/View/MiniSurvey/Question/QuestionViewCellTemplateSelector.cs
index a5f70ff..0c6357c 100644
--- a/LastenradBayern/TINK/View/MiniSurvey/Question/QuestionViewCellTemplateSelector.cs
+++ b/LastenradBayern/TINK/View/MiniSurvey/Question/QuestionViewCellTemplateSelector.cs
@@ -2,25 +2,25 @@
 
 namespace TINK.View.MiniSurvey.Question
 {
-    /// <summary>
-    /// Selects different templates for different question types.
-    /// </summary>    
-    public class QuestionViewCellTemplateSelector : DataTemplateSelector
-    {
-        DataTemplate checkOneViewCell;
-        DataTemplate freeTextViewCell;
+	/// <summary>
+	/// Selects different templates for different question types.
+	/// </summary>    
+	public class QuestionViewCellTemplateSelector : DataTemplateSelector
+	{
+		DataTemplate checkOneViewCell;
+		DataTemplate freeTextViewCell;
 
-        public QuestionViewCellTemplateSelector()
-        {
-            checkOneViewCell = new DataTemplate(typeof(CheckOneViewCell));
-            freeTextViewCell = new DataTemplate(typeof(FreeTextViewCell));
-        }
+		public QuestionViewCellTemplateSelector()
+		{
+			checkOneViewCell = new DataTemplate(typeof(CheckOneViewCell));
+			freeTextViewCell = new DataTemplate(typeof(FreeTextViewCell));
+		}
 
-        protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
-        {
-            return item is ViewModel.MiniSurvey.Question.FreeTextViewModel
-                ? freeTextViewCell
-                : checkOneViewCell;
-        }
-    }
+		protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
+		{
+			return item is ViewModel.MiniSurvey.Question.FreeTextViewModel
+				? freeTextViewCell
+				: checkOneViewCell;
+		}
+	}
 }
diff --git a/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml.cs b/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml.cs
index 071db56..903878a 100644
--- a/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml.cs
+++ b/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml.cs
@@ -10,177 +10,177 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.MyBikes
 {
-    using Serilog;
-    using TINK.Model;
-    using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
-    using TINK.Model.Device;
-    using TINK.ViewModel.MyBikes;
-    using Xamarin.CommunityToolkit.Extensions;
+	using Serilog;
+	using TINK.Model;
+	using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
+	using TINK.Model.Device;
+	using TINK.ViewModel.MyBikes;
+	using Xamarin.CommunityToolkit.Extensions;
 
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class MyBikesPage : ContentPage, IViewService
-    {
-        /// <summary> Refernce to view model. </summary>
-        MyBikesPageViewModel m_oViewModel = null;
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class MyBikesPage : ContentPage, IViewService
+	{
+		/// <summary> Refernce to view model. </summary>
+		MyBikesPageViewModel m_oViewModel = null;
 
-        /// <summary> Initialization status to ensure initialization logic is not called multiple times. </summary>
-        private bool isInitializationStarted = false;
+		/// <summary> Initialization status to ensure initialization logic is not called multiple times. </summary>
+		private bool isInitializationStarted = false;
 
-        /// <summary>
-        /// Constructs a my bikes page.
-        /// </summary>
-        public MyBikesPage()
-        {
-        }
+		/// <summary>
+		/// Constructs a my bikes page.
+		/// </summary>
+		public MyBikesPage()
+		{
+		}
 
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        protected async override void OnAppearing()
-        {
-            // Don't repeat the initialization if it has been completed already.
-            if (isInitializationStarted) return;
-            isInitializationStarted = true;
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		protected async override void OnAppearing()
+		{
+			// Don't repeat the initialization if it has been completed already.
+			if (isInitializationStarted) return;
+			isInitializationStarted = true;
 
-            if (m_oViewModel != null)
-            {
-                // No need to create view model, set binding context an items source if already done.
-                // If done twice tap events are fired multiple times (when hiding page using home button).
-                await m_oViewModel.OnAppearing();
-                isInitializationStarted = false;
-                return;
-            }
+			if (m_oViewModel != null)
+			{
+				// No need to create view model, set binding context an items source if already done.
+				// If done twice tap events are fired multiple times (when hiding page using home button).
+				await m_oViewModel.OnAppearing();
+				isInitializationStarted = false;
+				return;
+			}
 
-            try
-            {
-                var model = App.ModelRoot;
+			try
+			{
+				var model = App.ModelRoot;
 
-                // Backup synchronization context when called from GUI-thread.
-                var synchronizationContext = SynchronizationContext.Current;
+				// Backup synchronization context when called from GUI-thread.
+				var synchronizationContext = SynchronizationContext.Current;
 
-                m_oViewModel = new MyBikesPageViewModel(
-                    model.ActiveUser,
-                    App.PermissionsService,
-                    App.BluetoothService,
-                    Device.RuntimePlatform,
-                    () => model.GetIsConnected(),
-                    (isConnected) => model.GetConnector(isConnected),
-                    App.LocationServicesContainer.Active,
-                    model.LocksServices.Active,
-                    model.Stations,
-                    model.Polling,
-                    (d, obj) => synchronizationContext.Post(d, obj),
-                    model.SmartDevice,
-                    this,
-                    (url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url))
-                {
-                    IsReportLevelVerbose = model.IsReportLevelVerbose
-                };
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<MyBikesPage>().Error("Displaying bikes at station page failed. {Exception}", exception);
-                await DisplayAlert("Fehler", $"Seite Räder an Station kann nicht angezeigt werden. ${exception.Message}", "OK");
-                isInitializationStarted = false;
-                return;
-            }
+				m_oViewModel = new MyBikesPageViewModel(
+					model.ActiveUser,
+					App.PermissionsService,
+					App.BluetoothService,
+					Device.RuntimePlatform,
+					() => model.GetIsConnected(),
+					(isConnected) => model.GetConnector(isConnected),
+					App.LocationServicesContainer.Active,
+					model.LocksServices.Active,
+					model.Stations,
+					model.Polling,
+					(d, obj) => synchronizationContext.Post(d, obj),
+					model.SmartDevice,
+					this,
+					(url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url))
+				{
+					IsReportLevelVerbose = model.IsReportLevelVerbose
+				};
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<MyBikesPage>().Error("Displaying bikes at station page failed. {Exception}", exception);
+				await DisplayAlert("Fehler", $"Seite Räder an Station kann nicht angezeigt werden. ${exception.Message}", "OK");
+				isInitializationStarted = false;
+				return;
+			}
 
-            InitializeComponent();
+			InitializeComponent();
 
-            BindingContext = m_oViewModel;
-            MyBikesListView.ItemsSource = m_oViewModel;
+			BindingContext = m_oViewModel;
+			MyBikesListView.ItemsSource = m_oViewModel;
 
-            await m_oViewModel.OnAppearing();
-            isInitializationStarted = false;
-        }
+			await m_oViewModel.OnAppearing();
+			isInitializationStarted = false;
+		}
 
-        /// <summary>
-        /// Invoked when pages is closed/ hidden. 
-        /// Stops update process.
-        /// </summary>
-        protected async override void OnDisappearing()
-        {
-            if (m_oViewModel == null)
-            {
-                // View model might be null (Example: Occured when page to querry for location permissions was opened)
-                return;
-            }
+		/// <summary>
+		/// Invoked when pages is closed/ hidden. 
+		/// Stops update process.
+		/// </summary>
+		protected async override void OnDisappearing()
+		{
+			if (m_oViewModel == null)
+			{
+				// View model might be null (Example: Occured when page to querry for location permissions was opened)
+				return;
+			}
 
-            await m_oViewModel.OnDisappearing();
-        }
+			await m_oViewModel.OnDisappearing();
+		}
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strCancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strCancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strAccept">Text of accept button.</param>
-        /// <param name="p_strCancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strAccept">Text of accept button.</param>
+		/// <param name="p_strCancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
 
 #if USEFLYOUT
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => throw new NotImplementedException();
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="typeOfPage">Page to display.</param>
-        public async Task PushModalAsync(ViewTypes typeOfPage)
-            => await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="typeOfPage">Page to display.</param>
+		public async Task PushModalAsync(ViewTypes typeOfPage)
+			=> await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
 
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync() => throw new NotSupportedException();
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync() => throw new NotSupportedException();
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
 
 #if USCSHARP9
         public async Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup());
 #else
-        /// <summary> Displays user feedback popup.</summary>
-        /// <param name="co2Saving"> Co2 saving information.</param>
-        /// <returns>User feedback.</returns>
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
+		/// <summary> Displays user feedback popup.</summary>
+		/// <param name="co2Saving"> Co2 saving information.</param>
+		/// <returns>User feedback.</returns>
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/RootFlyout/RootPage.xaml.cs b/LastenradBayern/TINK/View/RootFlyout/RootPage.xaml.cs
index f3a52bb..7a0ecd0 100644
--- a/LastenradBayern/TINK/View/RootFlyout/RootPage.xaml.cs
+++ b/LastenradBayern/TINK/View/RootFlyout/RootPage.xaml.cs
@@ -8,35 +8,35 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Root
 {
-    /// <summary>
-    /// Mamages creation of detail pages if a flyout page menu entry is selected.
-    /// Exposes flyout page style navigation which is used by detail pages.
-    /// </summary>
-    /// <remarks>
-    /// Examples of use cases when detail pages do navigation:
-    // - switch to map page after succesfully logging in/ logging out
-    // - switch to login page form bikes at station page if not yet logged in
-    /// </remarks>
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	/// <summary>
+	/// Mamages creation of detail pages if a flyout page menu entry is selected.
+	/// Exposes flyout page style navigation which is used by detail pages.
+	/// </summary>
+	/// <remarks>
+	/// Examples of use cases when detail pages do navigation:
+	// - switch to map page after succesfully logging in/ logging out
+	// - switch to login page form bikes at station page if not yet logged in
+	/// </remarks>
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class RootPage : FlyoutPage, INavigationMasterDetail
 #else
-    public partial class RootPage : FlyoutPage
+	public partial class RootPage : FlyoutPage
 #endif
-    {
-        public RootPage()
-        {
-            InitializeComponent();
-            FlyoutPage.ListView.ItemSelected += OnListViewItemSelected;
+	{
+		public RootPage()
+		{
+			InitializeComponent();
+			FlyoutPage.ListView.ItemSelected += OnListViewItemSelected;
 
-            // Any type of split behaviour conflics with map shifting functionality (assuming FlyoutPage behaves same like MasterDetailPage).
-            FlyoutLayoutBehavior = FlyoutLayoutBehavior.Popover;
+			// Any type of split behaviour conflics with map shifting functionality (assuming FlyoutPage behaves same like MasterDetailPage).
+			FlyoutLayoutBehavior = FlyoutLayoutBehavior.Popover;
 
-            var navigationPage = Detail as NavigationPage;
-            if (navigationPage == null)
-            {
-                return;
-            }
+			var navigationPage = Detail as NavigationPage;
+			if (navigationPage == null)
+			{
+				return;
+			}
 
 #if USEFLYOUT
             var detailPage = navigationPage.RootPage as IDetailPage;
@@ -47,38 +47,38 @@ namespace TINK.View.Root
 
             detailPage.NavigationMasterDetail = this;
 #endif
-        }
+		}
 
-        /// <summary>
-        /// Is called if a flyout page menu entry is selected.
-        /// Creates  a new page.
-        /// </summary>
-        private void OnListViewItemSelected(object sender, SelectedItemChangedEventArgs e)
-        {
-            if (!(e.SelectedItem is RootPageFlyoutMenuItem item))
-            {
-                // Unexpected argument detected.
-                return;
-            }
+		/// <summary>
+		/// Is called if a flyout page menu entry is selected.
+		/// Creates  a new page.
+		/// </summary>
+		private void OnListViewItemSelected(object sender, SelectedItemChangedEventArgs e)
+		{
+			if (!(e.SelectedItem is RootPageFlyoutMenuItem item))
+			{
+				// Unexpected argument detected.
+				return;
+			}
 
-            // Set selected station to new 
-            App.ModelRoot.SelectedStation = new NullStation();
+			// Set selected station to new 
+			App.ModelRoot.SelectedStation = new NullStation();
 
-            ShowPage(item.TargetType, item.Title);
+			ShowPage(item.TargetType, item.Title);
 
-            IsPresented = false;
-            FlyoutPage.ListView.SelectedItem = null;
-        }
+			IsPresented = false;
+			FlyoutPage.ListView.SelectedItem = null;
+		}
 
-        /// <summary>
-        /// Shows a detail page.
-        /// </summary>
-        /// <param name="typeOfPage">Type of page to show.</param>
-        /// <param name="title">Title of page.</param>
-        public void ShowPage(Type typeOfPage, string title)
-        {
-            var page = (Page)Activator.CreateInstance(typeOfPage);
-            page.Title = title;
+		/// <summary>
+		/// Shows a detail page.
+		/// </summary>
+		/// <param name="typeOfPage">Type of page to show.</param>
+		/// <param name="title">Title of page.</param>
+		public void ShowPage(Type typeOfPage, string title)
+		{
+			var page = (Page)Activator.CreateInstance(typeOfPage);
+			page.Title = title;
 
 #if USEFLYOUT
             if (page is IDetailPage detailPage)
@@ -89,7 +89,7 @@ namespace TINK.View.Root
             }
 #endif
 
-            Detail = new NavigationPage(page);
-        }
-    }
+			Detail = new NavigationPage(page);
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/RootFlyout/RootPageFlyout.xaml.cs b/LastenradBayern/TINK/View/RootFlyout/RootPageFlyout.xaml.cs
index 5134fa0..0b6a960 100644
--- a/LastenradBayern/TINK/View/RootFlyout/RootPageFlyout.xaml.cs
+++ b/LastenradBayern/TINK/View/RootFlyout/RootPageFlyout.xaml.cs
@@ -18,19 +18,19 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Root
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class RootPageFlyout : ContentPage
-    {
-        public ListView ListView;
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class RootPageFlyout : ContentPage
+	{
+		public ListView ListView;
 
-        public RootPageFlyout()
-        {
-            InitializeComponent();
+		public RootPageFlyout()
+		{
+			InitializeComponent();
 
-            BindingContext = new RootPageFlyoutViewModel();
+			BindingContext = new RootPageFlyoutViewModel();
 
-            ListView = MenuItemsListView;
-        }
+			ListView = MenuItemsListView;
+		}
 
-    }
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/RootFlyout/RootPageFlyoutMenuItem.cs b/LastenradBayern/TINK/View/RootFlyout/RootPageFlyoutMenuItem.cs
index 4756def..850e69f 100644
--- a/LastenradBayern/TINK/View/RootFlyout/RootPageFlyoutMenuItem.cs
+++ b/LastenradBayern/TINK/View/RootFlyout/RootPageFlyoutMenuItem.cs
@@ -3,18 +3,18 @@
 namespace TINK.View.Root
 {
 
-    public class RootPageFlyoutMenuItem
-    {
-        public RootPageFlyoutMenuItem()
-        {
-            TargetType = typeof(RootPageFlyoutMenuItem);
-        }
-        public int Id { get; set; }
+	public class RootPageFlyoutMenuItem
+	{
+		public RootPageFlyoutMenuItem()
+		{
+			TargetType = typeof(RootPageFlyoutMenuItem);
+		}
+		public int Id { get; set; }
 
-        public string GlyphCode { get; set; }
+		public string GlyphCode { get; set; }
 
-        public string Title { get; set; }
+		public string Title { get; set; }
 
-        public Type TargetType { get; set; }
-    }
+		public Type TargetType { get; set; }
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/RootMasterDetail/MainPageMenuItem.cs b/LastenradBayern/TINK/View/RootMasterDetail/MainPageMenuItem.cs
index ca04b1e..5fe31de 100644
--- a/LastenradBayern/TINK/View/RootMasterDetail/MainPageMenuItem.cs
+++ b/LastenradBayern/TINK/View/RootMasterDetail/MainPageMenuItem.cs
@@ -4,39 +4,39 @@ using TINK.ViewModel.MasterDetail;
 
 namespace TINK.View
 {
-    public class MainPageMenuItem
-    {
-        public MainPageMenuItem()
-        {
-            TargetType = typeof(MapPage);
-        }
+	public class MainPageMenuItem
+	{
+		public MainPageMenuItem()
+		{
+			TargetType = typeof(MapPage);
+		}
 
-        public MainPageMenuItem(
-            int p_iId,
-            Type p_oTypeOfPage,
-            string p_strTitle = null)
-        {
-            TargetType = p_oTypeOfPage;
-            Id = p_iId;
-            Title = p_strTitle ?? Helper.GetCaption(p_oTypeOfPage);
-        }
+		public MainPageMenuItem(
+			int p_iId,
+			Type p_oTypeOfPage,
+			string p_strTitle = null)
+		{
+			TargetType = p_oTypeOfPage;
+			Id = p_iId;
+			Title = p_strTitle ?? Helper.GetCaption(p_oTypeOfPage);
+		}
 
-        public int Id
-        {
-            get;
-            private set;
-        }
+		public int Id
+		{
+			get;
+			private set;
+		}
 
-        public string Title
-        {
-            get;
-            private set;
-        }
+		public string Title
+		{
+			get;
+			private set;
+		}
 
-        public Type TargetType
-        {
-            get;
-            private set;
-        }
-    }
+		public Type TargetType
+		{
+			get;
+			private set;
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/RootShell/AppShell.xaml.cs b/LastenradBayern/TINK/View/RootShell/AppShell.xaml.cs
index 71f7994..b27cdc1 100644
--- a/LastenradBayern/TINK/View/RootShell/AppShell.xaml.cs
+++ b/LastenradBayern/TINK/View/RootShell/AppShell.xaml.cs
@@ -4,12 +4,12 @@ using Xamarin.Forms;
 
 namespace TINK.View.RootShell
 {
-    public partial class AppShell : Shell
-    {
-        public AppShell()
-        {
-            InitializeComponent();
-            BindingContext = new AppShellViewModel();
-        }
-    }
+	public partial class AppShell : Shell
+	{
+		public AppShell()
+		{
+			InitializeComponent();
+			BindingContext = new AppShellViewModel();
+		}
+	}
 }
diff --git a/LastenradBayern/TINK/View/RootShell/FlyoutHeader.xaml.cs b/LastenradBayern/TINK/View/RootShell/FlyoutHeader.xaml.cs
index 8dda9e4..67382d5 100644
--- a/LastenradBayern/TINK/View/RootShell/FlyoutHeader.xaml.cs
+++ b/LastenradBayern/TINK/View/RootShell/FlyoutHeader.xaml.cs
@@ -9,12 +9,12 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.RootShell
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class FlyoutHeader : ContentView
-    {
-        public FlyoutHeader()
-        {
-            InitializeComponent();
-        }
-    }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class FlyoutHeader : ContentView
+	{
+		public FlyoutHeader()
+		{
+			InitializeComponent();
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/Settings/SettingsPage.xaml.cs b/LastenradBayern/TINK/View/Settings/SettingsPage.xaml.cs
index 8166aa5..00d3271 100644
--- a/LastenradBayern/TINK/View/Settings/SettingsPage.xaml.cs
+++ b/LastenradBayern/TINK/View/Settings/SettingsPage.xaml.cs
@@ -12,82 +12,82 @@ using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 
 namespace TINK.View.Settings
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class SettingsPage : ContentPage, IViewService, IDetailPage
 #else
-    public partial class SettingsPage : ContentPage, IViewService
+	public partial class SettingsPage : ContentPage, IViewService
 #endif
-    {
-        /// <summary> Refernce to view model. </summary>
-        SettingsPageViewModel m_oViewModel = null;
+	{
+		/// <summary> Refernce to view model. </summary>
+		SettingsPageViewModel m_oViewModel = null;
 
-        /// <summary> Constructs a settings page. </summary>
-        public SettingsPage()
-        {
-            InitializeComponent();
+		/// <summary> Constructs a settings page. </summary>
+		public SettingsPage()
+		{
+			InitializeComponent();
 
-            var l_oModel = App.ModelRoot;
+			var l_oModel = App.ModelRoot;
 
-            m_oViewModel = new SettingsPageViewModel(
-                l_oModel,
-                App.LocationServicesContainer,
-                this);
+			m_oViewModel = new SettingsPageViewModel(
+				l_oModel,
+				App.LocationServicesContainer,
+				this);
 
-            BindingContext = m_oViewModel;
+			BindingContext = m_oViewModel;
 
-            Filters.ItemsSource = m_oViewModel.GroupFilter;
-        }
+			Filters.ItemsSource = m_oViewModel.GroupFilter;
+		}
 
-        /// <summary> Displays alert message. </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strCancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
+		/// <summary> Displays alert message. </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strCancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strAccept">Text of accept button.</param>
-        /// <param name="p_strCancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strAccept">Text of accept button.</param>
+		/// <param name="p_strCancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
 
-        /// <summary>
-        /// Displays an action sheet.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strCancel">Text of button.</param>
-        /// <param name="destruction"></param>
-        /// <param name="p_oButtons">Buttons holding options to select.</param>
-        /// <returns>Text selected</returns>
-        public new async Task<string> DisplayActionSheet(String p_strTitle, String p_strCancel, String destruction, params String[] p_oButtons)
-                => await base.DisplayActionSheet(p_strTitle, p_strCancel, destruction, p_oButtons);
+		/// <summary>
+		/// Displays an action sheet.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strCancel">Text of button.</param>
+		/// <param name="destruction"></param>
+		/// <param name="p_oButtons">Buttons holding options to select.</param>
+		/// <returns>Text selected</returns>
+		public new async Task<string> DisplayActionSheet(String p_strTitle, String p_strCancel, String destruction, params String[] p_oButtons)
+				=> await base.DisplayActionSheet(p_strTitle, p_strCancel, destruction, p_oButtons);
 
 #if USEFLYOUT
         /// <summary>
@@ -97,19 +97,19 @@ namespace TINK.View.Settings
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => m_oNavigation.ShowPage(p_oType.GetViewType(), p_strTitle);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushModalAsync(ViewTypes p_oTypeOfPage)
-            => throw new NotImplementedException();
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushModalAsync(ViewTypes p_oTypeOfPage)
+			=> throw new NotImplementedException();
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync()
-            => throw new NotSupportedException();
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync()
+			=> throw new NotSupportedException();
 
 #if USEFLYOUT
         /// <summary>Delegate to perform navigation.</summary>
@@ -124,33 +124,33 @@ namespace TINK.View.Settings
         }
 
 #endif
-        /// <summary>
-        /// Invoked when pages is closed/ hidden. 
-        /// Stops update process.
-        /// </summary>
-        protected async override void OnDisappearing()
-        {
-            if (m_oViewModel == null)
-            {
-                // View model might be null.
-                return;
-            }
+		/// <summary>
+		/// Invoked when pages is closed/ hidden. 
+		/// Stops update process.
+		/// </summary>
+		protected async override void OnDisappearing()
+		{
+			if (m_oViewModel == null)
+			{
+				// View model might be null.
+				return;
+			}
 
-            await m_oViewModel?.OnDisappearing();
-        }
+			await m_oViewModel?.OnDisappearing();
+		}
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public async Task PushAsync(ViewTypes p_oTypeOfPage)
-            => await Navigation.PushAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public async Task PushAsync(ViewTypes p_oTypeOfPage)
+			=> await Navigation.PushAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
 
 #if USCSHARP9
         public async Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup());
 #else
-        /// <summary> Displays user feedback popup.</summary>
-        /// <param name="co2Saving"> Co2 saving information.</param>
-        /// <returns>User feedback.</returns>
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
+		/// <summary> Displays user feedback popup.</summary>
+		/// <param name="co2Saving"> Co2 saving information.</param>
+		/// <returns>User feedback.</returns>
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
 #endif
 
 #if USERFEEDBACKDLG_TRYOUT
@@ -164,5 +164,5 @@ namespace TINK.View.Settings
                 "OK");
         }
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/StringNotNullOrEmptyToVisibleConverter.cs b/LastenradBayern/TINK/View/StringNotNullOrEmptyToVisibleConverter.cs
index ebf2361..d4c2f32 100644
--- a/LastenradBayern/TINK/View/StringNotNullOrEmptyToVisibleConverter.cs
+++ b/LastenradBayern/TINK/View/StringNotNullOrEmptyToVisibleConverter.cs
@@ -4,20 +4,20 @@ using Xamarin.Forms;
 
 namespace TINK.View
 {
-    /// <summary> Converts a string into visible state. If string is null or empty element becomes invisible.</summary>
-    public class StringNotNullOrEmptyToVisibleConverter : IValueConverter
-    {
-        /// <summary> Converts a string into visible state.</summary>
-        /// <param name="value">Text value from view model used to derive whether object is visible or not.</param>
-        /// <returns>Boolean value indicating whether object is visible or not.</returns>
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return value != null && value is string text && !string.IsNullOrEmpty(text);
-        }
+	/// <summary> Converts a string into visible state. If string is null or empty element becomes invisible.</summary>
+	public class StringNotNullOrEmptyToVisibleConverter : IValueConverter
+	{
+		/// <summary> Converts a string into visible state.</summary>
+		/// <param name="value">Text value from view model used to derive whether object is visible or not.</param>
+		/// <returns>Boolean value indicating whether object is visible or not.</returns>
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			return value != null && value is string text && !string.IsNullOrEmpty(text);
+		}
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return "";
-        }
-    }
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			return "";
+		}
+	}
 }
diff --git a/LastenradBayern/TINK/View/ViewTypesTypeProvider.cs b/LastenradBayern/TINK/View/ViewTypesTypeProvider.cs
index d5c0c76..30d8cd7 100644
--- a/LastenradBayern/TINK/View/ViewTypesTypeProvider.cs
+++ b/LastenradBayern/TINK/View/ViewTypesTypeProvider.cs
@@ -15,63 +15,63 @@ using Xamarin.Forms;
 
 namespace TINK.View
 {
-    public static class ViewTypesTypeProvider
-    {
-        public static Type GetViewType(this ViewTypes viewType)
-        {
-            switch (viewType)
-            {
-                case ViewTypes.LoginPage:
-                    return typeof(LoginPage);
+	public static class ViewTypesTypeProvider
+	{
+		public static Type GetViewType(this ViewTypes viewType)
+		{
+			switch (viewType)
+			{
+				case ViewTypes.LoginPage:
+					return typeof(LoginPage);
 
-                case ViewTypes.MapPage:
-                    return typeof(MapPage);
+				case ViewTypes.MapPage:
+					return typeof(MapPage);
 
-                case ViewTypes.RegisterPage:
-                    return typeof(RegisterPage);
+				case ViewTypes.RegisterPage:
+					return typeof(RegisterPage);
 
-                case ViewTypes.PasswordForgottenPage:
-                    return typeof(PasswordForgottenPage);
+				case ViewTypes.PasswordForgottenPage:
+					return typeof(PasswordForgottenPage);
 
-                case ViewTypes.BikeInfoCarouselPage:
-                    return typeof(BikeInfoCarouselPage);
+				case ViewTypes.BikeInfoCarouselPage:
+					return typeof(BikeInfoCarouselPage);
 
-                case ViewTypes.MyBikesPage:
-                    return typeof(MyBikesPage);
+				case ViewTypes.MyBikesPage:
+					return typeof(MyBikesPage);
 
-                case ViewTypes.SettingsPage:
-                    return typeof(SettingsPage);
+				case ViewTypes.SettingsPage:
+					return typeof(SettingsPage);
 
-                case ViewTypes.TabbedPageInfo:
-                    return typeof(InfoPage);
+				case ViewTypes.TabbedPageInfo:
+					return typeof(InfoPage);
 
-                case ViewTypes.FeesAndBikesPage:
-                    return typeof(FeesAndBikesPage);
+				case ViewTypes.FeesAndBikesPage:
+					return typeof(FeesAndBikesPage);
 
-                case ViewTypes.ManageAccountPage:
-                    return typeof(ManageAccountPage);
+				case ViewTypes.ManageAccountPage:
+					return typeof(ManageAccountPage);
 
-                case ViewTypes.AgbPage:
-                    return typeof(AgbPage);
+				case ViewTypes.AgbPage:
+					return typeof(AgbPage);
 
-                case ViewTypes.WhatsNewPage:
-                    return typeof(WhatsNewPage);
+				case ViewTypes.WhatsNewPage:
+					return typeof(WhatsNewPage);
 
-                case ViewTypes.BikesAtStation:
-                    return typeof(BikesAtStationPage);
+				case ViewTypes.BikesAtStation:
+					return typeof(BikesAtStationPage);
 
-                case ViewTypes.ContactPage:
-                    return typeof(ContactPage);
+				case ViewTypes.ContactPage:
+					return typeof(ContactPage);
 
-                case ViewTypes.SelectStationPage:
-                    return typeof(SelectStationPage);
+				case ViewTypes.SelectStationPage:
+					return typeof(SelectStationPage);
 
-                case ViewTypes.MiniSurvey:
-                    return typeof(MiniSurveyPage);
+				case ViewTypes.MiniSurvey:
+					return typeof(MiniSurveyPage);
 
-                default:
-                    return typeof(ContentPage);
-            }
-        }
-    }
+				default:
+					return typeof(ContentPage);
+			}
+		}
+	}
 }
diff --git a/LastenradBayern/TINK/View/WhatsNew/Agb/AgbPage.xaml.cs b/LastenradBayern/TINK/View/WhatsNew/Agb/AgbPage.xaml.cs
index ccaeb0f..cb114dd 100644
--- a/LastenradBayern/TINK/View/WhatsNew/Agb/AgbPage.xaml.cs
+++ b/LastenradBayern/TINK/View/WhatsNew/Agb/AgbPage.xaml.cs
@@ -9,76 +9,76 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.WhatsNew.Agb
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class AgbPage : ContentPage, IViewService
-    {
-        public AgbPage()
-        {
-            InitializeComponent();
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class AgbPage : ContentPage, IViewService
+	{
+		public AgbPage()
+		{
+			InitializeComponent();
 
-            agbViewModel = new AgbViewModel(
-                App.ModelRoot.NextActiveUri.Host,
-                App.ModelRoot.IsSiteCachingOn,
-                CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
-                (resourceName) => ViewModelResourceHelper.GetSource(resourceName),
-                this);
+			agbViewModel = new AgbViewModel(
+				App.ModelRoot.NextActiveUri.Host,
+				App.ModelRoot.IsSiteCachingOn,
+				CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
+				(resourceName) => ViewModelResourceHelper.GetSource(resourceName),
+				this);
 
-            BindingContext = agbViewModel;
-        }
+			BindingContext = agbViewModel;
+		}
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary> Invoked when page is shown. </summary>
-        protected async override void OnAppearing()
-            => await agbViewModel.OnAppearing();
+		/// <summary> Invoked when page is shown. </summary>
+		protected async override void OnAppearing()
+			=> await agbViewModel.OnAppearing();
 
-        /// <summary> Reference to view model.</summary>
-        AgbViewModel agbViewModel;
+		/// <summary> Reference to view model.</summary>
+		AgbViewModel agbViewModel;
 
-        public async Task PopModalAsync()
-            => await Navigation.PopModalAsync();
+		public async Task PopModalAsync()
+			=> await Navigation.PopModalAsync();
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushAsync(ViewTypes p_oTypeOfPage)
-            => throw new NotImplementedException();
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushAsync(ViewTypes p_oTypeOfPage)
+			=> throw new NotImplementedException();
 
-        public Task PushModalAsync(ViewTypes p_oTypeOfPage)
-            => throw new NotImplementedException();
+		public Task PushModalAsync(ViewTypes p_oTypeOfPage)
+			=> throw new NotImplementedException();
 
 #if USEFLYOUT
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => throw new NotImplementedException();
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/WhatsNew/WhatsNewPage.xaml.cs b/LastenradBayern/TINK/View/WhatsNew/WhatsNewPage.xaml.cs
index f519596..c1c1a2c 100644
--- a/LastenradBayern/TINK/View/WhatsNew/WhatsNewPage.xaml.cs
+++ b/LastenradBayern/TINK/View/WhatsNew/WhatsNewPage.xaml.cs
@@ -7,100 +7,100 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.WhatsNew
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class WhatsNewPage : ContentPage, IViewService
-    {
-        /// <summary> Holds a reference on the view model. </summary>
-        private ViewModel.WhatsNew.WhatsNewViewModel WhatsNewViewModel;
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class WhatsNewPage : ContentPage, IViewService
+	{
+		/// <summary> Holds a reference on the view model. </summary>
+		private ViewModel.WhatsNew.WhatsNewViewModel WhatsNewViewModel;
 
-        /// <summary> Constructs whats new page.</summary>
-        /// <param name="showMasterDetail">Action to invoke master detail page.</param>
-        public WhatsNewPage(Action showMasterDetail)
-        {
-            InitializeComponent();
+		/// <summary> Constructs whats new page.</summary>
+		/// <param name="showMasterDetail">Action to invoke master detail page.</param>
+		public WhatsNewPage(Action showMasterDetail)
+		{
+			InitializeComponent();
 
-            WhatsNewViewModel = new ViewModel.WhatsNew.WhatsNewViewModel(
-                DependencyService.Get<IAppInfo>().Version,
-                App.ModelRoot.WhatsNew.WhatsNewText,
-                App.ModelRoot.WhatsNew.IsShowAgbRequired,
-                showMasterDetail,
-                this);
+			WhatsNewViewModel = new ViewModel.WhatsNew.WhatsNewViewModel(
+				DependencyService.Get<IAppInfo>().Version,
+				App.ModelRoot.WhatsNew.WhatsNewText,
+				App.ModelRoot.WhatsNew.IsShowAgbRequired,
+				showMasterDetail,
+				this);
 
-            BindingContext = WhatsNewViewModel;
-        }
+			BindingContext = WhatsNewViewModel;
+		}
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        public Task PopModalAsync()
-        {
-            throw new NotImplementedException(); ;
-        }
+		public Task PopModalAsync()
+		{
+			throw new NotImplementedException(); ;
+		}
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushAsync(ViewTypes p_oTypeOfPage)
-        {
-            throw new NotImplementedException();
-        }
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushAsync(ViewTypes p_oTypeOfPage)
+		{
+			throw new NotImplementedException();
+		}
 
-        public async Task PushModalAsync(ViewTypes p_oTypeOfPage)
-        {
-            await Navigation.PushModalAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
-        }
+		public async Task PushModalAsync(ViewTypes p_oTypeOfPage)
+		{
+			await Navigation.PushModalAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
+		}
 
 #if USEFLYOUT
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => throw new NotImplementedException();
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
 
-        /// <summary>
-        /// Invoked when pages is closed/ hidden.
-        /// /// </summary>
-        protected override void OnDisappearing()
-        {
-            base.OnDisappearing();
+		/// <summary>
+		/// Invoked when pages is closed/ hidden.
+		/// /// </summary>
+		protected override void OnDisappearing()
+		{
+			base.OnDisappearing();
 
-            if (WhatsNewViewModel == null)
-            {
-                // View model might be null.
-                return;
-            }
+			if (WhatsNewViewModel == null)
+			{
+				// View model might be null.
+				return;
+			}
 
-            WhatsNewViewModel?.OnDisappearing(() =>
-            {
-                App.ModelRoot.WhatsNew.WasShownInCurrentSession = true;
-                App.ModelRoot.Save();
-            });
-        }
-    }
+			WhatsNewViewModel?.OnDisappearing(() =>
+			{
+				App.ModelRoot.WhatsNew.WasShownInCurrentSession = true;
+				App.ModelRoot.Save();
+			});
+		}
+	}
 }
\ No newline at end of file
diff --git a/LastenradBayern/TINK/ViewModel/RootFlyout/RootPageViewModel.cs b/LastenradBayern/TINK/ViewModel/RootFlyout/RootPageViewModel.cs
index 15a5a4d..b7a220b 100644
--- a/LastenradBayern/TINK/ViewModel/RootFlyout/RootPageViewModel.cs
+++ b/LastenradBayern/TINK/ViewModel/RootFlyout/RootPageViewModel.cs
@@ -24,175 +24,175 @@ using TINK.View.Themes;
 
 namespace TINK.ViewModel.Root
 {
-    /// <summary>
-    /// View model for flyout menu entries. Respositility
-    /// - populates entries depending on app state on showing menu
-    /// - updates menu denpending on app state change, i.e. user logs in/ out. 
-    /// </summary>
-    public class RootPageFlyoutViewModel : INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Dictionary to manage collection of menu items.
-        /// </summary>
-        private Dictionary<Type, int> m_oEntryDictionary;
+	/// <summary>
+	/// View model for flyout menu entries. Respositility
+	/// - populates entries depending on app state on showing menu
+	/// - updates menu denpending on app state change, i.e. user logs in/ out. 
+	/// </summary>
+	public class RootPageFlyoutViewModel : INotifyPropertyChanged
+	{
+		/// <summary>
+		/// Dictionary to manage collection of menu items.
+		/// </summary>
+		private Dictionary<Type, int> m_oEntryDictionary;
 
-        public event PropertyChangedEventHandler PropertyChanged;
+		public event PropertyChangedEventHandler PropertyChanged;
 
-        /// <summary> Updates menu entries depending on state. </summary>
-        private void UpdateMenuEntries()
-        {
-            for (int l_iIndex = MenuItems.Count - 1; l_iIndex >= 0; l_iIndex--)
-            {
-                MenuItems.Clear();
-                m_oEntryDictionary.Clear();
-            }
+		/// <summary> Updates menu entries depending on state. </summary>
+		private void UpdateMenuEntries()
+		{
+			for (int l_iIndex = MenuItems.Count - 1; l_iIndex >= 0; l_iIndex--)
+			{
+				MenuItems.Clear();
+				m_oEntryDictionary.Clear();
+			}
 
-            CheckAddItem(typeof(MapPage));
+			CheckAddItem(typeof(MapPage));
 
-            if (App.ModelRoot.ActiveUser.IsLoggedIn)
-            {
-                CheckAddItem(typeof(MyBikesPage));
-                CheckAddItem(typeof(FindBikePage));
-                CheckAddItem(typeof(AccountPage));
-            }
-            else
-            {
-                CheckAddItem(typeof(LoginPage));
-            }
+			if (App.ModelRoot.ActiveUser.IsLoggedIn)
+			{
+				CheckAddItem(typeof(MyBikesPage));
+				CheckAddItem(typeof(FindBikePage));
+				CheckAddItem(typeof(AccountPage));
+			}
+			else
+			{
+				CheckAddItem(typeof(LoginPage));
+			}
 
-            if (App.ModelRoot.Uris.ActiveUri.Host.GetIsCopri()
-                || App.ModelRoot.ActiveUser.IsLoggedIn)
-            {
-                CheckAddItem(typeof(SettingsPage));
-            }
+			if (App.ModelRoot.Uris.ActiveUri.Host.GetIsCopri()
+				|| App.ModelRoot.ActiveUser.IsLoggedIn)
+			{
+				CheckAddItem(typeof(SettingsPage));
+			}
 
-            CheckAddItem(typeof(FeesAndBikesPage)); // Fees and bikes
+			CheckAddItem(typeof(FeesAndBikesPage)); // Fees and bikes
 
-            CheckAddItem(typeof(ContactPage)); // Feedback and contact
+			CheckAddItem(typeof(ContactPage)); // Feedback and contact
 
-            CheckAddItem(typeof(InfoPage)); // About sharee.bike
-        }
+			CheckAddItem(typeof(InfoPage)); // About sharee.bike
+		}
 
-        /// <summary>Adds a menu item to master detail menu.</summary>
-        /// <param name="p_oType">Type decribing entry to be added.</param>
-        private void CheckAddItem(Type p_oType)
-        {
-            if (m_oEntryDictionary.ContainsKey(p_oType))
-            {
-                // Nothing to do because has already been added.
-                return;
-            }
+		/// <summary>Adds a menu item to master detail menu.</summary>
+		/// <param name="p_oType">Type decribing entry to be added.</param>
+		private void CheckAddItem(Type p_oType)
+		{
+			if (m_oEntryDictionary.ContainsKey(p_oType))
+			{
+				// Nothing to do because has already been added.
+				return;
+			}
 
-            m_oEntryDictionary.Add(
-                p_oType,
-                m_oEntryDictionary.Count);
+			m_oEntryDictionary.Add(
+				p_oType,
+				m_oEntryDictionary.Count);
 
-            MenuItems.Add(new RootPageFlyoutMenuItem
-            {
-                TargetType = p_oType,
-                GlyphCode = Helper.GetGlyphCode(p_oType),
-                Title = Helper.GetCaption(p_oType),
-                Id = m_oEntryDictionary[p_oType]
-            });
-        }
+			MenuItems.Add(new RootPageFlyoutMenuItem
+			{
+				TargetType = p_oType,
+				GlyphCode = Helper.GetGlyphCode(p_oType),
+				Title = Helper.GetCaption(p_oType),
+				Id = m_oEntryDictionary[p_oType]
+			});
+		}
 
-        /// <summary> Removes a page from menu.</summary>
-        /// <param name="p_oType"></param>
-        private void RemoveItem(Type p_oType)
-        {
-            if (!m_oEntryDictionary.ContainsKey(p_oType))
-            {
-                // Nothing to do because item was never added/ already removed.
-                return;
-            }
+		/// <summary> Removes a page from menu.</summary>
+		/// <param name="p_oType"></param>
+		private void RemoveItem(Type p_oType)
+		{
+			if (!m_oEntryDictionary.ContainsKey(p_oType))
+			{
+				// Nothing to do because item was never added/ already removed.
+				return;
+			}
 
-            MenuItems.Remove(MenuItems[m_oEntryDictionary[p_oType]]);
-            m_oEntryDictionary.Remove(p_oType);
-        }
+			MenuItems.Remove(MenuItems[m_oEntryDictionary[p_oType]]);
+			m_oEntryDictionary.Remove(p_oType);
+		}
 
-        public RootPageFlyoutViewModel()
-        {
-            MenuItems = new ObservableCollection<RootPageFlyoutMenuItem>();
-            m_oEntryDictionary = new Dictionary<Type, int>();
+		public RootPageFlyoutViewModel()
+		{
+			MenuItems = new ObservableCollection<RootPageFlyoutMenuItem>();
+			m_oEntryDictionary = new Dictionary<Type, int>();
 
-            // Update menu entries on login/ logout actions.
-            App.ModelRoot.ActiveUser.StateChanged += (sender, eventargs) => OnUpdateRequired();
+			// Update menu entries on login/ logout actions.
+			App.ModelRoot.ActiveUser.StateChanged += (sender, eventargs) => OnUpdateRequired();
 
-            // Update flyout view model whenever theme is switched.
-            App.ModelRoot.Themes.PropertyChanged += (sender, eventargs) =>
-            {
-                if (!(sender is ServicesContainerMutableT<object> themes))
-                    return;
+			// Update flyout view model whenever theme is switched.
+			App.ModelRoot.Themes.PropertyChanged += (sender, eventargs) =>
+			{
+				if (!(sender is ServicesContainerMutableT<object> themes))
+					return;
 
-                MasterDetailMenuTitlte = GetMasterDetailMenuTitle(themes.Active);
+				MasterDetailMenuTitlte = GetMasterDetailMenuTitle(themes.Active);
 
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(MasterDetailMenuTitlte)));
-            };
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(MasterDetailMenuTitlte)));
+			};
 
-            MasterDetailMenuTitlte = GetMasterDetailMenuTitle(App.ModelRoot.Themes.Active);
+			MasterDetailMenuTitlte = GetMasterDetailMenuTitle(App.ModelRoot.Themes.Active);
 
-            UpdateMenuEntries();
-        }
+			UpdateMenuEntries();
+		}
 
-        /// <summary>
-        /// Gets the flyout title from theme name
-        /// </summary>
-        /// <param name="theme">Name of theme.</param>
-        /// <returns>Flyout title.</returns>
-        private string GetMasterDetailMenuTitle(object theme)
-        {
-            if (!(theme is ITheme active))
-                return TINK.Themes.LastenradBayern.OPERATORINFO;
+		/// <summary>
+		/// Gets the flyout title from theme name
+		/// </summary>
+		/// <param name="theme">Name of theme.</param>
+		/// <returns>Flyout title.</returns>
+		private string GetMasterDetailMenuTitle(object theme)
+		{
+			if (!(theme is ITheme active))
+				return TINK.Themes.LastenradBayern.OPERATORINFO;
 
-            return $"{(!string.IsNullOrEmpty(active.OperatorInfo) ? ($"{active.OperatorInfo}") : "sharee.bike")}";
-        }
+			return $"{(!string.IsNullOrEmpty(active.OperatorInfo) ? ($"{active.OperatorInfo}") : "sharee.bike")}";
+		}
 
-        /// <summary>
-        /// Holds the title of the fylout page.
-        /// </summary>
-        public string MasterDetailMenuTitlte { get; private set; }
+		/// <summary>
+		/// Holds the title of the fylout page.
+		/// </summary>
+		public string MasterDetailMenuTitlte { get; private set; }
 
 
-        /// <summary>
-        /// Provides collection of menu items for master page.
-        /// </summary>
-        public ObservableCollection<RootPageFlyoutMenuItem> MenuItems
-        {
-            get; private set;
-        }
+		/// <summary>
+		/// Provides collection of menu items for master page.
+		/// </summary>
+		public ObservableCollection<RootPageFlyoutMenuItem> MenuItems
+		{
+			get; private set;
+		}
 
-        /// <summary>
-        /// Gets or sets the selected item.
-        /// </summary>
-        public MainPageMenuItem SelectedMenuItem
-        {
-            get;
-            set;
-        }
+		/// <summary>
+		/// Gets or sets the selected item.
+		/// </summary>
+		public MainPageMenuItem SelectedMenuItem
+		{
+			get;
+			set;
+		}
 
-        /// <summary>
-        /// Command object which is invoked from view when an item is selected.
-        /// </summary>
-        public Command MenuItemSelected
-        {
-            get
-            {
-                return new Command(OnUpdateRequired);
-            }
+		/// <summary>
+		/// Command object which is invoked from view when an item is selected.
+		/// </summary>
+		public Command MenuItemSelected
+		{
+			get
+			{
+				return new Command(OnUpdateRequired);
+			}
 
-        }
+		}
 
-        /// <summary> Manges updates required due to selection of a menu or login events.</summary>
-        public void OnUpdateRequired()
-        {
+		/// <summary> Manges updates required due to selection of a menu or login events.</summary>
+		public void OnUpdateRequired()
+		{
 
-            UpdateMenuEntries();
+			UpdateMenuEntries();
 
-            if (SelectedMenuItem == null)
-            {
-                // Nothing to do if no menu entry is selected.
-                return;
-            }
-        }
-    }
+			if (SelectedMenuItem == null)
+			{
+				// Nothing to do if no menu entry is selected.
+				return;
+			}
+		}
+	}
 }
diff --git a/LastenradBayern/TINK/ViewModel/RootMasterDetail/Helper.cs b/LastenradBayern/TINK/ViewModel/RootMasterDetail/Helper.cs
index d43f497..efa35d6 100644
--- a/LastenradBayern/TINK/ViewModel/RootMasterDetail/Helper.cs
+++ b/LastenradBayern/TINK/ViewModel/RootMasterDetail/Helper.cs
@@ -12,104 +12,104 @@ using TINK.ViewModel.Info;
 
 namespace TINK.ViewModel.MasterDetail
 {
-    public static class Helper
-    {
-        /// <summary>
-        /// Gets a description for a map page used as menu item entry and caption.
-        /// </summary>
-        /// <param name="type">Type of page to get caption for.</param>
-        /// <returns></returns>
-        public static string GetCaption(Type type)
-        {
-            if (type == typeof(MapPage)) // Bikes sites
-            {
-                return AppResources.MarkingMapPage;
-            }
-            else if (type == typeof(FindBikePage)) // Find Bike
-            {
-                return AppResources.MarkingFindBike;
-            }
-            else if (type == typeof(MyBikesPage)) // My Bikes
-            {
-                return AppResources.MarkingMyBikes;
-            }
-            else if (type == typeof(AccountPage)) // Account
-            {
-                return AppResources.MarkingAccount;
-            }
-            else if (type == typeof(LoginPage))  // Login
-            {
-                return AppResources.MarkingLogin;
-            }
-            else if (type == typeof(SettingsPage)) // Settings
-            {
-                return AppResources.MarkingSettings;
-            }
-            else if (type == typeof(FeesAndBikesPage))
-            {
-                return AppResources.MarkingFeesAndBikes;
-            }
-            else if (type == typeof(ContactPage))
-            {
-                return AppResources.MarkingFeedbackAndContact;
-            }
-            else if (type == typeof(InfoPage))
-            {
-                return AppResources.MarkingAbout;
-            }
-            else
-            {
-                return type.Name;
-            }
-        }
+	public static class Helper
+	{
+		/// <summary>
+		/// Gets a description for a map page used as menu item entry and caption.
+		/// </summary>
+		/// <param name="type">Type of page to get caption for.</param>
+		/// <returns></returns>
+		public static string GetCaption(Type type)
+		{
+			if (type == typeof(MapPage)) // Bikes sites
+			{
+				return AppResources.MarkingMapPage;
+			}
+			else if (type == typeof(FindBikePage)) // Find Bike
+			{
+				return AppResources.MarkingFindBike;
+			}
+			else if (type == typeof(MyBikesPage)) // My Bikes
+			{
+				return AppResources.MarkingMyBikes;
+			}
+			else if (type == typeof(AccountPage)) // Account
+			{
+				return AppResources.MarkingAccount;
+			}
+			else if (type == typeof(LoginPage))  // Login
+			{
+				return AppResources.MarkingLogin;
+			}
+			else if (type == typeof(SettingsPage)) // Settings
+			{
+				return AppResources.MarkingSettings;
+			}
+			else if (type == typeof(FeesAndBikesPage))
+			{
+				return AppResources.MarkingFeesAndBikes;
+			}
+			else if (type == typeof(ContactPage))
+			{
+				return AppResources.MarkingFeedbackAndContact;
+			}
+			else if (type == typeof(InfoPage))
+			{
+				return AppResources.MarkingAbout;
+			}
+			else
+			{
+				return type.Name;
+			}
+		}
 
-        /// <summary>
-        /// Gets a description for a map page used as menu item entry and caption.
-        /// </summary>
-        /// <param name="type">Type of page to get caption for.</param>
-        /// <returns></returns>
-        public static string GetGlyphCode(Type type)
-        {
-            if (type == typeof(MapPage)) // Bikes sites
-            {
-                return "\uf5a0";
-            }
-            else if (type == typeof(FindBikePage)) // My Bikes
-            {
-                return "\uf002";
-            }
-            else if (type == typeof(MyBikesPage)) // My Bikes
-            {
-                return "\uf206";
-            }
-            else if (type == typeof(AccountPage)) // Account
-            {
-                return "\uf007";
-            }
-            else if (type == typeof(LoginPage))  // Login
-            {
-                return "\uf2f6";
-            }
-            else if (type == typeof(SettingsPage)) // Settings
-            {
-                return "\uf013";
-            }
-            else if (type == typeof(FeesAndBikesPage))
-            {
-                return "\uf7d9";
-            }
-            else if (type == typeof(ContactPage))
-            {
-                return "\uf095";
-            }
-            else if (type == typeof(InfoPage))
-            {
-                return "\uf05a";
-            }
-            else
-            {
-                return type.Name;
-            }
-        }
-    }
+		/// <summary>
+		/// Gets a description for a map page used as menu item entry and caption.
+		/// </summary>
+		/// <param name="type">Type of page to get caption for.</param>
+		/// <returns></returns>
+		public static string GetGlyphCode(Type type)
+		{
+			if (type == typeof(MapPage)) // Bikes sites
+			{
+				return "\uf5a0";
+			}
+			else if (type == typeof(FindBikePage)) // My Bikes
+			{
+				return "\uf002";
+			}
+			else if (type == typeof(MyBikesPage)) // My Bikes
+			{
+				return "\uf206";
+			}
+			else if (type == typeof(AccountPage)) // Account
+			{
+				return "\uf007";
+			}
+			else if (type == typeof(LoginPage))  // Login
+			{
+				return "\uf2f6";
+			}
+			else if (type == typeof(SettingsPage)) // Settings
+			{
+				return "\uf013";
+			}
+			else if (type == typeof(FeesAndBikesPage))
+			{
+				return "\uf7d9";
+			}
+			else if (type == typeof(ContactPage))
+			{
+				return "\uf095";
+			}
+			else if (type == typeof(InfoPage))
+			{
+				return "\uf05a";
+			}
+			else
+			{
+				return type.Name;
+			}
+		}
+	}
 }
diff --git a/LastenradBayern/TINK/ViewModel/RootShell/AppShellViewModel.cs b/LastenradBayern/TINK/ViewModel/RootShell/AppShellViewModel.cs
index 5a08227..747ab86 100644
--- a/LastenradBayern/TINK/ViewModel/RootShell/AppShellViewModel.cs
+++ b/LastenradBayern/TINK/ViewModel/RootShell/AppShellViewModel.cs
@@ -7,66 +7,66 @@ using TINK.ViewModel.Info;
 
 namespace TINK.ViewModel.RootShell
 {
-    public class AppShellViewModel : INotifyPropertyChanged
-    {
-        public AppShellViewModel()
-        {
-            App.ModelRoot.ActiveUser.StateChanged += (sender, eventargs) =>
-            {
-                // Login state changed. Update related menu entries.
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsMyBikesPageVisible)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsFindBikePageVisible)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsAccountPageVisible)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLoginPageVisible)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsSettingsPageVisible)));
-            };
+	public class AppShellViewModel : INotifyPropertyChanged
+	{
+		public AppShellViewModel()
+		{
+			App.ModelRoot.ActiveUser.StateChanged += (sender, eventargs) =>
+			{
+				// Login state changed. Update related menu entries.
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsMyBikesPageVisible)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsFindBikePageVisible)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsAccountPageVisible)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLoginPageVisible)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsSettingsPageVisible)));
+			};
 
-            // Update flyout view model whenever theme is switched.
-            App.ModelRoot.Themes.PropertyChanged += (sender, eventargs) =>
-            {
-                if (!(sender is ServicesContainerMutableT<object> themes))
-                    return;
+			// Update flyout view model whenever theme is switched.
+			App.ModelRoot.Themes.PropertyChanged += (sender, eventargs) =>
+			{
+				if (!(sender is ServicesContainerMutableT<object> themes))
+					return;
 
-                MasterDetailMenuTitlte = GetMasterDetailMenuTitle(themes.Active);
+				MasterDetailMenuTitlte = GetMasterDetailMenuTitle(themes.Active);
 
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(MasterDetailMenuTitlte)));
-            };
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(MasterDetailMenuTitlte)));
+			};
 
-            MasterDetailMenuTitlte = GetMasterDetailMenuTitle(App.ModelRoot.Themes.Active);
-        }
+			MasterDetailMenuTitlte = GetMasterDetailMenuTitle(App.ModelRoot.Themes.Active);
+		}
 
-        /// <summary>
-        /// Gets the flyout title from theme name
-        /// </summary>
-        /// <param name="theme">Name of theme.</param>
-        /// <returns>Flyout title.</returns>
-        private string GetMasterDetailMenuTitle(object theme)
-        {
-            if (!(theme is ITheme active))
-                return TINK.Themes.ShareeBike.OPERATORINFO;
+		/// <summary>
+		/// Gets the flyout title from theme name
+		/// </summary>
+		/// <param name="theme">Name of theme.</param>
+		/// <returns>Flyout title.</returns>
+		private string GetMasterDetailMenuTitle(object theme)
+		{
+			if (!(theme is ITheme active))
+				return TINK.Themes.ShareeBike.OPERATORINFO;
 
-            return $"{(!string.IsNullOrEmpty(active.OperatorInfo) ? ($"{active.OperatorInfo}") : "sharee.bike")}";
-        }
+			return $"{(!string.IsNullOrEmpty(active.OperatorInfo) ? ($"{active.OperatorInfo}") : "sharee.bike")}";
+		}
 
-        /// <summary>
-        /// Holds the title of the fylout page.
-        /// </summary>
-        public string MasterDetailMenuTitlte { get; private set; }
+		/// <summary>
+		/// Holds the title of the fylout page.
+		/// </summary>
+		public string MasterDetailMenuTitlte { get; private set; }
 
-        public event PropertyChangedEventHandler PropertyChanged;
+		public event PropertyChangedEventHandler PropertyChanged;
 
-        public bool IsMyBikesPageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
+		public bool IsMyBikesPageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
 
-        public bool IsFindBikePageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
+		public bool IsFindBikePageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
 
-        public bool IsAccountPageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
+		public bool IsAccountPageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
 
-        public bool IsLoginPageVisible => !App.ModelRoot.ActiveUser.IsLoggedIn;
+		public bool IsLoginPageVisible => !App.ModelRoot.ActiveUser.IsLoggedIn;
 
-        public bool IsSettingsPageVisible => App.ModelRoot.Uris.ActiveUri.Host.GetIsCopri()
-                || App.ModelRoot.ActiveUser.IsLoggedIn;
+		public bool IsSettingsPageVisible => App.ModelRoot.Uris.ActiveUri.Host.GetIsCopri()
+				|| App.ModelRoot.ActiveUser.IsLoggedIn;
 
-        public string TabbedPageIngoTitle => AppResources.MarkingAbout;
+		public string TabbedPageIngoTitle => AppResources.MarkingAbout;
 
-    }
+	}
 }
diff --git a/LastenradBayern/TINK/ViewModel/ViewModelResourceHelper.cs b/LastenradBayern/TINK/ViewModel/ViewModelResourceHelper.cs
index 363155a..979fc70 100644
--- a/LastenradBayern/TINK/ViewModel/ViewModelResourceHelper.cs
+++ b/LastenradBayern/TINK/ViewModel/ViewModelResourceHelper.cs
@@ -5,38 +5,38 @@ using Serilog;
 
 namespace TINK.ViewModel
 {
-    public static class ViewModelResourceHelper
-    {
-        /// <summary> Get ressource prefix depending on platform.</summary>
-        public static string RessourcePrefix
-        {
-            get
-            {
+	public static class ViewModelResourceHelper
+	{
+		/// <summary> Get ressource prefix depending on platform.</summary>
+		public static string RessourcePrefix
+		{
+			get
+			{
 #if __IOS__
-                return "TINK.iOS.";
+				return "TINK.iOS.";
 #endif
 #if __ANDROID__
-                return "TINK.Droid.";
+				return "TINK.Droid.";
 #endif
 #if WINDOWS_UWP
                 return "TINK.WinPhone.";
 #endif
-            }
-        }
+			}
+		}
 
-        /// <summary> Gets an an embedded html ressource.</summary>
-        /// <param name="resrouceName">Name of resource to get.</param>
-        /// <returns></returns>
-        public static string GetSource(string resrouceName)
-        {
-            var l_oRessourceName = RessourcePrefix + resrouceName;
-            Log.Verbose($"Using this resource prefix {RessourcePrefix}.");
-            // note that the prefix includes the trailing period '.' that is required
-            var assembly = typeof(ViewModelResourceHelper).GetTypeInfo().Assembly;
-            var stream = assembly.GetManifestResourceStream(l_oRessourceName);
-            return stream != null
-                ? (new StreamReader(stream, Encoding.UTF8)).ReadToEnd()
-                 : string.Format("<!DOCTYPE html><html lang=\"de\"><body>An error occurred loading html- ressource {0}.</body>", l_oRessourceName);
-        }
-    }
+		/// <summary> Gets an an embedded html ressource.</summary>
+		/// <param name="resrouceName">Name of resource to get.</param>
+		/// <returns></returns>
+		public static string GetSource(string resrouceName)
+		{
+			var l_oRessourceName = RessourcePrefix + resrouceName;
+			Log.Verbose($"Using this resource prefix {RessourcePrefix}.");
+			// note that the prefix includes the trailing period '.' that is required
+			var assembly = typeof(ViewModelResourceHelper).GetTypeInfo().Assembly;
+			var stream = assembly.GetManifestResourceStream(l_oRessourceName);
+			return stream != null
+				? (new StreamReader(stream, Encoding.UTF8)).ReadToEnd()
+				 : string.Format("<!DOCTYPE html><html lang=\"de\"><body>An error occurred loading html- ressource {0}.</body>", l_oRessourceName);
+		}
+	}
 }
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItBase.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItBase.cs
index cedb32a..403f5ec 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItBase.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItBase.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -17,1094 +17,1125 @@ using Xamarin.Essentials;
 
 namespace TINK.Services.BluetoothLock.BLE
 {
-    /// <summary> Manages a single lock.</summary>
-    public abstract class LockItBase : ILockService
-    {
-        /// <summary> Lenght of seed in bytes.</summary>
-        private const int SEEDLENGTH = 16;
+	/// <summary> Manages a single lock.</summary>
+	public abstract class LockItBase : ILockService
+	{
+		/// <summary> Lenght of seed in bytes.</summary>
+		private const int SEEDLENGTH = 16;
 
-        /// <summary> Timeout for open/ close operations.</summary>
-        protected const int OPEN_CLOSE_TIMEOUT_MS = 30000;
+		/// <summary> Timeout for open/ close operations.</summary>
+		protected const int OPEN_CLOSE_TIMEOUT_MS = 30000;
 
-        /// <summary> Timeout for get service operations.</summary>
-        private const int GETSERVICE_TIMEOUT_MS = 3000;
+		/// <summary> Timeout for get service operations.</summary>
+		private const int GETSERVICE_TIMEOUT_MS = 3000;
 
-        /// <summary> Timeout for read operations.</summary>
-        private const int READ_TIMEOUT_MS = 3000;
+		/// <summary> Timeout for read operations.</summary>
+		private const int READ_TIMEOUT_MS = 3000;
 
-        protected LockItBase(IDevice device, IAdapter adapter, ICipher cipher)
-        {
-            Device = device ?? throw new ArgumentException(nameof(device));
-            Cipher = cipher ?? throw new ArgumentException(nameof(cipher));
-            Adapter = adapter ?? throw new ArgumentException(nameof(adapter));
+		protected LockItBase(IDevice device, IAdapter adapter, ICipher cipher)
+		{
+			Device = device ?? throw new ArgumentException(nameof(device));
+			Cipher = cipher ?? throw new ArgumentException(nameof(cipher));
+			Adapter = adapter ?? throw new ArgumentException(nameof(adapter));
 
-            _retryPollicy = Policy<byte[]>
-                .Handle<CharacteristicReadException>()
-                .WaitAndRetryAsync(2, index => TimeSpan.FromMilliseconds(100));
+			_retryPollicy = Policy<byte[]>
+				.Handle<CharacteristicReadException>()
+				.WaitAndRetryAsync(2, index => TimeSpan.FromMilliseconds(100));
 
-            GetGuid();
-            GetName();
+			GetGuid();
+			GetName();
 
-            if (InvalidatedSeed.ContainsKey(Guid))
-            {
-                // Lock was already connected. No need to add entry.
-                return;
-            }
+			if (InvalidatedSeed.ContainsKey(Guid))
+			{
+				// Lock was already connected. No need to add entry.
+				return;
+			}
 
-            InvalidatedSeed.Add(Guid, new List<string>());
-        }
+			InvalidatedSeed.Add(Guid, new List<string>());
+		}
 
-        private static readonly Dictionary<Guid, List<string>> InvalidatedSeed = new Dictionary<Guid, List<string>>();
+		private static readonly Dictionary<Guid, List<string>> InvalidatedSeed = new Dictionary<Guid, List<string>>();
 
-        /// <summary> Count of write- actions to activate lock characteristic..</summary>
-        protected int ActivateLockWriteCounter { get; private set; }
+		/// <summary> Count of write- actions to activate lock characteristic..</summary>
+		protected int ActivateLockWriteCounter { get; private set; }
 
-        protected ICipher Cipher { get; }
+		protected ICipher Cipher { get; }
 
-        protected IAdapter Adapter { get; }
+		protected IAdapter Adapter { get; }
 
-        protected IDevice Device { get; }
+		protected IDevice Device { get; }
 
-        private IService LockControl { get; set; }
+		private IService LockControl { get; set; }
 
-        private IService BatteryControl { get; set; }
+		private IService BatteryControl { get; set; }
 
-        private ICharacteristic ActivateLockCharacteristic { get; set; }
+		private ICharacteristic ActivateLockCharacteristic { get; set; }
 
-        private ICharacteristic AlarmCharacteristic { get; set; }
+		private ICharacteristic AlarmCharacteristic { get; set; }
 
-        private ICharacteristic AlarmSettingsCharacteristic { get; set; }
+		private ICharacteristic AlarmSettingsCharacteristic { get; set; }
 
-        private ICharacteristic AuthCharacteristic { get; set; }
+		private ICharacteristic AuthCharacteristic { get; set; }
 
-        private ICharacteristic StateCharacteristic { get; set; }
+		private ICharacteristic StateCharacteristic { get; set; }
 
-        private ICharacteristic SoundCharacteristic { get; set; }
+		private ICharacteristic SoundCharacteristic { get; set; }
 
-        private ICharacteristic BatteryCharacteristic { get; set; }
+		private ICharacteristic BatteryCharacteristic { get; set; }
 
-        private readonly AsyncRetryPolicy<byte[]> _retryPollicy;
+		private readonly AsyncRetryPolicy<byte[]> _retryPollicy;
 
-        /// <summary> Gets the lock control service.</summary>
-        private async Task<IService> GetLockControlService()
-        {
-            if (LockControl != null) return LockControl;
+		/// <summary> Gets the lock control service.</summary>
+		private async Task<IService> GetLockControlService()
+		{
+			if (LockControl != null) return LockControl;
 
-            LockControl = null;
+			LockControl = null;
 
-            Log.ForContext<LockItBase>().Debug("Request to get lock control service.");
+			Log.ForContext<LockItBase>().Debug("Request to get lock control service.");
 
-            var cts = new CancellationTokenSource();
-            cts.CancelAfter(GETSERVICE_TIMEOUT_MS);
-            try
-            {
-                LockControl = await Device.GetServiceAsync(new Guid("0000f00d-1212-efde-1523-785fef13d123"), cts.Token);
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Getting lock control service failed. {Exception}", exception);
-                throw new System.Exception($"Can not get lock control service. {exception.Message}", exception);
-            }
-            finally
-            {
-                cts.Dispose();
-            }
+			var cts = new CancellationTokenSource();
+			cts.CancelAfter(GETSERVICE_TIMEOUT_MS);
+			try
+			{
+				LockControl = await Device.GetServiceAsync(new Guid("0000f00d-1212-efde-1523-785fef13d123"), cts.Token);
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Getting lock control service failed. {Exception}", exception);
+				throw new System.Exception($"Can not get lock control service. {exception.Message}", exception);
+			}
+			finally
+			{
+				cts.Dispose();
+			}
 
-            Log.ForContext<LockItBase>().Debug("Getting lock control service succeeded.");
-            return LockControl;
-        }
+			Log.ForContext<LockItBase>().Debug("Getting lock control service succeeded.");
+			return LockControl;
+		}
 
-        /// <summary> Gets battery service.</summary>
-        private async Task<IService> GetBatteryService()
-        {
-            if (BatteryControl != null) return BatteryControl;
+		/// <summary> Gets battery service.</summary>
+		private async Task<IService> GetBatteryService()
+		{
+			if (BatteryControl != null) return BatteryControl;
 
-            BatteryControl = null;
+			BatteryControl = null;
 
-            Log.ForContext<LockItBase>().Debug("Request to get battery control service.");
+			Log.ForContext<LockItBase>().Debug("Request to get battery control service.");
 
-            var cts = new CancellationTokenSource();
-            cts.CancelAfter(GETSERVICE_TIMEOUT_MS);
-            try
-            {
-                BatteryControl = await Device.GetServiceAsync(new Guid("0000180F-0000-1000-8000-00805f9b34fb"), cts.Token);
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Getting battery service failed. {Exception}", exception);
-                throw new System.Exception($"Can not get battery service. {exception.Message}", exception);
-            }
-            finally
-            {
-                cts.Dispose();
-            }
-
-            Log.ForContext<LockItBase>().Debug("Getting battery service succeeded.");
-            return BatteryControl;
-        }
+			var cts = new CancellationTokenSource();
+			cts.CancelAfter(GETSERVICE_TIMEOUT_MS);
+			try
+			{
+				BatteryControl = await Device.GetServiceAsync(new Guid("0000180F-0000-1000-8000-00805f9b34fb"), cts.Token);
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Getting battery service failed. {Exception}", exception);
+				throw new System.Exception($"Can not get battery service. {exception.Message}", exception);
+			}
+			finally
+			{
+				cts.Dispose();
+			}
+
+			Log.ForContext<LockItBase>().Debug("Getting battery service succeeded.");
+			return BatteryControl;
+		}
 
-        /// <summary> Gets the state characteristic.</summary>
-        private async Task<ICharacteristic> GetActivateLockCharacteristicAsync()
-        {
-            if (ActivateLockCharacteristic != null) return ActivateLockCharacteristic;
-
-            ActivateLockCharacteristic = null;
-
-            Log.ForContext<LockItBase>().Debug("Request to get activate lock characteristic.");
-
-            try
-            {
-                ActivateLockCharacteristic = await (await GetLockControlService())?.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123"));
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Getting activate lock charcteristic failed. {Exception}", exception);
-                throw new System.Exception($"Can not get activate characteristic. {exception.Message}", exception);
-            }
-
-            Log.ForContext<LockItBase>().Debug("Activate lock characteristic retrieved successfully.");
-
-            return ActivateLockCharacteristic;
-        }
-
-        /// <summary> Gets the alarm characteristic.</summary>
-        private async Task<ICharacteristic> GetAlarmCharacteristicAsync()
-        {
-            if (AlarmCharacteristic != null) return AlarmCharacteristic;
-
-            AlarmCharacteristic = null;
-
-            Log.ForContext<LockItBase>().Debug("Request to get alarm characteristic.");
-
-            try
-            {
-                AlarmCharacteristic = await (await GetLockControlService())?.GetCharacteristicAsync(new Guid("0000BFFF-1212-efde-1523-785fef13d123"));
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Getting alarm-charcteristic failed. {Exception}", exception);
-                throw new System.Exception($"Can not get alarm characteristic. {exception.Message}", exception);
-            }
-
-            Log.ForContext<LockItBase>().Debug("Get alarm characteristic retrieved successfully.");
-            return AlarmCharacteristic;
-        }
-
-        /// <summary> Gets the alarm settings characteristic.</summary>
-        private async Task<ICharacteristic> GetAlarmSettingsCharacteristicAsync()
-        {
-            if (AlarmSettingsCharacteristic != null) return AlarmSettingsCharacteristic;
-
-            AlarmSettingsCharacteristic = null;
-
-            Log.ForContext<LockItBase>().Debug("Request to get alarm settings characteristic.");
-
-            try
-            {
-                AlarmSettingsCharacteristic = await (await GetLockControlService())?.GetCharacteristicAsync(new Guid("0000BFFE-1212-efde-1523-785fef13d123"));
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Getting alarm settings charcteristic failed. {Exception}", exception);
-                throw new System.Exception($"Can not get alarm settings characteristic. {exception.Message}", exception);
-            }
-
-            Log.ForContext<LockItBase>().Debug("Get alarm settings characteristic retrieved successfully.");
-            return AlarmSettingsCharacteristic;
-        }
-
-        /// <summary> Gets the auth characteristic.</summary>
-        private async Task<ICharacteristic> GetAuthCharacteristicAsync()
-        {
-            if (AuthCharacteristic != null) return AuthCharacteristic;
-
-            AuthCharacteristic = null;
-
-            Log.ForContext<LockItBase>().Debug("Request to get auth characteristic.");
-            try
-            {
-                AuthCharacteristic = await (await GetLockControlService())?.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123"));
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Getting auth-charcteristic failed. {Exception}", exception);
-                throw new System.Exception(string.Format("Can not get auth characteristic. {0}", exception.Message), exception);
-            }
-
-            Log.ForContext<LockItBase>().Debug("Get auth characteristic retrieved successfully.");
-            return AuthCharacteristic;
-        }
-
-        /// <summary> Gets the state characteristic.</summary>
-        protected async Task<ICharacteristic> GetStateCharacteristicAsync()
-        {
-            if (StateCharacteristic != null) return StateCharacteristic;
-
-            StateCharacteristic = null;
-
-            Log.ForContext<LockItBase>().Debug("Request to get lock state characteristic.");
-            try
-            {
-                StateCharacteristic = await (await GetLockControlService())?.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123"));
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Getting state charcteristic failed. {Exception}", exception);
-                throw new System.Exception(string.Format("Can not get state characteristic. {0}", exception.Message), exception);
-            }
-
-            Log.ForContext<LockItBase>().Debug("Get state characteristic retrieved successfully.");
-            return StateCharacteristic;
-        }
-
-        /// <summary> Gets the sound characteristic.</summary>
-        private async Task<ICharacteristic> GetSoundCharacteristicAsync()
-        {
-            if (SoundCharacteristic != null) return SoundCharacteristic;
-
-            SoundCharacteristic = null;
-
-            Log.ForContext<LockItBase>().Debug("Request to get sound characteristic.");
-            try
-            {
-                SoundCharacteristic = await (await GetLockControlService())?.GetCharacteristicAsync(new Guid("0000BAAE-1212-efde-1523-785fef13d123"));
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Getting sound charcteristic failed. {Exception}", exception);
-                throw new System.Exception($"Can not get sound characteristic. {exception.Message}", exception);
-            }
-
-            Log.ForContext<LockItBase>().Debug("Get sound characteristic retrieved successfully.");
-            return SoundCharacteristic;
-        }
-
-        /// <summary> Gets the battery characteristic.</summary>
-        protected async Task<ICharacteristic> GetBatteryCharacteristicAsync()
-        {
-            if (BatteryCharacteristic != null) return BatteryCharacteristic;
-
-            BatteryCharacteristic = null;
-
-            Log.ForContext<LockItBase>().Debug("Request to get battery characteristic.");
-            try
-            {
-                BatteryCharacteristic = await (await GetBatteryService())?.GetCharacteristicAsync(new Guid("00002a19-0000-1000-8000-00805f9b34fb"));
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Getting battery charcteristic failed. {Exception}", exception);
-                throw new System.Exception($"Can not get battery characteristic. {exception.Message}", exception);
-            }
-
-            Log.ForContext<LockItBase>().Debug("Get battery characteristic retrieved successfully.");
-            return BatteryCharacteristic;
-        }
-
-        /// <summary> Query name of lock.</summary>
-        private void GetName()
-        {
-            if (!string.IsNullOrEmpty(Name))
-            {
-                // Prevent valid name to be queried more than twice because Name does not change.
-                return;
-            }
-
-            Log.ForContext<LockItBase>().Debug("Query name of lock.");
-            try
-            {
-                Name = Device.Name ?? string.Empty;
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Retrieving bluetooth name failed . {Exception}", exception);
-                throw new System.Exception($"Can not get name of lock. {exception.Message}", exception);
-            }
-
-            Log.ForContext<LockItBase>().Debug($"Lock name is {Name}.");
-            Id = Name.GetBluetoothLockId();
-            return;
-        }
-
-        /// <summary> Full idvertisement name.</summary>
-        public string Name { get; private set; } = string.Empty;
-
-        /// <summary> Id part of idvertisement name.</summary>
-        public int Id { get; private set; }
-
-        /// <summary> Query GUID of lock.</summary>
-        private void GetGuid()
-        {
-            if (Guid != TextToLockItTypeHelper.INVALIDLOCKGUID)
-            {
-                // Prevent valid GUID to be queried more than twice because GUID does not change.
-            }
-
-            Log.ForContext<LockItBase>().Debug("Query name of lock.");
-            try
-            {
-                Guid = Device.Id;
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Retrieving bluetooth guid failed. {Exception}", exception);
-                throw new System.Exception($"Can not get guid of lock. {exception.Message}", exception);
-            }
-
-            Log.ForContext<LockItBase>().Debug($"Lock GUID is {Guid}.");
-        }
-
-        /// <summary> GUID.</summary>
-        public Guid Guid { get; private set; } = TextToLockItTypeHelper.INVALIDLOCKGUID;
-
-        private byte[] CopriKey { get; set; } = new byte[0];
-
-        /// <summary> Gets the device state.</summary>
-        public DeviceState? GetDeviceState()
-        {
-            if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
-            {
-                throw new System.Exception("Can not get device state. Platform must not be unknown and bluetooth code must be run on main thread.");
-            }
-
-            DeviceState? state;
-            Log.ForContext<LockItBase>().Debug("Request to get connection state.");
-            try
-            {
-                state = Device?.State.GetDeviceState()
-                    ?? throw new System.Exception("Can not get bluetooth device state. State must not be null.");
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Retrieving bluetooth state failed. {Exception}", exception);
-                throw new System.Exception($"Can not get bluetooth state. {exception.Message}", exception);
-            }
-
-            Log.ForContext<LockItBase>().Debug($"Connection state is {state}.");
-            return state;
-        }
-
-        /// <summary> Reconnects to device. </summary>
-        /// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence. </remarks>
-        /// <param name="authInfo">Info required to connect.</param>
-        /// <param name="connectTimeout">Timeout to apply when connecting to bluetooth lock.</param>
-        /// <returns>True if connecting succeeded, false if not.</returns>
-        public abstract Task ReconnectAsync(
-            LockInfoAuthTdo authInfo,
-            TimeSpan connectTimeout);
-
-        /// <summary> Reconnects to device. </summary>
-        /// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence. </remarks>
-        /// <param name="authInfo">Info required to connect.</param>
-        /// <param name="connectTimeout">Timeout to apply when connecting to bluetooth lock.</param>
-        /// <returns>True if connecting succeeded, false if not.</returns>
-        protected async Task ReconnectAsync(
-        LockInfoAuthTdo authInfo,
-        TimeSpan connectTimeout,
-        Func<LockItBase> factory)
-        {
-            if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
-            {
-                throw new System.Exception("Can not reconnect to lock. Platform must not be unknown and bluetooth code must be run on main thread.");
-            }
-
-            // Check if key is available.
-            if (authInfo == null)
-            {
-                Log.ForContext<LockItBase>().Error($"Can not authenticate. No auth info available.");
-                throw new AuthKeyException($"Can not authenticate. No auth info available.");
-            }
-
-            if (authInfo.K_seed.Length != SEEDLENGTH
-                || authInfo.K_u.Length <= 0)
-            {
-                throw new AuthKeyException($"Can not authenticate. Invalid seed-/ k-user-lenght {authInfo.K_seed.Length}/ {authInfo.K_u.Length} detected.");
-            }
-
-            if (Device.State == Plugin.BLE.Abstractions.DeviceState.Connected)
-            {
-                throw new AlreadyConnectedException();
-            }
-
-            // Reset all references to characteristics.
-            LockControl = null;
-            ActivateLockCharacteristic = null;
-            AlarmCharacteristic = null;
-            AlarmSettingsCharacteristic = null;
-            AuthCharacteristic = null;
-            StateCharacteristic = null;
-            SoundCharacteristic = null;
-            ActivateLockWriteCounter = 0;
-
-            var cts = new CancellationTokenSource(connectTimeout);
-
-            // Connect to device and authenticate.
-            Log.ForContext<LockItBase>().Debug($"Request connect to device {Device.Name}. Connect state is {Device.State}.");
-            try
-            {
-                await Adapter.ConnectToDeviceAsync(
-                    Device,
-                    new ConnectParameters(forceBleTransport: true /* Force BLE transport */),
-                    cts.Token);
-            }
-            catch (System.Exception exception)
-            {
-                if (exception is TaskCanceledException)
-                {
-                    // A timeout occurred.
-                    throw new System.Exception($"Can not reconnect.\r\nTimeout of {connectTimeout.TotalMilliseconds} [ms] elapsed.", exception);
-                }
-
-                Log.ForContext<LockItBase>().Error("Can not reconnect. {Exception}", exception);
-                throw new System.Exception($"Can not Reconnect. {exception.Message}", exception);
-            }
-
-            Log.ForContext<LockItBase>().Debug($"Connecting to device succeeded. Starting auth sequence...");
-
-            var lockIt = await Authenticate(Device, authInfo, Adapter, Cipher, factory);
-            CopriKey = lockIt.CopriKey;
-        }
-
-        /// <summary> Connects to device. </summary>
-        /// <param name="authInfo">Info required to connect.</param>
-        /// <param name="device">Device with must be connected.</param>
-        /// <returns>True if connecting succeeded, false if not.</returns>
-        protected static async Task<LockItBase> Authenticate(
-            IDevice device,
-            LockInfoAuthTdo authInfo,
-            IAdapter adapter,
-            ICipher cipher,
-            Func<LockItBase> factory)
-        {
-            if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
-            {
-                throw new System.Exception("Can not authenticate. Platform must not be unknown and bluetooth code must be run on main thread.");
-            }
-
-            if (device == null)
-                throw new ArgumentException(nameof(device));
-
-            if (cipher == null)
-                throw new ArgumentException(nameof(cipher));
-
-            if (adapter == null)
-                throw new ArgumentException(nameof(adapter));
-
-            // Check if connect is required.
-            DeviceState deviceState;
-            Log.ForContext<LockItBase>().Debug("Retrieving connection state is in context of auth.");
-            try
-            {
-                deviceState = device?.State.GetDeviceState()
-                    ?? throw new System.Exception("Can not get bluetooth device state. State must not be null.");
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Can not authenticate. Retrieving bluetooth state failed. {Exception}", exception);
-                throw new System.Exception(string.Format("Can not authenticate. Getting bluetooth state failed. {0}", exception.Message), exception);
-            }
-
-            switch (deviceState)
-            {
-                case DeviceState.Disconnected:
-                    throw new BluetoothDisconnectedException();
-
-                case DeviceState.Connected:
-                    break;
-
-                default:
-                    // Can not get state if device is not connected.
-                    Log.ForContext<LockItBase>().Error($"Can not authenticate. Unexpected lock state {deviceState} detected.");
-                    throw new System.Exception(string.Format("Can not authenticate. Unexpected bluetooth state {0} detected.", deviceState));
-            }
-
-            // Check if key is available.
-            if (authInfo == null)
-            {
-                Log.ForContext<LockItBase>().Error($"Can not authenticate. No auth info available.");
-                throw new AuthKeyException($"Can not authenticate. No auth info available.");
-            }
-
-            if (authInfo.K_seed.Length != SEEDLENGTH
-                || authInfo.K_u.Length <= 0)
-            {
-                throw new AuthKeyException($"Can not authenticate. Invalid seed-/ k-user-lenght {authInfo.K_seed.Length}/ {authInfo.K_u.Length} detected.");
-            }
-
-            Log.ForContext<LockItBase>().Debug($"Connection state is {deviceState} in context of auth.");
-
-            var lockIt = factory();
-
-            if (InvalidatedSeed[lockIt.Guid].Contains(string.Join(",", authInfo.K_seed)))
-            {
-                throw new AuthKeyException($"Can not authenticate. Seed {string.Join(",", authInfo.K_seed)} was already used.");
-            }
-
-            InvalidatedSeed[lockIt.Guid].Add(string.Join(",", authInfo.K_seed));
-
-            // Connect to device and authenticate.
-            try
-            {
-                await AuthenticateAsync(
-                    lockIt,
-                    authInfo,
-                   lockIt.Cipher);
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Authentication failed. {Exception}", exception);
-                try
-                {
-                    // Disconnect from device if auth did not succeed.
-                    await lockIt.Adapter.DisconnectDeviceAsync(lockIt.Device);
-                }
-                catch (System.Exception exceptionInner)
-                {
-                    Log.ForContext<LockItBase>().Error("Authentication failed. Disconnect throw an exception. {Exception}", exceptionInner);
-                }
-
-                Log.ForContext<LockItBase>().Error($"Auth failed for device name={lockIt.Name}, GUID={lockIt.Guid}.");
-
-                throw;
-            }
-
-            lockIt.CopriKey = authInfo.K_u;
-
-            Log.ForContext<LockItBase>().Debug($"Auth succeeded for device name={lockIt.Name}, GUID={lockIt.Guid}, state={lockIt.GetDeviceState()}.");
-            return lockIt;
-        }
-
-        /// <summary> Performs an authentication.</summary>
-        private static async Task AuthenticateAsync(
-            LockItBase lockIt,
-            LockInfoAuthTdo lockInfo,
-            ICipher cipher)
-        {
-            Log.ForContext<LockItBase>().Debug($"Request to autenticate for {lockIt.Name}.");
-
-            var authCharacteristic = await lockIt.GetAuthCharacteristicAsync();
-            if (authCharacteristic == null)
-            {
-                Log.ForContext<LockItBase>().Debug("Getting auth-charcteristic failed.");
-                throw new CoundntGetCharacteristicException("Authentication failed. Auth characteristic must not be null.");
-            }
-
-            bool success;
-
-            try
-            {
-                success = await authCharacteristic.WriteAsync(lockInfo.K_seed);
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Writing copri seed failed.{AuthCharacteristic}{CommandWritten}{Exception}", ToSerilogString(authCharacteristic), ToSerilogString(lockInfo.K_seed), exception);
-                throw new System.Exception(string.Format("Can not authenticate. Writing copri seed failed. {0}", exception.Message), exception);
-            }
-            if (!success)
-            {
-                Log.ForContext<LockItBase>().Debug("Writing copri seed failed.{AuthCharacteristic}{CommandWritten}", ToSerilogString(authCharacteristic), ToSerilogString(lockInfo.K_seed));
-                throw new System.Exception("Can not authenticate. Writing copri seed did not succeed.");
-            }
-
-            Log.ForContext<LockItBase>().Debug("Copri seed written successfully.{AuthCharacteristic}{CommandWritten}.", ToSerilogString(authCharacteristic), ToSerilogString(lockInfo.K_seed));
-
-            byte[] seedLockEncrypted;
-            var cts = new CancellationTokenSource();
-            cts.CancelAfter(READ_TIMEOUT_MS);
-            try
-            {
-                seedLockEncrypted = await authCharacteristic.ReadAsync(cts.Token); // encrypted seed value (random value) from lock to decypt using k_user
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Retrieveing encrypted random value from lock (seed)(ReadAsync-call) failed.{ReadCharacteristic}{Exception}", ToSerilogString(authCharacteristic), exception);
-                throw new System.Exception(string.Format("Can not authenticate. Reading encrypted seed failed. {0}", exception.Message), exception);
-            }
-            finally
-            {
-                cts.Dispose();
-            }
-
-            Log.ForContext<LockItBase>().Debug("Retrieveing encrypted random value from lock (seed)(ReadAsync-call) succeeded.{ReadCharacteristic}{Reading}", ToSerilogString(authCharacteristic), "***");
-
-            var crypto = new AuthCryptoHelper(
-                seedLockEncrypted,
-                lockInfo.K_u,
-                cipher);
-
-            byte[] accessKeyEncrypted;
-            try
-            {
-                accessKeyEncrypted = crypto.GetAccessKeyEncrypted();
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Error getting encrypted access key. {Exception}", exception);
-                throw new System.Exception(string.Format("Can not authenticate. Getting access key failed. {0}", exception.Message), exception);
-            }
-
-            try
-            {
-                success = await authCharacteristic.WriteAsync(accessKeyEncrypted);
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Writing encrypted access key failed.{Key}{Seed}{AuthCharacteristic}{CommandWritten}{Exception}", ToSerilogString(crypto.KeyCopri), ToSerilogString(lockInfo.K_seed), ToSerilogString(authCharacteristic), ToSerilogString(accessKeyEncrypted), exception);
-                throw new System.Exception(string.Format("Can not authenticate. Writing access key failed. {0}", exception.Message), exception);
-            }
-            if (!success)
-            {
-                Log.ForContext<LockItBase>().Debug("Writing encrypted access key failed.{Key}{Seed}{AuthCharacteristic}{CommandWritten}", ToSerilogString(crypto.KeyCopri), ToSerilogString(lockInfo.K_seed), ToSerilogString(authCharacteristic), "***");
-                throw new System.Exception(string.Format("Can not authenticate. Writing access key did not succeed."));
-            }
-
-            Log.ForContext<LockItBase>().Debug("Encrypted access key written successfully.{Key}{Seed}{AuthCharacteristic}{CommandWritten}", ToSerilogString(crypto.KeyCopri), ToSerilogString(lockInfo.K_seed), ToSerilogString(authCharacteristic), "***");
-        }
-
-        /// <summary> Gets the lock state like locking state (open/ close). </summary>
-        /// <param name="doWaitRetry">True if to wait and retry in case of failures. </param>
-        /// <remarks> 
-        /// Lock state is first byte of of value read from state characteristic ("0000baaa-1212-efde-1523-785fef13d123").
-        /// Values are as follows
-        /// Open = 0x00,
-        /// Closed = 0x01,
-        /// Unknown = 0x02,
-        /// CouldntCloseMoving = 0x03,
-        /// CouldntOpenBoldBlocked = 0x04,
-        /// CouldntCloseBoldBlocked = 0x05
-        /// TINK.Services.BluetoothLock.Tdo.LockitLockingState.
-        /// </remarks>
-        /// <returns> Lock state.</returns>
-        /// <exception cref="BluetoothDisconnectedException">App is not connected to lock.</exception>
-        /// <exception cref="CoundntGetCharacteristicException">Getting state characteristic to read from failed.</exception>
-        /// <exception cref="Exception">
-        /// Call not from main thread or unkonwn platform detected or
-        /// query device state (connected, disconnected, ....) failed for an unknown reason or returned an unexpected value or
-        /// reading state characteristic failed or reading from characteristic was empty.
-        /// </exception>
-        /// <exception> Exceptions thrown by PluginBle::ICharacteristic.ReasAsync.</exception>
-        public async Task<LockInfoTdo> GetLockStateAsync(bool doWaitRetry = false)
-        {
-            if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
-            {
-                throw new System.Exception("Can not get lock state. Platform must not be unknown and bluetooth code must be run on main thread.");
-            }
-
-            DeviceState? deviceState;
-            Log.ForContext<LockItBase>().Debug("Request to get connection state in context of getting locking state.");
-            try
-            {
-                deviceState = Device?.State.GetDeviceState()
-                    ?? throw new System.Exception("Can not get bluetooth device state. State must not be null.");
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Can not get lock state. Retrieving bluetooth state failed. {Exception}", exception);
-                throw new System.Exception(string.Format("Can not get lock state. Getting bluetooth state failed. {0}", exception.Message), exception);
-            }
-
-            switch (deviceState)
-            {
-                case DeviceState.Disconnected:
-                    throw new BluetoothDisconnectedException();
-
-                case DeviceState.Connected:
-                    break;
-
-                default:
-                    // Can not get state if device is not connected.
-                    Log.ForContext<LockItBase>().Error($"Getting lock state failed. Unexpected lock state {deviceState} detected.");
-                    throw new System.Exception(string.Format("Can not get lock state. Unexpected bluetooth state {0} detected.", deviceState));
-            }
-
-            Log.ForContext<LockItBase>().Debug($"Connection state is {deviceState}.");
-
-            var stateCharacteristic = await GetStateCharacteristicAsync();
-            if (stateCharacteristic == null)
-            {
-                Log.ForContext<LockItBase>().Error($"Can not get lock state. State characteristic is not available.");
-                throw new CoundntGetCharacteristicException("Can not get lock state. State characteristic must not be null.");
-            }
-
-            byte[] state;
-            async Task<byte[]> readAsyncDelegate()
-            {
-                var cts = new CancellationTokenSource();
-                cts.CancelAfter(READ_TIMEOUT_MS);
-                try
-                {
-                    return await stateCharacteristic.ReadAsync(cts.Token);
-                }
-                catch (System.Exception exception)
-                {
-                    Log.ForContext<LockItBase>().Error("Retrieving lock state (ReadAsync-call) failed inside delegate.{StateCharacteristic}{Exception}", ToSerilogString(stateCharacteristic), exception);
-                    throw;
-                }
-                finally
-                {
-                    cts.Dispose();
-                }
-            }
-
-            try
-            {
-                state = doWaitRetry
-                    ? await _retryPollicy.ExecuteAsync(async () => await readAsyncDelegate())
-                    : await readAsyncDelegate();
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Retrieving lock state (ReadAsync-call) failed.{StateCharacteristic}{Exception}", ToSerilogString(stateCharacteristic), exception);
-                throw new System.Exception(string.Format("Can not get lock state. Reading data failed. {0}", exception.Message), exception);
-            }
-            if (state == null || state.Length <= 0)
-            {
-                Log.ForContext<LockItBase>().Debug("Retrieving lock state (ReadAsync-call) failed. Data read is null or empty.{StateCharacteristic}", ToSerilogString(stateCharacteristic));
-                throw new System.Exception("Can not get lock state. No data read");
-            }
-
-            var lockInfoTdo = new LockInfoTdo.Builder
-            {
-                Id = Id,
-                Guid = Guid,
-                State = (LockitLockingState?)state[0]
-            }.Build();
-
-            Log.ForContext<LockItBase>().Debug("Retrieving lock state (ReadAsync-call) succeeded.{@LockInfoTdo}{StateCharacteristic}{Reading}", lockInfoTdo, ToSerilogString(stateCharacteristic), state);
-
-            return lockInfoTdo;
-        }
-
-        /// <summary>Gets the battery percentage.</summary>
-        public async Task<double> GetBatteryPercentageAsync()
-        {
-            if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
-            {
-                throw new System.Exception("Can not get battery percentage. Platform must not be unknown and bluetooth code must be run on main thread.");
-            }
-
-            DeviceState? deviceState;
-            Log.ForContext<LockItBase>().Debug("Request to get battery percentage in context of getting locking state.");
-            try
-            {
-                deviceState = Device?.State.GetDeviceState()
-                    ?? throw new System.Exception("Can not get bluetooth device state. State must not be null.");
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Can not get battery percentage. Retrieving bluetooth state failed. {Exception}", exception);
-                throw new System.Exception(string.Format("Can not get battery percentage. Getting bluetooth state failed. {0}", exception.Message), exception);
-            }
-
-            switch (deviceState)
-            {
-                case DeviceState.Disconnected:
-                    throw new BluetoothDisconnectedException();
-
-                case DeviceState.Connected:
-                    break;
-
-                default:
-                    // Can not get state if device is not connected.
-                    Log.ForContext<LockItBase>().Error($"Getting battery percentage failed. Unexpected battery percentage {deviceState} detected.");
-                    throw new System.Exception(string.Format("Can not get battery percentage. Unexpected bluetooth state {0} detected.", deviceState));
-            }
-
-            Log.ForContext<LockItBase>().Debug($"Connection state is {deviceState}.");
-
-            var batteryCharacteristic = await GetBatteryCharacteristicAsync();
-            if (batteryCharacteristic == null)
-            {
-                Log.ForContext<LockItBase>().Error($"Can not get battery percentage. State characteristic is not available.");
-                throw new CoundntGetCharacteristicException("Can not get battery percentage. State characteristic must not be null.");
-            }
-
-            byte[] state;
-            var cts = new CancellationTokenSource();
-            cts.CancelAfter(READ_TIMEOUT_MS);
-            try
-            {
-                state = await batteryCharacteristic.ReadAsync(cts.Token);
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Retrieving charging level (ReadAsync-call) failed. {BatteryCharacteristic}{Exception}", ToSerilogString(batteryCharacteristic), exception);
-                throw new System.Exception(string.Format("Can not get battery percentage. Reading data failed. {0}", exception.Message), exception);
-            }
-            finally
-            {
-                cts.Dispose();
-            }
-
-            if (state == null || state.Length <= 0)
-            {
-                Log.ForContext<LockItBase>().Debug("Retrieving charging level (ReadAsync-call) failed. Data read is null or empty.{BatteryCharacteristic}", ToSerilogString(batteryCharacteristic));
-                throw new System.Exception("Can not get battery percentage. No data read.");
-            }
-
-            Log.ForContext<LockItBase>().Debug("Retrieving charging level (ReadAsync-call) succeeded.{Level}{BatteryCharacteristic}{Reading}", state[0], ToSerilogString(batteryCharacteristic), state);
-
-            return state[0];
-        }
-
-        /// <summary> Opens lock. </summary>
-        /// <returns> Locking state.</returns>
-        public abstract Task<LockitLockingState?> OpenAsync();
-
-        /// <summary> Close the lock.</summary>
-        /// <returns>Locking state.</returns>
-        public abstract Task<LockitLockingState?> CloseAsync();
-
-        /// <summary> Opens/ closes lock.</summary>
-        /// <param name="counter"></param>
-        /// <param name="open"></param>
-        /// <returns>True if opening/ closing command could be written successfully.</returns>
-        protected async Task<bool> OpenCloseLock(bool open)
-        {
-            DeviceState deviceState;
-            Log.ForContext<LockItBase>().Debug("Request to get connection state in context of opening/ closing lock.");
-            try
-            {
-                deviceState = Device?.State.GetDeviceState()
-                    ?? throw new System.Exception("Can not get bluetooth device state. State must not be null.");
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Retrieving bluetooth state failed when opening/ closing lock failed. {Exception}", exception);
-                throw new System.Exception($"Can not Open/ Close lock. Getting bluetooth failed. {exception.Message}", exception);
-            }
-
-            switch (deviceState)
-            {
-                case DeviceState.Disconnected:
-                    throw new BluetoothDisconnectedException();
-
-                case DeviceState.Connected:
-                    break;
-
-                default:
-                    // Can not open lock if bluetooth state is not connected.
-                    Log.ForContext<LockItBase>().Debug($"Can not open/ close lock. Unexpected connection state detected {deviceState}.");
-                    return false;
-            }
-
-            Log.ForContext<LockItBase>().Debug($"Connection state before opening/ closing lock is {deviceState}.");
-
-            var activateLockCharacteristic = await GetActivateLockCharacteristicAsync();
-            if (activateLockCharacteristic == null)
-            {
-                Log.ForContext<LockItBase>().Debug("Getting lock control service failed.");
-                return false;
-            }
-
-            byte[] state = bitShift(
-                new byte[] { 0, 0, open ? (byte)1 : (byte)2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-                ++ActivateLockWriteCounter);
-
-            byte[] stateEnctryped;
-            try
-            {
-                stateEnctryped = Cipher.Encrypt(CopriKey, state);
-            }
-            catch (System.Exception exception)
-            {
-                ActivateLockWriteCounter--;
-                Log.ForContext<LockItBase>().Error("Encypting command to open/ close lock failed. {Exception}", exception);
-                throw new System.Exception($"Can not open/ close lock. Encrypting command to lock/ unlock failed. {exception.Message}", exception);
-            }
-
-            bool success;
-            try
-            {
-                success = await activateLockCharacteristic.WriteAsync(stateEnctryped);
-            }
-            catch (System.Exception exception)
-            {
-                ActivateLockWriteCounter--;
-                Log.ForContext<LockItBase>().Error(open
-                        ? "Writing data to open lock failed.{ActivateLockCharacteristic}{CommandWritten}{Exception}"
-                        : "Writing data to close lock failed.{ActivateLockCharacteristic}{CommandWritten}{Exception}",
-                    ToSerilogString(activateLockCharacteristic), ToSerilogString(stateEnctryped), exception);
-                throw new System.Exception($"Can not {(open ? "open" : "close")} lock. Writing command to lock/ unlock failed. {exception.Message}", exception);
-            }
-
-            Log.ForContext<LockItBase>().Debug(open
-                    ? "Command to open lock written successfully.{ActivateLockCharacteristic}{CommandWritten}"
-                    : "Command to open lock written successfully.{ActivateLockCharacteristic}{CommandWritten}",
-                ToSerilogString(activateLockCharacteristic), ToSerilogString(stateEnctryped));
-
-            return success;
-        }
-
-        /// <summary> Gets a value indicating whether alarm is on or off.</summary>
-        public async Task<bool> GetIsAlarmOffAsync()
-        {
-            if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
-            {
-                throw new System.Exception("Can not turn alarm off. Platform must not be unknown and bluetooth code must be run on main thread.");
-            }
-
-            var alarmCharacteristic = await GetAlarmCharacteristicAsync();
-            if (alarmCharacteristic == null)
-            {
-                Log.ForContext<LockItBase>().Debug("Getting alarm characteristic failed.");
-                throw new System.Exception($"Can not get alarm whether alarm is on or off. Getting alarm characteristic returned null.");
-            }
-
-            byte[] alarmSettings;
-            var cts = new CancellationTokenSource();
-            cts.CancelAfter(READ_TIMEOUT_MS);
-            try
-            {
-                alarmSettings = await alarmCharacteristic.ReadAsync(cts.Token);
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Retrieving alarm settings (ReadAsync-call) failed.{AlarmCharacteristic}{Exception}", ToSerilogString(alarmCharacteristic), exception);
-                throw new System.Exception($"Can not get whether alarm is off or on {exception.Message}.");
-            }
-            finally
-            {
-                cts.Dispose();
-            }
-
-            if (alarmSettings == null || alarmSettings.Length < 1)
-            {
-                Log.ForContext<LockItBase>().Error("Retrieving alarm settings (ReadAsync-call) failed.{AlarmCharacteristic}{Reading}", ToSerilogString(alarmCharacteristic));
-                throw new System.Exception("Can not get whether alarm is off or on. Reading failed.");
-            }
-
-            var isAlarmOff = alarmSettings[0] == 0;
-            Log.ForContext<LockItBase>().Debug("Retrieving alarm settings (ReadAsync-call) succeeded.{IsArlarmOff}{AlarmCharacteristic}{Reading}", isAlarmOff, ToSerilogString(alarmCharacteristic), alarmSettings);
-            return isAlarmOff;
-        }
-
-        /// <summary> Sets alarm on or off.</summary>
-        public async Task SetIsAlarmOffAsync(bool isActivated)
-        {
-            if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
-            {
-                throw new System.Exception("Can not turn alarm off. Platform must not be unknown and bluetooth code must be run on main thread.");
-            }
-
-            ICharacteristic alarmCharacteristic = await GetAlarmCharacteristicAsync();
-            if (alarmCharacteristic == null)
-            {
-                Log.ForContext<LockItBase>().Debug("Getting alarm characteristic failed.");
-                throw new System.Exception($"Can not set alarm {isActivated}. Getting alarm characteristic returned null.");
-            }
-
-            bool success;
-            var command = new byte[] { isActivated ? (byte)1 : (byte)0 };
-            try
-            {
-                success = await alarmCharacteristic.WriteAsync(command);
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Writing alarm settings failed.{AlarmCharacteristic}{CommandWritten}{Exception}", ToSerilogString(alarmCharacteristic), command[0], exception);
-                throw new System.Exception($"Can not set alarm settings. {exception.Message}", exception);
-            }
-
-            if (!success)
-            {
-                Log.ForContext<LockItBase>().Error("Writing alarm settings failed.{AlarmCharacteristic}{CommandWritten}", ToSerilogString(alarmCharacteristic), command[0]);
-                throw new System.Exception($"Can not set alarm settings. Writing  settings did not succeed.");
-            }
-
-            Log.ForContext<LockItBase>().Debug("Alarm settings written successfully.{AlarmCharacteristic}{CommandWritten}.", ToSerilogString(alarmCharacteristic), command[0]);
-        }
-
-        public async Task<bool> SetSoundAsync(SoundSettings settings)
-        {
-            if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
-            {
-                throw new System.Exception("Can not set sound settings. Platform must not be unknown and bluetooth code must be run on main thread.");
-            }
-
-            ICharacteristic soundCharacteristic = await GetSoundCharacteristicAsync();
-            if (soundCharacteristic == null)
-            {
-                Log.ForContext<LockItBase>().Debug("Getting sound characteristic failed.");
-                return false;
-            }
-
-            bool success;
-            byte command = (byte)settings;
-            try
-            {
-                success = await soundCharacteristic.WriteAsync(new byte[] { command });
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Writing sound settings failed.{SoundCharacteristic}{CommandWritten}{Exception}", ToSerilogString(soundCharacteristic), command, exception);
-                throw new System.Exception($"Can not set sound settings. {exception.Message}", exception);
-            }
-
-            Log.ForContext<LockItBase>().Debug(success
-                    ? "Writing sound settings failed.{SoundCharacteristic}{CommandWritten}"
-                    : "Sound settings written successfully.{SoundCharacteristic}{CommandWritten}",
-                ToSerilogString(soundCharacteristic), command);
-
-            return success;
-        }
-
-        public async Task<bool> SetAlarmSettingsAsync(AlarmSettings settings)
-        {
-            if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
-            {
-                throw new System.Exception("Can not set alarm settings. Platform must not be unknown and bluetooth code must be run on main thread.");
-            }
-
-            ICharacteristic alarmSettingsCharacteristic = await GetAlarmSettingsCharacteristicAsync();
-            if (alarmSettingsCharacteristic == null)
-            {
-                Log.ForContext<LockItBase>().Debug("Getting alarm settings characteristic failed.");
-                return false;
-            }
-
-            bool success;
-            byte command = (byte)settings;
-            try
-            {
-                success = await alarmSettingsCharacteristic.WriteAsync(new byte[] { command });
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItBase>().Error("Writing alarm settings failed.{SoundCharacteristic}{CommandWritten}{Exception}", ToSerilogString(alarmSettingsCharacteristic), command, exception);
-                throw new System.Exception($"Can not set alarm settings. {exception.Message}", exception);
-            }
-
-            Log.ForContext<LockItBase>().Debug(success
-                    ? "Writing alarm settings failed.{SoundCharacteristic}{CommandWritten}"
-                    : "Alarm settings written successfully.{SoundCharacteristic}{CommandWritten}",
-                ToSerilogString(alarmSettingsCharacteristic), command);
-
-            return success;
-        }
-
-        private static byte[] bitShift(byte[] data, int counter)
-        {
-            int mask = 0x000000FF;
-            data[0] = (byte)(counter & mask);
-            data[1] = (byte)(counter >> 8);
-
-            return data;
-        }
-
-
-        /// <summary> Disconnect from bluetooth lock. </summary>
-        public async Task Disconnect() => await Adapter.DisconnectDeviceAsync(Device);
-
-        /// <summary>
-        /// Don' t use .Destructure.ByTransforming<ICharacteristic>(...) because this would introduce a dependency to Plugin.BLE in main project.
-        /// </summary> 
-        /// <param name="charcteristic"></param>
-        /// <returns></returns>
-        private static string ToSerilogString(ICharacteristic charcteristic)
-            => charcteristic.Id.ToString();
-
-        private static string ToSerilogString(byte[] byteArray)
-            => "***"; // For debuging purposes it might be reqired to return string.Join(",", byteArray); Do not log any confidental value in production context.
-    }
+		/// <summary> Gets the state characteristic.</summary>
+		private async Task<ICharacteristic> GetActivateLockCharacteristicAsync()
+		{
+			if (ActivateLockCharacteristic != null) return ActivateLockCharacteristic;
+
+			ActivateLockCharacteristic = null;
+
+			Log.ForContext<LockItBase>().Debug("Request to get activate lock characteristic.");
+
+			try
+			{
+				ActivateLockCharacteristic = await (await GetLockControlService())?.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123"));
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Getting activate lock charcteristic failed. {Exception}", exception);
+				throw new System.Exception($"Can not get activate characteristic. {exception.Message}", exception);
+			}
+
+			Log.ForContext<LockItBase>().Debug("Activate lock characteristic retrieved successfully.");
+
+			return ActivateLockCharacteristic;
+		}
+
+		/// <summary> Gets the alarm characteristic.</summary>
+		private async Task<ICharacteristic> GetAlarmCharacteristicAsync()
+		{
+			if (AlarmCharacteristic != null) return AlarmCharacteristic;
+
+			AlarmCharacteristic = null;
+
+			Log.ForContext<LockItBase>().Debug("Request to get alarm characteristic.");
+
+			try
+			{
+				AlarmCharacteristic = await (await GetLockControlService())?.GetCharacteristicAsync(new Guid("0000BFFF-1212-efde-1523-785fef13d123"));
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Getting alarm-charcteristic failed. {Exception}", exception);
+				throw new System.Exception($"Can not get alarm characteristic. {exception.Message}", exception);
+			}
+
+			Log.ForContext<LockItBase>().Debug("Get alarm characteristic retrieved successfully.");
+			return AlarmCharacteristic;
+		}
+
+		/// <summary> Gets the alarm settings characteristic.</summary>
+		private async Task<ICharacteristic> GetAlarmSettingsCharacteristicAsync()
+		{
+			if (AlarmSettingsCharacteristic != null) return AlarmSettingsCharacteristic;
+
+			AlarmSettingsCharacteristic = null;
+
+			Log.ForContext<LockItBase>().Debug("Request to get alarm settings characteristic.");
+
+			try
+			{
+				AlarmSettingsCharacteristic = await (await GetLockControlService())?.GetCharacteristicAsync(new Guid("0000BFFE-1212-efde-1523-785fef13d123"));
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Getting alarm settings charcteristic failed. {Exception}", exception);
+				throw new System.Exception($"Can not get alarm settings characteristic. {exception.Message}", exception);
+			}
+
+			Log.ForContext<LockItBase>().Debug("Get alarm settings characteristic retrieved successfully.");
+			return AlarmSettingsCharacteristic;
+		}
+
+		/// <summary> Gets the auth characteristic.</summary>
+		private async Task<ICharacteristic> GetAuthCharacteristicAsync()
+		{
+			if (AuthCharacteristic != null) return AuthCharacteristic;
+
+			AuthCharacteristic = null;
+
+			Log.ForContext<LockItBase>().Debug("Request to get auth characteristic.");
+			try
+			{
+				AuthCharacteristic = await (await GetLockControlService())?.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123"));
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Getting auth-charcteristic failed. {Exception}", exception);
+				throw new System.Exception(string.Format("Can not get auth characteristic. {0}", exception.Message), exception);
+			}
+
+			Log.ForContext<LockItBase>().Debug("Get auth characteristic retrieved successfully.");
+			return AuthCharacteristic;
+		}
+
+		/// <summary> Gets the state characteristic.</summary>
+		protected async Task<ICharacteristic> GetStateCharacteristicAsync()
+		{
+			if (StateCharacteristic != null) return StateCharacteristic;
+
+			StateCharacteristic = null;
+
+			Log.ForContext<LockItBase>().Debug("Request to get lock state characteristic.");
+			try
+			{
+				StateCharacteristic = await (await GetLockControlService())?.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123"));
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Getting state charcteristic failed. {Exception}", exception);
+				throw new System.Exception(string.Format("Can not get state characteristic. {0}", exception.Message), exception);
+			}
+
+			Log.ForContext<LockItBase>().Debug("Get state characteristic retrieved successfully.");
+			return StateCharacteristic;
+		}
+
+		/// <summary> Gets the sound characteristic.</summary>
+		private async Task<ICharacteristic> GetSoundCharacteristicAsync()
+		{
+			if (SoundCharacteristic != null) return SoundCharacteristic;
+
+			SoundCharacteristic = null;
+
+			Log.ForContext<LockItBase>().Debug("Request to get sound characteristic.");
+			try
+			{
+				SoundCharacteristic = await (await GetLockControlService())?.GetCharacteristicAsync(new Guid("0000BAAE-1212-efde-1523-785fef13d123"));
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Getting sound charcteristic failed. {Exception}", exception);
+				throw new System.Exception($"Can not get sound characteristic. {exception.Message}", exception);
+			}
+
+			Log.ForContext<LockItBase>().Debug("Get sound characteristic retrieved successfully.");
+			return SoundCharacteristic;
+		}
+
+		/// <summary> Gets the battery characteristic.</summary>
+		protected async Task<ICharacteristic> GetBatteryCharacteristicAsync()
+		{
+			if (BatteryCharacteristic != null) return BatteryCharacteristic;
+
+			BatteryCharacteristic = null;
+
+			Log.ForContext<LockItBase>().Debug("Request to get battery characteristic.");
+			try
+			{
+				BatteryCharacteristic = await (await GetBatteryService())?.GetCharacteristicAsync(new Guid("00002a19-0000-1000-8000-00805f9b34fb"));
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Getting battery charcteristic failed. {Exception}", exception);
+				throw new System.Exception($"Can not get battery characteristic. {exception.Message}", exception);
+			}
+
+			Log.ForContext<LockItBase>().Debug("Get battery characteristic retrieved successfully.");
+			return BatteryCharacteristic;
+		}
+
+		/// <summary> Query name of lock.</summary>
+		private void GetName()
+		{
+			if (!string.IsNullOrEmpty(Name))
+			{
+				// Prevent valid name to be queried more than twice because Name does not change.
+				return;
+			}
+
+			Log.ForContext<LockItBase>().Debug("Query name of lock.");
+			try
+			{
+				Name = Device.Name ?? string.Empty;
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Retrieving bluetooth name failed . {Exception}", exception);
+				throw new System.Exception($"Can not get name of lock. {exception.Message}", exception);
+			}
+
+			Log.ForContext<LockItBase>().Debug($"Lock name is {Name}.");
+			Id = Name.GetBluetoothLockId();
+			return;
+		}
+
+		/// <summary> Full idvertisement name.</summary>
+		public string Name { get; private set; } = string.Empty;
+
+		/// <summary> Id part of idvertisement name.</summary>
+		public int Id { get; private set; }
+
+		/// <summary> Query GUID of lock.</summary>
+		private void GetGuid()
+		{
+			if (Guid != TextToLockItTypeHelper.INVALIDLOCKGUID)
+			{
+				// Prevent valid GUID to be queried more than twice because GUID does not change.
+			}
+
+			Log.ForContext<LockItBase>().Debug("Query name of lock.");
+			try
+			{
+				Guid = Device.Id;
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Retrieving bluetooth guid failed. {Exception}", exception);
+				throw new System.Exception($"Can not get guid of lock. {exception.Message}", exception);
+			}
+
+			Log.ForContext<LockItBase>().Debug($"Lock GUID is {Guid}.");
+		}
+
+		/// <summary> GUID.</summary>
+		public Guid Guid { get; private set; } = TextToLockItTypeHelper.INVALIDLOCKGUID;
+
+		private byte[] CopriKey { get; set; } = new byte[0];
+
+		/// <summary> Gets the device state.</summary>
+		public DeviceState? GetDeviceState()
+		{
+			if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
+			{
+				throw new System.Exception("Can not get device state. Platform must not be unknown and bluetooth code must be run on main thread.");
+			}
+
+			DeviceState? state;
+			Log.ForContext<LockItBase>().Debug("Request to get connection state.");
+			try
+			{
+				state = Device?.State.GetDeviceState()
+					?? throw new System.Exception("Can not get bluetooth device state. State must not be null.");
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Retrieving bluetooth state failed. {Exception}", exception);
+				throw new System.Exception($"Can not get bluetooth state. {exception.Message}", exception);
+			}
+
+			Log.ForContext<LockItBase>().Debug($"Connection state is {state}.");
+			return state;
+		}
+
+		/// <summary> Reconnects to device. </summary>
+		/// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence. </remarks>
+		/// <param name="authInfo">Info required to connect.</param>
+		/// <param name="connectTimeout">Timeout to apply when connecting to bluetooth lock.</param>
+		/// <returns>True if connecting succeeded, false if not.</returns>
+		public abstract Task ReconnectAsync(
+			LockInfoAuthTdo authInfo,
+			TimeSpan connectTimeout);
+
+		/// <summary> Reconnects to device. </summary>
+		/// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence. </remarks>
+		/// <param name="authInfo">Info required to connect.</param>
+		/// <param name="connectTimeout">Timeout to apply when connecting to bluetooth lock.</param>
+		/// <returns>True if connecting succeeded, false if not.</returns>
+		protected async Task ReconnectAsync(
+		LockInfoAuthTdo authInfo,
+		TimeSpan connectTimeout,
+		Func<LockItBase> factory)
+		{
+			if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
+			{
+				throw new System.Exception("Can not reconnect to lock. Platform must not be unknown and bluetooth code must be run on main thread.");
+			}
+
+			// Check if key is available.
+			if (authInfo == null)
+			{
+				Log.ForContext<LockItBase>().Error($"Can not authenticate. No auth info available.");
+				throw new AuthKeyException($"Can not authenticate. No auth info available.");
+			}
+
+			if (authInfo.K_seed.Length != SEEDLENGTH
+				|| authInfo.K_u.Length <= 0)
+			{
+				throw new AuthKeyException($"Can not authenticate. Invalid seed-/ k-user-lenght {authInfo.K_seed.Length}/ {authInfo.K_u.Length} detected.");
+			}
+
+			if (Device.State == Plugin.BLE.Abstractions.DeviceState.Connected)
+			{
+				throw new AlreadyConnectedException();
+			}
+
+			// Reset all references to characteristics.
+			LockControl = null;
+			ActivateLockCharacteristic = null;
+			AlarmCharacteristic = null;
+			AlarmSettingsCharacteristic = null;
+			AuthCharacteristic = null;
+			StateCharacteristic = null;
+			SoundCharacteristic = null;
+			ActivateLockWriteCounter = 0;
+
+			var cts = new CancellationTokenSource(connectTimeout);
+
+			// Connect to device and authenticate.
+			Log.ForContext<LockItBase>().Debug($"Request connect to device {Device.Name}. Connect state is {Device.State}.");
+			try
+			{
+				await Adapter.ConnectToDeviceAsync(
+					Device,
+					new ConnectParameters(forceBleTransport: true /* Force BLE transport */),
+					cts.Token);
+			}
+			catch (System.Exception exception)
+			{
+				if (exception is TaskCanceledException)
+				{
+					// A timeout occurred.
+					throw new System.Exception($"Can not reconnect.\r\nTimeout of {connectTimeout.TotalMilliseconds} [ms] elapsed.", exception);
+				}
+
+				Log.ForContext<LockItBase>().Error("Can not reconnect. {Exception}", exception);
+				throw new System.Exception($"Can not Reconnect. {exception.Message}", exception);
+			}
+
+			Log.ForContext<LockItBase>().Debug($"Connecting to device succeeded. Starting auth sequence...");
+
+			var lockIt = await Authenticate(Device, authInfo, Adapter, Cipher, factory);
+			CopriKey = lockIt.CopriKey;
+		}
+
+		/// <summary> Connects to device. </summary>
+		/// <param name="authInfo">Info required to connect.</param>
+		/// <param name="device">Device with must be connected.</param>
+		/// <returns>True if connecting succeeded, false if not.</returns>
+		protected static async Task<LockItBase> Authenticate(
+			IDevice device,
+			LockInfoAuthTdo authInfo,
+			IAdapter adapter,
+			ICipher cipher,
+			Func<LockItBase> factory)
+		{
+			if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
+			{
+				throw new System.Exception("Can not authenticate. Platform must not be unknown and bluetooth code must be run on main thread.");
+			}
+
+			if (device == null)
+				throw new ArgumentException(nameof(device));
+
+			if (cipher == null)
+				throw new ArgumentException(nameof(cipher));
+
+			if (adapter == null)
+				throw new ArgumentException(nameof(adapter));
+
+			// Check if connect is required.
+			DeviceState deviceState;
+			Log.ForContext<LockItBase>().Debug("Retrieving connection state is in context of auth.");
+			try
+			{
+				deviceState = device?.State.GetDeviceState()
+					?? throw new System.Exception("Can not get bluetooth device state. State must not be null.");
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Can not authenticate. Retrieving bluetooth state failed. {Exception}", exception);
+				throw new System.Exception(string.Format("Can not authenticate. Getting bluetooth state failed. {0}", exception.Message), exception);
+			}
+
+			switch (deviceState)
+			{
+				case DeviceState.Disconnected:
+					throw new BluetoothDisconnectedException();
+
+				case DeviceState.Connected:
+					break;
+
+				default:
+					// Can not get state if device is not connected.
+					Log.ForContext<LockItBase>().Error($"Can not authenticate. Unexpected lock state {deviceState} detected.");
+					throw new System.Exception(string.Format("Can not authenticate. Unexpected bluetooth state {0} detected.", deviceState));
+			}
+
+			// Check if key is available.
+			if (authInfo == null)
+			{
+				Log.ForContext<LockItBase>().Error($"Can not authenticate. No auth info available.");
+				throw new AuthKeyException($"Can not authenticate. No auth info available.");
+			}
+
+			if (authInfo.K_seed.Length != SEEDLENGTH
+				|| authInfo.K_u.Length <= 0)
+			{
+				throw new AuthKeyException($"Can not authenticate. Invalid seed-/ k-user-lenght {authInfo.K_seed.Length}/ {authInfo.K_u.Length} detected.");
+			}
+
+			Log.ForContext<LockItBase>().Debug($"Connection state is {deviceState} in context of auth.");
+
+			var lockIt = factory();
+
+			if (InvalidatedSeed[lockIt.Guid].Contains(string.Join(",", authInfo.K_seed)))
+			{
+				throw new AuthKeyException($"Can not authenticate. Seed {string.Join(",", authInfo.K_seed)} was already used.");
+			}
+
+			InvalidatedSeed[lockIt.Guid].Add(string.Join(",", authInfo.K_seed));
+
+			// Connect to device and authenticate.
+			try
+			{
+				await AuthenticateAsync(
+					lockIt,
+					authInfo,
+				   lockIt.Cipher);
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Authentication failed. {Exception}", exception);
+				try
+				{
+					// Disconnect from device if auth did not succeed.
+					await lockIt.Adapter.DisconnectDeviceAsync(lockIt.Device);
+				}
+				catch (System.Exception exceptionInner)
+				{
+					Log.ForContext<LockItBase>().Error("Authentication failed. Disconnect throw an exception. {Exception}", exceptionInner);
+				}
+
+				Log.ForContext<LockItBase>().Error($"Auth failed for device name={lockIt.Name}, GUID={lockIt.Guid}.");
+
+				throw;
+			}
+
+			lockIt.CopriKey = authInfo.K_u;
+
+			Log.ForContext<LockItBase>().Debug($"Auth succeeded for device name={lockIt.Name}, GUID={lockIt.Guid}, state={lockIt.GetDeviceState()}.");
+			return lockIt;
+		}
+
+		/// <summary> Performs an authentication.</summary>
+		private static async Task AuthenticateAsync(
+			LockItBase lockIt,
+			LockInfoAuthTdo lockInfo,
+			ICipher cipher)
+		{
+			Log.ForContext<LockItBase>().Debug($"Request to autenticate for {lockIt.Name}.");
+
+			var authCharacteristic = await lockIt.GetAuthCharacteristicAsync();
+			if (authCharacteristic == null)
+			{
+				Log.ForContext<LockItBase>().Debug("Getting auth-charcteristic failed.");
+				throw new CoundntGetCharacteristicException("Authentication failed. Auth characteristic must not be null.");
+			}
+
+			bool success;
+
+			try
+			{
+				success = await authCharacteristic.WriteAsync(lockInfo.K_seed);
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Writing copri seed failed.{AuthCharacteristic}{CommandWritten}{Exception}", ToSerilogString(authCharacteristic), ToSerilogString(lockInfo.K_seed), exception);
+				throw new System.Exception(string.Format("Can not authenticate. Writing copri seed failed. {0}", exception.Message), exception);
+			}
+			if (!success)
+			{
+				Log.ForContext<LockItBase>().Debug("Writing copri seed failed.{AuthCharacteristic}{CommandWritten}", ToSerilogString(authCharacteristic), ToSerilogString(lockInfo.K_seed));
+				throw new System.Exception("Can not authenticate. Writing copri seed did not succeed.");
+			}
+
+			Log.ForContext<LockItBase>().Debug("Copri seed written successfully.{AuthCharacteristic}{CommandWritten}.", ToSerilogString(authCharacteristic), ToSerilogString(lockInfo.K_seed));
+
+			byte[] seedLockEncrypted;
+			var cts = new CancellationTokenSource();
+			cts.CancelAfter(READ_TIMEOUT_MS);
+			try
+			{
+				seedLockEncrypted = await authCharacteristic.ReadAsync(cts.Token); // encrypted seed value (random value) from lock to decypt using k_user
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Retrieveing encrypted random value from lock (seed)(ReadAsync-call) failed.{ReadCharacteristic}{Exception}", ToSerilogString(authCharacteristic), exception);
+				throw new System.Exception(string.Format("Can not authenticate. Reading encrypted seed failed. {0}", exception.Message), exception);
+			}
+			finally
+			{
+				cts.Dispose();
+			}
+
+			Log.ForContext<LockItBase>().Debug("Retrieveing encrypted random value from lock (seed)(ReadAsync-call) succeeded.{ReadCharacteristic}{Reading}", ToSerilogString(authCharacteristic), "***");
+
+			var crypto = new AuthCryptoHelper(
+				seedLockEncrypted,
+				lockInfo.K_u,
+				cipher);
+
+			byte[] accessKeyEncrypted;
+			try
+			{
+				accessKeyEncrypted = crypto.GetAccessKeyEncrypted();
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Error getting encrypted access key. {Exception}", exception);
+				throw new System.Exception(string.Format("Can not authenticate. Getting access key failed. {0}", exception.Message), exception);
+			}
+
+			try
+			{
+				success = await authCharacteristic.WriteAsync(accessKeyEncrypted);
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Writing encrypted access key failed.{Key}{Seed}{AuthCharacteristic}{CommandWritten}{Exception}", ToSerilogString(crypto.KeyCopri), ToSerilogString(lockInfo.K_seed), ToSerilogString(authCharacteristic), ToSerilogString(accessKeyEncrypted), exception);
+				throw new System.Exception(string.Format("Can not authenticate. Writing access key failed. {0}", exception.Message), exception);
+			}
+			if (!success)
+			{
+				Log.ForContext<LockItBase>().Debug("Writing encrypted access key failed.{Key}{Seed}{AuthCharacteristic}{CommandWritten}", ToSerilogString(crypto.KeyCopri), ToSerilogString(lockInfo.K_seed), ToSerilogString(authCharacteristic), "***");
+				throw new System.Exception(string.Format("Can not authenticate. Writing access key did not succeed."));
+			}
+
+			Log.ForContext<LockItBase>().Debug("Encrypted access key written successfully.{Key}{Seed}{AuthCharacteristic}{CommandWritten}", ToSerilogString(crypto.KeyCopri), ToSerilogString(lockInfo.K_seed), ToSerilogString(authCharacteristic), "***");
+		}
+
+		/// <summary> Gets the lock state like locking state (open/ close). </summary>
+		/// <param name="doWaitRetry">True if to wait and retry in case of failures. </param>
+		/// <remarks> 
+		/// Lock state is first byte of of value read from state characteristic ("0000baaa-1212-efde-1523-785fef13d123").
+		/// Values are as follows
+		/// Open = 0x00,
+		/// Closed = 0x01,
+		/// Unknown = 0x02,
+		/// CouldntCloseMoving = 0x03,
+		/// CouldntOpenBoldBlocked = 0x04,
+		/// CouldntCloseBoldBlocked = 0x05
+		/// TINK.Services.BluetoothLock.Tdo.LockitLockingState.
+		/// </remarks>
+		/// <returns> Lock state.</returns>
+		/// <exception cref="BluetoothDisconnectedException">App is not connected to lock.</exception>
+		/// <exception cref="CoundntGetCharacteristicException">Getting state characteristic to read from failed.</exception>
+		/// <exception cref="Exception">
+		/// Call not from main thread or unkonwn platform detected or
+		/// query device state (connected, disconnected, ....) failed for an unknown reason or returned an unexpected value or
+		/// reading state characteristic failed or reading from characteristic was empty.
+		/// </exception>
+		/// <exception> Exceptions thrown by PluginBle::ICharacteristic.ReasAsync.</exception>
+		public async Task<LockInfoTdo> GetLockStateAsync(bool doWaitRetry = false)
+		{
+			if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
+			{
+				throw new System.Exception("Can not get lock state. Platform must not be unknown and bluetooth code must be run on main thread.");
+			}
+
+			DeviceState? deviceState;
+			Log.ForContext<LockItBase>().Debug("Request to get connection state in context of getting locking state.");
+			try
+			{
+				deviceState = Device?.State.GetDeviceState()
+					?? throw new System.Exception("Can not get bluetooth device state. State must not be null.");
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Can not get lock state. Retrieving bluetooth state failed. {Exception}", exception);
+				throw new System.Exception(string.Format("Can not get lock state. Getting bluetooth state failed. {0}", exception.Message), exception);
+			}
+
+			switch (deviceState)
+			{
+				case DeviceState.Disconnected:
+					throw new BluetoothDisconnectedException();
+
+				case DeviceState.Connected:
+					break;
+
+				default:
+					// Can not get state if device is not connected.
+					Log.ForContext<LockItBase>().Error($"Getting lock state failed. Unexpected lock state {deviceState} detected.");
+					throw new System.Exception(string.Format("Can not get lock state. Unexpected bluetooth state {0} detected.", deviceState));
+			}
+
+			Log.ForContext<LockItBase>().Debug($"Connection state is {deviceState}.");
+
+			var stateCharacteristic = await GetStateCharacteristicAsync();
+			if (stateCharacteristic == null)
+			{
+				Log.ForContext<LockItBase>().Error($"Can not get lock state. State characteristic is not available.");
+				throw new CoundntGetCharacteristicException("Can not get lock state. State characteristic must not be null.");
+			}
+
+			byte[] state;
+			async Task<byte[]> readAsyncDelegate()
+			{
+				var cts = new CancellationTokenSource();
+				cts.CancelAfter(READ_TIMEOUT_MS);
+				try
+				{
+					return await stateCharacteristic.ReadAsync(cts.Token);
+				}
+				catch (System.Exception exception)
+				{
+					Log.ForContext<LockItBase>().Error("Retrieving lock state (ReadAsync-call) failed inside delegate.{StateCharacteristic}{Exception}", ToSerilogString(stateCharacteristic), exception);
+					throw;
+				}
+				finally
+				{
+					cts.Dispose();
+				}
+			}
+
+			try
+			{
+				state = doWaitRetry
+					? await _retryPollicy.ExecuteAsync(async () => await readAsyncDelegate())
+					: await readAsyncDelegate();
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Retrieving lock state (ReadAsync-call) failed.{StateCharacteristic}{Exception}", ToSerilogString(stateCharacteristic), exception);
+				throw new System.Exception(string.Format("Can not get lock state. Reading data failed. {0}", exception.Message), exception);
+			}
+			if (state == null || state.Length <= 0)
+			{
+				Log.ForContext<LockItBase>().Debug("Retrieving lock state (ReadAsync-call) failed. Data read is null or empty.{StateCharacteristic}", ToSerilogString(stateCharacteristic));
+				throw new System.Exception("Can not get lock state. No data read");
+			}
+
+			var lockInfoTdo = new LockInfoTdo.Builder
+			{
+				Id = Id,
+				Guid = Guid,
+				State = (LockitLockingState?)state[0]
+			}.Build();
+
+			Log.ForContext<LockItBase>().Debug("Retrieving lock state (ReadAsync-call) succeeded. {@LockInfoTdo}{StateCharacteristic}{Reading}",
+				lockInfoTdo,
+				ToSerilogString(stateCharacteristic),
+				state);
+
+			return lockInfoTdo;
+		}
+
+		/// <summary>Gets the battery percentage.</summary>
+		public async Task<double> GetBatteryPercentageAsync()
+		{
+			if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
+			{
+				throw new System.Exception("Can not get battery percentage. Platform must not be unknown and bluetooth code must be run on main thread.");
+			}
+
+			DeviceState? deviceState;
+			Log.ForContext<LockItBase>().Debug("Request to get battery percentage in context of getting locking state.");
+			try
+			{
+				deviceState = Device?.State.GetDeviceState()
+					?? throw new System.Exception("Can not get bluetooth device state. State must not be null.");
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Can not get battery percentage. Retrieving bluetooth state failed. {Exception}", exception);
+				throw new System.Exception(string.Format("Can not get battery percentage. Getting bluetooth state failed. {0}", exception.Message), exception);
+			}
+
+			switch (deviceState)
+			{
+				case DeviceState.Disconnected:
+					throw new BluetoothDisconnectedException();
+
+				case DeviceState.Connected:
+					break;
+
+				default:
+					// Can not get state if device is not connected.
+					Log.ForContext<LockItBase>().Error($"Getting battery percentage failed. Unexpected battery percentage {deviceState} detected.");
+					throw new System.Exception(string.Format("Can not get battery percentage. Unexpected bluetooth state {0} detected.", deviceState));
+			}
+
+			Log.ForContext<LockItBase>().Debug($"Connection state is {deviceState}.");
+
+			var batteryCharacteristic = await GetBatteryCharacteristicAsync();
+			if (batteryCharacteristic == null)
+			{
+				Log.ForContext<LockItBase>().Error($"Can not get battery percentage. State characteristic is not available.");
+				throw new CoundntGetCharacteristicException("Can not get battery percentage. State characteristic must not be null.");
+			}
+
+			byte[] state;
+			var cts = new CancellationTokenSource();
+			cts.CancelAfter(READ_TIMEOUT_MS);
+			try
+			{
+				state = await batteryCharacteristic.ReadAsync(cts.Token);
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Retrieving charging level (ReadAsync-call) failed. {BatteryCharacteristic}{Exception}", ToSerilogString(batteryCharacteristic), exception);
+				throw new System.Exception(string.Format("Can not get battery percentage. Reading data failed. {0}", exception.Message), exception);
+			}
+			finally
+			{
+				cts.Dispose();
+			}
+
+			if (state == null || state.Length <= 0)
+			{
+				Log.ForContext<LockItBase>().Debug("Retrieving charging level (ReadAsync-call) failed. Data read is null or empty.{BatteryCharacteristic}", ToSerilogString(batteryCharacteristic));
+				throw new System.Exception("Can not get battery percentage. No data read.");
+			}
+
+			Log.ForContext<LockItBase>().Debug("Retrieving charging level (ReadAsync-call) succeeded.{Level}{BatteryCharacteristic}{Reading}", state[0], ToSerilogString(batteryCharacteristic), state);
+
+			return state[0];
+		}
+
+		/// <summary> Opens lock. </summary>
+		/// <returns> Locking state.</returns>
+		public abstract Task<LockitLockingState?> OpenAsync();
+
+		/// <summary> Close the lock.</summary>
+		/// <returns>Locking state.</returns>
+		public abstract Task<LockitLockingState?> CloseAsync();
+
+		/// <summary> Opens/ closes lock.</summary>
+		/// <param name="counter"></param>
+		/// <param name="open"></param>
+		/// <returns>True if opening/ closing command could be written successfully.</returns>
+		protected async Task<bool> OpenCloseLockAsync(bool open)
+		{
+			DeviceState deviceState;
+			Log.ForContext<LockItBase>().Debug(open
+				? "Request to get connection state in context of opening lock."
+				: "Request to get connection state in context of closing lock.");
+			try
+			{
+				deviceState = Device?.State.GetDeviceState()
+					?? throw new System.Exception(open
+						? "Can not open lock. Getting bluetooth device state failed. State must not be null."
+						: "Can not close lock. Getting bluetooth device state failed. State must not be null.");
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error(open
+						? "Retrieving bluetooth state failed when opening lock failed. {Exception}"
+						: "Retrieving bluetooth state failed when closing lock failed. {Exception}",
+					exception);
+				throw new System.Exception(open
+							? $"Can not open lock. Getting bluetooth failed. {exception.Message}"
+							: $"Can not close lock. Getting bluetooth failed. {exception.Message}",
+						exception);
+			}
+
+			switch (deviceState)
+			{
+				case DeviceState.Disconnected:
+					throw new BluetoothDisconnectedException();
+
+				case DeviceState.Connected:
+					break;
+
+				default:
+					// Can not open lock if bluetooth state is not connected.
+					Log.ForContext<LockItBase>().Debug(open
+						? $"Can not open lock. Unexpected connection state detected {deviceState}."
+						: $"Can not close lock. Unexpected connection state detected {deviceState}.");
+					return false;
+			}
+
+			Log.ForContext<LockItBase>().Debug(open
+				? $"Connection state before opening lock is {deviceState}."
+				: $"Connection state before closing lock is {deviceState}.");
+
+			var activateLockCharacteristic = await GetActivateLockCharacteristicAsync();
+			if (activateLockCharacteristic == null)
+			{
+				Log.ForContext<LockItBase>().Debug(open
+					? "Can not open lock. Getting lock control service failed."
+					: "Can not close lock. Getting lock control service failed.");
+				return false;
+			}
+
+			byte[] state = bitShift(
+				new byte[] { 0, 0, open ? (byte)1 : (byte)2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+				++ActivateLockWriteCounter);
+
+			byte[] stateEnctryped;
+			try
+			{
+				stateEnctryped = Cipher.Encrypt(CopriKey, state);
+			}
+			catch (System.Exception exception)
+			{
+				ActivateLockWriteCounter--;
+				Log.ForContext<LockItBase>().Error(open
+						? "Encypting command to open lock failed. {Exception}"
+						: "Encypting command to close lock failed. {Exception}",
+					exception);
+				throw new System.Exception(open
+						? $"Can not open lock. Encrypting command to lock/ unlock failed. {exception.Message}"
+						: $"Can not close lock. Encrypting command to lock/ unlock failed. {exception.Message}",
+					exception);
+			}
+
+			bool success;
+			try
+			{
+				success = await activateLockCharacteristic.WriteAsync(stateEnctryped);
+			}
+			catch (System.Exception exception)
+			{
+				ActivateLockWriteCounter--;
+				Log.ForContext<LockItBase>().Error(open
+						? "Writing data to open lock failed.{ActivateLockCharacteristic}{CommandWritten}{Exception}"
+						: "Writing data to close lock failed.{ActivateLockCharacteristic}{CommandWritten}{Exception}",
+					ToSerilogString(activateLockCharacteristic),
+					ToSerilogString(stateEnctryped),
+					exception);
+				throw new System.Exception(open
+					? $"Can not open lock. Writing command failed. {exception.Message}"
+					: $"Can not close lock. Writing command failed. {exception.Message}",
+					exception);
+			}
+
+			Log.ForContext<LockItBase>().Debug(open
+					? "Command to open lock written successfully.{ActivateLockCharacteristic}{CommandWritten}"
+					: "Command to close lock written successfully.{ActivateLockCharacteristic}{CommandWritten}",
+				ToSerilogString(activateLockCharacteristic),
+				ToSerilogString(stateEnctryped));
+
+			return success;
+		}
+
+		/// <summary> Gets a value indicating whether alarm is on or off.</summary>
+		public async Task<bool> GetIsAlarmOffAsync()
+		{
+			if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
+			{
+				throw new System.Exception("Can not turn alarm off. Platform must not be unknown and bluetooth code must be run on main thread.");
+			}
+
+			var alarmCharacteristic = await GetAlarmCharacteristicAsync();
+			if (alarmCharacteristic == null)
+			{
+				Log.ForContext<LockItBase>().Debug("Getting alarm characteristic failed.");
+				throw new System.Exception($"Can not get alarm whether alarm is on or off. Getting alarm characteristic returned null.");
+			}
+
+			byte[] alarmSettings;
+			var cts = new CancellationTokenSource();
+			cts.CancelAfter(READ_TIMEOUT_MS);
+			try
+			{
+				alarmSettings = await alarmCharacteristic.ReadAsync(cts.Token);
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Retrieving alarm settings (ReadAsync-call) failed.{AlarmCharacteristic}{Exception}", ToSerilogString(alarmCharacteristic), exception);
+				throw new System.Exception($"Can not get whether alarm is off or on {exception.Message}.");
+			}
+			finally
+			{
+				cts.Dispose();
+			}
+
+			if (alarmSettings == null || alarmSettings.Length < 1)
+			{
+				Log.ForContext<LockItBase>().Error("Retrieving alarm settings (ReadAsync-call) failed.{AlarmCharacteristic}{Reading}", ToSerilogString(alarmCharacteristic));
+				throw new System.Exception("Can not get whether alarm is off or on. Reading failed.");
+			}
+
+			var isAlarmOff = alarmSettings[0] == 0;
+			Log.ForContext<LockItBase>().Debug("Retrieving alarm settings (ReadAsync-call) succeeded.{IsArlarmOff}{AlarmCharacteristic}{Reading}", isAlarmOff, ToSerilogString(alarmCharacteristic), alarmSettings);
+			return isAlarmOff;
+		}
+
+		/// <summary> Sets alarm on or off.</summary>
+		public async Task SetIsAlarmOffAsync(bool isActivated)
+		{
+			if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
+			{
+				throw new System.Exception("Can not turn alarm off. Platform must not be unknown and bluetooth code must be run on main thread.");
+			}
+
+			ICharacteristic alarmCharacteristic = await GetAlarmCharacteristicAsync();
+			if (alarmCharacteristic == null)
+			{
+				Log.ForContext<LockItBase>().Debug("Getting alarm characteristic failed.");
+				throw new System.Exception($"Can not set alarm {isActivated}. Getting alarm characteristic returned null.");
+			}
+
+			bool success;
+			var command = new byte[] { isActivated ? (byte)1 : (byte)0 };
+			try
+			{
+				success = await alarmCharacteristic.WriteAsync(command);
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Writing alarm settings failed.{AlarmCharacteristic}{CommandWritten}{Exception}", ToSerilogString(alarmCharacteristic), command[0], exception);
+				throw new System.Exception($"Can not set alarm settings. {exception.Message}", exception);
+			}
+
+			if (!success)
+			{
+				Log.ForContext<LockItBase>().Error("Writing alarm settings failed.{AlarmCharacteristic}{CommandWritten}", ToSerilogString(alarmCharacteristic), command[0]);
+				throw new System.Exception($"Can not set alarm settings. Writing  settings did not succeed.");
+			}
+
+			Log.ForContext<LockItBase>().Debug("Alarm settings written successfully.{AlarmCharacteristic}{CommandWritten}.", ToSerilogString(alarmCharacteristic), command[0]);
+		}
+
+		public async Task<bool> SetSoundAsync(SoundSettings settings)
+		{
+			if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
+			{
+				throw new System.Exception("Can not set sound settings. Platform must not be unknown and bluetooth code must be run on main thread.");
+			}
+
+			ICharacteristic soundCharacteristic = await GetSoundCharacteristicAsync();
+			if (soundCharacteristic == null)
+			{
+				Log.ForContext<LockItBase>().Debug("Getting sound characteristic failed.");
+				return false;
+			}
+
+			bool success;
+			byte command = (byte)settings;
+			try
+			{
+				success = await soundCharacteristic.WriteAsync(new byte[] { command });
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Writing sound settings failed.{SoundCharacteristic}{CommandWritten}{Exception}", ToSerilogString(soundCharacteristic), command, exception);
+				throw new System.Exception($"Can not set sound settings. {exception.Message}", exception);
+			}
+
+			Log.ForContext<LockItBase>().Debug(success
+					? "Writing sound settings failed.{SoundCharacteristic}{CommandWritten}"
+					: "Sound settings written successfully.{SoundCharacteristic}{CommandWritten}",
+				ToSerilogString(soundCharacteristic), command);
+
+			return success;
+		}
+
+		public async Task<bool> SetAlarmSettingsAsync(AlarmSettings settings)
+		{
+			if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
+			{
+				throw new System.Exception("Can not set alarm settings. Platform must not be unknown and bluetooth code must be run on main thread.");
+			}
+
+			ICharacteristic alarmSettingsCharacteristic = await GetAlarmSettingsCharacteristicAsync();
+			if (alarmSettingsCharacteristic == null)
+			{
+				Log.ForContext<LockItBase>().Debug("Getting alarm settings characteristic failed.");
+				return false;
+			}
+
+			bool success;
+			byte command = (byte)settings;
+			try
+			{
+				success = await alarmSettingsCharacteristic.WriteAsync(new byte[] { command });
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItBase>().Error("Writing alarm settings failed.{SoundCharacteristic}{CommandWritten}{Exception}", ToSerilogString(alarmSettingsCharacteristic), command, exception);
+				throw new System.Exception($"Can not set alarm settings. {exception.Message}", exception);
+			}
+
+			Log.ForContext<LockItBase>().Debug(success
+					? "Writing alarm settings failed.{SoundCharacteristic}{CommandWritten}"
+					: "Alarm settings written successfully.{SoundCharacteristic}{CommandWritten}",
+				ToSerilogString(alarmSettingsCharacteristic), command);
+
+			return success;
+		}
+
+		private static byte[] bitShift(byte[] data, int counter)
+		{
+			int mask = 0x000000FF;
+			data[0] = (byte)(counter & mask);
+			data[1] = (byte)(counter >> 8);
+
+			return data;
+		}
+
+
+		/// <summary> Disconnect from bluetooth lock. </summary>
+		public async Task Disconnect() => await Adapter.DisconnectDeviceAsync(Device);
+
+		/// <summary>
+		/// Don' t use .Destructure.ByTransforming<ICharacteristic>(...) because this would introduce a dependency to Plugin.BLE in main project.
+		/// </summary> 
+		/// <param name="charcteristic"></param>
+		/// <returns></returns>
+		private static string ToSerilogString(ICharacteristic charcteristic)
+			=> charcteristic.Id.ToString();
+
+		private static string ToSerilogString(byte[] byteArray)
+			=> "***"; // For debuging purposes it might be reqired to return string.Join(",", byteArray); Do not log any confidental value in production context.
+	}
 }
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItByGuidService.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItByGuidService.cs
index 283f519..ddf51d4 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItByGuidService.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItByGuidService.cs
@@ -16,147 +16,147 @@ using Xamarin.Essentials;
 
 namespace TINK.Services.BluetoothLock.BLE
 {
-    public class LockItByGuidService : LockItServiceBase, ILocksService
-    {
-        /// <summary> Constructs a LockItByGuidService object.</summary>
-        /// <param name="cipher">Encrpyting/ decrypting object.</param>
-        public LockItByGuidService(ICipher cipher) : base(cipher)
-        {
-        }
+	public class LockItByGuidService : LockItServiceBase, ILocksService
+	{
+		/// <summary> Constructs a LockItByGuidService object.</summary>
+		/// <param name="cipher">Encrpyting/ decrypting object.</param>
+		public LockItByGuidService(ICipher cipher) : base(cipher)
+		{
+		}
 
-        /// <summary> Checks for locks which have not yet been discoverted and connects them. </summary>
-        /// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence. </remarks>
-        /// <param name="locksInfo">Locks to reconnect.</param>
-        /// <param name="connectTimeout">Timeout for connect operation of a single lock.</param>
-        protected override async Task<IEnumerable<ILockService>> CheckConnectMissing(IEnumerable<LockInfoAuthTdo> locksInfo, TimeSpan connectTimeout)
-        {
-            if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
-            {
-                throw new System.Exception("Can not connect to locks by guid. Platform must not be unknown and bluetooth code must be run on main thread.");
-            }
+		/// <summary> Checks for locks which have not yet been discoverted and connects them. </summary>
+		/// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence. </remarks>
+		/// <param name="locksInfo">Locks to reconnect.</param>
+		/// <param name="connectTimeout">Timeout for connect operation of a single lock.</param>
+		protected override async Task<IEnumerable<ILockService>> CheckConnectMissing(IEnumerable<LockInfoAuthTdo> locksInfo, TimeSpan connectTimeout)
+		{
+			if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
+			{
+				throw new System.Exception("Can not connect to locks by guid. Platform must not be unknown and bluetooth code must be run on main thread.");
+			}
 
-            // Get list of target locks without invalid entries.
-            var validLocksInfo = locksInfo
-                .Where(x => x.IsGuidValid)
-                .Where(x => x.K_seed.Length > 0 && x.K_u.Length > 0)
-                .ToList();
+			// Get list of target locks without invalid entries.
+			var validLocksInfo = locksInfo
+				.Where(x => x.IsGuidValid)
+				.Where(x => x.K_seed.Length > 0 && x.K_u.Length > 0)
+				.ToList();
 
-            var locksList = new List<ILockService>();
+			var locksList = new List<ILockService>();
 
-            // Connect to 
-            foreach (var lockInfo in validLocksInfo)
-            {
-                if (DeviceList.Any(x => x.Name.GetBluetoothLockId() == lockInfo.Id || x.Guid == lockInfo.Guid))
-                {
-                    // Device is already connected.
-                    continue;
-                }
+			// Connect to 
+			foreach (var lockInfo in validLocksInfo)
+			{
+				if (DeviceList.Any(x => x.Name.GetBluetoothLockId() == lockInfo.Id || x.Guid == lockInfo.Guid))
+				{
+					// Device is already connected.
+					continue;
+				}
 
-                // Connect to device and authenticate.
-                ILockService lockIt = null;
-                try
-                {
-                    lockIt = await ConnectByGuid(lockInfo, connectTimeout);
-                }
-                catch (System.Exception exception)
-                {
-                    // Member is called for background update of missing devices. 
-                    // Do not display any error messages.
-                    Log.ForContext<LockItByGuidService>().Error($"Authentication failed. {exception.Message}");
-                    continue;
-                }
-                if (lockIt == null)
-                {
-                    continue;
-                }
+				// Connect to device and authenticate.
+				ILockService lockIt = null;
+				try
+				{
+					lockIt = await ConnectByGuid(lockInfo, connectTimeout);
+				}
+				catch (System.Exception exception)
+				{
+					// Member is called for background update of missing devices. 
+					// Do not display any error messages.
+					Log.ForContext<LockItByGuidService>().Error($"Authentication failed. {exception.Message}");
+					continue;
+				}
+				if (lockIt == null)
+				{
+					continue;
+				}
 
-                locksList.Add(lockIt);
-            }
+				locksList.Add(lockIt);
+			}
 
-            return locksList;
-        }
+			return locksList;
+		}
 
-        /// <summary> Connects to lock.</summary>
-        /// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence. </remarks>
-        /// <param name="authInfo"> Info required to connect to lock.</param>
-        /// <param name="connectTimeout">Timeout for connect operation.</param>
-        public async Task<LockInfoTdo> ConnectAsync(LockInfoAuthTdo authInfo, TimeSpan connectTimeout)
-        {
-            if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
-            {
-                throw new System.Exception("Can not connect to lock by guid. Platform must not be unknown and bluetooth code must be run on main thread.");
-            }
+		/// <summary> Connects to lock.</summary>
+		/// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence. </remarks>
+		/// <param name="authInfo"> Info required to connect to lock.</param>
+		/// <param name="connectTimeout">Timeout for connect operation.</param>
+		public async Task<LockInfoTdo> ConnectAsync(LockInfoAuthTdo authInfo, TimeSpan connectTimeout)
+		{
+			if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
+			{
+				throw new System.Exception("Can not connect to lock by guid. Platform must not be unknown and bluetooth code must be run on main thread.");
+			}
 
-            // Connect to device and authenticate.
-            var lockIt = await ConnectByGuid(authInfo, connectTimeout);
+			// Connect to device and authenticate.
+			var lockIt = await ConnectByGuid(authInfo, connectTimeout);
 
-            if (lockIt == null)
-            {
-                return new LockInfoTdo.Builder { Id = authInfo.Id, Guid = authInfo.Guid, State = null }.Build();
-            }
+			if (lockIt == null)
+			{
+				return new LockInfoTdo.Builder { Id = authInfo.Id, Guid = authInfo.Guid, State = null }.Build();
+			}
 
-            DeviceList.Add(lockIt);
+			DeviceList.Add(lockIt);
 
-            return await lockIt.GetLockStateAsync();
-        }
+			return await lockIt.GetLockStateAsync();
+		}
 
-        /// <summary> Connects to lock.</summary>
-        /// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence. </remarks>
-        /// <param name="authInfo"> Info required to connect to lock.</param>
-        /// <param name="connectTimeout">Timeout for connect operation.</param>
-        private async Task<ILockService> ConnectByGuid(LockInfoAuthTdo authInfo, TimeSpan connectTimeout)
-        {
-            if (authInfo.Guid == TextToLockItTypeHelper.INVALIDLOCKGUID)
-            {
-                Log.ForContext<LockItByGuidService>().Error($"Can not connect to lock {authInfo.Id}. Guid is unknown.");
-                throw new GuidUnknownException();
-            }
+		/// <summary> Connects to lock.</summary>
+		/// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence. </remarks>
+		/// <param name="authInfo"> Info required to connect to lock.</param>
+		/// <param name="connectTimeout">Timeout for connect operation.</param>
+		private async Task<ILockService> ConnectByGuid(LockInfoAuthTdo authInfo, TimeSpan connectTimeout)
+		{
+			if (authInfo.Guid == TextToLockItTypeHelper.INVALIDLOCKGUID)
+			{
+				Log.ForContext<LockItByGuidService>().Error($"Can not connect to lock {authInfo.Id}. Guid is unknown.");
+				throw new GuidUnknownException();
+			}
 
-            var lockIt = DeviceList.FirstOrDefault(x => x.Name.GetBluetoothLockId() == authInfo.Id || x.Guid == authInfo.Guid);
-            if (lockIt != null && lockIt.GetDeviceState() == DeviceState.Connected)
-            {
-                // Device is already connected.
-                return lockIt;
-            }
+			var lockIt = DeviceList.FirstOrDefault(x => x.Name.GetBluetoothLockId() == authInfo.Id || x.Guid == authInfo.Guid);
+			if (lockIt != null && lockIt.GetDeviceState() == DeviceState.Connected)
+			{
+				// Device is already connected.
+				return lockIt;
+			}
 
-            var adapter = CrossBluetoothLE.Current.Adapter;
-            Log.ForContext<LockItByGuidService>().Debug($"Request connect to device {authInfo.Id}.");
+			var adapter = CrossBluetoothLE.Current.Adapter;
+			Log.ForContext<LockItByGuidService>().Debug($"Request connect to device {authInfo.Id}.");
 
-            if (LockItByGuidServiceHelper.DevelGuids.ContainsKey(authInfo.Id) && LockItByGuidServiceHelper.DevelGuids[authInfo.Id] != authInfo.Guid)
-                throw new System.Exception($"Invalid Guid {authInfo.Guid} for lock with id {authInfo.Id} detected. Guid should be {LockItByGuidServiceHelper.DevelGuids[authInfo.Id]}.");
+			if (LockItByGuidServiceHelper.DevelGuids.ContainsKey(authInfo.Id) && LockItByGuidServiceHelper.DevelGuids[authInfo.Id] != authInfo.Guid)
+				throw new System.Exception($"Invalid Guid {authInfo.Guid} for lock with id {authInfo.Id} detected. Guid should be {LockItByGuidServiceHelper.DevelGuids[authInfo.Id]}.");
 
-            IDevice device;
-            var cts = new CancellationTokenSource(connectTimeout);
-            // Step 1: Perform bluetooth connect.
-            try
-            {
-                device = await adapter.ConnectToKnownDeviceAsync(
-                    authInfo.Guid,
-                    new ConnectParameters(forceBleTransport: true), // Force BLE transport 
-                    cts.Token);
-            }
-            catch (System.Exception exception)
-            {
-                if (exception is TaskCanceledException)
-                {
-                    // A timeout occurred.
-                    throw new System.Exception($"Can not connect to lock by guid.\r\nTimeout of {connectTimeout.TotalMilliseconds} [ms] elapsed.", exception);
-                }
+			IDevice device;
+			var cts = new CancellationTokenSource(connectTimeout);
+			// Step 1: Perform bluetooth connect.
+			try
+			{
+				device = await adapter.ConnectToKnownDeviceAsync(
+					authInfo.Guid,
+					new ConnectParameters(forceBleTransport: true), // Force BLE transport 
+					cts.Token);
+			}
+			catch (System.Exception exception)
+			{
+				if (exception is TaskCanceledException)
+				{
+					// A timeout occurred.
+					throw new System.Exception($"Can not connect to lock by guid.\r\nTimeout of {connectTimeout.TotalMilliseconds} [ms] elapsed.", exception);
+				}
 
-                Log.ForContext<LockItByGuidService>().Error("Bluetooth connect to known device request failed. {Exception}", exception);
-                throw new System.Exception($"Can not connect to lock by guid.\r\n{exception.Message}", exception);
-            }
+				Log.ForContext<LockItByGuidService>().Error("Bluetooth connect to known device request failed. {Exception}", exception);
+				throw new System.Exception($"Can not connect to lock by guid.\r\n{exception.Message}", exception);
+			}
 
-            // Step 2: Authenticate.
-            lockIt = await LockItEventBased.Authenticate(device, authInfo, CrossBluetoothLE.Current.Adapter, Cipher);
+			// Step 2: Authenticate.
+			lockIt = await LockItEventBased.Authenticate(device, authInfo, CrossBluetoothLE.Current.Adapter, Cipher);
 
-            if (lockIt == null)
-            {
-                Log.ForContext<LockItByGuidService>().Error("Connect to device failed.");
-                return null;
-            }
+			if (lockIt == null)
+			{
+				Log.ForContext<LockItByGuidService>().Error("Connect to device failed.");
+				return null;
+			}
 
-            return lockIt;
-        }
-    }
+			return lockIt;
+		}
+	}
 }
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItByScanService.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItByScanService.cs
index abbf69b..a63cae8 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItByScanService.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItByScanService.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -15,291 +15,291 @@ using Xamarin.Essentials;
 
 namespace TINK.Services.BluetoothLock.BLE
 {
-    /// <summary> Manages ILockIt- Locks.</summary>
-    public abstract class LockItByScanServiceBase : LockItServiceBase
-    {
-        /// <summary> Service to manage bluetooth stack. </summary>
-        private IBluetoothLE BluetoothService { get; }
+	/// <summary> Manages ILockIt- Locks.</summary>
+	public abstract class LockItByScanServiceBase : LockItServiceBase
+	{
+		/// <summary> Service to manage bluetooth stack. </summary>
+		private IBluetoothLE BluetoothService { get; }
 
-        /// <summary> Returns true if location permission is required (Android) but on given. </summary>
-        private Func<Task<bool>> IsLocationPermissionMissingDelegate { get; }
+		/// <summary> Returns true if location permission is required (Android) but on given. </summary>
+		private Func<Task<bool>> IsLocationPermissionMissingDelegate { get; }
 
-        /// <summary> Returns true if location service is required (Android) and off. </summary>
-        private Func<bool> IsLocationRequiredAndOffDelegate { get; }
+		/// <summary> Returns true if location service is required (Android) and off. </summary>
+		private Func<bool> IsLocationRequiredAndOffDelegate { get; }
 
-        private Func<IDevice, LockInfoAuthTdo, IAdapter, Task<LockItBase>> AuthenticateDelegate { get; set; }
+		private Func<IDevice, LockInfoAuthTdo, IAdapter, Task<LockItBase>> AuthenticateDelegate { get; set; }
 
-        public LockItByScanServiceBase(
-            ICipher cipher,
-            Func<IDevice, LockInfoAuthTdo, IAdapter, Task<LockItBase>> authenticateDelegate,
-            IBluetoothLE bluetoothLE,
-            Func<Task<bool>> isLocationPermissionMissingDelegate,
-            Func<bool> isLocationRequiredAndOffDelegate) : base(cipher)
-        {
-            BluetoothService = bluetoothLE
-                    ?? throw new ArgumentException($"Can not instantiate {nameof(LockItByScanServiceBase)}- object. No bluetooth service available.");
+		public LockItByScanServiceBase(
+			ICipher cipher,
+			Func<IDevice, LockInfoAuthTdo, IAdapter, Task<LockItBase>> authenticateDelegate,
+			IBluetoothLE bluetoothLE,
+			Func<Task<bool>> isLocationPermissionMissingDelegate,
+			Func<bool> isLocationRequiredAndOffDelegate) : base(cipher)
+		{
+			BluetoothService = bluetoothLE
+					?? throw new ArgumentException($"Can not instantiate {nameof(LockItByScanServiceBase)}- object. No bluetooth service available.");
 
-            IsLocationPermissionMissingDelegate = isLocationPermissionMissingDelegate
-                    ?? throw new ArgumentException($"Can not instantiate {nameof(LockItByScanServiceBase)}- object. No location permission missing delegate available.");
+			IsLocationPermissionMissingDelegate = isLocationPermissionMissingDelegate
+					?? throw new ArgumentException($"Can not instantiate {nameof(LockItByScanServiceBase)}- object. No location permission missing delegate available.");
 
-            IsLocationRequiredAndOffDelegate = isLocationRequiredAndOffDelegate
-                    ?? throw new ArgumentException($"Can not instantiate {nameof(LockItByScanServiceBase)}- object. No location .");
+			IsLocationRequiredAndOffDelegate = isLocationRequiredAndOffDelegate
+					?? throw new ArgumentException($"Can not instantiate {nameof(LockItByScanServiceBase)}- object. No location .");
 
-            AuthenticateDelegate = authenticateDelegate;
-        }
+			AuthenticateDelegate = authenticateDelegate;
+		}
 
-        /// <summary> Connects to lock.</summary>
-        /// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence. </remarks>
-        /// <param name="authInfo"> Info required to connect to lock.</param>
-        /// <param name="connectTimeout">Timeout for connect operation.</param>
-        public async Task<LockInfoTdo> ConnectAsync(LockInfoAuthTdo authInfo, TimeSpan connectTimeout)
-        {
-            if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
-            {
-                throw new System.Exception("Can not connect to lock by name. Platform must not be unknown and bluetooth code must be run on main thread.");
-            }
+		/// <summary> Connects to lock.</summary>
+		/// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence. </remarks>
+		/// <param name="authInfo"> Info required to connect to lock.</param>
+		/// <param name="connectTimeout">Timeout for connect operation.</param>
+		public async Task<LockInfoTdo> ConnectAsync(LockInfoAuthTdo authInfo, TimeSpan connectTimeout)
+		{
+			if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
+			{
+				throw new System.Exception("Can not connect to lock by name. Platform must not be unknown and bluetooth code must be run on main thread.");
+			}
 
-            Log.ForContext<LockItByScanServiceBase>().Debug($"Request to connect to device {authInfo.Id}.");
+			Log.ForContext<LockItByScanServiceBase>().Debug($"Request to connect to device {authInfo.Id}.");
 
-            var lockIt = DeviceList.FirstOrDefault(x => x.Name.GetBluetoothLockId() == authInfo.Id || x.Guid == authInfo.Guid);
+			var lockIt = DeviceList.FirstOrDefault(x => x.Name.GetBluetoothLockId() == authInfo.Id || x.Guid == authInfo.Guid);
 
-            if (lockIt != null && lockIt.GetDeviceState() == DeviceState.Connected)
-            {
-                // Nothing to do
-                Log.ForContext<LockItByScanServiceBase>().Debug($"Nothing to do. Lock is already connected.");
-                return await lockIt.GetLockStateAsync();
-            }
+			if (lockIt != null && lockIt.GetDeviceState() == DeviceState.Connected)
+			{
+				// Nothing to do
+				Log.ForContext<LockItByScanServiceBase>().Debug($"Nothing to do. Lock is already connected.");
+				return await lockIt.GetLockStateAsync();
+			}
 
-            if (lockIt != null)
-            {
-                // Reconnect required
-                Log.ForContext<LockItByScanServiceBase>().Debug($"Device {lockIt.Name} has been already connected but needs reconnect.");
-                await lockIt.ReconnectAsync(authInfo, connectTimeout);
-                return await lockIt.GetLockStateAsync();
-            }
+			if (lockIt != null)
+			{
+				// Reconnect required
+				Log.ForContext<LockItByScanServiceBase>().Debug($"Device {lockIt.Name} has been already connected but needs reconnect.");
+				await lockIt.ReconnectAsync(authInfo, connectTimeout);
+				return await lockIt.GetLockStateAsync();
+			}
 
-            // Device has not yet been discovered.
-            Log.ForContext<LockItByScanServiceBase>().Verbose("Starting scan for new devices...");
-            var newlyDiscovertedDevice = await ScanForNewDevices(new List<int> { authInfo.Id }, connectTimeout);
+			// Device has not yet been discovered.
+			Log.ForContext<LockItByScanServiceBase>().Verbose("Starting scan for new devices...");
+			var newlyDiscovertedDevice = await ScanForNewDevices(new List<int> { authInfo.Id }, connectTimeout);
 
-            var bleDevice = newlyDiscovertedDevice.FirstOrDefault(x => x.Name.GetBluetoothLockId() == authInfo.Id);
+			var bleDevice = newlyDiscovertedDevice.FirstOrDefault(x => x.Name.GetBluetoothLockId() == authInfo.Id);
 
-            if (bleDevice == null)
-            {
-                // Try to check why lock was not found.
-                var bluetoothState = await BluetoothService.GetBluetoothState();
-                switch (bluetoothState)
-                {
-                    case BluetoothState.On:
-                        break;
+			if (bleDevice == null)
+			{
+				// Try to check why lock was not found.
+				var bluetoothState = await BluetoothService.GetBluetoothState();
+				switch (bluetoothState)
+				{
+					case BluetoothState.On:
+						break;
 
-                    case BluetoothState.Off:
-                        Log.ForContext<LockItByScanServiceBase>().Debug("Lock probable not found because bluetooth is off.");
-                        throw new ConnectBluetoothNotOnException();
+					case BluetoothState.Off:
+						Log.ForContext<LockItByScanServiceBase>().Debug("Lock probable not found because bluetooth is off.");
+						throw new ConnectBluetoothNotOnException();
 
-                    default:
-                        Log.ForContext<LockItByScanServiceBase>().Debug("Lock probable not found because unexpected bluetooth state {state} detected.", bluetoothState);
-                        throw new ConnectBluetoothNotOnException(bluetoothState);
-                }
+					default:
+						Log.ForContext<LockItByScanServiceBase>().Debug("Lock probable not found because unexpected bluetooth state {state} detected.", bluetoothState);
+						throw new ConnectBluetoothNotOnException(bluetoothState);
+				}
 
-                if (await IsLocationPermissionMissingDelegate())
-                {
-                    Log.ForContext<LockItByScanServiceBase>().Debug("Lock probable not found because missing location permission.");
-                    throw new ConnectLocationPermissionMissingException();
-                }
-                if (IsLocationRequiredAndOffDelegate())
-                {
-                    Log.ForContext<LockItByScanServiceBase>().Debug("Lock probable not found because location is off.");
-                    throw new ConnectLocationOffException();
-                }
+				if (await IsLocationPermissionMissingDelegate())
+				{
+					Log.ForContext<LockItByScanServiceBase>().Debug("Lock probable not found because missing location permission.");
+					throw new ConnectLocationPermissionMissingException();
+				}
+				if (IsLocationRequiredAndOffDelegate())
+				{
+					Log.ForContext<LockItByScanServiceBase>().Debug("Lock probable not found because location is off.");
+					throw new ConnectLocationOffException();
+				}
 
-                Log.ForContext<LockItByScanServiceBase>().Debug("Can not connect because device was not discovered. List of discovered devices {deviceList}.", String.Join(";", newlyDiscovertedDevice?.Select(x => x?.Id)));
-                throw new OutOfReachException();
-            }
+				Log.ForContext<LockItByScanServiceBase>().Debug("Can not connect because device was not discovered. List of discovered devices {deviceList}.", String.Join(";", newlyDiscovertedDevice?.Select(x => x?.Id)));
+				throw new OutOfReachException();
+			}
 
-            var adapter = CrossBluetoothLE.Current.Adapter;
-            var cts = new CancellationTokenSource(connectTimeout);
+			var adapter = CrossBluetoothLE.Current.Adapter;
+			var cts = new CancellationTokenSource(connectTimeout);
 
-            // Connect to device and authenticate.
-            Log.ForContext<LockItByScanServiceBase>().Debug($"Device sucessfully discovered. Request connect to device {bleDevice?.Name}. Connect state is {bleDevice?.State}.");
-            try
-            {
-                await adapter.ConnectToDeviceAsync(
-                    bleDevice,
-                    new ConnectParameters(forceBleTransport: true /* Force BLE transport */),
-                    cts.Token);
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItByScanServiceBase>().Error("Can not connect to device by name. {Exception}", exception);
-                if (exception is TaskCanceledException)
-                {
-                    // A timeout occurred.
-                    throw new System.Exception($"Can not connect to lock by name.\r\nTimeout is {connectTimeout.TotalMilliseconds} [ms].\r\n{exception.Message}", exception);
-                }
+			// Connect to device and authenticate.
+			Log.ForContext<LockItByScanServiceBase>().Debug($"Device sucessfully discovered. Request connect to device {bleDevice?.Name}. Connect state is {bleDevice?.State}.");
+			try
+			{
+				await adapter.ConnectToDeviceAsync(
+					bleDevice,
+					new ConnectParameters(forceBleTransport: true /* Force BLE transport */),
+					cts.Token);
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItByScanServiceBase>().Error("Can not connect to device by name. {Exception}", exception);
+				if (exception is TaskCanceledException)
+				{
+					// A timeout occurred.
+					throw new System.Exception($"Can not connect to lock by name.\r\nTimeout is {connectTimeout.TotalMilliseconds} [ms].\r\n{exception.Message}", exception);
+				}
 
-                Log.ForContext<LockItByScanServiceBase>().Error("Bluetooth connect to known device request failed. {Exception}", exception);
-                throw new System.Exception($"Can not connect to lock by name. {exception.Message}", exception);
-            }
+				Log.ForContext<LockItByScanServiceBase>().Error("Bluetooth connect to known device request failed. {Exception}", exception);
+				throw new System.Exception($"Can not connect to lock by name. {exception.Message}", exception);
+			}
 
-            lockIt = await AuthenticateDelegate(bleDevice, authInfo, CrossBluetoothLE.Current.Adapter);
-            if (lockIt == null)
-            {
-                await adapter.DisconnectDeviceAsync(bleDevice);
-                return await Task.FromResult<LockInfoTdo>(null);
-            }
+			lockIt = await AuthenticateDelegate(bleDevice, authInfo, CrossBluetoothLE.Current.Adapter);
+			if (lockIt == null)
+			{
+				await adapter.DisconnectDeviceAsync(bleDevice);
+				return await Task.FromResult<LockInfoTdo>(null);
+			}
 
-            DeviceList.Add(lockIt);
+			DeviceList.Add(lockIt);
 
-            return await lockIt.GetLockStateAsync();
-        }
+			return await lockIt.GetLockStateAsync();
+		}
 
-        /// <summary> Checks for locks which have not yet been discoverted and connects them. </summary>
-        /// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence for each lock to be connected. </remarks>
-        /// <param name="locksInfo">Locks to reconnect.</param>
-        /// <param name="connectTimeout">Timeout for connect operation of a single lock.</param>
-        protected override async Task<IEnumerable<ILockService>> CheckConnectMissing(IEnumerable<LockInfoAuthTdo> locksInfo, TimeSpan connectTimeout)
-        {
-            // Get list of target locks without invalid entries.
-            var validLocksInfo = locksInfo
-                .Where(x => x.IsIdValid)
-                .Where(x => x.K_seed.Length > 0 && x.K_u.Length > 0)
-                .ToList();
+		/// <summary> Checks for locks which have not yet been discoverted and connects them. </summary>
+		/// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence for each lock to be connected. </remarks>
+		/// <param name="locksInfo">Locks to reconnect.</param>
+		/// <param name="connectTimeout">Timeout for connect operation of a single lock.</param>
+		protected override async Task<IEnumerable<ILockService>> CheckConnectMissing(IEnumerable<LockInfoAuthTdo> locksInfo, TimeSpan connectTimeout)
+		{
+			// Get list of target locks without invalid entries.
+			var validLocksInfo = locksInfo
+				.Where(x => x.IsIdValid)
+				.Where(x => x.K_seed.Length > 0 && x.K_u.Length > 0)
+				.ToList();
 
-            // Get Locks to scan for
-            var locksInfoToScanFor = validLocksInfo.Where(x => !DeviceList.Any(y => y.Name.GetBluetoothLockId() == x.Id)).ToList();
+			// Get Locks to scan for
+			var locksInfoToScanFor = validLocksInfo.Where(x => !DeviceList.Any(y => y.Name.GetBluetoothLockId() == x.Id)).ToList();
 
-            // Check if bluetooth scan is required
-            if (locksInfoToScanFor.Count <= 0)
-            {
-                // No Scan required.
-                return new List<LockItBase>();
-            }
+			// Check if bluetooth scan is required
+			if (locksInfoToScanFor.Count <= 0)
+			{
+				// No Scan required.
+				return new List<LockItBase>();
+			}
 
-            // Do bluetooth scan
-            var scanTargets = locksInfoToScanFor.Select(x => x.Id).ToList();
-            var newlyDiscovertedDevicesList = await ScanForNewDevices(scanTargets, TimeSpan.FromSeconds(connectTimeout.TotalSeconds * scanTargets.Count));
+			// Do bluetooth scan
+			var scanTargets = locksInfoToScanFor.Select(x => x.Id).ToList();
+			var newlyDiscovertedDevicesList = await ScanForNewDevices(scanTargets, TimeSpan.FromSeconds(connectTimeout.TotalSeconds * scanTargets.Count));
 
-            var locksList = new List<LockItBase>();
+			var locksList = new List<LockItBase>();
 
-            // Connect to newly discovered devices.
-            foreach (var lockInfo in locksInfoToScanFor)
-            {
-                var device = newlyDiscovertedDevicesList.FirstOrDefault(x => x.Name.GetBluetoothLockId() == lockInfo.Id);
-                if (device == null)
-                {
-                    // No device found for given lock.
-                    continue;
-                }
+			// Connect to newly discovered devices.
+			foreach (var lockInfo in locksInfoToScanFor)
+			{
+				var device = newlyDiscovertedDevicesList.FirstOrDefault(x => x.Name.GetBluetoothLockId() == lockInfo.Id);
+				if (device == null)
+				{
+					// No device found for given lock.
+					continue;
+				}
 
-                Log.ForContext<LockItByScanServiceBase>().Debug($"Request connect to device {device?.Name}. Connect state is {device?.State}.");
+				Log.ForContext<LockItByScanServiceBase>().Debug($"Request connect to device {device?.Name}. Connect state is {device?.State}.");
 
-                var cts = new CancellationTokenSource(connectTimeout);
+				var cts = new CancellationTokenSource(connectTimeout);
 
-                try
-                {
-                    // Connect to device and authenticate.
-                    await CrossBluetoothLE.Current.Adapter.ConnectToDeviceAsync(
-                        device,
-                        new ConnectParameters(forceBleTransport: true), // Force BLE transport 
-                        cts.Token);
-                }
-                catch (System.Exception exception)
-                {
-                    Log.ForContext<LockItByScanServiceBase>().Error("Can not connect to lock. {Exception}", exception);
-                    continue;
-                }
+				try
+				{
+					// Connect to device and authenticate.
+					await CrossBluetoothLE.Current.Adapter.ConnectToDeviceAsync(
+						device,
+						new ConnectParameters(forceBleTransport: true), // Force BLE transport 
+						cts.Token);
+				}
+				catch (System.Exception exception)
+				{
+					Log.ForContext<LockItByScanServiceBase>().Error("Can not connect to lock. {Exception}", exception);
+					continue;
+				}
 
-                LockItBase lockIt = null;
-                try
-                {
-                    lockIt = await AuthenticateDelegate(device, lockInfo, CrossBluetoothLE.Current.Adapter);
-                }
-                catch (System.Exception exception)
-                {
-                    // Member is called for background update of missing devices. 
-                    // Do not display any error messages.
-                    Log.ForContext<LockItByScanServiceBase>().Error($"Authentication failed. {exception.Message}");
-                    continue;
-                }
-                if (lockIt == null)
-                {
-                    // connectiong to device succeded.
-                    continue;
-                }
+				LockItBase lockIt = null;
+				try
+				{
+					lockIt = await AuthenticateDelegate(device, lockInfo, CrossBluetoothLE.Current.Adapter);
+				}
+				catch (System.Exception exception)
+				{
+					// Member is called for background update of missing devices. 
+					// Do not display any error messages.
+					Log.ForContext<LockItByScanServiceBase>().Error($"Authentication failed. {exception.Message}");
+					continue;
+				}
+				if (lockIt == null)
+				{
+					// connectiong to device succeded.
+					continue;
+				}
 
-                Log.ForContext<LockItByScanServiceBase>().Debug($"Auth succeeded for device {device}.");
-                locksList.Add(lockIt);
-            }
+				Log.ForContext<LockItByScanServiceBase>().Debug($"Auth succeeded for device {device}.");
+				locksList.Add(lockIt);
+			}
 
-            return locksList;
-        }
+			return locksList;
+		}
 
-        /// <summary> Scans for a given set of devices.</summary>
-        /// <param name="targetLocks">Locks to scan for.</param>
-        /// <returns></returns>
-        private static async Task<IEnumerable<IDevice>> ScanForNewDevices(
-            IEnumerable<int> targetLocks,
-            TimeSpan connectTimeout)
-        {
-            var adapter = CrossBluetoothLE.Current.Adapter;
+		/// <summary> Scans for a given set of devices.</summary>
+		/// <param name="targetLocks">Locks to scan for.</param>
+		/// <returns></returns>
+		private static async Task<IEnumerable<IDevice>> ScanForNewDevices(
+			IEnumerable<int> targetLocks,
+			TimeSpan connectTimeout)
+		{
+			var adapter = CrossBluetoothLE.Current.Adapter;
 
-            var newlyDiscovertedDevicesList = new List<IDevice>();
+			var newlyDiscovertedDevicesList = new List<IDevice>();
 
-            var cts = new CancellationTokenSource(connectTimeout);
+			var cts = new CancellationTokenSource(connectTimeout);
 
-            // Not all devices already connected.
-            // Start scanning
-            adapter.DeviceDiscovered += (s, a) =>
-            {
-                var name = a.Device.Name;
-                if (string.IsNullOrEmpty(name))
-                {
-                    // Lock without name detected.
-                    Log.ForContext<LockItByScanServiceBase>().Debug($"Lock without name discovered.");
-                    return;
-                }
+			// Not all devices already connected.
+			// Start scanning
+			adapter.DeviceDiscovered += (s, a) =>
+			{
+				var name = a.Device.Name;
+				if (string.IsNullOrEmpty(name))
+				{
+					// Lock without name detected.
+					Log.ForContext<LockItByScanServiceBase>().Debug($"Ble decvice without name discovered. RSSI={a.Device.Rssi}, GUID={a.Device.Id}, State={a.Device.State}.");
+					return;
+				}
 
-                if (targetLocks.Where(x => x != TextToLockItTypeHelper.INVALIDLOCKID).Contains(name.GetBluetoothLockId()))
-                {
-                    Log.ForContext<LockItByScanServiceBase>().Debug($"New LOCKIT device {name} discovered.");
+				if (targetLocks.Where(x => x != TextToLockItTypeHelper.INVALIDLOCKID).Contains(name.GetBluetoothLockId()))
+				{
+					Log.ForContext<LockItByScanServiceBase>().Debug($"New LOCKIT device {name} discovered.  RSSI={a.Device.Rssi}, GUID={a.Device.Id}, State={a.Device.State}.");
 
-                    newlyDiscovertedDevicesList.Add(a.Device);
+					newlyDiscovertedDevicesList.Add(a.Device);
 
-                    if (newlyDiscovertedDevicesList.Count() >= targetLocks.Count())
-                    {
-                        cts.Cancel();
-                    }
+					if (newlyDiscovertedDevicesList.Count() >= targetLocks.Count())
+					{
+						cts.Cancel();
+					}
 
-                    return;
-                }
+					return;
+				}
 
-                Log.ForContext<LockItByScanServiceBase>().Verbose($"Device of unknown advertisement name {name} discovered.");
-            };
+				Log.ForContext<LockItByScanServiceBase>().Verbose($"Device of unknown advertisement name {name} discovered.  RSSI={a.Device.Rssi}, GUID={a.Device.Id}, State={a.Device.State}.");
+			};
 
-            try
-            {
-                await adapter.StartScanningForDevicesAsync(cancellationToken: cts.Token);
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<LockItByScanServiceBase>().Error("Bluetooth scan failed. {Exception}", exception);
-                throw;
-            }
-            finally
-            {
-                try
-                {
-                    await adapter.StopScanningForDevicesAsync();
-                }
-                catch (System.Exception exception)
-                {
-                    Log.ForContext<LockItByScanServiceBase>().Error("Stop scanning failed. {Excpetion}", exception);
-                    throw;
-                }
-            }
+			try
+			{
+				await adapter.StartScanningForDevicesAsync(cancellationToken: cts.Token);
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<LockItByScanServiceBase>().Error("Bluetooth scan failed. {Exception}", exception);
+				throw;
+			}
+			finally
+			{
+				try
+				{
+					await adapter.StopScanningForDevicesAsync();
+				}
+				catch (System.Exception exception)
+				{
+					Log.ForContext<LockItByScanServiceBase>().Error("Stop scanning failed. {Excpetion}", exception);
+					throw;
+				}
+			}
 
-            return newlyDiscovertedDevicesList;
-        }
-    }
+			return newlyDiscovertedDevicesList;
+		}
+	}
 }
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItByScanServiceEventBased.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItByScanServiceEventBased.cs
index 4900817..c7f0642 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItByScanServiceEventBased.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItByScanServiceEventBased.cs
@@ -5,14 +5,14 @@ using TINK.Model.Device;
 
 namespace TINK.Services.BluetoothLock.BLE
 {
-    public class LockItByScanServiceEventBased : LockItByScanServiceBase, ILocksService
-    {
-        public LockItByScanServiceEventBased(ICipher cipher, IBluetoothLE bluetoothLE, Func<Task<bool>> isLocationPermissionMissingDelegate, Func<bool> isLocationRequiredAndOffDelegate) : base(
-            cipher,
-            (bleDevice, authInfo, adapter) => LockItEventBased.Authenticate(bleDevice, authInfo, adapter, cipher),
-            bluetoothLE,
-            isLocationPermissionMissingDelegate,
-            isLocationRequiredAndOffDelegate)
-        { }
-    }
+	public class LockItByScanServiceEventBased : LockItByScanServiceBase, ILocksService
+	{
+		public LockItByScanServiceEventBased(ICipher cipher, IBluetoothLE bluetoothLE, Func<Task<bool>> isLocationPermissionMissingDelegate, Func<bool> isLocationRequiredAndOffDelegate) : base(
+			cipher,
+			(bleDevice, authInfo, adapter) => LockItEventBased.Authenticate(bleDevice, authInfo, adapter, cipher),
+			bluetoothLE,
+			isLocationPermissionMissingDelegate,
+			isLocationRequiredAndOffDelegate)
+		{ }
+	}
 }
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItByScanServicePolling.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItByScanServicePolling.cs
index 67d6659..3c34984 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItByScanServicePolling.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItByScanServicePolling.cs
@@ -5,14 +5,14 @@ using TINK.Model.Device;
 
 namespace TINK.Services.BluetoothLock.BLE
 {
-    public class LockItByScanServicePolling : LockItByScanServiceBase, ILocksService
-    {
-        public LockItByScanServicePolling(ICipher cipher, IBluetoothLE bluetoothLE, Func<Task<bool>> isLocationPermissionMissingDelegate, Func<bool> isLocationRequiredAndOffDelegate) : base(
-            cipher,
-            (bleDevice, authInfo, adapter) => LockItPolling.Authenticate(bleDevice, authInfo, adapter, cipher),
-            bluetoothLE,
-            isLocationPermissionMissingDelegate,
-            isLocationRequiredAndOffDelegate)
-        { }
-    }
+	public class LockItByScanServicePolling : LockItByScanServiceBase, ILocksService
+	{
+		public LockItByScanServicePolling(ICipher cipher, IBluetoothLE bluetoothLE, Func<Task<bool>> isLocationPermissionMissingDelegate, Func<bool> isLocationRequiredAndOffDelegate) : base(
+			cipher,
+			(bleDevice, authInfo, adapter) => LockItPolling.Authenticate(bleDevice, authInfo, adapter, cipher),
+			bluetoothLE,
+			isLocationPermissionMissingDelegate,
+			isLocationRequiredAndOffDelegate)
+		{ }
+	}
 }
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItEventBased.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItEventBased.cs
index 08c7c7b..daaf62b 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItEventBased.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItEventBased.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Plugin.BLE.Abstractions.Contracts;
@@ -12,304 +12,312 @@ using Xamarin.Essentials;
 
 namespace TINK.Services.BluetoothLock.BLE
 {
-    public class LockItEventBased : LockItBase
-    {
-        private LockItEventBased(IDevice device, IAdapter adapter, ICipher cipher) : base(device, adapter, cipher)
-        {
-        }
+	public class LockItEventBased : LockItBase
+	{
+		private LockItEventBased(IDevice device, IAdapter adapter, ICipher cipher) : base(device, adapter, cipher)
+		{
+		}
 
-        /// <summary> Reconnects to device. </summary>
-        /// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence. </remarks>
-        /// <param name="authInfo">Info required to connect.</param>
-        /// <param name="connectTimeout">Timeout to apply when connecting to bluetooth lock.</param>
-        /// <returns>True if connecting succeeded, false if not.</returns>
-        public async override Task ReconnectAsync(
-            LockInfoAuthTdo authInfo,
-            TimeSpan connectTimeout)
-            => await ReconnectAsync(
-                authInfo,
-                connectTimeout,
-                () => new LockItEventBased(Device, Adapter, Cipher));
+		/// <summary> Reconnects to device. </summary>
+		/// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence. </remarks>
+		/// <param name="authInfo">Info required to connect.</param>
+		/// <param name="connectTimeout">Timeout to apply when connecting to bluetooth lock.</param>
+		/// <returns>True if connecting succeeded, false if not.</returns>
+		public async override Task ReconnectAsync(
+			LockInfoAuthTdo authInfo,
+			TimeSpan connectTimeout)
+			=> await ReconnectAsync(
+				authInfo,
+				connectTimeout,
+				() => new LockItEventBased(Device, Adapter, Cipher));
 
-        /// <summary> Connects to device. </summary>
-        /// <param name="authInfo">Info required to connect.</param>
-        /// <param name="device">Device with must be connected.</param>
-        /// <returns>True if connecting succeeded, false if not.</returns>
-        public static async Task<LockItBase> Authenticate(
-            IDevice device,
-            LockInfoAuthTdo authInfo,
-            IAdapter adapter,
-            ICipher cipher)
-        => await Authenticate(
-            device,
-            authInfo,
-            adapter,
-            cipher,
-            () => new LockItEventBased(device, adapter, cipher));
+		/// <summary> Connects to device. </summary>
+		/// <param name="authInfo">Info required to connect.</param>
+		/// <param name="device">Device with must be connected.</param>
+		/// <returns>True if connecting succeeded, false if not.</returns>
+		public static async Task<LockItBase> Authenticate(
+			IDevice device,
+			LockInfoAuthTdo authInfo,
+			IAdapter adapter,
+			ICipher cipher)
+		=> await Authenticate(
+			device,
+			authInfo,
+			adapter,
+			cipher,
+			() => new LockItEventBased(device, adapter, cipher));
 
-        /// <summary> Opens lock. </summary>
-        /// <returns> Locking state.</returns>
-        public async override Task<LockitLockingState?> OpenAsync()
-        {
-            if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
-            {
-                throw new System.Exception("Can not open lock. Platform must not be unknown and bluetooth code must be run on main thread.");
-            }
+		/// <summary> Opens lock. </summary>
+		/// <returns> Locking state.</returns>
+		public async override Task<LockitLockingState?> OpenAsync()
+		{
+			if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
+			{
+				throw new System.Exception("Can not open lock. Platform must not be unknown and bluetooth code must be run on main thread.");
+			}
 
-            LockitLockingState? lockingState = (await GetLockStateAsync())?.State;
-            if (lockingState == null)
-            {
-                // Device not reachable.
-                Log.ForContext<LockItEventBased>().Information("Can not open lock. Device is not reachable (get state).");
-                return await Task.FromResult((LockitLockingState?)null);
-            }
+			LockitLockingState? lockingState = (await GetLockStateAsync())?.State;
+			if (lockingState == null)
+			{
+				// Device not reachable.
+				Log.ForContext<LockItEventBased>().Information("Can not open lock. Device is not reachable (get state).");
+				return await Task.FromResult((LockitLockingState?)null);
+			}
 
-            if (lockingState.Value.GetLockingState() == LockingState.Open)
-            {
-                // Lock is already open.
-                Log.ForContext<LockItEventBased>().Information("No need to open lock. Lock is already open.");
-                return await Task.FromResult((LockitLockingState?)null);
-            }
+			if (lockingState.Value.GetLockingState() == LockingState.Open)
+			{
+				// Lock is already open.
+				Log.ForContext<LockItEventBased>().Information("No need to open lock. Lock is already open.");
+				return await Task.FromResult((LockitLockingState?)null);
+			}
 
-            Log.ForContext<LockItEventBased>().Debug($"Request to closed lock. Current lockikng state is {lockingState}, counter value {ActivateLockWriteCounter}.");
+			Log.ForContext<LockItEventBased>().Debug($"Request to open lock. Current locking state is {lockingState}, counter value {ActivateLockWriteCounter}.");
 
-            double batteryPercentage = double.NaN;
+			double batteryPercentage = double.NaN;
 
-            var lockStateCharacteristic = await GetStateCharacteristicAsync();
-            var batteryStateCharacteristic = await GetBatteryCharacteristicAsync();
+			var lockStateCharacteristic = await GetStateCharacteristicAsync();
+			var batteryStateCharacteristic = await GetBatteryCharacteristicAsync();
 
-            TaskCompletionSource<LockitLockingState?> tcs = new TaskCompletionSource<LockitLockingState?>();
-            var cts = new CancellationTokenSource(OPEN_CLOSE_TIMEOUT_MS);
-            cts.Token.Register(() => tcs.TrySetCanceled(), useSynchronizationContext: false);
+			TaskCompletionSource<LockitLockingState?> tcs = new TaskCompletionSource<LockitLockingState?>();
+			var cts = new CancellationTokenSource(OPEN_CLOSE_TIMEOUT_MS);
+			cts.Token.Register(() => tcs.TrySetCanceled(), useSynchronizationContext: false);
 
-            EventHandler<CharacteristicUpdatedEventArgs> lockStateCharcteristicChanged = (sender, args) => GetStateValue(tcs, args.Characteristic.Value);
-            EventHandler<CharacteristicUpdatedEventArgs> batteryStateCharcteristicChanged = (sender, args) => batteryPercentage = GetChargeValue(args.Characteristic.Value);
-            try
-            {
-                lockStateCharacteristic.ValueUpdated += lockStateCharcteristicChanged;
-                batteryStateCharacteristic.ValueUpdated += batteryStateCharcteristicChanged;
-            }
-            catch (System.Exception ex)
-            {
-                Log.ForContext<LockItEventBased>().Error("Subscribing to events when opening lock failed.{Exception}", ex);
-                return await Task.FromResult((LockitLockingState?)null);
-            }
+			EventHandler<CharacteristicUpdatedEventArgs> lockStateCharcteristicChanged = (sender, args) => GetStateValue(tcs, args.Characteristic.Value);
+			EventHandler<CharacteristicUpdatedEventArgs> batteryStateCharcteristicChanged = (sender, args) => batteryPercentage = GetChargeValue(args.Characteristic.Value);
+			try
+			{
+				lockStateCharacteristic.ValueUpdated += lockStateCharcteristicChanged;
+				batteryStateCharacteristic.ValueUpdated += batteryStateCharcteristicChanged;
+			}
+			catch (System.Exception ex)
+			{
+				Log.ForContext<LockItEventBased>().Error("Subscribing to events when opening lock failed.{Exception}", ex);
+				return await Task.FromResult((LockitLockingState?)null);
+			}
 
-            try
-            {
-                await lockStateCharacteristic.StartUpdatesAsync();
-                await batteryStateCharacteristic.StartUpdatesAsync();
-            }
-            catch (System.Exception ex)
-            {
-                Log.ForContext<LockItEventBased>().Error("Starting updates wen opening lock failed.{Exception}", ex);
-                return await Task.FromResult((LockitLockingState?)null);
-            }
+			try
+			{
+				await lockStateCharacteristic.StartUpdatesAsync();
+				await batteryStateCharacteristic.StartUpdatesAsync();
+			}
+			catch (System.Exception ex)
+			{
+				Log.ForContext<LockItEventBased>().Error("Starting updates when opening lock failed.{Exception}", ex);
+				return await Task.FromResult((LockitLockingState?)null);
+			}
 
-            try
-            {
-                var result = await OpenCloseLock(true); // Close lock;
+			try
+			{
+				var result = await OpenCloseLockAsync(true); // Close lock;
 
-                if (!result)
-                {
-                    // State did not change. Return previous state.
-                    Log.ForContext<LockItEventBased>().Information($"Opening lock failed.");
-                    return await Task.FromResult(lockingState.Value);
-                }
+				if (!result)
+				{
+					// State did not change. Return previous state.
+					Log.ForContext<LockItEventBased>().Information($"Opening lock failed.");
+					return await Task.FromResult(lockingState.Value);
+				}
 
-                // Wait until event has been received.
-                lockingState = await tcs.Task;
-            }
-            finally
-            {
-                try
-                {
-                    await lockStateCharacteristic.StopUpdatesAsync();
-                    await batteryStateCharacteristic.StopUpdatesAsync();
+				// Wait until event has been received.
+				lockingState = await tcs.Task;
+			}
+			finally
+			{
+				try
+				{
+					await lockStateCharacteristic.StopUpdatesAsync();
+					await batteryStateCharacteristic.StopUpdatesAsync();
 
-                    lockStateCharacteristic.ValueUpdated -= lockStateCharcteristicChanged;
-                    batteryStateCharacteristic.ValueUpdated -= batteryStateCharcteristicChanged;
-                }
-                catch (System.Exception ex)
-                {
-                    Log.ForContext<LockItEventBased>().Error("Sopping updates/ unsubscribing from events when opening lock failed.{Exception}", ex);
-                }
-            }
+					lockStateCharacteristic.ValueUpdated -= lockStateCharcteristicChanged;
+					batteryStateCharacteristic.ValueUpdated -= batteryStateCharcteristicChanged;
+				}
+				catch (System.Exception ex)
+				{
+					Log.ForContext<LockItEventBased>().Error("Sopping updates/ unsubscribing from events when opening lock failed.{Exception}", ex);
+				}
+			}
 
-            if (lockingState == null)
-            {
-                return null;
-            }
+			if (lockingState == null)
+			{
+				return null;
+			}
 
-            switch (lockingState.Value)
-            {
-                case LockitLockingState.Open:
-                    return lockingState.Value;
+			switch (lockingState.Value)
+			{
+				case LockitLockingState.Open:
+					Log.ForContext<LockItEventBased>().Information($"Lock was opened successfully.");
+					return lockingState.Value;
 
-                case LockitLockingState.CouldntOpenBoldBlocked:
-                    // Expected error. ILockIt count not be opened (Spoke blocks lock, ....)
-                    throw new CouldntOpenBoldIsBlockedException();
+				case LockitLockingState.CouldntOpenBoldBlocked:
+					// Expected error. ILockIt count not be opened (Spoke blocks lock, ....)
+					Log.ForContext<LockItEventBased>().Debug($"Opening lock failed. Bold is blocked.");
+					throw new CouldntOpenBoldIsBlockedException();
 
-                case LockitLockingState.Unknown:
-                    // Expected error. ILockIt count not be opened (Spoke has blocked/ blocks lock, ....)
-                    throw new CouldntOpenBoldWasBlockedException();
+				case LockitLockingState.Unknown:
+					// Expected error. ILockIt count not be opened (Spoke has blocked/ blocks lock, ....)
+					Log.ForContext<LockItEventBased>().Debug($"Opening lock failed. Bold was blocked.");
+					throw new CouldntOpenBoldWasBlockedException();
 
-                default:
-                    // Comprises values
-                    // - LockitLockingState.Closed 
-                    // - LockitLockingState.Unknown
-                    // - LockitLockingState.CouldntOpenBoldBlocked
-                    // Internal error which sould never occure. Lock refuses to open but connection is ok.
-                    throw new CouldntOpenInconsistentStateExecption(lockingState.Value.GetLockingState());
-            }
-        }
+				default:
+					// Comprises values
+					// - LockitLockingState.Closed 
+					// - LockitLockingState.Unknown
+					// - LockitLockingState.CouldntOpenBoldBlocked
+					// Internal error which sould never occure. Lock refuses to open but connection is ok.
+					Log.ForContext<LockItEventBased>().Debug($"Opening lock failed. Unexpected lock state {lockingState.Value.GetLockingState()} detected.");
+					throw new CouldntOpenInconsistentStateExecption(lockingState.Value.GetLockingState());
+			}
+		}
 
-        /// <summary> Close the lock.</summary>
-        /// <returns>Locking state.</returns>
-        public async override Task<LockitLockingState?> CloseAsync()
-        {
-            if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
-            {
-                throw new System.Exception("Can not close lock. Platform must not be unknown and bluetooth code must be run on main thread.");
-            }
+		/// <summary> Close the lock.</summary>
+		/// <returns>Locking state.</returns>
+		public async override Task<LockitLockingState?> CloseAsync()
+		{
+			if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
+			{
+				throw new System.Exception("Can not close lock. Platform must not be unknown and bluetooth code must be run on main thread.");
+			}
 
-            // Get current state
-            LockitLockingState? lockingState = (await GetLockStateAsync()).State;
-            if (lockingState == null)
-            {
-                // Device not reachable.
-                Log.ForContext<LockItEventBased>().Error("Can not close lock. Device is not reachable (get state).");
-                return await Task.FromResult((LockitLockingState?)null);
-            }
+			// Get current state
+			LockitLockingState? lockingState = (await GetLockStateAsync()).State;
+			if (lockingState == null)
+			{
+				// Device not reachable.
+				Log.ForContext<LockItEventBased>().Error("Can not close lock. Device is not reachable (get state).");
+				return await Task.FromResult((LockitLockingState?)null);
+			}
 
-            if (lockingState.Value.GetLockingState() == LockingState.Closed)
-            {
-                // Lock is already closed.
-                Log.ForContext<LockItEventBased>().Error("No need to close lock. Lock is already closed.");
-                return await Task.FromResult(lockingState.Value);
-            }
+			if (lockingState.Value.GetLockingState() == LockingState.Closed)
+			{
+				// Lock is already closed.
+				Log.ForContext<LockItEventBased>().Error("No need to close lock. Lock is already closed.");
+				return await Task.FromResult(lockingState.Value);
+			}
 
-            lockingState = null;
-            var lockStateCharacteristic = await GetStateCharacteristicAsync();
+			lockingState = null;
+			var lockStateCharacteristic = await GetStateCharacteristicAsync();
 
-            TaskCompletionSource<LockitLockingState?> tcs = new TaskCompletionSource<LockitLockingState?>();
-            var cts = new CancellationTokenSource(OPEN_CLOSE_TIMEOUT_MS);
-            cts.Token.Register(() => tcs.TrySetCanceled(), useSynchronizationContext: false);
+			TaskCompletionSource<LockitLockingState?> tcs = new TaskCompletionSource<LockitLockingState?>();
+			var cts = new CancellationTokenSource(OPEN_CLOSE_TIMEOUT_MS);
+			cts.Token.Register(() => tcs.TrySetCanceled(), useSynchronizationContext: false);
 
-            EventHandler<CharacteristicUpdatedEventArgs> lockStateCharcteristicChanged = (sender, args) => GetStateValue(tcs, args.Characteristic.Value);
+			EventHandler<CharacteristicUpdatedEventArgs> lockStateCharcteristicChanged = (sender, args) => GetStateValue(tcs, args.Characteristic.Value);
 
-            try
-            {
-                lockStateCharacteristic.ValueUpdated += lockStateCharcteristicChanged;
-            }
-            catch (System.Exception ex)
-            {
-                Log.ForContext<LockItEventBased>().Error("Subscribing to events when closing lock failed.{Exception}", ex);
-                return await Task.FromResult((LockitLockingState?)null);
-            }
-            try
-            {
-                await lockStateCharacteristic.StartUpdatesAsync();
-            }
-            catch (System.Exception ex)
-            {
-                Log.ForContext<LockItEventBased>().Error("Starting update when closing lock failed.{Exception}", ex);
-                return await Task.FromResult((LockitLockingState?)null);
-            }
+			try
+			{
+				lockStateCharacteristic.ValueUpdated += lockStateCharcteristicChanged;
+			}
+			catch (System.Exception ex)
+			{
+				Log.ForContext<LockItEventBased>().Error("Subscribing to events when closing lock failed.{Exception}", ex);
+				return await Task.FromResult((LockitLockingState?)null);
+			}
+			try
+			{
+				await lockStateCharacteristic.StartUpdatesAsync();
+			}
+			catch (System.Exception ex)
+			{
+				Log.ForContext<LockItEventBased>().Error("Starting update when closing lock failed.{Exception}", ex);
+				return await Task.FromResult((LockitLockingState?)null);
+			}
 
-            try
-            {
-                Log.ForContext<LockItEventBased>().Debug($"Request to closed lock. Current state is {lockingState}, counter value {ActivateLockWriteCounter}.");
-                var result = await OpenCloseLock(false); // Close lock
-                if (!result)
-                {
-                    // State did not change. Return previous state.
-                    Log.ForContext<LockItEventBased>().Information($"Closing lock failed.");
-                    return await Task.FromResult(lockingState.Value);
-                }
+			try
+			{
+				Log.ForContext<LockItEventBased>().Debug($"Request to close lock. Current state is {lockingState}, counter value {ActivateLockWriteCounter}.");
+				var result = await OpenCloseLockAsync(false); // Close lock
+				if (!result)
+				{
+					// State did not change. Return previous state.
+					Log.ForContext<LockItEventBased>().Information($"Closing lock failed.");
+					return await Task.FromResult(lockingState.Value);
+				}
 
-                // Wait until event has been received.
-                lockingState = await tcs.Task;
-            }
-            finally
-            {
-                try
-                {
-                    await lockStateCharacteristic.StopUpdatesAsync();
+				// Wait until event has been received.
+				lockingState = await tcs.Task;
+			}
+			finally
+			{
+				try
+				{
+					await lockStateCharacteristic.StopUpdatesAsync();
 
-                    lockStateCharacteristic.ValueUpdated -= lockStateCharcteristicChanged;
-                }
-                catch (System.Exception ex)
-                {
-                    Log.ForContext<LockItEventBased>().Error("Sopping update/ unsubscribing from events when closing lock failed.{Exception}", ex);
-                }
-            }
+					lockStateCharacteristic.ValueUpdated -= lockStateCharcteristicChanged;
+				}
+				catch (System.Exception ex)
+				{
+					Log.ForContext<LockItEventBased>().Error("Sopping update/ unsubscribing from events when closing lock failed.{Exception}", ex);
+				}
+			}
 
-            if (lockingState == null)
-            {
-                return null;
-            }
+			if (lockingState == null)
+			{
+				return null;
+			}
 
-            switch (lockingState.Value)
-            {
-                case LockitLockingState.CouldntCloseBoldBlocked:
-                    // Expected error. ILockIt could not be closed (Spoke blocks lock, ....)
-                    throw new CouldntCloseBoldBlockedException();
+			switch (lockingState.Value)
+			{
+				case LockitLockingState.CouldntCloseBoldBlocked:
+					// Expected error. ILockIt could not be closed (Spoke blocks lock, ....)
+					Log.ForContext<LockItEventBased>().Debug($"Closing lock failed. Bold is blocked.");
+					throw new CouldntCloseBoldBlockedException();
 
-                case LockitLockingState.CouldntCloseMoving:
-                    // Expected error. ILockIt could not be closed (bike is moving)
-                    throw new CouldntCloseMovingException();
+				case LockitLockingState.CouldntCloseMoving:
+					// Expected error. ILockIt could not be closed (bike is moving)
+					Log.ForContext<LockItEventBased>().Debug($"Closing lock failed. Bike is moving.");
+					throw new CouldntCloseMovingException();
 
-                case LockitLockingState.Closed:
-                    return lockingState;
+				case LockitLockingState.Closed:
+					Log.ForContext<LockItEventBased>().Information($"Lock was closed successfully.");
+					return lockingState;
 
-                default:
-                    // Comprises values
-                    // - LockitLockingState.Open 
-                    // - LockitLockingState.Unknown
-                    // - LockitLockingState.CouldntOpenBoldBlocked
-                    // Internal error which sould never occurre. Lock refuses to close but connection is ok.                    
-                    throw new CouldntCloseInconsistentStateExecption(lockingState.Value.GetLockingState());
-            }
-        }
+				default:
+					// Comprises values
+					// - LockitLockingState.Open 
+					// - LockitLockingState.Unknown
+					// - LockitLockingState.CouldntOpenBoldBlocked
+					// Internal error which sould never occurre. Lock refuses to close but connection is ok.                    
+					Log.ForContext<LockItEventBased>().Debug($"Opening lock failed. Unexpected lock state {lockingState.Value.GetLockingState()} detected.");
+					throw new CouldntCloseInconsistentStateExecption(lockingState.Value.GetLockingState());
+			}
+		}
 
-        /// <summary> Gets the locking state from event argument. </summary>
-        Action<TaskCompletionSource<LockitLockingState?>, byte[]> GetStateValue = (tcs, value) =>
-        {
-            try
-            {
-                if (value?.Length <= 0)
-                {
-                    tcs.TrySetResult(null);
-                    return;
-                }
+		/// <summary> Gets the locking state from event argument. </summary>
+		Action<TaskCompletionSource<LockitLockingState?>, byte[]> GetStateValue = (tcs, value) =>
+		{
+			try
+			{
+				if (value?.Length <= 0)
+				{
+					tcs.TrySetResult(null);
+					return;
+				}
 
-                tcs.TrySetResult((LockitLockingState?)value[0]);
-            }
-            catch (System.Exception ex)
-            {
-                Log.ForContext<LockItEventBased>().Error("Error on sinking lock state characteristic on opening/closing .{Exception}", ex);
-                tcs.TrySetResult(null);
-            }
-        };
+				tcs.TrySetResult((LockitLockingState?)value[0]);
+			}
+			catch (System.Exception ex)
+			{
+				Log.ForContext<LockItEventBased>().Error("Error on sinking lock state characteristic on opening/closing .{Exception}", ex);
+				tcs.TrySetResult(null);
+			}
+		};
 
-        /// <summary> Gets the battery state from lock.</summary>
-        Func<byte[], double> GetChargeValue = (value) =>
-        {
-            try
-            {
-                if (value.Length <= 0)
-                {
-                    return double.NaN;
-                }
+		/// <summary> Gets the battery state from lock.</summary>
+		Func<byte[], double> GetChargeValue = (value) =>
+		{
+			try
+			{
+				if (value.Length <= 0)
+				{
+					return double.NaN;
+				}
 
-                return value[0];
-            }
-            catch (System.Exception ex)
-            {
-                Log.ForContext<LockItEventBased>().Error("Error on sinking battery state characteristic on opening.{Exception}", ex);
-                return double.NaN;
-            }
-        };
-    }
+				return value[0];
+			}
+			catch (System.Exception ex)
+			{
+				Log.ForContext<LockItEventBased>().Error("Error on sinking battery state characteristic on opening.{Exception}", ex);
+				return double.NaN;
+			}
+		};
+	}
 }
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItPolling.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItPolling.cs
index d29c07c..a4148ec 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItPolling.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItPolling.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
 using Plugin.BLE.Abstractions.Contracts;
@@ -11,208 +11,218 @@ using Xamarin.Essentials;
 
 namespace TINK.Services.BluetoothLock.BLE
 {
-    public class LockItPolling : LockItBase
-    {
-        public LockItPolling(IDevice device, IAdapter adapter, ICipher cipher) : base(device, adapter, cipher)
-        {
-        }
+	public class LockItPolling : LockItBase
+	{
+		public LockItPolling(IDevice device, IAdapter adapter, ICipher cipher) : base(device, adapter, cipher)
+		{
+		}
 
-        /// <summary> Reconnects to device. </summary>
-        /// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence. </remarks>
-        /// <param name="authInfo">Info required to connect.</param>
-        /// <param name="connectTimeout">Timeout to apply when connecting to bluetooth lock.</param>
-        /// <returns>True if connecting succeeded, false if not.</returns>
-        public override async Task ReconnectAsync(
-            LockInfoAuthTdo authInfo,
-            TimeSpan connectTimeout)
-            => await ReconnectAsync(
-                authInfo,
-                connectTimeout,
-                () => new LockItPolling(Device, Adapter, Cipher));
+		/// <summary> Reconnects to device. </summary>
+		/// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence. </remarks>
+		/// <param name="authInfo">Info required to connect.</param>
+		/// <param name="connectTimeout">Timeout to apply when connecting to bluetooth lock.</param>
+		/// <returns>True if connecting succeeded, false if not.</returns>
+		public override async Task ReconnectAsync(
+			LockInfoAuthTdo authInfo,
+			TimeSpan connectTimeout)
+			=> await ReconnectAsync(
+				authInfo,
+				connectTimeout,
+				() => new LockItPolling(Device, Adapter, Cipher));
 
-        /// <summary> Connects to device. </summary>
-        /// <param name="authInfo">Info required to connect.</param>
-        /// <param name="device">Device with must be connected.</param>
-        /// <returns>True if connecting succeeded, false if not.</returns>
-        public static async Task<LockItBase> Authenticate(
-            IDevice device,
-            LockInfoAuthTdo authInfo,
-            IAdapter adapter,
-            ICipher cipher)
-            => await Authenticate(
-                device,
-                authInfo,
-                adapter,
-                cipher,
-                () => new LockItPolling(device, adapter, cipher));
+		/// <summary> Connects to device. </summary>
+		/// <param name="authInfo">Info required to connect.</param>
+		/// <param name="device">Device with must be connected.</param>
+		/// <returns>True if connecting succeeded, false if not.</returns>
+		public static async Task<LockItBase> Authenticate(
+			IDevice device,
+			LockInfoAuthTdo authInfo,
+			IAdapter adapter,
+			ICipher cipher)
+			=> await Authenticate(
+				device,
+				authInfo,
+				adapter,
+				cipher,
+				() => new LockItPolling(device, adapter, cipher));
 
-        /// <summary> Opens the lock. </summary>
-        public async override Task<LockitLockingState?> OpenAsync()
-        {
-            if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
-            {
-                throw new System.Exception("Can not open lock. Platform must not be unknown and bluetooth code must be run on main thread.");
-            }
+		/// <summary> Opens the lock. </summary>
+		public async override Task<LockitLockingState?> OpenAsync()
+		{
+			if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
+			{
+				throw new System.Exception("Can not open lock. Platform must not be unknown and bluetooth code must be run on main thread.");
+			}
 
-            var info = await GetLockStateAsync();
-            if (info?.State == null)
-            {
-                // Device not reachable.
-                Log.ForContext<LockItPolling>().Information("Can not open lock. Device is not reachable (get state).");
-                return await Task.FromResult((LockitLockingState?)null);
-            }
+			var info = await GetLockStateAsync();
+			if (info?.State == null)
+			{
+				// Device not reachable.
+				Log.ForContext<LockItPolling>().Information("Can not open lock. Device is not reachable (get state).");
+				return await Task.FromResult((LockitLockingState?)null);
+			}
 
-            if (info.State.Value.GetLockingState() == LockingState.Open)
-            {
-                // Lock is already open.
-                Log.ForContext<LockItPolling>().Information("No need to open lock. Lock is already open.");
-                return await Task.FromResult((LockitLockingState?)null);
-            }
+			if (info.State.Value.GetLockingState() == LockingState.Open)
+			{
+				// Lock is already open.
+				Log.ForContext<LockItPolling>().Information("No need to open lock. Lock is already open.");
+				return await Task.FromResult((LockitLockingState?)null);
+			}
 
-            Log.ForContext<LockItPolling>().Debug($"Request to closed lock. Current lockikng state is {info}, counter value {ActivateLockWriteCounter}.");
+			Log.ForContext<LockItPolling>().Debug($"Request to open lock. Current locking state is {info}, counter value {ActivateLockWriteCounter}.");
 
-            var result = await OpenCloseLock(
-                true); // Close lock);
+			var result = await OpenCloseLockAsync(
+				true); // Close lock);
 
-            if (!result)
-            {
-                // State did not change. Return previous state.
-                Log.ForContext<LockItPolling>().Information($"Opening lock failed.");
-                return await Task.FromResult(info.State.Value);
-            }
+			if (!result)
+			{
+				// State did not change. Return previous state.
+				Log.ForContext<LockItPolling>().Information($"Opening lock failed.");
+				return await Task.FromResult(info.State.Value);
+			}
 
-            info = await GetLockStateAsync();
-            if (info?.State == null)
-            {
-                // Device not reachable.
-                Log.ForContext<LockItPolling>().Information($"State after open command unknown. Device is not reachable (get state).");
-                return await Task.FromResult((LockitLockingState?)null);
-            }
+			info = await GetLockStateAsync();
+			if (info?.State == null)
+			{
+				// Device not reachable.
+				Log.ForContext<LockItPolling>().Information($"State after open command unknown. Device is not reachable (get state).");
+				return await Task.FromResult((LockitLockingState?)null);
+			}
 
-            var watch = new Stopwatch();
-            watch.Start();
+			var watch = new Stopwatch();
+			watch.Start();
 
-            while (info?.State != null
-                && info.State.Value != LockitLockingState.CouldntOpenBoldBlocked
-                && info.State.Value != LockitLockingState.Open
-                && watch.Elapsed < TimeSpan.FromMilliseconds(OPEN_CLOSE_TIMEOUT_MS))
-            {
-                info = await GetLockStateAsync(true); // While opening lock seems not always respond to reading operations.
-                Log.ForContext<LockItPolling>().Information($"Current lock state is {info?.State.Value}.");
-            }
+			while (info?.State != null
+				&& info.State.Value != LockitLockingState.CouldntOpenBoldBlocked
+				&& info.State.Value != LockitLockingState.Open
+				&& watch.Elapsed < TimeSpan.FromMilliseconds(OPEN_CLOSE_TIMEOUT_MS))
+			{
+				info = await GetLockStateAsync(true); // While opening lock seems not always respond to reading operations.
+				Log.ForContext<LockItPolling>().Debug($"Waiting for lock to open. Current lock state is {info?.State.Value}.");
+			}
 
-            if (info == null)
-            {
-                return null;
-            }
+			if (info == null)
+			{
+				Log.ForContext<LockItPolling>().Fatal($"Opening lock failed. State object is null.");
+				return null;
+			}
 
-            switch (info.State.Value)
-            {
-                case LockitLockingState.Open:
-                    return info.State.Value;
+			switch (info.State.Value)
+			{
+				case LockitLockingState.Open:
+					Log.ForContext<LockItPolling>().Information($"Lock was opened successfully.");
+					return info.State.Value;
 
-                case LockitLockingState.CouldntOpenBoldBlocked:
-                    // Expected error. ILockIt count not be opened (Spoke blocks lock, ....)
-                    throw new CouldntOpenBoldIsBlockedException();
+				case LockitLockingState.CouldntOpenBoldBlocked:
+					// Expected error. ILockIt count not be opened (Spoke blocks lock, ....)
+					Log.ForContext<LockItPolling>().Debug($"Opening lock failed. Bold is blocked.");
+					throw new CouldntOpenBoldIsBlockedException();
 
-                case LockitLockingState.Unknown:
-                    // Expected error. ILockIt count not be opened (Spoke has blocked/ blocks lock, ....)
-                    throw new CouldntOpenBoldWasBlockedException();
+				case LockitLockingState.Unknown:
+					// Expected error. ILockIt count not be opened (Spoke has blocked/ blocks lock, ....)
+					Log.ForContext<LockItPolling>().Debug($"Opening lock failed. Bold was blocked.");
+					throw new CouldntOpenBoldWasBlockedException();
 
-                default:
-                    // Comprises values
-                    // - LockitLockingState.Closed 
-                    // - LockitLockingState.CouldntCloseMoving (should never happen because command open was send)
-                    // - LockitLockingState.CouldntCloseBoldBlocked (should never happen because command open was send)
-                    // Internal error which sould never occure. Lock refuses to open but connection is ok.
-                    throw new CouldntOpenInconsistentStateExecption(info.State.Value.GetLockingState());
-            }
-        }
+				default:
+					// Comprises values
+					// - LockitLockingState.Closed 
+					// - LockitLockingState.CouldntCloseMoving (should never happen because command open was send)
+					// - LockitLockingState.CouldntCloseBoldBlocked (should never happen because command open was send)
+					// Internal error which sould never occure. Lock refuses to open but connection is ok.
+					Log.ForContext<LockItPolling>().Debug($"Opening lock failed. Unexpected lock state {info.State.Value.GetLockingState()} detected.");
+					throw new CouldntOpenInconsistentStateExecption(info.State.Value.GetLockingState());
+			}
+		}
 
-        /// <summary> Close the lock.</summary>
-        /// <returns>Locking state.</returns>
-        public async override Task<LockitLockingState?> CloseAsync()
-        {
-            if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
-            {
-                throw new System.Exception("Can not close lock. Platform must not be unknown and bluetooth code must be run on main thread.");
-            }
+		/// <summary> Close the lock.</summary>
+		/// <returns>Locking state.</returns>
+		public async override Task<LockitLockingState?> CloseAsync()
+		{
+			if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
+			{
+				throw new System.Exception("Can not close lock. Platform must not be unknown and bluetooth code must be run on main thread.");
+			}
 
-            // Get current state
-            var info = await GetLockStateAsync();
-            if (info?.State == null)
-            {
-                // Device not reachable.
-                Log.ForContext<LockItPolling>().Error("Can not close lock. Device is not reachable (get state).");
-                return await Task.FromResult((LockitLockingState?)null);
-            }
+			// Get current state
+			var info = await GetLockStateAsync();
+			if (info?.State == null)
+			{
+				// Device not reachable.
+				Log.ForContext<LockItPolling>().Error("Can not close lock. Device is not reachable (get state).");
+				return await Task.FromResult((LockitLockingState?)null);
+			}
 
-            if (info.State.Value.GetLockingState() == LockingState.Closed)
-            {
-                // Lock is already closed.
-                Log.ForContext<LockItPolling>().Error("No need to close lock. Lock is already closed.");
-                return await Task.FromResult(info.State.Value);
-            }
+			if (info.State.Value.GetLockingState() == LockingState.Closed)
+			{
+				// Lock is already closed.
+				Log.ForContext<LockItPolling>().Error("No need to close lock. Lock is already closed.");
+				return await Task.FromResult(info.State.Value);
+			}
 
-            Log.ForContext<LockItPolling>().Debug($"Request to closed lock. Current state is {info}, counter value {ActivateLockWriteCounter}.");
+			Log.ForContext<LockItPolling>().Debug($"Request to close lock. Current locking state is {info}, counter value {ActivateLockWriteCounter}.");
 
-            var result = await OpenCloseLock(false); // Close lock
-            if (!result)
-            {
-                // State did not change. Return previous state.
-                Log.ForContext<LockItPolling>().Information($"Closing lock failed.");
-                return await Task.FromResult(info.State.Value);
-            }
+			var result = await OpenCloseLockAsync(false); // Close lock
+			if (!result)
+			{
+				// State did not change. Return previous state.
+				Log.ForContext<LockItPolling>().Information($"Closing lock failed.");
+				return await Task.FromResult(info.State.Value);
+			}
 
-            // Get lock state until either lock state chaneges or until log gets unreachable.
-            info = await GetLockStateAsync();
-            if (info?.State == null)
-            {
-                // Device not reachable.
-                Log.ForContext<LockItPolling>().Information($"Lock state after close command unknown.");
-                return await Task.FromResult((LockitLockingState?)null);
-            }
+			// Get lock state until either lock state chaneges or until log gets unreachable.
+			info = await GetLockStateAsync();
+			if (info?.State == null)
+			{
+				// Device not reachable.
+				Log.ForContext<LockItPolling>().Information($"Lock state after close command unknown.");
+				return await Task.FromResult((LockitLockingState?)null);
+			}
 
-            var watch = new Stopwatch();
-            watch.Start();
+			var watch = new Stopwatch();
+			watch.Start();
 
-            while (info.State != null
-                && info.State.Value != LockitLockingState.CouldntCloseBoldBlocked
-                && info.State.Value != LockitLockingState.CouldntCloseMoving
-                && info.State.Value != LockitLockingState.Closed
-                && watch.Elapsed < TimeSpan.FromMilliseconds(OPEN_CLOSE_TIMEOUT_MS))
-            {
-                info = await GetLockStateAsync(true); ; // While closing lock seems not always respond to reading operations.
-                Log.ForContext<LockItPolling>().Information($"Current lock state is {info?.State.Value}.");
-            }
+			while (info.State != null
+				&& info.State.Value != LockitLockingState.CouldntCloseBoldBlocked
+				&& info.State.Value != LockitLockingState.CouldntCloseMoving
+				&& info.State.Value != LockitLockingState.Closed
+				&& watch.Elapsed < TimeSpan.FromMilliseconds(OPEN_CLOSE_TIMEOUT_MS))
+			{
+				info = await GetLockStateAsync(true); ; // While closing lock seems not always respond to reading operations.
+				Log.ForContext<LockItPolling>().Debug($"Waiting for lock to close. Current lock state is {info?.State.Value}.");
+			}
 
-            if (info == null)
-            {
-                return null;
-            }
+			if (info == null)
+			{
+				Log.ForContext<LockItPolling>().Fatal($"Closing lock failed. State object is null.");
+				return null;
+			}
 
-            switch (info.State.Value)
-            {
-                case LockitLockingState.CouldntCloseBoldBlocked:
-                    // Expected error. ILockIt could not be closed (Spoke blocks lock, ....)
-                    throw new CouldntCloseBoldBlockedException();
+			switch (info.State.Value)
+			{
+				case LockitLockingState.CouldntCloseBoldBlocked:
+					// Expected error. ILockIt could not be closed (Spoke blocks lock, ....)
+					Log.ForContext<LockItPolling>().Debug($"Closing lock failed. Bold is blocked.");
+					throw new CouldntCloseBoldBlockedException();
 
-                case LockitLockingState.CouldntCloseMoving:
-                    // Expected error. ILockIt could not be closed (bike is moving)
-                    throw new CouldntCloseMovingException();
+				case LockitLockingState.CouldntCloseMoving:
+					// Expected error. ILockIt could not be closed (bike is moving)
+					Log.ForContext<LockItPolling>().Debug($"Closing lock failed. Bike is moving.");
+					throw new CouldntCloseMovingException();
 
-                case LockitLockingState.Closed:
-                    // Everything is ok.
-                    return info.State.Value;
+				case LockitLockingState.Closed:
+					// Everything is ok.
+					Log.ForContext<LockItPolling>().Information($"Lock was closed successfully.");
+					return info.State.Value;
 
-                default:
-                    // Comprises values
-                    // - LockitLockingState.Open 
-                    // - LockitLockingState.Unknown
-                    // - LockitLockingState.CouldntOpenBoldBlocked
-                    // Internal error which sould never occurre. Lock refuses to close but connection is ok.                    
-                    throw new CouldntCloseInconsistentStateExecption(info.State.Value.GetLockingState());
-            }
-        }
-    }
+				default:
+					// Comprises values
+					// - LockitLockingState.Open 
+					// - LockitLockingState.Unknown
+					// - LockitLockingState.CouldntOpenBoldBlocked
+					// Internal error which sould never occurre. Lock refuses to close but connection is ok.
+					Log.ForContext<LockItPolling>().Debug($"Closing lock failed. Unexpected lock state {info.State.Value.GetLockingState()} detected.");
+					throw new CouldntCloseInconsistentStateExecption(info.State.Value.GetLockingState());
+			}
+		}
+	}
 }
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItServiceBase.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItServiceBase.cs
index e0875d5..746d9cb 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItServiceBase.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItServiceBase.cs
@@ -11,172 +11,172 @@ using Xamarin.Essentials;
 
 namespace TINK.Services.BluetoothLock.BLE
 {
-    public abstract class LockItServiceBase
-    {
-        /// <summary>Constructs base object.</summary>
-        /// <param name="cipher">Encrpyting/ decrypting object.</param>        /// <param name="connectTimeout">Timeout to apply when connecting to bluetooth lock.</param>
-        public LockItServiceBase(ICipher cipher)
-        {
-            Cipher = cipher;
-        }
+	public abstract class LockItServiceBase
+	{
+		/// <summary>Constructs base object.</summary>
+		/// <param name="cipher">Encrpyting/ decrypting object.</param>        /// <param name="connectTimeout">Timeout to apply when connecting to bluetooth lock.</param>
+		public LockItServiceBase(ICipher cipher)
+		{
+			Cipher = cipher;
+		}
 
-        /// <summary> Holds timeout values for series of connecting attemps to a lock or multiple locks. </summary>
-        public ITimeOutProvider TimeOut { get; set; }
+		/// <summary> Holds timeout values for series of connecting attemps to a lock or multiple locks. </summary>
+		public ITimeOutProvider TimeOut { get; set; }
 
-        protected ICipher Cipher { get; }
+		protected ICipher Cipher { get; }
 
-        /// <summary> List of available or connected bluetooth devices. </summary>
-        protected List<ILockService> DeviceList = new List<ILockService>();
+		/// <summary> List of available or connected bluetooth devices. </summary>
+		protected List<ILockService> DeviceList = new List<ILockService>();
 
 
-        /// <summary> Reconnect locks of interest if required. </summary>
-        /// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence for each lock to be reconnected. </remarks>
-        /// <param name="locksInfo">Locks to reconnect.</param>
-        /// <param name="connectTimeout">Timeout for connect operation.</param>
-        public static async Task CheckReconnect(
-            IEnumerable<ILockService> deviceList,
-            IEnumerable<LockInfoAuthTdo> locksInfo,
-            TimeSpan connectTimeout)
-        {
-            // Get list of target locks without invalid entries.
-            var validLocksInfo = locksInfo
-                .Where(x => x.IsIdValid || x.IsGuidValid)
-                .Where(x => x.K_seed.Length > 0 && x.K_u.Length > 0)
-                .ToList();
+		/// <summary> Reconnect locks of interest if required. </summary>
+		/// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence for each lock to be reconnected. </remarks>
+		/// <param name="locksInfo">Locks to reconnect.</param>
+		/// <param name="connectTimeout">Timeout for connect operation.</param>
+		public static async Task CheckReconnect(
+			IEnumerable<ILockService> deviceList,
+			IEnumerable<LockInfoAuthTdo> locksInfo,
+			TimeSpan connectTimeout)
+		{
+			// Get list of target locks without invalid entries.
+			var validLocksInfo = locksInfo
+				.Where(x => x.IsIdValid || x.IsGuidValid)
+				.Where(x => x.K_seed.Length > 0 && x.K_u.Length > 0)
+				.ToList();
 
-            foreach (var device in deviceList)
-            {
-                if (device.GetDeviceState() == DeviceState.Connected)
-                {
-                    // No need to reconnect device because device is already connected.
-                    continue;
-                }
+			foreach (var device in deviceList)
+			{
+				if (device.GetDeviceState() == DeviceState.Connected)
+				{
+					// No need to reconnect device because device is already connected.
+					continue;
+				}
 
-                var lockInfo = validLocksInfo.FirstOrDefault(x => x.Id == device.Name.GetBluetoothLockId() || x.Guid == device.Guid);
+				var lockInfo = validLocksInfo.FirstOrDefault(x => x.Id == device.Name.GetBluetoothLockId() || x.Guid == device.Guid);
 
-                if (lockInfo == null)
-                {
-                    // Current lock from deviceList is not of interest detected, no need to reconnect.
-                    continue;
-                }
+				if (lockInfo == null)
+				{
+					// Current lock from deviceList is not of interest detected, no need to reconnect.
+					continue;
+				}
 
-                try
-                {
-                    await device.ReconnectAsync(lockInfo, connectTimeout);
-                }
-                catch (System.Exception exception)
-                {
-                    // Member is called for background update of missing devices. 
-                    // Do not display any error messages.
-                    Log.ForContext<LockItServiceBase>().Error($"Reconnect failed. {exception.Message}");
-                    continue;
-                }
-            }
-        }
+				try
+				{
+					await device.ReconnectAsync(lockInfo, connectTimeout);
+				}
+				catch (System.Exception exception)
+				{
+					// Member is called for background update of missing devices. 
+					// Do not display any error messages.
+					Log.ForContext<LockItServiceBase>().Error($"Reconnect failed. {exception.Message}");
+					continue;
+				}
+			}
+		}
 
-        /// <summary> Gets the state for locks of interest.</summary>
-        /// <remarks>
-        /// Might require a
-        /// - connect to lock 
-        /// - reconnect to lock
-        /// </remarks>
-        /// <param name="locksInfo">Locks toget info for.</param>
-        /// <param name="connectTimeout">Timeout for connect operation of a single lock.</param>
-        public async Task<IEnumerable<LockInfoTdo>> GetLocksStateAsync(
-            IEnumerable<LockInfoAuthTdo> locksInfo,
-            TimeSpan connectTimeout)
-        {
-            if (locksInfo.Count() == 0)
-            {
-                // Nothing to do.
-                return new List<LockInfoTdo>();
-            }
+		/// <summary> Gets the state for locks of interest.</summary>
+		/// <remarks>
+		/// Might require a
+		/// - connect to lock 
+		/// - reconnect to lock
+		/// </remarks>
+		/// <param name="locksInfo">Locks toget info for.</param>
+		/// <param name="connectTimeout">Timeout for connect operation of a single lock.</param>
+		public async Task<IEnumerable<LockInfoTdo>> GetLocksStateAsync(
+			IEnumerable<LockInfoAuthTdo> locksInfo,
+			TimeSpan connectTimeout)
+		{
+			if (locksInfo.Count() == 0)
+			{
+				// Nothing to do.
+				return new List<LockInfoTdo>();
+			}
 
-            // Reconnect locks.
-            await CheckReconnect(DeviceList, locksInfo, connectTimeout);
+			// Reconnect locks.
+			await CheckReconnect(DeviceList, locksInfo, connectTimeout);
 
-            // Connect to locks which were not yet discovered.
-            DeviceList.AddRange(await CheckConnectMissing(locksInfo, connectTimeout));
+			// Connect to locks which were not yet discovered.
+			DeviceList.AddRange(await CheckConnectMissing(locksInfo, connectTimeout));
 
-            // Get devices for which to update state.            
-            var locksInfoState = new List<LockInfoTdo>();
+			// Get devices for which to update state.            
+			var locksInfoState = new List<LockInfoTdo>();
 
-            foreach (var device in DeviceList)
-            {
-                var lockInfoAuth = locksInfo.FirstOrDefault(x => x.Guid == device.Guid || x.Id == device.Id);
-                if (lockInfoAuth == null)
-                {
-                    // Device is not of interest.
-                    continue;
-                }
+			foreach (var device in DeviceList)
+			{
+				var lockInfoAuth = locksInfo.FirstOrDefault(x => x.Guid == device.Guid || x.Id == device.Id);
+				if (lockInfoAuth == null)
+				{
+					// Device is not of interest.
+					continue;
+				}
 
-                var state = await device.GetLockStateAsync();
-                locksInfoState.Add(new LockInfoTdo.Builder
-                {
-                    Id = lockInfoAuth.Id,
-                    Guid = lockInfoAuth.IsGuidValid ? lockInfoAuth.Guid : device.Guid,
-                    State = state?.State
-                }.Build());
-            }
+				var state = await device.GetLockStateAsync();
+				locksInfoState.Add(new LockInfoTdo.Builder
+				{
+					Id = lockInfoAuth.Id,
+					Guid = lockInfoAuth.IsGuidValid ? lockInfoAuth.Guid : device.Guid,
+					State = state?.State
+				}.Build());
+			}
 
-            return locksInfoState;
-        }
+			return locksInfoState;
+		}
 
-        /// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence. </remarks>
-        /// <param name="locksInfo">Locks to reconnect.</param>
-        /// <param name="connectTimeout">Timeout for connect operation of a single lock.</param>
-        protected abstract Task<IEnumerable<ILockService>> CheckConnectMissing(
-            IEnumerable<LockInfoAuthTdo> locksInfo,
-            TimeSpan connectTimeout);
+		/// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence. </remarks>
+		/// <param name="locksInfo">Locks to reconnect.</param>
+		/// <param name="connectTimeout">Timeout for connect operation of a single lock.</param>
+		protected abstract Task<IEnumerable<ILockService>> CheckConnectMissing(
+			IEnumerable<LockInfoAuthTdo> locksInfo,
+			TimeSpan connectTimeout);
 
-        /// <summary>Gets a lock by bike Id.</summary>
-        /// <param name="bikeId"></param>
-        /// <returns>Lock object</returns>
-        public ILockService this[int bikeId]
-        {
-            get
-            {
-                var device = DeviceList.FirstOrDefault(x => x.Name.GetBluetoothLockId() == bikeId);
-                if (device == null)
-                {
-                    return new NullLock(bikeId);
-                }
+		/// <summary>Gets a lock by bike Id.</summary>
+		/// <param name="bikeId"></param>
+		/// <returns>Lock object</returns>
+		public ILockService this[int bikeId]
+		{
+			get
+			{
+				var device = DeviceList.FirstOrDefault(x => x.Name.GetBluetoothLockId() == bikeId);
+				if (device == null)
+				{
+					return new NullLock(bikeId);
+				}
 
-                return device;
-            }
-        }
+				return device;
+			}
+		}
 
-        /// <summary> Connects to lock.</summary>
-        /// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence. </remarks>
-        /// <param name="authInfo"> Info required to connect to lock.</param>
-        /// <param name="connectTimeout">Timeout for connect operation.</param>
-        public async Task<LockingState> DisconnectAsync(int bikeId, Guid bikeGuid)
-        {
-            if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
-            {
-                throw new System.Exception("Can not disconnect from lock. Platform must not be unknown and bluetooth code must be run on main thread.");
-            }
+		/// <summary> Connects to lock.</summary>
+		/// <remarks> Consists of a bluetooth connect plus invocation of an authentication sequence. </remarks>
+		/// <param name="authInfo"> Info required to connect to lock.</param>
+		/// <param name="connectTimeout">Timeout for connect operation.</param>
+		public async Task<LockingState> DisconnectAsync(int bikeId, Guid bikeGuid)
+		{
+			if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
+			{
+				throw new System.Exception("Can not disconnect from lock. Platform must not be unknown and bluetooth code must be run on main thread.");
+			}
 
-            Log.ForContext<LockItByScanServiceBase>().Debug($"Request to disconnect from device {bikeId}/ {bikeGuid}.");
+			Log.ForContext<LockItByScanServiceBase>().Debug($"Request to disconnect from device {bikeId}/ {bikeGuid}.");
 
-            var lockIt = DeviceList.FirstOrDefault(x => x.Name.GetBluetoothLockId() == bikeId || x.Guid == bikeGuid);
+			var lockIt = DeviceList.FirstOrDefault(x => x.Name.GetBluetoothLockId() == bikeId || x.Guid == bikeGuid);
 
-            if (lockIt == null)
-            {
-                // Nothing to do
-                return LockingState.UnknownDisconnected;
-            }
+			if (lockIt == null)
+			{
+				// Nothing to do
+				return LockingState.UnknownDisconnected;
+			}
 
-            DeviceList.Remove(lockIt);
+			DeviceList.Remove(lockIt);
 
-            if (lockIt.GetDeviceState() == DeviceState.Disconnected)
-            {
-                // Nothing to do
-                return LockingState.UnknownDisconnected;
-            }
+			if (lockIt.GetDeviceState() == DeviceState.Disconnected)
+			{
+				// Nothing to do
+				return LockingState.UnknownDisconnected;
+			}
 
-            await lockIt.Disconnect();
-            return LockingState.UnknownDisconnected;
-        }
-    }
+			await lockIt.Disconnect();
+			return LockingState.UnknownDisconnected;
+		}
+	}
 }
\ No newline at end of file
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItServiceHelper.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItServiceHelper.cs
index 656df42..3e44ff9 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItServiceHelper.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItServiceHelper.cs
@@ -2,8 +2,8 @@
 
 namespace TINK.Services.BluetoothLock.BLE
 {
-    public static class LockItServiceHelper
-    {
-        public static string Name { get => TextToLockItTypeHelper.ISHAREITADVERTISMENTTITLE; }
-    }
+	public static class LockItServiceHelper
+	{
+		public static string Name { get => TextToLockItTypeHelper.ISHAREITADVERTISMENTTITLE; }
+	}
 }
diff --git a/LockItBLE/Services/BluetoothLock/BLE/PluginBleHelper.cs b/LockItBLE/Services/BluetoothLock/BLE/PluginBleHelper.cs
index b2ae6d9..18e2967 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/PluginBleHelper.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/PluginBleHelper.cs
@@ -2,34 +2,34 @@
 
 namespace TINK.Services.BluetoothLock.BLE
 {
-    public static class PluginBleHelper
-    {
-        /// <summary>
-        /// Maps Plugin.BLE device state to LockItShared device state.
-        /// </summary>
-        /// <param name="state">State to convert</param>
-        /// <returns></returns>
-        /// <exception cref="ArgumentException">Unexpected state detected.</exception>
-        public static DeviceState GetDeviceState(this Plugin.BLE.Abstractions.DeviceState state)
-        {
-            switch (state)
-            {
-                case Plugin.BLE.Abstractions.DeviceState.Disconnected:
-                    return DeviceState.Disconnected;
+	public static class PluginBleHelper
+	{
+		/// <summary>
+		/// Maps Plugin.BLE device state to LockItShared device state.
+		/// </summary>
+		/// <param name="state">State to convert</param>
+		/// <returns></returns>
+		/// <exception cref="ArgumentException">Unexpected state detected.</exception>
+		public static DeviceState GetDeviceState(this Plugin.BLE.Abstractions.DeviceState state)
+		{
+			switch (state)
+			{
+				case Plugin.BLE.Abstractions.DeviceState.Disconnected:
+					return DeviceState.Disconnected;
 
-                case Plugin.BLE.Abstractions.DeviceState.Connecting:
-                    return DeviceState.Connecting;
+				case Plugin.BLE.Abstractions.DeviceState.Connecting:
+					return DeviceState.Connecting;
 
-                case Plugin.BLE.Abstractions.DeviceState.Connected:
-                    return DeviceState.Connected;
+				case Plugin.BLE.Abstractions.DeviceState.Connected:
+					return DeviceState.Connected;
 
-                case Plugin.BLE.Abstractions.DeviceState.Limited:
-                    return DeviceState.Limited;
+				case Plugin.BLE.Abstractions.DeviceState.Limited:
+					return DeviceState.Limited;
 
-                default:
-                    throw new ArgumentException($"Can not convert state Plugin.BLE-{state}.");
-            }
-        }
+				default:
+					throw new ArgumentException($"Can not convert state Plugin.BLE-{state}.");
+			}
+		}
 
-    }
+	}
 }
diff --git a/LockItBLE/Services/BluetoothLock/StateChecker.cs b/LockItBLE/Services/BluetoothLock/StateChecker.cs
index a5e34e8..5dd4c95 100644
--- a/LockItBLE/Services/BluetoothLock/StateChecker.cs
+++ b/LockItBLE/Services/BluetoothLock/StateChecker.cs
@@ -4,38 +4,38 @@ using Plugin.BLE.Abstractions.Contracts;
 
 namespace TINK.Services.BluetoothLock
 {
-    public static class StateChecker
-    {
-        /// <summary>
-        /// Get current bluetooth state
-        /// </summary>
-        /// <remarks>See https://github.com/xabre/xamarin-bluetooth-le/issues/112#issuecomment-380994887.</remarks>
-        /// <param name="ble">Crossplatform bluetooth implementation object</param>
-        /// <returns>BluetoothState</returns>
-        public static Task<BluetoothState> GetBluetoothState(this IBluetoothLE ble)
-        {
-            var tcs = new TaskCompletionSource<BluetoothState>();
+	public static class StateChecker
+	{
+		/// <summary>
+		/// Get current bluetooth state
+		/// </summary>
+		/// <remarks>See https://github.com/xabre/xamarin-bluetooth-le/issues/112#issuecomment-380994887.</remarks>
+		/// <param name="ble">Crossplatform bluetooth implementation object</param>
+		/// <returns>BluetoothState</returns>
+		public static Task<BluetoothState> GetBluetoothState(this IBluetoothLE ble)
+		{
+			var tcs = new TaskCompletionSource<BluetoothState>();
 
-            if (ble.State != BluetoothState.Unknown)
-            {
-                // If we can detect state out of box just returning in
-                tcs.SetResult(ble.State);
-            }
-            else
-            {
-                // Otherwise let's setup dynamic event handler and wait for first state update
-                EventHandler<Plugin.BLE.Abstractions.EventArgs.BluetoothStateChangedArgs> handler = null;
-                handler = (o, e) =>
-                {
-                    ble.StateChanged -= handler;
-                    // and return it as our state
-                    // we can have an 'Unknown' check here, but in normal situation it should never occur
-                    tcs.SetResult(e.NewState);
-                };
-                ble.StateChanged += handler;
-            }
+			if (ble.State != BluetoothState.Unknown)
+			{
+				// If we can detect state out of box just returning in
+				tcs.SetResult(ble.State);
+			}
+			else
+			{
+				// Otherwise let's setup dynamic event handler and wait for first state update
+				EventHandler<Plugin.BLE.Abstractions.EventArgs.BluetoothStateChangedArgs> handler = null;
+				handler = (o, e) =>
+				{
+					ble.StateChanged -= handler;
+					// and return it as our state
+					// we can have an 'Unknown' check here, but in normal situation it should never occur
+					tcs.SetResult(e.NewState);
+				};
+				ble.StateChanged += handler;
+			}
 
-            return tcs.Task;
-        }
-    }
+			return tcs.Task;
+		}
+	}
 }
diff --git a/LockItShared/Model/Bikes/Bike/BluetoothLock/ILockInfo.cs b/LockItShared/Model/Bikes/Bike/BluetoothLock/ILockInfo.cs
index 8dd80c3..5eca3ca 100644
--- a/LockItShared/Model/Bikes/Bike/BluetoothLock/ILockInfo.cs
+++ b/LockItShared/Model/Bikes/Bike/BluetoothLock/ILockInfo.cs
@@ -1,11 +1,11 @@
 namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 {
-    public interface ILockInfo
-    {
-        /// <summary> Identification number of bluetooth lock.</summary>
-        int Id { get; }
+	public interface ILockInfo
+	{
+		/// <summary> Identification number of bluetooth lock.</summary>
+		int Id { get; }
 
-        /// <summary> Gets the user key.</summary>
-        byte[] UserKey { get; }
-    }
+		/// <summary> Gets the user key.</summary>
+		byte[] UserKey { get; }
+	}
 }
diff --git a/LockItShared/Model/Bikes/Bike/BluetoothLock/LockInfo.cs b/LockItShared/Model/Bikes/Bike/BluetoothLock/LockInfo.cs
index 29ba27c..8f659ba 100644
--- a/LockItShared/Model/Bikes/Bike/BluetoothLock/LockInfo.cs
+++ b/LockItShared/Model/Bikes/Bike/BluetoothLock/LockInfo.cs
@@ -5,128 +5,128 @@ using TINK.Model.Connector;
 
 namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 {
-    /// <summary> Locking states. </summary>
-    public enum LockingState
-    {
-        /// <summary> App is not connected to lock.</summary>
-        UnknownDisconnected,
+	/// <summary> Locking states. </summary>
+	public enum LockingState
+	{
+		/// <summary> App is not connected to lock.</summary>
+		UnknownDisconnected,
 
-        /// <summary> Lock might be open, closed or something in between.</summary>
-        /// <remarks> 
-        /// Under certain circumstances lock reports/ is known to be in this state (genuine ILOCKIT locking state LockitLockingState.Unknown).
-        /// Example: If bold is blocked it might happen that opening or closing lock leads to state unknown, i.e.  might be open, closed or inbetween.
-        /// </remarks>
-        UnknownFromHardwareError,
+		/// <summary> Lock might be open, closed or something in between.</summary>
+		/// <remarks> 
+		/// Under certain circumstances lock reports/ is known to be in this state (genuine ILOCKIT locking state LockitLockingState.Unknown).
+		/// Example: If bold is blocked it might happen that opening or closing lock leads to state unknown, i.e.  might be open, closed or inbetween.
+		/// </remarks>
+		UnknownFromHardwareError,
 
-        /// <summary> Lock is closed. </summary>
-        Closed,
+		/// <summary> Lock is closed. </summary>
+		Closed,
 
-        /// <summary> Lock is open. </summary>
-        Open
-    }
+		/// <summary> Lock is open. </summary>
+		Open
+	}
 
-    [DataContract]
-    public class LockInfo : ILockInfo, IEquatable<LockInfo>
-    {
-        /// <summary> Identification number of bluetooth lock, 6-digits, second part of advertisement name.</summary>
-        [DataMember]
-        public int Id { get; private set; } = TextToLockItTypeHelper.INVALIDLOCKID;
+	[DataContract]
+	public class LockInfo : ILockInfo, IEquatable<LockInfo>
+	{
+		/// <summary> Identification number of bluetooth lock, 6-digits, second part of advertisement name.</summary>
+		[DataMember]
+		public int Id { get; private set; } = TextToLockItTypeHelper.INVALIDLOCKID;
 
-        /// <summary> Identification GUID of bluetooth lock.</summary>
-        [DataMember]
-        public Guid Guid { get; private set; } = TextToLockItTypeHelper.INVALIDLOCKGUID;
+		/// <summary> Identification GUID of bluetooth lock.</summary>
+		[DataMember]
+		public Guid Guid { get; private set; } = TextToLockItTypeHelper.INVALIDLOCKGUID;
 
-        [DataMember]
-        public byte[] UserKey { get; private set; }
+		[DataMember]
+		public byte[] UserKey { get; private set; }
 
-        [DataMember]
-        public byte[] AdminKey { get; private set; }
+		[DataMember]
+		public byte[] AdminKey { get; private set; }
 
-        [DataMember]
-        public byte[] Seed { get; private set; }
+		[DataMember]
+		public byte[] Seed { get; private set; }
 
-        /// <summary> Locking state of bluetooth lock. </summary>
-        [DataMember]
-        public LockingState State { get; private set; } = LockingState.UnknownDisconnected;
+		/// <summary> Locking state of bluetooth lock. </summary>
+		[DataMember]
+		public LockingState State { get; private set; } = LockingState.UnknownDisconnected;
 
-        public bool IsIdValid => Id != TextToLockItTypeHelper.INVALIDLOCKID;
+		public bool IsIdValid => Id != TextToLockItTypeHelper.INVALIDLOCKID;
 
-        public bool IsGuidValid => Guid != TextToLockItTypeHelper.INVALIDLOCKGUID;
+		public bool IsGuidValid => Guid != TextToLockItTypeHelper.INVALIDLOCKGUID;
 
-        public override bool Equals(object obj) => this.Equals(obj as LockInfo);
+		public override bool Equals(object obj) => this.Equals(obj as LockInfo);
 
-        public bool Equals(LockInfo other)
-        {
-            if (Object.ReferenceEquals(other, null)) return false;
-            if (Object.ReferenceEquals(this, other)) return true;
-            if (this.GetType() != other.GetType()) return false;
+		public bool Equals(LockInfo other)
+		{
+			if (Object.ReferenceEquals(other, null)) return false;
+			if (Object.ReferenceEquals(this, other)) return true;
+			if (this.GetType() != other.GetType()) return false;
 
-            return ToString() == other.ToString();
-        }
+			return ToString() == other.ToString();
+		}
 
-        public override int GetHashCode()
-        {
-            return ToString().GetHashCode();
-        }
+		public override int GetHashCode()
+		{
+			return ToString().GetHashCode();
+		}
 
-        public override string ToString()
-        {
-            return JsonConvert.SerializeObject(this);
-        }
+		public override string ToString()
+		{
+			return JsonConvert.SerializeObject(this);
+		}
 
-        public static bool operator ==(LockInfo lhs, LockInfo rhs)
-        {
-            if (Object.ReferenceEquals(lhs, null))
-                return Object.ReferenceEquals(rhs, null) ? true /*null == null = true*/: false;
+		public static bool operator ==(LockInfo lhs, LockInfo rhs)
+		{
+			if (Object.ReferenceEquals(lhs, null))
+				return Object.ReferenceEquals(rhs, null) ? true /*null == null = true*/: false;
 
-            return lhs.Equals(rhs);
-        }
+			return lhs.Equals(rhs);
+		}
 
-        public static bool operator !=(LockInfo lhs, LockInfo rhs)
-        {
-            return !(lhs == rhs);
-        }
+		public static bool operator !=(LockInfo lhs, LockInfo rhs)
+		{
+			return !(lhs == rhs);
+		}
 
-        public class Builder
-        {
-            public Builder(LockInfo lockInfo = null)
-            {
-                if (lockInfo == null)
-                {
-                    return;
-                }
+		public class Builder
+		{
+			public Builder(LockInfo lockInfo = null)
+			{
+				if (lockInfo == null)
+				{
+					return;
+				}
 
-                LockInfo = JsonConvert.DeserializeObject<LockInfo>(JsonConvert.SerializeObject(lockInfo));
-            }
+				LockInfo = JsonConvert.DeserializeObject<LockInfo>(JsonConvert.SerializeObject(lockInfo));
+			}
 
-            private readonly LockInfo LockInfo = new LockInfo();
+			private readonly LockInfo LockInfo = new LockInfo();
 
-            public byte[] UserKey { get => LockInfo.UserKey; set => LockInfo.UserKey = value; }
+			public byte[] UserKey { get => LockInfo.UserKey; set => LockInfo.UserKey = value; }
 
-            public byte[] AdminKey { get => LockInfo.AdminKey; set => LockInfo.AdminKey = value; }
+			public byte[] AdminKey { get => LockInfo.AdminKey; set => LockInfo.AdminKey = value; }
 
-            public byte[] Seed { get => LockInfo.Seed; set => LockInfo.Seed = value; }
+			public byte[] Seed { get => LockInfo.Seed; set => LockInfo.Seed = value; }
 
-            public int Id { get => LockInfo.Id; set => LockInfo.Id = value; }
+			public int Id { get => LockInfo.Id; set => LockInfo.Id = value; }
 
-            public Guid Guid { get => LockInfo.Guid; set => LockInfo.Guid = value; }
+			public Guid Guid { get => LockInfo.Guid; set => LockInfo.Guid = value; }
 
-            public LockingState State { get => LockInfo.State; set => LockInfo.State = value; }
+			public LockingState State { get => LockInfo.State; set => LockInfo.State = value; }
 
-            public LockInfo Build()
-            {
-                // Ensure consistency.
-                if ((UserKey?.Length > 0 || Seed?.Length > 0)
-                    && (UserKey?.Length == 0 || Seed?.Length == 0 || !LockInfo.IsIdValid))
-                    throw new ArgumentException($"Can not build {typeof(LockInfo).Name}. Lock parameters must either be all know or all unknown.");
+			public LockInfo Build()
+			{
+				// Ensure consistency.
+				if ((UserKey?.Length > 0 || Seed?.Length > 0)
+					&& (UserKey?.Length == 0 || Seed?.Length == 0 || !LockInfo.IsIdValid))
+					throw new ArgumentException($"Can not build {typeof(LockInfo).Name}. Lock parameters must either be all know or all unknown.");
 
-                if (UserKey == null) UserKey = new byte[0];
-                if (AdminKey == null) AdminKey = new byte[0];
-                if (Seed == null) Seed = new byte[0];
+				if (UserKey == null) UserKey = new byte[0];
+				if (AdminKey == null) AdminKey = new byte[0];
+				if (Seed == null) Seed = new byte[0];
 
-                return LockInfo;
-            }
-        }
+				return LockInfo;
+			}
+		}
 
-    }
+	}
 }
diff --git a/LockItShared/Model/Bikes/Bike/CopriLock/ILockInfo.cs b/LockItShared/Model/Bikes/Bike/CopriLock/ILockInfo.cs
index f99b424..57df710 100644
--- a/LockItShared/Model/Bikes/Bike/CopriLock/ILockInfo.cs
+++ b/LockItShared/Model/Bikes/Bike/CopriLock/ILockInfo.cs
@@ -1,8 +1,8 @@
 namespace TINK.Model.Bikes.BikeInfoNS.CopriLock
 {
-    public interface ILockInfo
-    {
-        /// <summary> Locking state of backend lock. </summary>
-        LockingState State { get; }
-    }
+	public interface ILockInfo
+	{
+		/// <summary> Locking state of backend lock. </summary>
+		LockingState State { get; }
+	}
 }
diff --git a/LockItShared/Model/Bikes/Bike/CopriLock/LockInfo.cs b/LockItShared/Model/Bikes/Bike/CopriLock/LockInfo.cs
index 8926857..8e3b02d 100644
--- a/LockItShared/Model/Bikes/Bike/CopriLock/LockInfo.cs
+++ b/LockItShared/Model/Bikes/Bike/CopriLock/LockInfo.cs
@@ -4,85 +4,85 @@ using Newtonsoft.Json;
 
 namespace TINK.Model.Bikes.BikeInfoNS.CopriLock
 {
-    /// <summary> Locking states. </summary>
-    public enum LockingState
-    {
-        /// <summary> App is not connected to lock.</summary>
-        UnknownDisconnected,
+	/// <summary> Locking states. </summary>
+	public enum LockingState
+	{
+		/// <summary> App is not connected to lock.</summary>
+		UnknownDisconnected,
 
-        /// <summary> Lock is closed. </summary>
-        Closed,
+		/// <summary> Lock is closed. </summary>
+		Closed,
 
-        /// <summary> Lock is closing. </summary>
-        Closing,
+		/// <summary> Lock is closing. </summary>
+		Closing,
 
-        /// <summary> Lock is open. </summary>
-        Open,
+		/// <summary> Lock is open. </summary>
+		Open,
 
-        /// <summary> Lock is opening. </summary>
-        Opening
-    }
+		/// <summary> Lock is opening. </summary>
+		Opening
+	}
 
-    [DataContract]
-    public class LockInfo : ILockInfo
-    {
-        /// <summary> Locking state of bluetooth lock. </summary>
-        [DataMember]
-        public LockingState State { get; private set; } = LockingState.UnknownDisconnected;
+	[DataContract]
+	public class LockInfo : ILockInfo
+	{
+		/// <summary> Locking state of bluetooth lock. </summary>
+		[DataMember]
+		public LockingState State { get; private set; } = LockingState.UnknownDisconnected;
 
-        public override bool Equals(object obj) => this.Equals(obj as LockInfo);
+		public override bool Equals(object obj) => this.Equals(obj as LockInfo);
 
-        public bool Equals(LockInfo other)
-        {
-            if (Object.ReferenceEquals(other, null)) return false;
-            if (Object.ReferenceEquals(this, other)) return true;
-            if (this.GetType() != other.GetType()) return false;
+		public bool Equals(LockInfo other)
+		{
+			if (Object.ReferenceEquals(other, null)) return false;
+			if (Object.ReferenceEquals(this, other)) return true;
+			if (this.GetType() != other.GetType()) return false;
 
-            return ToString() == other.ToString();
-        }
+			return ToString() == other.ToString();
+		}
 
-        public override int GetHashCode()
-        {
-            return ToString().GetHashCode();
-        }
+		public override int GetHashCode()
+		{
+			return ToString().GetHashCode();
+		}
 
-        public override string ToString()
-        {
-            return JsonConvert.SerializeObject(this);
-        }
+		public override string ToString()
+		{
+			return JsonConvert.SerializeObject(this);
+		}
 
-        public static bool operator ==(LockInfo lhs, LockInfo rhs)
-        {
-            if (Object.ReferenceEquals(lhs, null))
-                return Object.ReferenceEquals(rhs, null) ? true /*null == null = true*/: false;
+		public static bool operator ==(LockInfo lhs, LockInfo rhs)
+		{
+			if (Object.ReferenceEquals(lhs, null))
+				return Object.ReferenceEquals(rhs, null) ? true /*null == null = true*/: false;
 
-            return lhs.Equals(rhs);
-        }
+			return lhs.Equals(rhs);
+		}
 
-        public static bool operator !=(LockInfo lhs, LockInfo rhs)
-        {
-            return !(lhs == rhs);
-        }
+		public static bool operator !=(LockInfo lhs, LockInfo rhs)
+		{
+			return !(lhs == rhs);
+		}
 
-        public class Builder
-        {
-            public Builder(LockInfo lockInfo = null)
-            {
-                if (lockInfo == null)
-                {
-                    return;
-                }
+		public class Builder
+		{
+			public Builder(LockInfo lockInfo = null)
+			{
+				if (lockInfo == null)
+				{
+					return;
+				}
 
-                LockInfo = JsonConvert.DeserializeObject<LockInfo>(JsonConvert.SerializeObject(lockInfo));
-            }
+				LockInfo = JsonConvert.DeserializeObject<LockInfo>(JsonConvert.SerializeObject(lockInfo));
+			}
 
-            private readonly LockInfo LockInfo = new LockInfo();
+			private readonly LockInfo LockInfo = new LockInfo();
 
 
-            public LockingState State { get => LockInfo.State; set => LockInfo.State = value; }
+			public LockingState State { get => LockInfo.State; set => LockInfo.State = value; }
 
-            public LockInfo Build() => LockInfo;
-        }
+			public LockInfo Build() => LockInfo;
+		}
 
-    }
+	}
 }
diff --git a/LockItShared/Model/Connector/TextToLockItTypeHelper.cs b/LockItShared/Model/Connector/TextToLockItTypeHelper.cs
index 0998719..4758ab2 100644
--- a/LockItShared/Model/Connector/TextToLockItTypeHelper.cs
+++ b/LockItShared/Model/Connector/TextToLockItTypeHelper.cs
@@ -3,30 +3,30 @@ using System.Text.RegularExpressions;
 
 namespace TINK.Model.Connector
 {
-    public static class TextToLockItTypeHelper
-    {
-        /// <summary> Lock id which representing a non valid id. </summary>
-        public const int INVALIDLOCKID = 0;
+	public static class TextToLockItTypeHelper
+	{
+		/// <summary> Lock id which representing a non valid id. </summary>
+		public const int INVALIDLOCKID = 0;
 
-        /// <summary> Lock GUID which representing a non valid id. </summary>
-        public readonly static Guid INVALIDLOCKGUID = new Guid();
+		/// <summary> Lock GUID which representing a non valid id. </summary>
+		public readonly static Guid INVALIDLOCKGUID = new Guid();
 
-        /// <summary> First part of advertisement name.</summary>
-        public static string ISHAREITADVERTISMENTTITLE = "ISHAREIT";
+		/// <summary> First part of advertisement name.</summary>
+		public static string ISHAREITADVERTISMENTTITLE = "ISHAREIT";
 
-        /// <summary> Gets the ID part from advertisment name. </summary>
-        /// <remarks> Advertisement name is made up of name plus separator (+ or -) and a ID</remarks>
-        /// <param name="advertisementName">Advertisment name to extract info from.</param>
-        /// <returns>From information.</returns>
-        public static int GetBluetoothLockId(this string advertisementName)
-        {
-            var name = advertisementName?.ToUpper();
-            if (string.IsNullOrEmpty(name))
-                return INVALIDLOCKID;
+		/// <summary> Gets the ID part from advertisment name. </summary>
+		/// <remarks> Advertisement name is made up of name plus separator (+ or -) and a ID</remarks>
+		/// <param name="advertisementName">Advertisment name to extract info from.</param>
+		/// <returns>From information.</returns>
+		public static int GetBluetoothLockId(this string advertisementName)
+		{
+			var name = advertisementName?.ToUpper();
+			if (string.IsNullOrEmpty(name))
+				return INVALIDLOCKID;
 
-            return int.TryParse(Regex.Replace(advertisementName, $"{ISHAREITADVERTISMENTTITLE}[\\-,\\+ ]", ""), out int lockId)
-                ? lockId
-                : INVALIDLOCKID;
-        }
-    }
+			return int.TryParse(Regex.Replace(advertisementName, $"{ISHAREITADVERTISMENTTITLE}[\\-,\\+ ]", ""), out int lockId)
+				? lockId
+				: INVALIDLOCKID;
+		}
+	}
 }
diff --git a/LockItShared/Model/Device/ICipher.cs b/LockItShared/Model/Device/ICipher.cs
index 79e4369..01f1cb0 100644
--- a/LockItShared/Model/Device/ICipher.cs
+++ b/LockItShared/Model/Device/ICipher.cs
@@ -1,17 +1,17 @@
 namespace TINK.Model.Device
 {
-    public interface ICipher
-    {
-        /// <summary> Encrypt data.</summary>
-        /// <param name="key">Key to encrypt data.</param>
-        /// <param name="clear">Data to entrycpt.</param>
-        /// <returns></returns>
-        byte[] Encrypt(byte[] key, byte[] clear);
+	public interface ICipher
+	{
+		/// <summary> Encrypt data.</summary>
+		/// <param name="key">Key to encrypt data.</param>
+		/// <param name="clear">Data to entrycpt.</param>
+		/// <returns></returns>
+		byte[] Encrypt(byte[] key, byte[] clear);
 
-        /// <summary> Decrypt data. </summary>
-        /// <param name="key">Key to decrypt data.</param>
-        /// <param name="encrypted">Encrpyted data to decrypt.</param>
-        /// <returns></returns>
-        byte[] Decrypt(byte[] key, byte[] encrypted);
-    }
+		/// <summary> Decrypt data. </summary>
+		/// <param name="key">Key to decrypt data.</param>
+		/// <param name="encrypted">Encrpyted data to decrypt.</param>
+		/// <returns></returns>
+		byte[] Decrypt(byte[] key, byte[] encrypted);
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Crypto/AuthCryptoHelper.cs b/LockItShared/Services/BluetoothLock/Crypto/AuthCryptoHelper.cs
index 1cb52c8..4e93dad 100644
--- a/LockItShared/Services/BluetoothLock/Crypto/AuthCryptoHelper.cs
+++ b/LockItShared/Services/BluetoothLock/Crypto/AuthCryptoHelper.cs
@@ -3,80 +3,80 @@ using TINK.Model.Device;
 
 namespace TINK.Services.BluetoothLock.Crypto
 {
-    public class AuthCryptoHelper
-    {
-        private ICipher Cipher { get; }
+	public class AuthCryptoHelper
+	{
+		private ICipher Cipher { get; }
 
-        /// <summary> Encrypted seed (random number) created inside ILOCKIT and passd to app.</summary>
-        private byte[] SeedLockEncrypted { get; }
+		/// <summary> Encrypted seed (random number) created inside ILOCKIT and passd to app.</summary>
+		private byte[] SeedLockEncrypted { get; }
 
-        /// <summary> Contstructs a auth crypto helper object.</summary>
-        /// <param name="seedLockEncrypted">Encrypted seed to deocode using <see cref="KeyCopri"/>.</param>
-        /// <param name="keyCopri">Key used to to decrypt <see cref="SeedLockEncrypted"/>.</param>
-        public AuthCryptoHelper(
-             byte[] seedLockEncrypted,
-             byte[] keyCopri,
-             ICipher cipher)
-        {
-            KeyCopri = keyCopri;
-            SeedLockEncrypted = seedLockEncrypted;
-            Cipher = cipher ?? new Cipher();
-        }
+		/// <summary> Contstructs a auth crypto helper object.</summary>
+		/// <param name="seedLockEncrypted">Encrypted seed to deocode using <see cref="KeyCopri"/>.</param>
+		/// <param name="keyCopri">Key used to to decrypt <see cref="SeedLockEncrypted"/>.</param>
+		public AuthCryptoHelper(
+			 byte[] seedLockEncrypted,
+			 byte[] keyCopri,
+			 ICipher cipher)
+		{
+			KeyCopri = keyCopri;
+			SeedLockEncrypted = seedLockEncrypted;
+			Cipher = cipher ?? new Cipher();
+		}
 
 
-        /// <summary> Public for testing purposes only.</summary>
-        public byte[] GetSeedLock()
-        {
-            byte[] seedLockDecrypted;
-            var seedLockEncrypted = SeedLockEncrypted;
-            var keyCopri = KeyCopri;
-            try
-            {
-                seedLockDecrypted = Cipher.Decrypt(
-                        keyCopri,
-                        seedLockEncrypted);
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<AuthCryptoHelper>().Error("Decrypting seed from lock failed. {Exception}", exception);
-                throw;
-            }
+		/// <summary> Public for testing purposes only.</summary>
+		public byte[] GetSeedLock()
+		{
+			byte[] seedLockDecrypted;
+			var seedLockEncrypted = SeedLockEncrypted;
+			var keyCopri = KeyCopri;
+			try
+			{
+				seedLockDecrypted = Cipher.Decrypt(
+						keyCopri,
+						seedLockEncrypted);
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<AuthCryptoHelper>().Error("Decrypting seed from lock failed. {Exception}", exception);
+				throw;
+			}
 
-            Log.ForContext<AuthCryptoHelper>().Verbose($"Lock random number decrypted from {string.Join(",", seedLockEncrypted)} to {string.Join(",", seedLockDecrypted)} using {string.Join(", ", keyCopri)}.");
-            return seedLockDecrypted;
-        }
+			Log.ForContext<AuthCryptoHelper>().Verbose($"Lock random number decrypted from {string.Join(",", seedLockEncrypted)} to {string.Join(",", seedLockDecrypted)} using {string.Join(", ", keyCopri)}.");
+			return seedLockDecrypted;
+		}
 
-        public byte[] GetAccessKeyEncrypted()
-        {
+		public byte[] GetAccessKeyEncrypted()
+		{
 
-            var accessKey = GetSeedLock();
+			var accessKey = GetSeedLock();
 
-            if (accessKey == null || accessKey.Length <= 0)
-            {
-                Log.ForContext<AuthCryptoHelper>().Error("Creating access key failed, Key must not be null or empty.");
-                throw new System.Exception();
-            }
+			if (accessKey == null || accessKey.Length <= 0)
+			{
+				Log.ForContext<AuthCryptoHelper>().Error("Creating access key failed, Key must not be null or empty.");
+				throw new System.Exception();
+			}
 
-            accessKey[accessKey.Length - 1] += 1;
+			accessKey[accessKey.Length - 1] += 1;
 
-            var keyCopri = KeyCopri;
-            byte[] acccessKeyEncrypted;
-            try
-            {
-                acccessKeyEncrypted = Cipher.Encrypt(
-                    keyCopri,
-                    accessKey);
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<AuthCryptoHelper>().Error("Encrypting access key failed. {Exception}", exception);
-                throw;
-            }
+			var keyCopri = KeyCopri;
+			byte[] acccessKeyEncrypted;
+			try
+			{
+				acccessKeyEncrypted = Cipher.Encrypt(
+					keyCopri,
+					accessKey);
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<AuthCryptoHelper>().Error("Encrypting access key failed. {Exception}", exception);
+				throw;
+			}
 
-            Log.ForContext<AuthCryptoHelper>().Verbose($"Access key encrypted from {string.Join(",", accessKey)} to {string.Join(",", acccessKeyEncrypted)} using {string.Join(", ", keyCopri)}.");
-            return acccessKeyEncrypted;
-        }
+			Log.ForContext<AuthCryptoHelper>().Verbose($"Access key encrypted from {string.Join(",", accessKey)} to {string.Join(",", acccessKeyEncrypted)} using {string.Join(", ", keyCopri)}.");
+			return acccessKeyEncrypted;
+		}
 
-        public byte[] KeyCopri { get; }
-    }
+		public byte[] KeyCopri { get; }
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Crypto/Cipher.cs b/LockItShared/Services/BluetoothLock/Crypto/Cipher.cs
index fdc69c2..25e06d1 100644
--- a/LockItShared/Services/BluetoothLock/Crypto/Cipher.cs
+++ b/LockItShared/Services/BluetoothLock/Crypto/Cipher.cs
@@ -5,84 +5,84 @@ using TINK.Model.Device;
 
 namespace TINK.Services.BluetoothLock.Crypto
 {
-    public class Cipher : ICipher
-    {
-        /// <summary> Decrypt data. </summary>
-        /// <remarks>
-        /// Further info see:
-        /// https://docs.microsoft.com/en-us/dotnet/api/system.security.cryptography.aes?view=netcore-3.1 for further info
-        //  https://docs.microsoft.com/en-us/dotnet/standard/security/cryptographic-services
-        //  https://stackoverflow.com/questions/24903575/how-to-return-byte-when-decrypt-using-cryptostream-descryptoserviceprovider/24903689
+	public class Cipher : ICipher
+	{
+		/// <summary> Decrypt data. </summary>
+		/// <remarks>
+		/// Further info see:
+		/// https://docs.microsoft.com/en-us/dotnet/api/system.security.cryptography.aes?view=netcore-3.1 for further info
+		//  https://docs.microsoft.com/en-us/dotnet/standard/security/cryptographic-services
+		//  https://stackoverflow.com/questions/24903575/how-to-return-byte-when-decrypt-using-cryptostream-descryptoserviceprovider/24903689
 
-        /// </remarks>
-        /// <param name="key">Key to decrypt data with.</param>
-        /// <param name="encrypted">Encrpyted data to decrypt.</param>
-        /// <returns>Decrypted data.</returns>
-        public byte[] Decrypt(byte[] key, byte[] encrypted)
-        {
-            // Check arguments.
-            if (encrypted == null || encrypted.Length <= 0)
-                throw new ArgumentNullException(nameof(encrypted));
+		/// </remarks>
+		/// <param name="key">Key to decrypt data with.</param>
+		/// <param name="encrypted">Encrpyted data to decrypt.</param>
+		/// <returns>Decrypted data.</returns>
+		public byte[] Decrypt(byte[] key, byte[] encrypted)
+		{
+			// Check arguments.
+			if (encrypted == null || encrypted.Length <= 0)
+				throw new ArgumentNullException(nameof(encrypted));
 
-            if (key == null || key.Length <= 0)
-                throw new ArgumentNullException(nameof(key));
+			if (key == null || key.Length <= 0)
+				throw new ArgumentNullException(nameof(key));
 
-            using (Aes aesAlg = Aes.Create())
-            {
-                aesAlg.KeySize = 192;
-                aesAlg.Mode = CipherMode.ECB;
-                aesAlg.Padding = PaddingMode.None;
-                aesAlg.Key = key;
+			using (Aes aesAlg = Aes.Create())
+			{
+				aesAlg.KeySize = 192;
+				aesAlg.Mode = CipherMode.ECB;
+				aesAlg.Padding = PaddingMode.None;
+				aesAlg.Key = key;
 
-                // Create a decryptor to perform the stream transform.
-                ICryptoTransform decryptor = aesAlg.CreateDecryptor(aesAlg.Key, aesAlg.IV);
+				// Create a decryptor to perform the stream transform.
+				ICryptoTransform decryptor = aesAlg.CreateDecryptor(aesAlg.Key, aesAlg.IV);
 
-                // Create the streams used for decryption.
-                using (var msDecrypt = new MemoryStream())
-                {
-                    using (var csDecrypt = new CryptoStream(msDecrypt, decryptor, CryptoStreamMode.Write))
-                    {
-                        csDecrypt.Write(encrypted, 0, encrypted.Length);
-                        csDecrypt.FlushFinalBlock();
-                        return msDecrypt.ToArray();
-                    }
-                }
-            }
-        }
+				// Create the streams used for decryption.
+				using (var msDecrypt = new MemoryStream())
+				{
+					using (var csDecrypt = new CryptoStream(msDecrypt, decryptor, CryptoStreamMode.Write))
+					{
+						csDecrypt.Write(encrypted, 0, encrypted.Length);
+						csDecrypt.FlushFinalBlock();
+						return msDecrypt.ToArray();
+					}
+				}
+			}
+		}
 
-        public byte[] Encrypt(byte[] key, byte[] clear)
-        {
-            // Check arguments.
-            if (clear == null || clear.Length <= 0)
-                throw new ArgumentNullException("plainText");
+		public byte[] Encrypt(byte[] key, byte[] clear)
+		{
+			// Check arguments.
+			if (clear == null || clear.Length <= 0)
+				throw new ArgumentNullException("plainText");
 
-            if (key == null || key.Length <= 0)
-                throw new ArgumentNullException("Key");
+			if (key == null || key.Length <= 0)
+				throw new ArgumentNullException("Key");
 
-            // Create an AesCryptoServiceProvider object
-            // with the specified key and IV.
-            using (AesCryptoServiceProvider aesAlg = new AesCryptoServiceProvider())
-            {
-                aesAlg.KeySize = 192;
-                aesAlg.Mode = CipherMode.ECB;
-                aesAlg.Padding = PaddingMode.None;
-                aesAlg.Key = key;
+			// Create an AesCryptoServiceProvider object
+			// with the specified key and IV.
+			using (AesCryptoServiceProvider aesAlg = new AesCryptoServiceProvider())
+			{
+				aesAlg.KeySize = 192;
+				aesAlg.Mode = CipherMode.ECB;
+				aesAlg.Padding = PaddingMode.None;
+				aesAlg.Key = key;
 
-                // Create an encryptor to perform the stream transform.
-                ICryptoTransform encryptor = aesAlg.CreateEncryptor(aesAlg.Key, aesAlg.IV);
+				// Create an encryptor to perform the stream transform.
+				ICryptoTransform encryptor = aesAlg.CreateEncryptor(aesAlg.Key, aesAlg.IV);
 
-                // Create the streams used for encryption.
-                using (var msEncrypt = new MemoryStream())
-                {
-                    using (var csEncrypt = new CryptoStream(msEncrypt, encryptor, CryptoStreamMode.Write))
-                    {
-                        csEncrypt.Write(clear, 0, clear.Length);
-                        csEncrypt.FlushFinalBlock();
-                        return msEncrypt.ToArray();
-                    }
-                }
-            }
+				// Create the streams used for encryption.
+				using (var msEncrypt = new MemoryStream())
+				{
+					using (var csEncrypt = new CryptoStream(msEncrypt, encryptor, CryptoStreamMode.Write))
+					{
+						csEncrypt.Write(clear, 0, clear.Length);
+						csEncrypt.FlushFinalBlock();
+						return msEncrypt.ToArray();
+					}
+				}
+			}
 
-        }
-    }
+		}
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Exception/AlreadyConnectedException.cs b/LockItShared/Services/BluetoothLock/Exception/AlreadyConnectedException.cs
index b52a593..114b0bc 100644
--- a/LockItShared/Services/BluetoothLock/Exception/AlreadyConnectedException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/AlreadyConnectedException.cs
@@ -1,7 +1,7 @@
 namespace TINK.Services.BluetoothLock.Exception
 {
-    public class AlreadyConnectedException : System.Exception
-    {
-        public AlreadyConnectedException() : base("Invalid reconnect call detected. Device is already connected.") { }
-    }
+	public class AlreadyConnectedException : System.Exception
+	{
+		public AlreadyConnectedException() : base("Invalid reconnect call detected. Device is already connected.") { }
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Exception/AuthKeyException.cs b/LockItShared/Services/BluetoothLock/Exception/AuthKeyException.cs
index d5646f5..e045b73 100644
--- a/LockItShared/Services/BluetoothLock/Exception/AuthKeyException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/AuthKeyException.cs
@@ -1,8 +1,8 @@
 namespace TINK.Services.BluetoothLock.Exception
 {
-    public class AuthKeyException : System.Exception
-    {
-        public AuthKeyException(string message) : base(message)
-        { }
-    }
+	public class AuthKeyException : System.Exception
+	{
+		public AuthKeyException(string message) : base(message)
+		{ }
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Exception/BluetoothDisconnectedException.cs b/LockItShared/Services/BluetoothLock/Exception/BluetoothDisconnectedException.cs
index fe16c52..4dca3a7 100644
--- a/LockItShared/Services/BluetoothLock/Exception/BluetoothDisconnectedException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/BluetoothDisconnectedException.cs
@@ -2,17 +2,17 @@
 
 namespace TINK.Services.BluetoothLock.Exception
 {
-    /// <summary>
-    /// If fired if app is disconnected from bluetooth.
-    /// </summary>
-    /// <remarks>
-    /// Member to determine if app is disconnected: IDevice.State from server Plugin.BLE. If DeviceState.Disconnected exception is fired.
-    /// All possible states: Disconnected, Connecting, Connected, Limited.
-    /// </remarks>
-    public class BluetoothDisconnectedException : StateAwareException
-    {
-        public BluetoothDisconnectedException() : base(LockingState.UnknownDisconnected, MultilingualResources.Resources.ErrorBluetoothDisconnectedException)
-        {
-        }
-    }
+	/// <summary>
+	/// If fired if app is disconnected from bluetooth.
+	/// </summary>
+	/// <remarks>
+	/// Member to determine if app is disconnected: IDevice.State from server Plugin.BLE. If DeviceState.Disconnected exception is fired.
+	/// All possible states: Disconnected, Connecting, Connected, Limited.
+	/// </remarks>
+	public class BluetoothDisconnectedException : StateAwareException
+	{
+		public BluetoothDisconnectedException() : base(LockingState.UnknownDisconnected, MultilingualResources.Resources.ErrorBluetoothDisconnectedException)
+		{
+		}
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Exception/ConnectBluetoothNotOnException.cs b/LockItShared/Services/BluetoothLock/Exception/ConnectBluetoothNotOnException.cs
index 3d1357d..4456b4c 100644
--- a/LockItShared/Services/BluetoothLock/Exception/ConnectBluetoothNotOnException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/ConnectBluetoothNotOnException.cs
@@ -3,15 +3,15 @@ using TINK.MultilingualResources;
 
 namespace TINK.Services.BluetoothLock.Exception
 {
-    /// <summary> Exception which is fired when bluetooth is not on. </summary>
-    /// <remarks>
-    /// Member to determine if app is disconnected: IBluetoothLE.State from server Plugin.BLE. If current value is not BluetoothState.On exception is fired.
-    /// All possible states: Unknown, Unavailable, Unauthorized, TurningOn, On, TurningOff, Off.
-    /// </remarks>
-    public class ConnectBluetoothNotOnException : System.Exception
-    {
-        public ConnectBluetoothNotOnException() : base(Resources.ErrorConnectLockBluetoothOffException) { }
+	/// <summary> Exception which is fired when bluetooth is not on. </summary>
+	/// <remarks>
+	/// Member to determine if app is disconnected: IBluetoothLE.State from server Plugin.BLE. If current value is not BluetoothState.On exception is fired.
+	/// All possible states: Unknown, Unavailable, Unauthorized, TurningOn, On, TurningOff, Off.
+	/// </remarks>
+	public class ConnectBluetoothNotOnException : System.Exception
+	{
+		public ConnectBluetoothNotOnException() : base(Resources.ErrorConnectLockBluetoothOffException) { }
 
-        public ConnectBluetoothNotOnException(object state) : base(string.Format(Resources.ErrorConnectLockBluetoothNotOnException, state.ToString())) { }
-    }
+		public ConnectBluetoothNotOnException(object state) : base(string.Format(Resources.ErrorConnectLockBluetoothNotOnException, state.ToString())) { }
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Exception/ConnectLocationOffException.cs b/LockItShared/Services/BluetoothLock/Exception/ConnectLocationOffException.cs
index fa4dff6..760ba06 100644
--- a/LockItShared/Services/BluetoothLock/Exception/ConnectLocationOffException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/ConnectLocationOffException.cs
@@ -2,8 +2,8 @@
 
 namespace TINK.Services.BluetoothLock.Exception
 {
-    public class ConnectLocationOffException : System.Exception
-    {
-        public ConnectLocationOffException() : base(Resources.ErrorConnectLockLocationOffException) { }
-    }
+	public class ConnectLocationOffException : System.Exception
+	{
+		public ConnectLocationOffException() : base(Resources.ErrorConnectLockLocationOffException) { }
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Exception/ConnectLocationPermissionMissingException.cs b/LockItShared/Services/BluetoothLock/Exception/ConnectLocationPermissionMissingException.cs
index b05ee4c..d37bd10 100644
--- a/LockItShared/Services/BluetoothLock/Exception/ConnectLocationPermissionMissingException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/ConnectLocationPermissionMissingException.cs
@@ -2,8 +2,8 @@
 
 namespace TINK.Services.BluetoothLock.Exception
 {
-    public class ConnectLocationPermissionMissingException : System.Exception
-    {
-        public ConnectLocationPermissionMissingException() : base(Resources.ErrorConnectLockLocationPermissingMissingException) { }
-    }
+	public class ConnectLocationPermissionMissingException : System.Exception
+	{
+		public ConnectLocationPermissionMissingException() : base(Resources.ErrorConnectLockLocationPermissingMissingException) { }
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Exception/CouldntCloseBoldBlockedException.cs b/LockItShared/Services/BluetoothLock/Exception/CouldntCloseBoldBlockedException.cs
index 45f11bd..e7a84d8 100644
--- a/LockItShared/Services/BluetoothLock/Exception/CouldntCloseBoldBlockedException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/CouldntCloseBoldBlockedException.cs
@@ -2,12 +2,12 @@
 
 namespace TINK.Services.BluetoothLock.Exception
 {
-    public class CouldntCloseBoldBlockedException : StateAwareException
-    {
-        public CouldntCloseBoldBlockedException() : base(
-            LockingState.UnknownFromHardwareError, // Lock is closed in most cases, but this is not guaranteed according to haveltec.
-            MultilingualResources.Resources.ErrorCloseLockBoldBlocked)
-        {
-        }
-    }
+	public class CouldntCloseBoldBlockedException : StateAwareException
+	{
+		public CouldntCloseBoldBlockedException() : base(
+			LockingState.UnknownFromHardwareError, // Lock is closed in most cases, but this is not guaranteed according to haveltec.
+			MultilingualResources.Resources.ErrorCloseLockBoldBlocked)
+		{
+		}
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Exception/CouldntCloseInconsistentStateExecption.cs b/LockItShared/Services/BluetoothLock/Exception/CouldntCloseInconsistentStateExecption.cs
index f36a1d1..a8ddeae 100644
--- a/LockItShared/Services/BluetoothLock/Exception/CouldntCloseInconsistentStateExecption.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/CouldntCloseInconsistentStateExecption.cs
@@ -4,15 +4,15 @@ using TINK.MultilingualResources;
 
 namespace TINK.Services.BluetoothLock.Exception
 {
-    public class CouldntCloseInconsistentStateExecption : StateAwareException
-    {
-        public CouldntCloseInconsistentStateExecption(LockingState state) :
-            base(
-                state,
-                state != LockingState.UnknownFromHardwareError
-                    ? string.Format(Resources.ErrorCloseLockUnexpectedState, state)
-                    : Resources.ErrorCloseLockUnknownPosition)
-        {
-        }
-    }
+	public class CouldntCloseInconsistentStateExecption : StateAwareException
+	{
+		public CouldntCloseInconsistentStateExecption(LockingState state) :
+			base(
+				state,
+				state != LockingState.UnknownFromHardwareError
+					? string.Format(Resources.ErrorCloseLockUnexpectedState, state)
+					: Resources.ErrorCloseLockUnknownPosition)
+		{
+		}
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Exception/CouldntCloseMovingException.cs b/LockItShared/Services/BluetoothLock/Exception/CouldntCloseMovingException.cs
index 86d36cd..08839fc 100644
--- a/LockItShared/Services/BluetoothLock/Exception/CouldntCloseMovingException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/CouldntCloseMovingException.cs
@@ -2,12 +2,12 @@
 
 namespace TINK.Services.BluetoothLock.Exception
 {
-    public class CouldntCloseMovingException : StateAwareException
-    {
-        public CouldntCloseMovingException() : base(
-            LockingState.Open, // Locking bold is probable (according to haveltec) still open.
-            MultilingualResources.Resources.ErrorCloseLockBikeMoving)
-        {
-        }
-    }
+	public class CouldntCloseMovingException : StateAwareException
+	{
+		public CouldntCloseMovingException() : base(
+			LockingState.Open, // Locking bold is probable (according to haveltec) still open.
+			MultilingualResources.Resources.ErrorCloseLockBikeMoving)
+		{
+		}
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldIsBlockedException.cs b/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldIsBlockedException.cs
index 211634d..3d7db49 100644
--- a/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldIsBlockedException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldIsBlockedException.cs
@@ -2,15 +2,15 @@
 
 namespace TINK.Services.BluetoothLock.Exception
 {
-    /// <summary>
-    /// Lock can not be opened, because bold is blocked. Lock reports that obstacle is still blocking.
-    /// </summary>
-    public class CouldntOpenBoldIsBlockedException : StateAwareException
-    {
-        public CouldntOpenBoldIsBlockedException() : base(
-            LockingState.UnknownFromHardwareError,
-            MultilingualResources.Resources.ErrorOpenLockBoldBlocked)
-        {
-        }
-    }
+	/// <summary>
+	/// Lock can not be opened, because bold is blocked. Lock reports that obstacle is still blocking.
+	/// </summary>
+	public class CouldntOpenBoldIsBlockedException : StateAwareException
+	{
+		public CouldntOpenBoldIsBlockedException() : base(
+			LockingState.UnknownFromHardwareError,
+			MultilingualResources.Resources.ErrorOpenLockBoldBlocked)
+		{
+		}
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldWasBlockedException.cs b/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldWasBlockedException.cs
index ddb04f1..d8aa420 100644
--- a/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldWasBlockedException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldWasBlockedException.cs
@@ -2,15 +2,15 @@
 
 namespace TINK.Services.BluetoothLock.Exception
 {
-    /// <summary>
-    /// Lock can not be opened, because bold is/ was blocked. Obstacle might no more block but lock could not be opened completely to obstacle.
-    /// </summary>
-    public class CouldntOpenBoldWasBlockedException : StateAwareException
-    {
-        public CouldntOpenBoldWasBlockedException() : base(
-            LockingState.UnknownFromHardwareError,
-            MultilingualResources.Resources.ErrorOpenLockBoldWasBlocked)
-        {
-        }
-    }
+	/// <summary>
+	/// Lock can not be opened, because bold is/ was blocked. Obstacle might no more block but lock could not be opened completely to obstacle.
+	/// </summary>
+	public class CouldntOpenBoldWasBlockedException : StateAwareException
+	{
+		public CouldntOpenBoldWasBlockedException() : base(
+			LockingState.UnknownFromHardwareError,
+			MultilingualResources.Resources.ErrorOpenLockBoldWasBlocked)
+		{
+		}
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Exception/CouldntOpenInconsistentStateExecption.cs b/LockItShared/Services/BluetoothLock/Exception/CouldntOpenInconsistentStateExecption.cs
index 019d3bd..9e5a4d0 100644
--- a/LockItShared/Services/BluetoothLock/Exception/CouldntOpenInconsistentStateExecption.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/CouldntOpenInconsistentStateExecption.cs
@@ -4,13 +4,13 @@ using TINK.MultilingualResources;
 
 namespace TINK.Services.BluetoothLock.Exception
 {
-    public class CouldntOpenInconsistentStateExecption : StateAwareException
-    {
-        public CouldntOpenInconsistentStateExecption(LockingState state) :
-            base(
-                state,
-                string.Format(Resources.ErrorOpenLockUnexpectedState, state))
-        {
-        }
-    }
+	public class CouldntOpenInconsistentStateExecption : StateAwareException
+	{
+		public CouldntOpenInconsistentStateExecption(LockingState state) :
+			base(
+				state,
+				string.Format(Resources.ErrorOpenLockUnexpectedState, state))
+		{
+		}
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Exception/CoundntGetCharacteristicException.cs b/LockItShared/Services/BluetoothLock/Exception/CoundntGetCharacteristicException.cs
index abed7bf..0723f22 100644
--- a/LockItShared/Services/BluetoothLock/Exception/CoundntGetCharacteristicException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/CoundntGetCharacteristicException.cs
@@ -1,8 +1,8 @@
 namespace TINK.Services.BluetoothLock.Exception
 {
-    public class CoundntGetCharacteristicException : System.Exception
-    {
-        public CoundntGetCharacteristicException(string message) : base(message)
-        { }
-    }
+	public class CoundntGetCharacteristicException : System.Exception
+	{
+		public CoundntGetCharacteristicException(string message) : base(message)
+		{ }
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Exception/GuidUnknownException.cs b/LockItShared/Services/BluetoothLock/Exception/GuidUnknownException.cs
index c862e96..17e08ef 100644
--- a/LockItShared/Services/BluetoothLock/Exception/GuidUnknownException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/GuidUnknownException.cs
@@ -1,9 +1,9 @@
 namespace TINK.Services.BluetoothLock.Exception
 {
-    public class GuidUnknownException : System.Exception
-    {
-        public GuidUnknownException() : base("Can not connect to lock. No Guid available.")
-        {
-        }
-    }
+	public class GuidUnknownException : System.Exception
+	{
+		public GuidUnknownException() : base("Can not connect to lock. No Guid available.")
+		{
+		}
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Exception/OutOfReachException.cs b/LockItShared/Services/BluetoothLock/Exception/OutOfReachException.cs
index bc61537..80004e4 100644
--- a/LockItShared/Services/BluetoothLock/Exception/OutOfReachException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/OutOfReachException.cs
@@ -1,8 +1,8 @@
 namespace TINK.Services.BluetoothLock.Exception
 {
-    /// <summary> Thrown whenever lock is out of reach.</summary>
-    /// <remarks> If fired when scan for devices does not result in lock beeing found.</remarks>
-    public class OutOfReachException : System.Exception
-    {
-    }
+	/// <summary> Thrown whenever lock is out of reach.</summary>
+	/// <remarks> If fired when scan for devices does not result in lock beeing found.</remarks>
+	public class OutOfReachException : System.Exception
+	{
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Exception/StateAwareException.cs b/LockItShared/Services/BluetoothLock/Exception/StateAwareException.cs
index 5d0d704..72bcf28 100644
--- a/LockItShared/Services/BluetoothLock/Exception/StateAwareException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/StateAwareException.cs
@@ -2,14 +2,14 @@
 
 namespace TINK.Services.BluetoothLock.Exception
 {
-    public abstract class StateAwareException : System.Exception
-    {
-        public StateAwareException(LockingState state, string description) : base(description)
-        {
-            State = state;
-        }
+	public abstract class StateAwareException : System.Exception
+	{
+		public StateAwareException(LockingState state, string description) : base(description)
+		{
+			State = state;
+		}
 
-        /// <summary> Holds the state reported by lock.</summary>
-        public LockingState State { get; }
-    }
+		/// <summary> Holds the state reported by lock.</summary>
+		public LockingState State { get; }
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/ILockService.cs b/LockItShared/Services/BluetoothLock/ILockService.cs
index bc56583..a184873 100644
--- a/LockItShared/Services/BluetoothLock/ILockService.cs
+++ b/LockItShared/Services/BluetoothLock/ILockService.cs
@@ -4,57 +4,57 @@ using TINK.Services.BluetoothLock.Tdo;
 
 namespace TINK.Services.BluetoothLock
 {
-    public enum DeviceState
-    {
-        Disconnected = 0,
-        Connecting = 1,
-        Connected = 2,
-        Limited = 3 /* Mactches Connecting? */
-    }
+	public enum DeviceState
+	{
+		Disconnected = 0,
+		Connecting = 1,
+		Connected = 2,
+		Limited = 3 /* Mactches Connecting? */
+	}
 
-    public interface ILockService
-    {
-        /// <summary> Reconnect to lock. </summary>
-        Task ReconnectAsync(
-            LockInfoAuthTdo authInfo,
-            TimeSpan connectTimeout);
+	public interface ILockService
+	{
+		/// <summary> Reconnect to lock. </summary>
+		Task ReconnectAsync(
+			LockInfoAuthTdo authInfo,
+			TimeSpan connectTimeout);
 
-        /// <summary> Opens lock. </summary>
-        /// <returns> State of lock after performing open operation. </returns>
-        Task<LockitLockingState?> OpenAsync();
+		/// <summary> Opens lock. </summary>
+		/// <returns> State of lock after performing open operation. </returns>
+		Task<LockitLockingState?> OpenAsync();
 
-        /// <summary> Closes lock. </summary>
-        /// <returns>State of lock after performing close operation.</returns>
-        Task<LockitLockingState?> CloseAsync();
+		/// <summary> Closes lock. </summary>
+		/// <returns>State of lock after performing close operation.</returns>
+		Task<LockitLockingState?> CloseAsync();
 
-        string Name { get; }
+		string Name { get; }
 
-        Guid Guid { get; }
+		Guid Guid { get; }
 
-        int Id { get; }
+		int Id { get; }
 
-        /// <summary> Gets the device state.</summary>
-        DeviceState? GetDeviceState();
+		/// <summary> Gets the device state.</summary>
+		DeviceState? GetDeviceState();
 
-        /// <summary>
-        /// Gets the locking state.
-        /// </summary>
-        /// <param name="doWaitRetry">True if to wait and retry in case of failures. </param>
-        /// <returns></returns>
-        Task<LockInfoTdo> GetLockStateAsync(bool doWaitRetry = false);
+		/// <summary>
+		/// Gets the locking state.
+		/// </summary>
+		/// <param name="doWaitRetry">True if to wait and retry in case of failures. </param>
+		/// <returns></returns>
+		Task<LockInfoTdo> GetLockStateAsync(bool doWaitRetry = false);
 
-        Task<bool> SetSoundAsync(SoundSettings settings);
+		Task<bool> SetSoundAsync(SoundSettings settings);
 
-        Task<bool> SetAlarmSettingsAsync(AlarmSettings settings);
+		Task<bool> SetAlarmSettingsAsync(AlarmSettings settings);
 
-        Task<bool> GetIsAlarmOffAsync();
+		Task<bool> GetIsAlarmOffAsync();
 
-        Task SetIsAlarmOffAsync(bool isActivated);
+		Task SetIsAlarmOffAsync(bool isActivated);
 
-        /// <summary>Gets the battery percentage.</summary>
-        Task<double> GetBatteryPercentageAsync();
+		/// <summary>Gets the battery percentage.</summary>
+		Task<double> GetBatteryPercentageAsync();
 
-        /// <summary> Disconnect from lock.</summary>
-        Task Disconnect();
-    }
+		/// <summary> Disconnect from lock.</summary>
+		Task Disconnect();
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/ILocksService.cs b/LockItShared/Services/BluetoothLock/ILocksService.cs
index b6c9030..96c5d8c 100644
--- a/LockItShared/Services/BluetoothLock/ILocksService.cs
+++ b/LockItShared/Services/BluetoothLock/ILocksService.cs
@@ -6,62 +6,62 @@ using TINK.Services.BluetoothLock.Tdo;
 
 namespace TINK.Services.BluetoothLock
 {
-    public interface ILocksService
-    {
-        /// <summary> Holds timeout values for series of connecting attemps to a lock or multiple locks. </summary>
-        ITimeOutProvider TimeOut { get; set; }
+	public interface ILocksService
+	{
+		/// <summary> Holds timeout values for series of connecting attemps to a lock or multiple locks. </summary>
+		ITimeOutProvider TimeOut { get; set; }
 
-        /// <summary> Gets lock info for all lock in reach./// </summary>
-        /// <param name="connectTimeout">Timeout for connect operation of a single lock.</param>
-        Task<IEnumerable<LockInfoTdo>> GetLocksStateAsync(
-            IEnumerable<LockInfoAuthTdo> locksInfo,
-            TimeSpan connectTimeout);
+		/// <summary> Gets lock info for all lock in reach./// </summary>
+		/// <param name="connectTimeout">Timeout for connect operation of a single lock.</param>
+		Task<IEnumerable<LockInfoTdo>> GetLocksStateAsync(
+			IEnumerable<LockInfoAuthTdo> locksInfo,
+			TimeSpan connectTimeout);
 
-        /// <summary> Connects to lock.</summary>
-        /// <param name="authInfo"> Info required to connect to lock.</param>
-        /// <param name="connectTimeout">Timeout for connect operation.</param>
-        Task<LockInfoTdo> ConnectAsync(
-            LockInfoAuthTdo authInfo,
-            TimeSpan connectTimeout);
+		/// <summary> Connects to lock.</summary>
+		/// <param name="authInfo"> Info required to connect to lock.</param>
+		/// <param name="connectTimeout">Timeout for connect operation.</param>
+		Task<LockInfoTdo> ConnectAsync(
+			LockInfoAuthTdo authInfo,
+			TimeSpan connectTimeout);
 
-        /// <summary>Gets a lock by bike Id.</summary>
-        /// <param name="bikeId"></param>
-        /// <returns>Lock object</returns>
-        ILockService this[int bikeId] { get; }
+		/// <summary>Gets a lock by bike Id.</summary>
+		/// <param name="bikeId"></param>
+		/// <returns>Lock object</returns>
+		ILockService this[int bikeId] { get; }
 
-        /// <summary> Disconnects lock.</summary>
-        /// <param name="bikeId"> Id of lock to disconnect.</param>
-        /// <param name="bikeGuid"> Guid of lock to disconnect.</param>
-        /// <returns> State disconnected it lock is already disconneced or after successfully disconnecting.</returns>
-        Task<LockingState> DisconnectAsync(int bikeId, Guid bikeGuid);
-    }
+		/// <summary> Disconnects lock.</summary>
+		/// <param name="bikeId"> Id of lock to disconnect.</param>
+		/// <param name="bikeGuid"> Guid of lock to disconnect.</param>
+		/// <returns> State disconnected it lock is already disconneced or after successfully disconnecting.</returns>
+		Task<LockingState> DisconnectAsync(int bikeId, Guid bikeGuid);
+	}
 
-    /// <summary> Alarm types types. </summary>
-    /// <remarks> Api-doc v29.0 </remarks>
-    public enum AlarmSettings
-    {
-        SmallSensivity = 2,
-        SmallSensivitySilent = 3,
-        SmallSensitivityPrealarm = 22,
-        MediumSensivity = 4,
-        MediumSensivitySilent = 0x05,
-        MediumSensivityPrealarm = 0x24,
-        HightestSensivity = 0x10,
-        HightestSensivitySilent = 0x11,
-        HightestSensivityPrealarm = 0x30,
-    }
+	/// <summary> Alarm types types. </summary>
+	/// <remarks> Api-doc v29.0 </remarks>
+	public enum AlarmSettings
+	{
+		SmallSensivity = 2,
+		SmallSensivitySilent = 3,
+		SmallSensitivityPrealarm = 22,
+		MediumSensivity = 4,
+		MediumSensivitySilent = 0x05,
+		MediumSensivityPrealarm = 0x24,
+		HightestSensivity = 0x10,
+		HightestSensivitySilent = 0x11,
+		HightestSensivityPrealarm = 0x30,
+	}
 
-    /// <summary> Sound types. </summary>
-    /// <remarks> Api-doc v29.0 </remarks>
-    public enum SoundSettings
-    {
-        OnLockingStartedWarn = 0x00,
-        Warn = 0x01,
-        LockingStarted = 0x02,
-        AllOff = 0x03, // Mute
-        OpenedSuccessfully = 0x04,
-        LockingStartedOpenedSuccessfully = 0x05,
-        AllOn = 0x06, // All sounds on
-        OpenedSuccessfullyWarn = 0x07,
-    }
+	/// <summary> Sound types. </summary>
+	/// <remarks> Api-doc v29.0 </remarks>
+	public enum SoundSettings
+	{
+		OnLockingStartedWarn = 0x00,
+		Warn = 0x01,
+		LockingStarted = 0x02,
+		AllOff = 0x03, // Mute
+		OpenedSuccessfully = 0x04,
+		LockingStartedOpenedSuccessfully = 0x05,
+		AllOn = 0x06, // All sounds on
+		OpenedSuccessfullyWarn = 0x07,
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/ITimeOutProvide.cs b/LockItShared/Services/BluetoothLock/ITimeOutProvide.cs
index ffd9417..db9af0d 100644
--- a/LockItShared/Services/BluetoothLock/ITimeOutProvide.cs
+++ b/LockItShared/Services/BluetoothLock/ITimeOutProvide.cs
@@ -2,10 +2,10 @@
 
 namespace TINK.Services.BluetoothLock
 {
-    public interface ITimeOutProvider
-    {
-        TimeSpan MultiConnect { get; }
+	public interface ITimeOutProvider
+	{
+		TimeSpan MultiConnect { get; }
 
-        TimeSpan GetSingleConnect(int countOfTry);
-    }
+		TimeSpan GetSingleConnect(int countOfTry);
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/LockInfoHelper.cs b/LockItShared/Services/BluetoothLock/LockInfoHelper.cs
index 0cd87bf..5f5c01b 100644
--- a/LockItShared/Services/BluetoothLock/LockInfoHelper.cs
+++ b/LockItShared/Services/BluetoothLock/LockInfoHelper.cs
@@ -5,66 +5,66 @@ using TINK.Services.BluetoothLock.Tdo;
 
 namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 {
-    public static class LockInfoHelper
-    {
-        /// <summary> Update by id.</summary>
-        /// <param name="locksInfo"> Lock info objects to update by id.</param>
-        /// <param name="locksInfoTdo">Tdos holding data to updat from</param>
-        /// <returns></returns>
-        public static IEnumerable<LockInfo> UpdateById(
-            this IEnumerable<LockInfo> locksInfo,
-            IEnumerable<LockInfoTdo> locksInfoTdo)
-        {
-            var locksInfoUpdated = new List<LockInfo>();
+	public static class LockInfoHelper
+	{
+		/// <summary> Update by id.</summary>
+		/// <param name="locksInfo"> Lock info objects to update by id.</param>
+		/// <param name="locksInfoTdo">Tdos holding data to updat from</param>
+		/// <returns></returns>
+		public static IEnumerable<LockInfo> UpdateById(
+			this IEnumerable<LockInfo> locksInfo,
+			IEnumerable<LockInfoTdo> locksInfoTdo)
+		{
+			var locksInfoUpdated = new List<LockInfo>();
 
-            foreach (var lockInfo in locksInfo)
-            {
-                var lockInfoTdo = locksInfoTdo.FirstOrDefault(x => x.Id == lockInfo.Id);
-                if (lockInfoTdo == null)
-                {
-                    // No object to update from found.
-                    locksInfoUpdated.Add(lockInfo);
-                    continue;
-                }
+			foreach (var lockInfo in locksInfo)
+			{
+				var lockInfoTdo = locksInfoTdo.FirstOrDefault(x => x.Id == lockInfo.Id);
+				if (lockInfoTdo == null)
+				{
+					// No object to update from found.
+					locksInfoUpdated.Add(lockInfo);
+					continue;
+				}
 
-                var state = lockInfoTdo.State.HasValue ? lockInfoTdo.State.Value.GetLockingState() : LockingState.UnknownDisconnected;
+				var state = lockInfoTdo.State.HasValue ? lockInfoTdo.State.Value.GetLockingState() : LockingState.UnknownDisconnected;
 
-                locksInfoUpdated.Add(state != lockInfo.State || lockInfoTdo.Guid != lockInfo.Guid
-                     ? new LockInfo.Builder(lockInfo) { Guid = lockInfoTdo.Guid, State = state }.Build() // State has changed, update required.
-                     : lockInfo);
-            }
+				locksInfoUpdated.Add(state != lockInfo.State || lockInfoTdo.Guid != lockInfo.Guid
+					 ? new LockInfo.Builder(lockInfo) { Guid = lockInfoTdo.Guid, State = state }.Build() // State has changed, update required.
+					 : lockInfo);
+			}
 
-            return locksInfoUpdated;
-        }
+			return locksInfoUpdated;
+		}
 
-        public static LockingState GetLockingState(this LockitLockingState lockingState)
-        {
-            switch (lockingState)
-            {
-                case LockitLockingState.Unknown:
-                case LockitLockingState.CouldntOpenBoldBlocked: // Lock is closed in most cases, but this is not guarnteed according to haveltec.
-                    return LockingState.UnknownFromHardwareError;
+		public static LockingState GetLockingState(this LockitLockingState lockingState)
+		{
+			switch (lockingState)
+			{
+				case LockitLockingState.Unknown:
+				case LockitLockingState.CouldntOpenBoldBlocked: // Lock is closed in most cases, but this is not guarnteed according to haveltec.
+					return LockingState.UnknownFromHardwareError;
 
-                case LockitLockingState.Open:
-                case LockitLockingState.CouldntCloseMoving:
-                case LockitLockingState.CouldntCloseBoldBlocked:
-                    return LockingState.Open;
+				case LockitLockingState.Open:
+				case LockitLockingState.CouldntCloseMoving:
+				case LockitLockingState.CouldntCloseBoldBlocked:
+					return LockingState.Open;
 
-                case LockitLockingState.Closed:
-                    return LockingState.Closed;
-            }
+				case LockitLockingState.Closed:
+					return LockingState.Closed;
+			}
 
-            throw new ArgumentException($"Can not convert LockIt specific locking state to logical locking state. Unknown state {lockingState} detected.");
-        }
+			throw new ArgumentException($"Can not convert LockIt specific locking state to logical locking state. Unknown state {lockingState} detected.");
+		}
 
-        /// <summary> Gets one type from another.</summary>
-        /// <param name="lockInfo"></param>
-        /// <returns></returns>
-        public static LockInfoAuthTdo ToLockInfoTdo(this LockInfo lockInfo)
-        {
-            return new LockInfoAuthTdo.Builder() { Id = lockInfo.Id, Guid = lockInfo.Guid, K_u = lockInfo.UserKey, K_a = lockInfo.AdminKey, K_seed = lockInfo.Seed }.Build();
-        }
+		/// <summary> Gets one type from another.</summary>
+		/// <param name="lockInfo"></param>
+		/// <returns></returns>
+		public static LockInfoAuthTdo ToLockInfoTdo(this LockInfo lockInfo)
+		{
+			return new LockInfoAuthTdo.Builder() { Id = lockInfo.Id, Guid = lockInfo.Guid, K_u = lockInfo.UserKey, K_a = lockInfo.AdminKey, K_seed = lockInfo.Seed }.Build();
+		}
 
 
-    }
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/LockItByGuidServiceHelper.cs b/LockItShared/Services/BluetoothLock/LockItByGuidServiceHelper.cs
index bdbd143..2cdc26e 100644
--- a/LockItShared/Services/BluetoothLock/LockItByGuidServiceHelper.cs
+++ b/LockItShared/Services/BluetoothLock/LockItByGuidServiceHelper.cs
@@ -3,18 +3,18 @@ using System.Collections.Generic;
 
 namespace LockItShared.Services.BluetoothLock
 {
-    public static class LockItByGuidServiceHelper
-    {
-        /// <summary> 
-        /// Holds guids of developent locks to ensure that no wrong guid are provided by COPRI 
-        /// </summary>
-        public static Dictionary<int, Guid> DevelGuids = new Dictionary<int, Guid>
-        {
-            { 2200537, new Guid("00000000-0000-0000-0000-d589a8023487") },
-            { 2200543, new Guid("00000000-0000-0000-0000-cc141a6f68bb") },
-            { 2200544, new Guid("00000000-0000-0000-0000-dc969f648732") },
-            { 2200545, new Guid("00000000-0000-0000-0000-e38bf9d32234") }
-        };
+	public static class LockItByGuidServiceHelper
+	{
+		/// <summary> 
+		/// Holds guids of developent locks to ensure that no wrong guid are provided by COPRI 
+		/// </summary>
+		public static Dictionary<int, Guid> DevelGuids = new Dictionary<int, Guid>
+		{
+			{ 2200537, new Guid("00000000-0000-0000-0000-d589a8023487") },
+			{ 2200543, new Guid("00000000-0000-0000-0000-cc141a6f68bb") },
+			{ 2200544, new Guid("00000000-0000-0000-0000-dc969f648732") },
+			{ 2200545, new Guid("00000000-0000-0000-0000-e38bf9d32234") }
+		};
 
-    }
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/NullLock.cs b/LockItShared/Services/BluetoothLock/NullLock.cs
index f932664..d0d455a 100644
--- a/LockItShared/Services/BluetoothLock/NullLock.cs
+++ b/LockItShared/Services/BluetoothLock/NullLock.cs
@@ -4,60 +4,60 @@ using TINK.Services.BluetoothLock.Tdo;
 
 namespace TINK.Services.BluetoothLock
 {
-    /// <summary>
-    /// Represents a not exisitng lock.
-    /// </summary>
-    public class NullLock : ILockService
-    {
-        private int BikeId { get; }
+	/// <summary>
+	/// Represents a not exisitng lock.
+	/// </summary>
+	public class NullLock : ILockService
+	{
+		private int BikeId { get; }
 
-        public NullLock(int bikeId)
-        {
-            BikeId = bikeId;
-        }
+		public NullLock(int bikeId)
+		{
+			BikeId = bikeId;
+		}
 
-        public Task ReconnectAsync(LockInfoAuthTdo authInfo, TimeSpan connectTimeout) =>
-            throw new NotImplementedException();
+		public Task ReconnectAsync(LockInfoAuthTdo authInfo, TimeSpan connectTimeout) =>
+			throw new NotImplementedException();
 
-        public string Name =>
-            throw new NotImplementedException();
+		public string Name =>
+			throw new NotImplementedException();
 
-        public Guid Guid =>
-            throw new NotImplementedException();
+		public Guid Guid =>
+			throw new NotImplementedException();
 
-        public int Id =>
-            throw new NotImplementedException();
+		public int Id =>
+			throw new NotImplementedException();
 
-        public async Task<LockitLockingState?> OpenAsync() =>
-            await Task.FromResult((LockitLockingState?)null);
+		public async Task<LockitLockingState?> OpenAsync() =>
+			await Task.FromResult((LockitLockingState?)null);
 
-        public async Task<LockitLockingState?> CloseAsync() =>
-            await Task.FromResult((LockitLockingState?)null);
+		public async Task<LockitLockingState?> CloseAsync() =>
+			await Task.FromResult((LockitLockingState?)null);
 
-        public Task<double> GetBatteryPercentageAsync() =>
-            throw new System.Exception($"Can not get battery percentage. Lock {BikeId} not found.");
+		public Task<double> GetBatteryPercentageAsync() =>
+			throw new System.Exception($"Can not get battery percentage. Lock {BikeId} not found.");
 
-        public DeviceState? GetDeviceState() =>
-            throw new NotImplementedException();
+		public DeviceState? GetDeviceState() =>
+			throw new NotImplementedException();
 
-        public Task<bool> GetIsAlarmOffAsync() =>
-            throw new System.Exception($"Can not get whether alarm is on or off. Lock {BikeId} not found.");
+		public Task<bool> GetIsAlarmOffAsync() =>
+			throw new System.Exception($"Can not get whether alarm is on or off. Lock {BikeId} not found.");
 
-        public Task<LockInfoTdo> GetLockStateAsync(bool doWaitRetry = false) =>
-            throw new NotImplementedException();
+		public Task<LockInfoTdo> GetLockStateAsync(bool doWaitRetry = false) =>
+			throw new NotImplementedException();
 
-        public Task SetIsAlarmOffAsync(bool isActivated) =>
-            throw new System.Exception($"Can not set alarm {isActivated}. Lock {BikeId} not found.");
+		public Task SetIsAlarmOffAsync(bool isActivated) =>
+			throw new System.Exception($"Can not set alarm {isActivated}. Lock {BikeId} not found.");
 
-        public async Task<bool> SetSoundAsync(SoundSettings settings) =>
-            await Task.FromResult(false);
+		public async Task<bool> SetSoundAsync(SoundSettings settings) =>
+			await Task.FromResult(false);
 
-        public async Task<bool> SetAlarmSettingsAsync(AlarmSettings settings) =>
-            await Task.FromResult(false);
+		public async Task<bool> SetAlarmSettingsAsync(AlarmSettings settings) =>
+			await Task.FromResult(false);
 
-        /// <summary> Disconnect from bluetooth lock. </summary>
-        public Task Disconnect() =>
-            throw new NotImplementedException();
+		/// <summary> Disconnect from bluetooth lock. </summary>
+		public Task Disconnect() =>
+			throw new NotImplementedException();
 
-    }
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Tdo/LockInfoAuthTdo.cs b/LockItShared/Services/BluetoothLock/Tdo/LockInfoAuthTdo.cs
index 417b57e..0a60a89 100644
--- a/LockItShared/Services/BluetoothLock/Tdo/LockInfoAuthTdo.cs
+++ b/LockItShared/Services/BluetoothLock/Tdo/LockInfoAuthTdo.cs
@@ -3,59 +3,59 @@ using TINK.Model.Connector;
 
 namespace TINK.Services.BluetoothLock.Tdo
 {
-    /// <summary> Data required to connect to a blutooth lock.</summary>
-    public class LockInfoAuthTdo
-    {
-        /// <summary> Identification number of bluetooth lock, 6-digits, second part of advertisement name.</summary>
-        public int Id { get; private set; }
+	/// <summary> Data required to connect to a blutooth lock.</summary>
+	public class LockInfoAuthTdo
+	{
+		/// <summary> Identification number of bluetooth lock, 6-digits, second part of advertisement name.</summary>
+		public int Id { get; private set; }
 
-        /// <summary> GUID to the device. </summary>
-        public Guid Guid { get; private set; }
+		/// <summary> GUID to the device. </summary>
+		public Guid Guid { get; private set; }
 
-        /// <summary> Seed used to generate key for connecting to bluetooth lock.</summary>
-        public byte[] K_seed { get; private set; }
+		/// <summary> Seed used to generate key for connecting to bluetooth lock.</summary>
+		public byte[] K_seed { get; private set; }
 
-        /// <summary> Key for connect to bluetooth lock as user.</summary>
-        public byte[] K_u { get; private set; }
+		/// <summary> Key for connect to bluetooth lock as user.</summary>
+		public byte[] K_u { get; private set; }
 
-        /// <summary> Key for connect to bluetooth lock as admin.</summary>
-        public byte[] K_a { get; private set; }
+		/// <summary> Key for connect to bluetooth lock as admin.</summary>
+		public byte[] K_a { get; private set; }
 
-        public bool IsIdValid => Id != TextToLockItTypeHelper.INVALIDLOCKID;
+		public bool IsIdValid => Id != TextToLockItTypeHelper.INVALIDLOCKID;
 
-        public bool IsGuidValid => Guid != TextToLockItTypeHelper.INVALIDLOCKGUID;
+		public bool IsGuidValid => Guid != TextToLockItTypeHelper.INVALIDLOCKGUID;
 
-        public class Builder
-        {
-            private LockInfoAuthTdo lockInfoTdo = new LockInfoAuthTdo();
+		public class Builder
+		{
+			private LockInfoAuthTdo lockInfoTdo = new LockInfoAuthTdo();
 
-            public Builder() { }
+			public Builder() { }
 
-            /// <summary> Identification number of bluetooth lock, 6-digits, second part of advertisement name.</summary>
-            public int Id { get => lockInfoTdo.Id; set { lockInfoTdo.Id = value; } }
+			/// <summary> Identification number of bluetooth lock, 6-digits, second part of advertisement name.</summary>
+			public int Id { get => lockInfoTdo.Id; set { lockInfoTdo.Id = value; } }
 
-            /// <summary> GUID to the device. </summary>
-            public Guid Guid { get => lockInfoTdo.Guid; set { lockInfoTdo.Guid = value; } }
+			/// <summary> GUID to the device. </summary>
+			public Guid Guid { get => lockInfoTdo.Guid; set { lockInfoTdo.Guid = value; } }
 
-            /// <summary> Seed used to generate key for connecting to bluetooth lock.</summary>
-            public byte[] K_seed { get => lockInfoTdo.K_seed; set { lockInfoTdo.K_seed = value; } }
+			/// <summary> Seed used to generate key for connecting to bluetooth lock.</summary>
+			public byte[] K_seed { get => lockInfoTdo.K_seed; set { lockInfoTdo.K_seed = value; } }
 
-            /// <summary> Key for connect to bluetooth lock as user.</summary>
-            public byte[] K_u { get => lockInfoTdo.K_u; set { lockInfoTdo.K_u = value; } }
+			/// <summary> Key for connect to bluetooth lock as user.</summary>
+			public byte[] K_u { get => lockInfoTdo.K_u; set { lockInfoTdo.K_u = value; } }
 
-            /// <summary> Key for connect to bluetooth lock as admin.</summary>
-            public byte[] K_a { get => lockInfoTdo.K_a; set { lockInfoTdo.K_a = value; } }
+			/// <summary> Key for connect to bluetooth lock as admin.</summary>
+			public byte[] K_a { get => lockInfoTdo.K_a; set { lockInfoTdo.K_a = value; } }
 
-            public LockInfoAuthTdo Build()
-            {
-                if (K_seed == null) K_seed = new byte[0];
+			public LockInfoAuthTdo Build()
+			{
+				if (K_seed == null) K_seed = new byte[0];
 
-                if (K_u == null) K_u = new byte[0];
+				if (K_u == null) K_u = new byte[0];
 
-                if (K_a == null) K_a = new byte[0];
+				if (K_a == null) K_a = new byte[0];
 
-                return lockInfoTdo;
-            }
-        }
-    }
+				return lockInfoTdo;
+			}
+		}
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Tdo/LockInfoTdo.cs b/LockItShared/Services/BluetoothLock/Tdo/LockInfoTdo.cs
index d8dbfa8..1af4d84 100644
--- a/LockItShared/Services/BluetoothLock/Tdo/LockInfoTdo.cs
+++ b/LockItShared/Services/BluetoothLock/Tdo/LockInfoTdo.cs
@@ -2,53 +2,53 @@
 
 namespace TINK.Services.BluetoothLock.Tdo
 {
-    /// <summary> Genuine ILOCKIT state.</summary>
-    public enum LockitLockingState
-    {
-        Open = 0x00,
+	/// <summary> Genuine ILOCKIT state.</summary>
+	public enum LockitLockingState
+	{
+		Open = 0x00,
 
-        Closed = 0x01,
+		Closed = 0x01,
 
-        Unknown = 0x02,
+		Unknown = 0x02,
 
-        CouldntCloseMoving = 0x03,
+		CouldntCloseMoving = 0x03,
 
-        CouldntOpenBoldBlocked = 0x04,
+		CouldntOpenBoldBlocked = 0x04,
 
-        CouldntCloseBoldBlocked = 0x05
-    }
+		CouldntCloseBoldBlocked = 0x05
+	}
 
-    /// <summary> Object holding info about bluetooth lock. </summary>
-    public class LockInfoTdo
-    {
-        private LockInfoTdo() { }
+	/// <summary> Object holding info about bluetooth lock. </summary>
+	public class LockInfoTdo
+	{
+		private LockInfoTdo() { }
 
-        /// <summary> Identification number of bluetooth lock, 6-digits, second part of advertisement name.</summary>
-        public int Id { get; private set; }
+		/// <summary> Identification number of bluetooth lock, 6-digits, second part of advertisement name.</summary>
+		public int Id { get; private set; }
 
-        /// <summary> Guid for direct connect.</summary>
-        public Guid Guid { get; private set; }
+		/// <summary> Guid for direct connect.</summary>
+		public Guid Guid { get; private set; }
 
-        /// <summary> Gets the current state of the lock.</summary>
-        public LockitLockingState? State { get; private set; }
+		/// <summary> Gets the current state of the lock.</summary>
+		public LockitLockingState? State { get; private set; }
 
-        public class Builder
-        {
-            private LockInfoTdo lockInfoTdo = new LockInfoTdo();
+		public class Builder
+		{
+			private LockInfoTdo lockInfoTdo = new LockInfoTdo();
 
-            /// <summary> Identification number of bluetooth lock, 6-digits, second part of advertisement name.</summary>
-            public int Id { get => lockInfoTdo.Id; set => lockInfoTdo.Id = value; }
+			/// <summary> Identification number of bluetooth lock, 6-digits, second part of advertisement name.</summary>
+			public int Id { get => lockInfoTdo.Id; set => lockInfoTdo.Id = value; }
 
-            /// <summary> Guid for direct connect.</summary>
-            public Guid Guid { get => lockInfoTdo.Guid; set => lockInfoTdo.Guid = value; }
+			/// <summary> Guid for direct connect.</summary>
+			public Guid Guid { get => lockInfoTdo.Guid; set => lockInfoTdo.Guid = value; }
 
-            /// <summary> Gets the current state of the lock.</summary>
-            public LockitLockingState? State { get => lockInfoTdo.State; set => lockInfoTdo.State = value; }
+			/// <summary> Gets the current state of the lock.</summary>
+			public LockitLockingState? State { get => lockInfoTdo.State; set => lockInfoTdo.State = value; }
 
-            public LockInfoTdo Build()
-            {
-                return lockInfoTdo;
-            }
-        }
-    }
+			public LockInfoTdo Build()
+			{
+				return lockInfoTdo;
+			}
+		}
+	}
 }
diff --git a/LockItShared/Services/BluetoothLock/TimeOutProvider.cs b/LockItShared/Services/BluetoothLock/TimeOutProvider.cs
index e678ba3..91944aa 100644
--- a/LockItShared/Services/BluetoothLock/TimeOutProvider.cs
+++ b/LockItShared/Services/BluetoothLock/TimeOutProvider.cs
@@ -4,27 +4,27 @@ using System.Linq;
 
 namespace TINK.Services.BluetoothLock
 {
-    public class TimeOutProvider : ITimeOutProvider
-    {
-        /// <summary> Maximum factor applied on timeout factor. </summary>
-        private readonly int MAXIMUMFACTORTIMEOUT = 4;
+	public class TimeOutProvider : ITimeOutProvider
+	{
+		/// <summary> Maximum factor applied on timeout factor. </summary>
+		private readonly int MAXIMUMFACTORTIMEOUT = 4;
 
-        /// <summary> Default timeout to connect to bluetooth lock. </summary>
-        public static int DEFAULT_BLUETOOTHCONNECT_TIMEOUTSECONDS = 5;
+		/// <summary> Default timeout to connect to bluetooth lock. </summary>
+		public static int DEFAULT_BLUETOOTHCONNECT_TIMEOUTSECONDS = 5;
 
-        public TimeOutProvider(IEnumerable<TimeSpan> timeOuts = null)
-        {
-            TimeOuts = timeOuts != null && timeOuts.Count() > 0
-                ? timeOuts.ToList()
-                : new List<TimeSpan> { new TimeSpan(0, 0, DEFAULT_BLUETOOTHCONNECT_TIMEOUTSECONDS) };
-        }
+		public TimeOutProvider(IEnumerable<TimeSpan> timeOuts = null)
+		{
+			TimeOuts = timeOuts != null && timeOuts.Count() > 0
+				? timeOuts.ToList()
+				: new List<TimeSpan> { new TimeSpan(0, 0, DEFAULT_BLUETOOTHCONNECT_TIMEOUTSECONDS) };
+		}
 
-        private List<TimeSpan> TimeOuts { get; }
+		private List<TimeSpan> TimeOuts { get; }
 
-        public TimeSpan MultiConnect => TimeOuts.ToArray()[0];
+		public TimeSpan MultiConnect => TimeOuts.ToArray()[0];
 
-        public TimeSpan GetSingleConnect(int countOfTry) => countOfTry < TimeOuts.Count
-            ? TimeOuts.ToArray()[countOfTry]
-            : new TimeSpan(TimeOuts.ToArray()[0].Ticks * Math.Min(countOfTry, MAXIMUMFACTORTIMEOUT));
-    }
+		public TimeSpan GetSingleConnect(int countOfTry) => countOfTry < TimeOuts.Count
+			? TimeOuts.ToArray()[countOfTry]
+			: new TimeSpan(TimeOuts.ToArray()[0].Ticks * Math.Min(countOfTry, MAXIMUMFACTORTIMEOUT));
+	}
 }
diff --git a/Meinkonrad/TINK.Android/MainActivity.cs b/Meinkonrad/TINK.Android/MainActivity.cs
index d650ac5..b78fc1f 100644
--- a/Meinkonrad/TINK.Android/MainActivity.cs
+++ b/Meinkonrad/TINK.Android/MainActivity.cs
@@ -12,96 +12,96 @@ using Xamarin.Forms.Platform.Android.AppLinks;
 
 namespace TINK.Droid
 {
-    [Activity(Label = "Mein konrad", Icon = "@drawable/sharee", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
+	[Activity(Label = "Mein konrad", Icon = "@drawable/sharee", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
 
-    [IntentFilter(new[] { Intent.ActionView },
-              Categories = new[] { Intent.ActionView, Intent.CategoryBrowsable, Intent.CategoryDefault },
-              DataScheme = "https",
-              DataHost = "app.sharee.bike",
-              DataPathPrefix = "/App-Meinkonrad",
-              AutoVerify = true)]
+	[IntentFilter(new[] { Intent.ActionView },
+			  Categories = new[] { Intent.ActionView, Intent.CategoryBrowsable, Intent.CategoryDefault },
+			  DataScheme = "https",
+			  DataHost = "app.sharee.bike",
+			  DataPathPrefix = "/App-Meinkonrad",
+			  AutoVerify = true)]
 
-    [IntentFilter(new[] { Intent.ActionView },
-              Categories = new[] { Intent.ActionView, Intent.CategoryBrowsable, Intent.CategoryDefault },
-              DataScheme = "http",
-              DataHost = "app.sharee.bike",
-              DataPathPrefix = "/App-Meinkonrad",
-              AutoVerify = true)]
+	[IntentFilter(new[] { Intent.ActionView },
+			  Categories = new[] { Intent.ActionView, Intent.CategoryBrowsable, Intent.CategoryDefault },
+			  DataScheme = "http",
+			  DataHost = "app.sharee.bike",
+			  DataPathPrefix = "/App-Meinkonrad",
+			  AutoVerify = true)]
 
-    public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
-    {
-        private void initFontScale()
-        {
-            Configuration configuration = Resources.Configuration;
-            configuration.FontScale = (float)1;
-            //0.85 small, 1 standard, 1.15 big，1.3 more bigger ，1.45 supper big 
-            DisplayMetrics metrics = new DisplayMetrics();
-            WindowManager.DefaultDisplay.GetMetrics(metrics);
-            metrics.ScaledDensity = configuration.FontScale * metrics.Density;
-            BaseContext.Resources.UpdateConfiguration(configuration, metrics);
-        }
-        protected override void OnCreate(Bundle bundle)
-        {
-            initFontScale();
+	public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
+	{
+		private void initFontScale()
+		{
+			Configuration configuration = Resources.Configuration;
+			configuration.FontScale = (float)1;
+			//0.85 small, 1 standard, 1.15 big，1.3 more bigger ，1.45 supper big 
+			DisplayMetrics metrics = new DisplayMetrics();
+			WindowManager.DefaultDisplay.GetMetrics(metrics);
+			metrics.ScaledDensity = configuration.FontScale * metrics.Density;
+			BaseContext.Resources.UpdateConfiguration(configuration, metrics);
+		}
+		protected override void OnCreate(Bundle bundle)
+		{
+			initFontScale();
 
-            TabLayoutResource = Resource.Layout.Tabbar;
-            ToolbarResource = Resource.Layout.Toolbar;
+			TabLayoutResource = Resource.Layout.Tabbar;
+			ToolbarResource = Resource.Layout.Toolbar;
 
-            base.OnCreate(bundle);
+			base.OnCreate(bundle);
 
-            global::Xamarin.Forms.Forms.Init(this, bundle);
+			global::Xamarin.Forms.Forms.Init(this, bundle);
 
-            FirebaseApp.InitializeApp(this);
-            AndroidAppLinks.Init(this);
+			FirebaseApp.InitializeApp(this);
+			AndroidAppLinks.Init(this);
 
-            // Initialize xamarin.essentials, see https://docs.microsoft.com/en-us/xamarin/essentials/get-started?tabs=macos%2Candroid.
-            Xamarin.Essentials.Platform.Init(this, bundle);
+			// Initialize xamarin.essentials, see https://docs.microsoft.com/en-us/xamarin/essentials/get-started?tabs=macos%2Candroid.
+			Xamarin.Essentials.Platform.Init(this, bundle);
 
-            // Required for initialization of Maps, see https://developer.xamarin.com/guides/xamarin-forms/user-interface/map/
-            Xamarin.FormsGoogleMaps.Init(this, bundle);
+			// Required for initialization of Maps, see https://developer.xamarin.com/guides/xamarin-forms/user-interface/map/
+			Xamarin.FormsGoogleMaps.Init(this, bundle);
 
-            // Required for initialization of binding package, see  https://github.com/nuitsjp/Xamarin.Forms.GoogleMaps.Bindings.
-            Xamarin.FormsGoogleMapsBindings.Init();
+			// Required for initialization of binding package, see  https://github.com/nuitsjp/Xamarin.Forms.GoogleMaps.Bindings.
+			Xamarin.FormsGoogleMapsBindings.Init();
 
-            // Get version name of app.
-            Context context = ApplicationContext;
-            new Model.Device.AppInfo(context.PackageManager.GetPackageInfo(context.PackageName, 0).VersionName);
+			// Get version name of app.
+			Context context = ApplicationContext;
+			new Model.Device.AppInfo(context.PackageManager.GetPackageInfo(context.PackageName, 0).VersionName);
 
-            Xamarin.Forms.Forms.ViewInitialized += (object sender, Xamarin.Forms.ViewInitializedEventArgs e) =>
-            {
-                if (!string.IsNullOrWhiteSpace(e.View.AutomationId))
-                {
-                    e.NativeView.ContentDescription = e.View.AutomationId;
-                }
-            };
+			Xamarin.Forms.Forms.ViewInitialized += (object sender, Xamarin.Forms.ViewInitializedEventArgs e) =>
+			{
+				if (!string.IsNullOrWhiteSpace(e.View.AutomationId))
+				{
+					e.NativeView.ContentDescription = e.View.AutomationId;
+				}
+			};
 
-            LoadApplication(new App());
-        }
+			LoadApplication(new App());
+		}
 
-        /// <summary>
-        /// Handles opening the dialog to request for permissions.
-        /// </summary>
-        public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Android.Content.PM.Permission[] grantResults)
-        {
-            if (App.PermissionsService.GetType() == typeof(TINK.Services.Permissions.Essentials.Permissions))
-            {
-                Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-            }
-            else if (App.PermissionsService.GetType() == typeof(TINK.Services.Permissions.Plugin.Permissions))
-            {
-                // Bug in 3.0.244 and earlier versions of sharee.bike app: Call of PermissionsImplementation.Current.OnRequestedPermission result was missing.
-                // see https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/136 for further details.
-                PermissionsImplementation.Current.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-            }
+		/// <summary>
+		/// Handles opening the dialog to request for permissions.
+		/// </summary>
+		public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Android.Content.PM.Permission[] grantResults)
+		{
+			if (App.PermissionsService.GetType() == typeof(TINK.Services.Permissions.Essentials.Permissions))
+			{
+				Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+			}
+			else if (App.PermissionsService.GetType() == typeof(TINK.Services.Permissions.Plugin.Permissions))
+			{
+				// Bug in 3.0.244 and earlier versions of sharee.bike app: Call of PermissionsImplementation.Current.OnRequestedPermission result was missing.
+				// see https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/136 for further details.
+				PermissionsImplementation.Current.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+			}
 
-            base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-        }
+			base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+		}
 
-        [Export("TapStation")]
-        public void TapStation(string stationNr)
-        {
-            BackdoorMethodHelpers.DoTapPage(stationNr);
-        }
-    }
+		[Export("TapStation")]
+		public void TapStation(string stationNr)
+		{
+			BackdoorMethodHelpers.DoTapPage(stationNr);
+		}
+	}
 }
 
diff --git a/Meinkonrad/TINK.Android/Model/Device/AppInfo.cs b/Meinkonrad/TINK.Android/Model/Device/AppInfo.cs
index 58b23f0..8febfc6 100644
--- a/Meinkonrad/TINK.Android/Model/Device/AppInfo.cs
+++ b/Meinkonrad/TINK.Android/Model/Device/AppInfo.cs
@@ -6,40 +6,40 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(AppInfo))]
 namespace TINK.Droid.Model.Device
 {
-    /// <summary> Holds information about the TINK- app. </summary>
-    public class AppInfo : IAppInfo
-    {
-        /// <summary> Holds the the version of the app.</summary>
-        private static Version m_oVersion = null;
+	/// <summary> Holds information about the TINK- app. </summary>
+	public class AppInfo : IAppInfo
+	{
+		/// <summary> Holds the the version of the app.</summary>
+		private static Version m_oVersion = null;
 
-        /// <summary> Constructs a app info object. </summary>
-        public AppInfo()
-        {
-        }
+		/// <summary> Constructs a app info object. </summary>
+		public AppInfo()
+		{
+		}
 
-        /// <summary> Constructs a app info object for initialization. </summary>
-        /// <param name="p_strVersionText"> Version to initializ object with.</param>
-        internal AppInfo(string p_strVersionText)
-        {
-            if (m_oVersion != null)
-            {
-                // Set version only once.
-                return;
-            }
+		/// <summary> Constructs a app info object for initialization. </summary>
+		/// <param name="p_strVersionText"> Version to initializ object with.</param>
+		internal AppInfo(string p_strVersionText)
+		{
+			if (m_oVersion != null)
+			{
+				// Set version only once.
+				return;
+			}
 
-            if (!Version.TryParse(p_strVersionText, out Version l_oVersion))
-            {
-                m_oVersion = new Version(0, 8);
-            }
+			if (!Version.TryParse(p_strVersionText, out Version l_oVersion))
+			{
+				m_oVersion = new Version(0, 8);
+			}
 
-            m_oVersion = l_oVersion;
-        }
+			m_oVersion = l_oVersion;
+		}
 
-        /// <summary> Get the version of the app. </summary>
-        public Version Version => m_oVersion ?? new Version(0, 9);
+		/// <summary> Get the version of the app. </summary>
+		public Version Version => m_oVersion ?? new Version(0, 9);
 
-        /// <summary> Gets the URL to the app store. </summary>
-        /// <value>The store URL.</value>
-        public string StoreUrl => $"https://play.google.com/store/apps/details?id={Android.App.Application.Context.PackageName}";
-    }
+		/// <summary> Gets the URL to the app store. </summary>
+		/// <value>The store URL.</value>
+		public string StoreUrl => $"https://play.google.com/store/apps/details?id={Android.App.Application.Context.PackageName}";
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK.Android/Model/Device/Device.cs b/Meinkonrad/TINK.Android/Model/Device/Device.cs
index d01840b..d4c162b 100644
--- a/Meinkonrad/TINK.Android/Model/Device/Device.cs
+++ b/Meinkonrad/TINK.Android/Model/Device/Device.cs
@@ -5,19 +5,19 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(TINK.Droid.Model.Device.Device))]
 namespace TINK.Droid.Model.Device
 {
-    public class Device : ISmartDevice
-    {
-        public string Manufacturer => DeviceInfo.Manufacturer;
+	public class Device : ISmartDevice
+	{
+		public string Manufacturer => DeviceInfo.Manufacturer;
 
-        public string Model => DeviceInfo.Model;
+		public string Model => DeviceInfo.Model;
 
-        public DevicePlatform Platform => DeviceInfo.Platform;
+		public DevicePlatform Platform => DeviceInfo.Platform;
 
-        public string VersionText => DeviceInfo.VersionString;
+		public string VersionText => DeviceInfo.VersionString;
 
-        /// <summary> Gets unitque device identifier. </summary>
-        /// <returns>Gets the identifies specifying device.</returns>
-        public string Identifier
-            => Android.Provider.Settings.Secure.GetString(Android.App.Application.Context.ContentResolver, Android.Provider.Settings.Secure.AndroidId);
-    }
+		/// <summary> Gets unitque device identifier. </summary>
+		/// <returns>Gets the identifies specifying device.</returns>
+		public string Identifier
+			=> Android.Provider.Settings.Secure.GetString(Android.App.Application.Context.ContentResolver, Android.Provider.Settings.Secure.AndroidId);
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK.Android/Model/Device/ExternalBrowseService.cs b/Meinkonrad/TINK.Android/Model/Device/ExternalBrowseService.cs
index a971c11..15bb1e6 100644
--- a/Meinkonrad/TINK.Android/Model/Device/ExternalBrowseService.cs
+++ b/Meinkonrad/TINK.Android/Model/Device/ExternalBrowseService.cs
@@ -6,18 +6,18 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(ExternalBrowseService))]
 namespace TINK.Droid.Model.Device
 {
-    public class ExternalBrowseService : IExternalBrowserService
-    {
-        /// <summary> Opens an external browser. </summary>
-        /// <param name="p_strUrl">Url to open.</param>
-        public void OpenUrl(string p_strUrl)
-        {
-            var uri = Android.Net.Uri.Parse(p_strUrl);
-            var intent = new Intent(Intent.ActionView, uri);
+	public class ExternalBrowseService : IExternalBrowserService
+	{
+		/// <summary> Opens an external browser. </summary>
+		/// <param name="p_strUrl">Url to open.</param>
+		public void OpenUrl(string p_strUrl)
+		{
+			var uri = Android.Net.Uri.Parse(p_strUrl);
+			var intent = new Intent(Intent.ActionView, uri);
 
-            intent.AddFlags(ActivityFlags.NewTask);
+			intent.AddFlags(ActivityFlags.NewTask);
 
-            Android.App.Application.Context.StartActivity(intent);
-        }
-    }
+			Android.App.Application.Context.StartActivity(intent);
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK.Android/Model/Device/Gps.cs b/Meinkonrad/TINK.Android/Model/Device/Gps.cs
index dfa055f..9087413 100644
--- a/Meinkonrad/TINK.Android/Model/Device/Gps.cs
+++ b/Meinkonrad/TINK.Android/Model/Device/Gps.cs
@@ -16,15 +16,15 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(TINK.Droid.Model.Device.Gps))]
 namespace TINK.Droid.Model.Device
 {
-    public class Gps : IGeolodationDependent
-    {
-        public bool IsGeolcationEnabled
-        {
-            get
-            {
-                LocationManager locationManager = (LocationManager)Android.App.Application.Context.GetSystemService(Context.LocationService);
-                return locationManager.IsProviderEnabled(LocationManager.GpsProvider);
-            }
-        }
-    }
+	public class Gps : IGeolodationDependent
+	{
+		public bool IsGeolcationEnabled
+		{
+			get
+			{
+				LocationManager locationManager = (LocationManager)Android.App.Application.Context.GetSystemService(Context.LocationService);
+				return locationManager.IsProviderEnabled(LocationManager.GpsProvider);
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK.Android/Model/Device/SpecialFolder.cs b/Meinkonrad/TINK.Android/Model/Device/SpecialFolder.cs
index 3ca8eae..d07b4cb 100644
--- a/Meinkonrad/TINK.Android/Model/Device/SpecialFolder.cs
+++ b/Meinkonrad/TINK.Android/Model/Device/SpecialFolder.cs
@@ -6,44 +6,44 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(TINK.Droid.Model.Device.SpecialFolder))]
 namespace TINK.Droid.Model.Device
 {
-    public class SpecialFolder : ISpecialFolder
-    {
-        /// <summary> Get the folder name of external folder to write to. </summary>
-        /// <returns> Name of the external folder. </returns>
-        public string GetExternalFilesDir()
-        {
-            string baseFolderPath = string.Empty;
-            try
-            {
-                var context = Android.App.Application.Context;
-                Java.IO.File[] dirs = context.GetExternalFilesDirs(null);
+	public class SpecialFolder : ISpecialFolder
+	{
+		/// <summary> Get the folder name of external folder to write to. </summary>
+		/// <returns> Name of the external folder. </returns>
+		public string GetExternalFilesDir()
+		{
+			string baseFolderPath = string.Empty;
+			try
+			{
+				var context = Android.App.Application.Context;
+				Java.IO.File[] dirs = context.GetExternalFilesDirs(null);
 
-                foreach (Java.IO.File folder in dirs)
-                {
-                    bool IsRemovable = Android.OS.Environment.InvokeIsExternalStorageRemovable(folder);
-                    bool IsEmulated = Android.OS.Environment.InvokeIsExternalStorageEmulated(folder);
+				foreach (Java.IO.File folder in dirs)
+				{
+					bool IsRemovable = Android.OS.Environment.InvokeIsExternalStorageRemovable(folder);
+					bool IsEmulated = Android.OS.Environment.InvokeIsExternalStorageEmulated(folder);
 
-                    if (IsRemovable
-                        && !IsEmulated)
-                    {
-                        baseFolderPath = folder.Path;
-                    }
-                }
-            }
+					if (IsRemovable
+						&& !IsEmulated)
+					{
+						baseFolderPath = folder.Path;
+					}
+				}
+			}
 
-            catch (Exception l_oException)
-            {
-                Log.Error("Getting external files directory failed. {@l_oException}", l_oException);
-            }
+			catch (Exception l_oException)
+			{
+				Log.Error("Getting external files directory failed. {@l_oException}", l_oException);
+			}
 
-            return baseFolderPath;
-        }
+			return baseFolderPath;
+		}
 
-        /// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
-        /// <returns>Directory name.</returns>
-        public string GetInternalPersonalDir()
-        {
-            return Environment.GetFolderPath(Environment.SpecialFolder.Personal);
-        }
-    }
+		/// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
+		/// <returns>Directory name.</returns>
+		public string GetInternalPersonalDir()
+		{
+			return Environment.GetFolderPath(Environment.SpecialFolder.Personal);
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK.Android/Model/Device/WebView.cs b/Meinkonrad/TINK.Android/Model/Device/WebView.cs
index dacf5dd..409c1c9 100644
--- a/Meinkonrad/TINK.Android/Model/Device/WebView.cs
+++ b/Meinkonrad/TINK.Android/Model/Device/WebView.cs
@@ -4,13 +4,13 @@ using TINK.Model.Device;
 [assembly: Xamarin.Forms.Dependency(typeof(TINK.Droid.Model.Device.WebView))]
 namespace TINK.Droid.Model.Device
 {
-    public class WebView : IWebView
-    {
-        /// <summary> Clears the cookie cache for all web views. </summary>
-        public void ClearCookies()
-        {
-            var cookieManager = CookieManager.Instance;
-            cookieManager.RemoveAllCookie();
-        }
-    }
+	public class WebView : IWebView
+	{
+		/// <summary> Clears the cookie cache for all web views. </summary>
+		public void ClearCookies()
+		{
+			var cookieManager = CookieManager.Instance;
+			cookieManager.RemoveAllCookie();
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
index 704e443..1aa4466 100644
--- a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
+++ b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.337" android:versionCode="337">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.338" android:versionCode="338">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
 	<!-- Google Maps related permissions -->
 	<!-- Permission to receive remote notifications from Google Play Services -->
diff --git a/Meinkonrad/TINK.iOS/AppDelegate.cs b/Meinkonrad/TINK.iOS/AppDelegate.cs
index 20f9554..6477bd0 100644
--- a/Meinkonrad/TINK.iOS/AppDelegate.cs
+++ b/Meinkonrad/TINK.iOS/AppDelegate.cs
@@ -5,45 +5,45 @@ using Xamarin.Forms.Platform.iOS;
 
 namespace TINK.iOS
 {
-    // The UIApplicationDelegate for the application. This class is responsible for launching the 
-    // User Interface of the application, as well as listening (and optionally responding) to 
-    // application events from iOS.
-    [Register("AppDelegate")]
-    public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate
-    {
-        //
-        // This method is invoked when the application has loaded and is ready to run. In this 
-        // method you should instantiate the window, load the UI into it and then make the window
-        // visible.
-        //
-        // You have 17 seconds to return from this method, or iOS will terminate your application.
-        //
-        public override bool FinishedLaunching(UIApplication app, NSDictionary options)
-        {
-            global::Xamarin.Forms.Forms.Init();
+	// The UIApplicationDelegate for the application. This class is responsible for launching the 
+	// User Interface of the application, as well as listening (and optionally responding) to 
+	// application events from iOS.
+	[Register("AppDelegate")]
+	public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate
+	{
+		//
+		// This method is invoked when the application has loaded and is ready to run. In this 
+		// method you should instantiate the window, load the UI into it and then make the window
+		// visible.
+		//
+		// You have 17 seconds to return from this method, or iOS will terminate your application.
+		//
+		public override bool FinishedLaunching(UIApplication app, NSDictionary options)
+		{
+			global::Xamarin.Forms.Forms.Init();
 
-            //Color of Icons in Navigation bar (e.g. burger menu and back arrow)
-            UINavigationBar.Appearance.TintColor = Color.White.ToUIColor();
+			//Color of Icons in Navigation bar (e.g. burger menu and back arrow)
+			UINavigationBar.Appearance.TintColor = Color.White.ToUIColor();
 
-            new iOS.Device.AppInfo(NSBundle.MainBundle.InfoDictionary[new NSString("CFBundleShortVersionString")]?.ToString() ?? string.Empty);
+			new iOS.Device.AppInfo(NSBundle.MainBundle.InfoDictionary[new NSString("CFBundleShortVersionString")]?.ToString() ?? string.Empty);
 
-            Forms.ViewInitialized += (object sender, ViewInitializedEventArgs e) =>
-            {
-                // http://developer.xamarin.com/recipes/testcloud/set-accessibilityidentifier-ios/
-                if (null != e.View.AutomationId)
-                {
-                    e.NativeView.AccessibilityIdentifier = e.View.AutomationId;
-                }
-            };
-            LoadApplication(new TINK.App());
+			Forms.ViewInitialized += (object sender, ViewInitializedEventArgs e) =>
+			{
+				// http://developer.xamarin.com/recipes/testcloud/set-accessibilityidentifier-ios/
+				if (null != e.View.AutomationId)
+				{
+					e.NativeView.AccessibilityIdentifier = e.View.AutomationId;
+				}
+			};
+			LoadApplication(new TINK.App());
 
-            // Required for initialization of Maps, see https://developer.xamarin.com/guides/xamarin-forms/user-interface/map/
-            Xamarin.FormsGoogleMaps.Init("000000000000000000000000000000000000000");
+			// Required for initialization of Maps, see https://developer.xamarin.com/guides/xamarin-forms/user-interface/map/
+			Xamarin.FormsGoogleMaps.Init("000000000000000000000000000000000000000");
 
-            // Required for initialization of binding package, see  https://github.com/nuitsjp/Xamarin.Forms.GoogleMaps.Bindings.
-            Xamarin.FormsGoogleMapsBindings.Init();
+			// Required for initialization of binding package, see  https://github.com/nuitsjp/Xamarin.Forms.GoogleMaps.Bindings.
+			Xamarin.FormsGoogleMapsBindings.Init();
 
-            return base.FinishedLaunching(app, options);
-        }
-    }
+			return base.FinishedLaunching(app, options);
+		}
+	}
 }
diff --git a/Meinkonrad/TINK.iOS/Device/AppInfo.cs b/Meinkonrad/TINK.iOS/Device/AppInfo.cs
index 22cec2a..8c62628 100644
--- a/Meinkonrad/TINK.iOS/Device/AppInfo.cs
+++ b/Meinkonrad/TINK.iOS/Device/AppInfo.cs
@@ -7,41 +7,41 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(AppInfo))]
 namespace TINK.iOS.Device
 {
-    /// <summary> Holds information about the TINK- app. </summary>
-    public class AppInfo : IAppInfo
-    {
-        /// <summary> Holds the the version of the app.</summary>
-        private static Version m_oVersion = null;
+	/// <summary> Holds information about the TINK- app. </summary>
+	public class AppInfo : IAppInfo
+	{
+		/// <summary> Holds the the version of the app.</summary>
+		private static Version m_oVersion = null;
 
-        /// <summary> Constructs a app info object. </summary>
-        public AppInfo()
-        {
-        }
+		/// <summary> Constructs a app info object. </summary>
+		public AppInfo()
+		{
+		}
 
-        /// <summary> Constructs a app info object for initialization. </summary>
-        /// <param name="p_strVersionText"> Version to initializ object with.</param>
-        internal AppInfo(string p_strVersionText)
-        {
-            if (m_oVersion != null)
-            {
-                // Set version only once.
-                return;
-            }
+		/// <summary> Constructs a app info object for initialization. </summary>
+		/// <param name="p_strVersionText"> Version to initializ object with.</param>
+		internal AppInfo(string p_strVersionText)
+		{
+			if (m_oVersion != null)
+			{
+				// Set version only once.
+				return;
+			}
 
-            if (!Version.TryParse(p_strVersionText, out Version l_oVersion))
-            {
-                m_oVersion = new Version(0, 8);
-            }
+			if (!Version.TryParse(p_strVersionText, out Version l_oVersion))
+			{
+				m_oVersion = new Version(0, 8);
+			}
 
-            m_oVersion = l_oVersion;
-        }
+			m_oVersion = l_oVersion;
+		}
 
-        /// <summary> Get the version of the app. </summary>
-        public Version Version => m_oVersion ?? new Version(0, 9);
+		/// <summary> Get the version of the app. </summary>
+		public Version Version => m_oVersion ?? new Version(0, 9);
 
-        /// <summary> Gets the URL to the app store. </summary>
-        /// <remarks> TINK Url was @"http://itunes.apple.com/de/app/tink-konstanz/id1181519270?mt=8"</remarks>
-        /// <value>The store URL.</value>
-        public string StoreUrl => $"https://itunes.apple.com/de/app/apple-store/{NSBundle.MainBundle.BundleIdentifier}?mt=8";
-    }
+		/// <summary> Gets the URL to the app store. </summary>
+		/// <remarks> TINK Url was @"http://itunes.apple.com/de/app/tink-konstanz/id1181519270?mt=8"</remarks>
+		/// <value>The store URL.</value>
+		public string StoreUrl => $"https://itunes.apple.com/de/app/apple-store/{NSBundle.MainBundle.BundleIdentifier}?mt=8";
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK.iOS/Device/Device.cs b/Meinkonrad/TINK.iOS/Device/Device.cs
index a715f2b..9fc0b4a 100644
--- a/Meinkonrad/TINK.iOS/Device/Device.cs
+++ b/Meinkonrad/TINK.iOS/Device/Device.cs
@@ -6,30 +6,30 @@ using Xamarin.Essentials;
 [assembly: Xamarin.Forms.Dependency(typeof(TINK.iOS.Device.Device))]
 namespace TINK.iOS.Device
 {
-    public class Device : ISmartDevice
-    {
-        [DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
-        private static extern uint IOServiceGetMatchingService(uint masterPort, IntPtr matching);
+	public class Device : ISmartDevice
+	{
+		[DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
+		private static extern uint IOServiceGetMatchingService(uint masterPort, IntPtr matching);
 
-        [DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
-        private static extern IntPtr IOServiceMatching(string s);
+		[DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
+		private static extern IntPtr IOServiceMatching(string s);
 
-        [DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
-        private static extern IntPtr IORegistryEntryCreateCFProperty(uint entry, IntPtr key, IntPtr allocator, uint options);
+		[DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
+		private static extern IntPtr IORegistryEntryCreateCFProperty(uint entry, IntPtr key, IntPtr allocator, uint options);
 
-        [DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
-        private static extern int IOObjectRelease(uint o);
+		[DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
+		private static extern int IOObjectRelease(uint o);
 
-        public string Manufacturer => DeviceInfo.Manufacturer;
+		public string Manufacturer => DeviceInfo.Manufacturer;
 
-        public string Model => DeviceInfo.Model;
+		public string Model => DeviceInfo.Model;
 
-        public DevicePlatform Platform => DeviceInfo.Platform;
+		public DevicePlatform Platform => DeviceInfo.Platform;
 
-        public string VersionText => DeviceInfo.VersionString;
-        /// <summary> Gets unitque device identifier. </summary>
-        /// <returns>Gets the identifies specifying device.</returns>
-        public string Identifier
-            => UIKit.UIDevice.CurrentDevice?.IdentifierForVendor?.AsString() ?? string.Empty;
-    }
+		public string VersionText => DeviceInfo.VersionString;
+		/// <summary> Gets unitque device identifier. </summary>
+		/// <returns>Gets the identifies specifying device.</returns>
+		public string Identifier
+			=> UIKit.UIDevice.CurrentDevice?.IdentifierForVendor?.AsString() ?? string.Empty;
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK.iOS/Device/ExternalBrowseService.cs b/Meinkonrad/TINK.iOS/Device/ExternalBrowseService.cs
index c9a7998..b0ac186 100644
--- a/Meinkonrad/TINK.iOS/Device/ExternalBrowseService.cs
+++ b/Meinkonrad/TINK.iOS/Device/ExternalBrowseService.cs
@@ -7,17 +7,17 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(ExternalBrowseService))]
 namespace TINK.iOS.Device
 {
-    public class ExternalBrowseService : IExternalBrowserService
-    {
-        /// <summary> Opens an external browser. </summary>
-        /// <param name="p_strUrl">Url to open.</param>
-        public void OpenUrl(string p_strUrl)
-        {
-            var l_oUrl = NSUrl.FromString(p_strUrl);
-            if (l_oUrl == null)
-                return;
+	public class ExternalBrowseService : IExternalBrowserService
+	{
+		/// <summary> Opens an external browser. </summary>
+		/// <param name="p_strUrl">Url to open.</param>
+		public void OpenUrl(string p_strUrl)
+		{
+			var l_oUrl = NSUrl.FromString(p_strUrl);
+			if (l_oUrl == null)
+				return;
 
-            UIApplication.SharedApplication.OpenUrl(l_oUrl);
-        }
-    }
+			UIApplication.SharedApplication.OpenUrl(l_oUrl);
+		}
+	}
 }
diff --git a/Meinkonrad/TINK.iOS/Device/Gps.cs b/Meinkonrad/TINK.iOS/Device/Gps.cs
index 6728593..21c425b 100644
--- a/Meinkonrad/TINK.iOS/Device/Gps.cs
+++ b/Meinkonrad/TINK.iOS/Device/Gps.cs
@@ -3,8 +3,8 @@
 [assembly: Xamarin.Forms.Dependency(typeof(TINK.iOS.Device.Gps))]
 namespace TINK.iOS.Device
 {
-    public class Gps : IGeolodationDependent
-    {
-        public bool IsGeolcationEnabled => true;
-    }
+	public class Gps : IGeolodationDependent
+	{
+		public bool IsGeolcationEnabled => true;
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK.iOS/Device/SpecialFolder.cs b/Meinkonrad/TINK.iOS/Device/SpecialFolder.cs
index 9434b04..5230371 100644
--- a/Meinkonrad/TINK.iOS/Device/SpecialFolder.cs
+++ b/Meinkonrad/TINK.iOS/Device/SpecialFolder.cs
@@ -5,23 +5,23 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(TINK.iOS.Device.SpecialFolder))]
 namespace TINK.iOS.Device
 {
-    public class SpecialFolder : ISpecialFolder
-    {
-        /// <summary>
-        /// Get the folder name of external folder to write to.
-        /// </summary>
-        /// <returns></returns>
-        public string GetExternalFilesDir()
-        {
-            return Environment.GetFolderPath(Environment.SpecialFolder.Personal);
-        }
+	public class SpecialFolder : ISpecialFolder
+	{
+		/// <summary>
+		/// Get the folder name of external folder to write to.
+		/// </summary>
+		/// <returns></returns>
+		public string GetExternalFilesDir()
+		{
+			return Environment.GetFolderPath(Environment.SpecialFolder.Personal);
+		}
 
-        /// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
-        /// <returns>Directory name.</returns>
-        public string GetInternalPersonalDir()
-        {
-            return Environment.GetFolderPath(Environment.SpecialFolder.Personal);
-        }
+		/// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
+		/// <returns>Directory name.</returns>
+		public string GetInternalPersonalDir()
+		{
+			return Environment.GetFolderPath(Environment.SpecialFolder.Personal);
+		}
 
-    }
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK.iOS/Device/WebView.cs b/Meinkonrad/TINK.iOS/Device/WebView.cs
index 5a5a5cb..f490266 100644
--- a/Meinkonrad/TINK.iOS/Device/WebView.cs
+++ b/Meinkonrad/TINK.iOS/Device/WebView.cs
@@ -5,14 +5,14 @@ using TINK.Model.Device;
 [assembly: Xamarin.Forms.Dependency(typeof(TINK.iOS.Device.WebView))]
 namespace TINK.iOS.Device
 {
-    public class WebView : IWebView
-    {
-        /// <summary> Clears the cookie cache for all web views. </summary>
-        public void ClearCookies()
-        {
-            NSHttpCookieStorage CookieStorage = NSHttpCookieStorage.SharedStorage;
-            foreach (var cookie in CookieStorage.Cookies)
-                CookieStorage.DeleteCookie(cookie);
-        }
-    }
+	public class WebView : IWebView
+	{
+		/// <summary> Clears the cookie cache for all web views. </summary>
+		public void ClearCookies()
+		{
+			NSHttpCookieStorage CookieStorage = NSHttpCookieStorage.SharedStorage;
+			foreach (var cookie in CookieStorage.Cookies)
+				CookieStorage.DeleteCookie(cookie);
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK.iOS/Device/iOSCipher.cs b/Meinkonrad/TINK.iOS/Device/iOSCipher.cs
index 4dc6464..fa4a22e 100644
--- a/Meinkonrad/TINK.iOS/Device/iOSCipher.cs
+++ b/Meinkonrad/TINK.iOS/Device/iOSCipher.cs
@@ -5,24 +5,24 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(TINK.iOS.Device.IOSCipher))]
 namespace TINK.iOS.Device
 {
-    public class IOSCipher : ICipher
-    {
-        /// <summary> Encrypt data.</summary>
-        /// <param name="key">Key to encrypt data.</param>
-        /// <param name="clear">Data to entrycpt.</param>
-        /// <returns></returns>
-        public byte[] Encrypt(byte[] key, byte[] clear)
-        {
-            throw new NotSupportedException();
-        }
+	public class IOSCipher : ICipher
+	{
+		/// <summary> Encrypt data.</summary>
+		/// <param name="key">Key to encrypt data.</param>
+		/// <param name="clear">Data to entrycpt.</param>
+		/// <returns></returns>
+		public byte[] Encrypt(byte[] key, byte[] clear)
+		{
+			throw new NotSupportedException();
+		}
 
-        /// <summary> Decrypt data. </summary>
-        /// <param name="key">Key to decrypt data with.</param>
-        /// <param name="encrypted">Encrpyted data to decrypt.</param>
-        /// <returns>Decrypted data.</returns>
-        public byte[] Decrypt(byte[] key, byte[] encrypted)
-        {
-            throw new NotSupportedException();
-        }
-    }
+		/// <summary> Decrypt data. </summary>
+		/// <param name="key">Key to decrypt data with.</param>
+		/// <param name="encrypted">Encrpyted data to decrypt.</param>
+		/// <returns>Decrypted data.</returns>
+		public byte[] Decrypt(byte[] key, byte[] encrypted)
+		{
+			throw new NotSupportedException();
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK.iOS/Info.plist b/Meinkonrad/TINK.iOS/Info.plist
index a388fb2..eb15ae2 100644
--- a/Meinkonrad/TINK.iOS/Info.plist
+++ b/Meinkonrad/TINK.iOS/Info.plist
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
@@ -6,8 +6,8 @@
 	<array>
 		<string>bluetooth-peripheral</string>
 	</array>
-        <key>UIUserInterfaceStyle</key>
-        <string>Light</string>
+	<key>UIUserInterfaceStyle</key>
+	<string>Light</string>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>1</integer>
@@ -47,7 +47,7 @@
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
 	<string>Location access is needed to show map at current position and pass position to server when returning bikes.</string>
 	<key>MinimumOSVersion</key>
-	<string>9.0</string>
+	<string>13.0</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Location access is needed to show map at current position and pass position to server when returning bikes.</string>
 	<key>CFBundleIdentifier</key>
@@ -55,8 +55,8 @@
 	<key>CFBundleDisplayName</key>
 	<string>Mein konrad</string>
 	<key>CFBundleVersion</key>
-	<string>337</string>
+	<string>338</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.337</string>
+	<string>3.0.338</string>
 </dict>
 </plist>
diff --git a/Meinkonrad/TINK.iOS/Main.cs b/Meinkonrad/TINK.iOS/Main.cs
index c766ee2..7a40150 100644
--- a/Meinkonrad/TINK.iOS/Main.cs
+++ b/Meinkonrad/TINK.iOS/Main.cs
@@ -2,14 +2,14 @@
 
 namespace TINK.iOS
 {
-    public class Application
-    {
-        // This is the main entry point of the application.
-        static void Main(string[] args)
-        {
-            // if you want to use a different Application Delegate class from "AppDelegate"
-            // you can specify it here.
-            UIApplication.Main(args, null, "AppDelegate");
-        }
-    }
+	public class Application
+	{
+		// This is the main entry point of the application.
+		static void Main(string[] args)
+		{
+			// if you want to use a different Application Delegate class from "AppDelegate"
+			// you can specify it here.
+			UIApplication.Main(args, null, "AppDelegate");
+		}
+	}
 }
diff --git a/Meinkonrad/TINK.iOS/Meinkonrad.iOS.csproj b/Meinkonrad/TINK.iOS/Meinkonrad.iOS.csproj
index e81bd89..f1b946b 100644
--- a/Meinkonrad/TINK.iOS/Meinkonrad.iOS.csproj
+++ b/Meinkonrad/TINK.iOS/Meinkonrad.iOS.csproj
@@ -24,7 +24,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchArch>i386, x86_64</MtouchArch>
+    <MtouchArch>x86_64</MtouchArch>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>true</MtouchDebug>
     <CodesignProvision>Automatic</CodesignProvision>
@@ -37,11 +37,12 @@
     <DefineConstants>__IOS__;__MOBILE__;__UNIFIED__</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <MtouchLink>None</MtouchLink>
-    <MtouchArch>i386, x86_64</MtouchArch>
+    <MtouchLink>SdkOnly</MtouchLink>
+    <MtouchArch>x86_64</MtouchArch>
     <ConsolePause>false</ConsolePause>
     <CodesignProvision>VS: com.TeilRad.Meinkonrad Development</CodesignProvision>
     <CodesignKey>Apple Development: Oliver Hauff (947JH7MS9L)</CodesignKey>
+    <MtouchSdkVersion>15.5</MtouchSdkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,12 +53,12 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
+    <MtouchArch>ARM64</MtouchArch>
     <CodesignKey>Apple Development: Oliver Hauff (947JH7MS9L)</CodesignKey>
     <MtouchDebug>true</MtouchDebug>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <CodesignProvision>VS: com.TeilRad.Meinkonrad Development</CodesignProvision>
-    <MtouchLink>None</MtouchLink>
+    <MtouchLink>SdkOnly</MtouchLink>
     <MtouchInterpreter>-all</MtouchInterpreter>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
@@ -67,7 +68,7 @@
     <DefineConstants>__IOS__;__MOBILE__;__UNIFIED__</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
+    <MtouchArch>ARM64</MtouchArch>
     <ConsolePause>false</ConsolePause>
     <CodesignKey>Apple Development: Oliver Hauff (947JH7MS9L)</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
@@ -77,6 +78,7 @@
     </CrashReportingApiKey>
     <MtouchLink>SdkOnly</MtouchLink>
     <CodesignProvision>VS: com.TeilRad.Meinkonrad Development</CodesignProvision>
+    <MtouchSdkVersion>15.5</MtouchSdkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
     <DebugType>none</DebugType>
@@ -202,10 +204,10 @@
       <Version>1.7.3</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Forms.GoogleMaps">
-      <Version>3.3.0</Version>
+      <Version>5.0.0</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Forms.GoogleMaps.Bindings" Version="3.0.0" />
-    <PackageReference Include="Xamarin.Google.iOS.Maps" Version="3.9.0" />
+    <PackageReference Include="Xamarin.Google.iOS.Maps" Version="6.0.1.1" />
     <PackageReference Include="PInvoke.BCrypt">
       <Version>0.7.124</Version>
     </PackageReference>
diff --git a/Meinkonrad/TINK/App.xaml.cs b/Meinkonrad/TINK/App.xaml.cs
index 44126c5..f3fdaaf 100644
--- a/Meinkonrad/TINK/App.xaml.cs
+++ b/Meinkonrad/TINK/App.xaml.cs
@@ -29,165 +29,165 @@ using Arendi.BleLibrary.Local;
 [assembly: XamlCompilation(XamlCompilationOptions.Compile)]
 namespace TINK
 {
-    public partial class App : Application
-    {
-        /// <summary>Title of the attachment file.</summary>
-        private const string ATTACHMENTTITLE = "Diagnostics.txt";
+	public partial class App : Application
+	{
+		/// <summary>Title of the attachment file.</summary>
+		private const string ATTACHMENTTITLE = "Diagnostics.txt";
 
-        /// <summary> Model root. </summary>
-        private static TinkApp m_oModelRoot;
+		/// <summary> Model root. </summary>
+		private static TinkApp m_oModelRoot;
 
-        /// <summary>
-        /// Gets the model root.
-        /// </summary>
-        public static TinkApp ModelRoot
-        {
-            get
-            {
-                if (m_oModelRoot != null)
-                {
-                    // Root model already exists, nothing to do.
-                    return m_oModelRoot;
-                }
+		/// <summary>
+		/// Gets the model root.
+		/// </summary>
+		public static TinkApp ModelRoot
+		{
+			get
+			{
+				if (m_oModelRoot != null)
+				{
+					// Root model already exists, nothing to do.
+					return m_oModelRoot;
+				}
 
-                // Get folder where to read settings from
-                var specialFolders = DependencyService.Get<ISpecialFolder>();
-                var internalPersonalDir = specialFolders.GetInternalPersonalDir();
+				// Get folder where to read settings from
+				var specialFolders = DependencyService.Get<ISpecialFolder>();
+				var internalPersonalDir = specialFolders.GetInternalPersonalDir();
 
-                // Delete attachtment from previous session.
-                DeleteAttachment(internalPersonalDir);
+				// Delete attachtment from previous session.
+				DeleteAttachment(internalPersonalDir);
 
-                // Setup logger using default settings. 
-                TinkApp.SetupLogging(
-                    new LoggingLevelSwitch(Model.Settings.Settings.DEFAULTLOGGINLEVEL),
-                    internalPersonalDir);
+				// Setup logger using default settings. 
+				TinkApp.SetupLogging(
+					new LoggingLevelSwitch(Model.Settings.Settings.DEFAULTLOGGINLEVEL),
+					internalPersonalDir);
 
-                // Subscribe to any unhandled/ unobserved exceptions.
-                AppDomain.CurrentDomain.UnhandledException += (sender, unobservedTaskExceptionEventArgs) => { Log.Fatal("Unobserved task exception: {Exception}", unobservedTaskExceptionEventArgs.ExceptionObject); };
-                TaskScheduler.UnobservedTaskException += (sender, unhandledExceptionEventArgs) => { Log.Fatal("Unhandled exception: {Exception}", unhandledExceptionEventArgs.Exception); };
+				// Subscribe to any unhandled/ unobserved exceptions.
+				AppDomain.CurrentDomain.UnhandledException += (sender, unobservedTaskExceptionEventArgs) => { Log.Fatal("Unobserved task exception: {Exception}", unobservedTaskExceptionEventArgs.ExceptionObject); };
+				TaskScheduler.UnobservedTaskException += (sender, unhandledExceptionEventArgs) => { Log.Fatal("Unhandled exception: {Exception}", unhandledExceptionEventArgs.Exception); };
 
-                // Restore last model state from json- file.
-                Dictionary<string, string> settingsJSON = new Dictionary<string, string>();
-                try
-                {
-                    settingsJSON = JsonSettingsDictionary.Deserialize(internalPersonalDir);
-                }
-                catch (Exception exception)
-                {
-                    Log.Error("Reading application settings from file failed.", exception);
-                }
+				// Restore last model state from json- file.
+				Dictionary<string, string> settingsJSON = new Dictionary<string, string>();
+				try
+				{
+					settingsJSON = JsonSettingsDictionary.Deserialize(internalPersonalDir);
+				}
+				catch (Exception exception)
+				{
+					Log.Error("Reading application settings from file failed.", exception);
+				}
 
-                Model.Settings.Settings settings;
-                try
-                {
-                    settings = new Model.Settings.Settings(
-                        JsonSettingsDictionary.GetGroupFilterMapPage(settingsJSON) ?? GroupFilterHelper.GetMapPageFilterDefaults, // Activate map filtering for meinkonrad
-                        JsonSettingsDictionary.GetGoupFilterSettings(settingsJSON) ?? GroupFilterHelper.GetSettingsFilterDefaults,// Activate map filtering for meinkonrad
-                        JsonSettingsDictionary.GetCopriHostUri(settingsJSON),
-                        JsonSettingsDictionary.GetPollingParameters(settingsJSON),
-                        JsonSettingsDictionary.GetMinimumLoggingLevel(settingsJSON),
-                        JsonSettingsDictionary.GetIsReportLevelVerbose(settingsJSON),
-                        JsonSettingsDictionary.GetExpiresAfter(settingsJSON),
-                        JsonSettingsDictionary.GetActiveLockService(settingsJSON),
-                        JsonSettingsDictionary.GetConnectTimeout(settingsJSON),
-                        JsonSettingsDictionary.GetActiveGeolocationService(settingsJSON),
-                        JsonSettingsDictionary.GetCenterMapToCurrentLocation(settingsJSON),
-                        Xamarin.Forms.GoogleMaps.MapSpan.FromCenterAndRadius(new Xamarin.Forms.GoogleMaps.Position(47.680, 9.180), Xamarin.Forms.GoogleMaps.Distance.FromKilometers(2.9)),
-                        JsonSettingsDictionary.GetLogToExternalFolder(settingsJSON),
-                        JsonSettingsDictionary.GetIsSiteCachingOn(settingsJSON),
-                        JsonSettingsDictionary.GetActiveTheme(settingsJSON) ?? typeof(Themes.Konrad).Name);
-                }
-                catch (Exception exception)
-                {
-                    Log.Error("Deserializing application settings from dictionary failed.", exception);
-                    settings = new Model.Settings.Settings();
-                }
+				Model.Settings.Settings settings;
+				try
+				{
+					settings = new Model.Settings.Settings(
+						JsonSettingsDictionary.GetGroupFilterMapPage(settingsJSON) ?? GroupFilterHelper.GetMapPageFilterDefaults, // Activate map filtering for meinkonrad
+						JsonSettingsDictionary.GetGoupFilterSettings(settingsJSON) ?? GroupFilterHelper.GetSettingsFilterDefaults,// Activate map filtering for meinkonrad
+						JsonSettingsDictionary.GetCopriHostUri(settingsJSON),
+						JsonSettingsDictionary.GetPollingParameters(settingsJSON),
+						JsonSettingsDictionary.GetMinimumLoggingLevel(settingsJSON),
+						JsonSettingsDictionary.GetIsReportLevelVerbose(settingsJSON),
+						JsonSettingsDictionary.GetExpiresAfter(settingsJSON),
+						JsonSettingsDictionary.GetActiveLockService(settingsJSON),
+						JsonSettingsDictionary.GetConnectTimeout(settingsJSON),
+						JsonSettingsDictionary.GetActiveGeolocationService(settingsJSON),
+						JsonSettingsDictionary.GetCenterMapToCurrentLocation(settingsJSON),
+						Xamarin.Forms.GoogleMaps.MapSpan.FromCenterAndRadius(new Xamarin.Forms.GoogleMaps.Position(47.680, 9.180), Xamarin.Forms.GoogleMaps.Distance.FromKilometers(2.9)),
+						JsonSettingsDictionary.GetLogToExternalFolder(settingsJSON),
+						JsonSettingsDictionary.GetIsSiteCachingOn(settingsJSON),
+						JsonSettingsDictionary.GetActiveTheme(settingsJSON) ?? typeof(Themes.Konrad).Name);
+				}
+				catch (Exception exception)
+				{
+					Log.Error("Deserializing application settings from dictionary failed.", exception);
+					settings = new Model.Settings.Settings();
+				}
 
-                if (settings.MinimumLogEventLevel != Model.Settings.Settings.DEFAULTLOGGINLEVEL
-                    || settings.LogToExternalFolder)
-                {
-                    // Eigher
-                    // - logging is not set to default value or
-                    // - logging is performed to external folder.
-                    // Need to reconfigure.
-                    Log.CloseAndFlush(); // Close before modifying logger configuration. Otherwise a sharing vialation occurs.
+				if (settings.MinimumLogEventLevel != Model.Settings.Settings.DEFAULTLOGGINLEVEL
+					|| settings.LogToExternalFolder)
+				{
+					// Eigher
+					// - logging is not set to default value or
+					// - logging is performed to external folder.
+					// Need to reconfigure.
+					Log.CloseAndFlush(); // Close before modifying logger configuration. Otherwise a sharing vialation occurs.
 
-                    TinkApp.SetupLogging(
-                        new LoggingLevelSwitch(settings.MinimumLogEventLevel),
-                        !settings.LogToExternalFolder
-                            ? internalPersonalDir
-                            : specialFolders.GetExternalFilesDir());
-                }
+					TinkApp.SetupLogging(
+						new LoggingLevelSwitch(settings.MinimumLogEventLevel),
+						!settings.LogToExternalFolder
+							? internalPersonalDir
+							: specialFolders.GetExternalFilesDir());
+				}
 
-                // Get auth cookie
-                Log.Debug("Get auth cookie.");
-                IStore store = null;
+				// Get auth cookie
+				Log.Debug("Get auth cookie.");
+				IStore store = null;
 
-                var lastVersion = JsonSettingsDictionary.GetAppVersion(settingsJSON);
-                if (new Version(3, 0, 290) <= lastVersion)
-                {
-                    // App versions newer than 3.0.173 stored geolocation service in configuration.
-                    // Version 3.0.290: Geolocation service "GeolocationService" is no more supported.
-                    // For this a swich of geolocation service is fored when loading configurations of older app versions.
-                    LocationServicesContainer.SetActive(settings.ActiveGeolocationService);
-                }
+				var lastVersion = JsonSettingsDictionary.GetAppVersion(settingsJSON);
+				if (new Version(3, 0, 290) <= lastVersion)
+				{
+					// App versions newer than 3.0.173 stored geolocation service in configuration.
+					// Version 3.0.290: Geolocation service "GeolocationService" is no more supported.
+					// For this a swich of geolocation service is fored when loading configurations of older app versions.
+					LocationServicesContainer.SetActive(settings.ActiveGeolocationService);
+				}
 
-                store = new Store();
+				store = new Store();
 
-                Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
+				Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
 
-                var context = SynchronizationContext.Current;
+				var context = SynchronizationContext.Current;
 
-                var appInfoService = DependencyService.Get<IAppInfo>();
+				var appInfoService = DependencyService.Get<IAppInfo>();
 
-                const string MERCHANTID = "0000000000";
+				const string MERCHANTID = "0000000000";
 
-                // Create new app instnace.
-                Log.Debug("Constructing main model...");
-                m_oModelRoot = new TinkApp(
-                    settings,
-                    store, // Manages user account
-                    isConnectedFunc: () => CrossConnectivity.Current.IsConnected,
-                    connectorFactory: (isConnected, activeUri, sessionCookie, mail, expiresAfter) => ConnectorFactory.Create(
-                        isConnected,
-                        activeUri,
-                        new Repository.AppContextInfo(MERCHANTID, AppFlavor.MeinKonrad.GetDisplayName().Replace(" ", ""), appInfoService.Version),
-                        CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
-                        sessionCookie,
-                        mail,
-                        expiresAfter),
-                    merchantId: MERCHANTID,
-                    bluetoothService: BluetoothService, /* locksService */
-                    locationPermissionsService: PermissionsService,
-                    locationServicesContainer: LocationServicesContainer,
-                    locksService: null,
-                    device: DependencyService.Get<ISmartDevice>(),
-                    specialFolder: specialFolders,
-                    cipher: new Cipher(),
-                    new TINK.Services.ThemeNS.Theme(Application.Current.Resources.MergedDictionaries),
-                    arendiCentral:
+				// Create new app instnace.
+				Log.Debug("Constructing main model...");
+				m_oModelRoot = new TinkApp(
+					settings,
+					store, // Manages user account
+					isConnectedFunc: () => CrossConnectivity.Current.IsConnected,
+					connectorFactory: (isConnected, activeUri, sessionCookie, mail, expiresAfter) => ConnectorFactory.Create(
+						isConnected,
+						activeUri,
+						new Repository.AppContextInfo(MERCHANTID, AppFlavor.MeinKonrad.GetDisplayName().Replace(" ", ""), appInfoService.Version),
+						CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
+						sessionCookie,
+						mail,
+						expiresAfter),
+					merchantId: MERCHANTID,
+					bluetoothService: BluetoothService, /* locksService */
+					locationPermissionsService: PermissionsService,
+					locationServicesContainer: LocationServicesContainer,
+					locksService: null,
+					device: DependencyService.Get<ISmartDevice>(),
+					specialFolder: specialFolders,
+					cipher: new Cipher(),
+					new TINK.Services.ThemeNS.Theme(Application.Current.Resources.MergedDictionaries),
+					arendiCentral:
 #if ARENDI
                     DependencyService.Get<ICentral>(),
 #else
-                    null,
+					null,
 #endif
-                    postAction: (d, obj) => context.Post(d, obj),
-                    currentVersion: appInfoService.Version,
-                    lastVersion: lastVersion,
-                    whatsNewShownInVersion: JsonSettingsDictionary.GetWhatsNew(settingsJSON) ?? settingsJSON.GetAppVersion(),
-                    appFlavor: AppFlavor.MeinKonrad);
+					postAction: (d, obj) => context.Post(d, obj),
+					currentVersion: appInfoService.Version,
+					lastVersion: lastVersion,
+					whatsNewShownInVersion: JsonSettingsDictionary.GetWhatsNew(settingsJSON) ?? settingsJSON.GetAppVersion(),
+					flavor: AppFlavor.MeinKonrad);
 
-                Log.Debug("Main model successfully constructed.");
-                return m_oModelRoot;
-            }
-        }
+				Log.Debug("Main model successfully constructed.");
+				return m_oModelRoot;
+			}
+		}
 
-        /// <summary>
-        /// Entry point of application.
-        /// </summary>
-        public App()
-        {
-            InitializeComponent();
+		/// <summary>
+		/// Entry point of application.
+		/// </summary>
+		public App()
+		{
+			InitializeComponent();
 
 #if USEFLYOUT
             // Use flyout page.
@@ -195,148 +195,148 @@ namespace TINK
                 ? new View.WhatsNew.WhatsNewPage(() => MainPage = new View.Root.RootPage()) // Show whats new info.
                 : (Page)new View.Root.RootPage(); // Just start sharee- app            
 #else
-            // Use shell.
-            //MainPage = new TINK.View.Welcome.WelcomePage();
-            MainPage = ModelRoot.WhatsNew.IsShowRequired
-            ? new View.WhatsNew.WhatsNewPage(() => MainPage = new View.RootShell.AppShell()) // Show whats new info.
-                : (Page)new View.RootShell.AppShell(); // Just start sharee- app
+			// Use shell.
+			//MainPage = new TINK.View.Welcome.WelcomePage();
+			MainPage = ModelRoot.WhatsNew.IsShowRequired
+			? new View.WhatsNew.WhatsNewPage(() => MainPage = new View.RootShell.AppShell()) // Show whats new info.
+				: (Page)new View.RootShell.AppShell(); // Just start sharee- app
 
 #endif
-        }
+		}
 
-        /// <summary> Concatenates all log files to a single one. </summary>
-        /// <returns>Full file name of attachment.</returns>
-        public static string CreateAttachment()
-        {
-            var sessionLogFiles = Log.Logger.GetLogFiles().ToArray();
+		/// <summary> Concatenates all log files to a single one. </summary>
+		/// <returns>Full file name of attachment.</returns>
+		public static string CreateAttachment()
+		{
+			var sessionLogFiles = Log.Logger.GetLogFiles().ToArray();
 
-            if (sessionLogFiles.Length < 1)
-            {
-                // Either
-                // - there is no logging file 
-                // - an error occurred getting list of log files.
-                return string.Empty;
-            }
+			if (sessionLogFiles.Length < 1)
+			{
+				// Either
+				// - there is no logging file 
+				// - an error occurred getting list of log files.
+				return string.Empty;
+			}
 
-            var fullLogFileName = System.IO.Path.Combine(ModelRoot.LogFileParentFolder, ATTACHMENTTITLE);
+			var fullLogFileName = System.IO.Path.Combine(ModelRoot.LogFileParentFolder, ATTACHMENTTITLE);
 
-            // Stop logging to avoid file access exception.
-            Log.CloseAndFlush();
+			// Stop logging to avoid file access exception.
+			Log.CloseAndFlush();
 
-            System.IO.File.WriteAllLines(
-                fullLogFileName,
-                sessionLogFiles.SelectMany(name =>
-                     (new List<string> { $"{{\"SessionFileName\":\"{name}\"}}" })
-                        .Concat(System.IO.File.ReadLines(name).ToArray())));
+			System.IO.File.WriteAllLines(
+				fullLogFileName,
+				sessionLogFiles.SelectMany(name =>
+					 (new List<string> { $"{{\"SessionFileName\":\"{name}\"}}" })
+						.Concat(System.IO.File.ReadLines(name).ToArray())));
 
-            // Resume logging
-            TinkApp.SetupLogging(
-                ModelRoot.Level,
-                ModelRoot.LogFileParentFolder);
+			// Resume logging
+			TinkApp.SetupLogging(
+				ModelRoot.Level,
+				ModelRoot.LogFileParentFolder);
 
-            return fullLogFileName;
-        }
+			return fullLogFileName;
+		}
 
-        /// <summary>Deletes an attachment if there is one.</summary>
-        /// <param name="folder">Folder to delete, is null folder is queried from model.</param>
-        private static void DeleteAttachment(string folder = null)
-        {
-            var attachment = System.IO.Path.Combine(folder ?? ModelRoot.LogFileParentFolder, ATTACHMENTTITLE);
-            if (!System.IO.File.Exists(attachment))
-            {
-                // No attachment found.
-                return;
-            }
+		/// <summary>Deletes an attachment if there is one.</summary>
+		/// <param name="folder">Folder to delete, is null folder is queried from model.</param>
+		private static void DeleteAttachment(string folder = null)
+		{
+			var attachment = System.IO.Path.Combine(folder ?? ModelRoot.LogFileParentFolder, ATTACHMENTTITLE);
+			if (!System.IO.File.Exists(attachment))
+			{
+				// No attachment found.
+				return;
+			}
 
-            System.IO.File.Delete(attachment);
-        }
+			System.IO.File.Delete(attachment);
+		}
 
-        protected override void OnSleep()
-        {
-            // Handle when your app sleeps
-            Log.CloseAndFlush();
-        }
+		protected override void OnSleep()
+		{
+			// Handle when your app sleeps
+			Log.CloseAndFlush();
+		}
 
-        protected override void OnResume()
-        {
-            DeleteAttachment();
+		protected override void OnResume()
+		{
+			DeleteAttachment();
 
-            TinkApp.SetupLogging(
-                ModelRoot.Level,
-                ModelRoot.LogFileParentFolder);
-        }
+			TinkApp.SetupLogging(
+				ModelRoot.Level,
+				ModelRoot.LogFileParentFolder);
+		}
 
-        /// <param name="uri">The URI for the request.</param>
-        /// <summary>Overriden to respond when the user initiates an app link request.</summary>
-        protected override void OnAppLinkRequestReceived(Uri uri)
-        {
-            base.OnAppLinkRequestReceived(uri);
-            if (uri.Host.ToLower() == "sharee.bike")
-            {
-                // Input e.g. sharee.bike/sharee/?lat=49.921&long=32.51
-                Array segments = Array.ConvertAll(uri.Segments, segment => segment.Replace("/", "")).Skip(1).ToArray();
-                if (uri.Query.Length > 0)
-                {
-                    Dictionary<string, string> queryDict = uri.Query
-                        .Substring(1)
-                        .Split("&")
-                        .Select(query => query.Split('='))
-                        .ToDictionary(query => query.FirstOrDefault(), query => query.Skip(1).FirstOrDefault());
-                }
-                // segments == ["sharee"]
-                // queryDict == [{["lat", "49.921"]}], {["long", "32.51"]}]
-                // => Navigate and pass params depending on linkinput
-                // If no custom navigation is configured, the app just opens as if the user opened it
-            }
-        }
+		/// <param name="uri">The URI for the request.</param>
+		/// <summary>Overriden to respond when the user initiates an app link request.</summary>
+		protected override void OnAppLinkRequestReceived(Uri uri)
+		{
+			base.OnAppLinkRequestReceived(uri);
+			if (uri.Host.ToLower() == "sharee.bike")
+			{
+				// Input e.g. sharee.bike/sharee/?lat=49.921&long=32.51
+				Array segments = Array.ConvertAll(uri.Segments, segment => segment.Replace("/", "")).Skip(1).ToArray();
+				if (uri.Query.Length > 0)
+				{
+					Dictionary<string, string> queryDict = uri.Query
+						.Substring(1)
+						.Split("&")
+						.Select(query => query.Split('='))
+						.ToDictionary(query => query.FirstOrDefault(), query => query.Skip(1).FirstOrDefault());
+				}
+				// segments == ["sharee"]
+				// queryDict == [{["lat", "49.921"]}], {["long", "32.51"]}]
+				// => Navigate and pass params depending on linkinput
+				// If no custom navigation is configured, the app just opens as if the user opened it
+			}
+		}
 
-        /// <summary> Gets the current logging level.</summary>
-        /// <returns></returns>
-        private static LogEventLevel GetCurrentLogEventLevel()
-        {
-            foreach (LogEventLevel level in Enum.GetValues(typeof(LogEventLevel)))
-            {
-                if (Log.IsEnabled(level))
-                    return level;
-            }
+		/// <summary> Gets the current logging level.</summary>
+		/// <returns></returns>
+		private static LogEventLevel GetCurrentLogEventLevel()
+		{
+			foreach (LogEventLevel level in Enum.GetValues(typeof(LogEventLevel)))
+			{
+				if (Log.IsEnabled(level))
+					return level;
+			}
 
-            return LogEventLevel.Error;
-        }
+			return LogEventLevel.Error;
+		}
 
-        /// <summary>
-        /// Holds the permission service instance.
-        /// </summary>
-        private static ILocationPermission _PermissionsService = null;
+		/// <summary>
+		/// Holds the permission service instance.
+		/// </summary>
+		private static ILocationPermission _PermissionsService = null;
 
-        /// <summary>
-        /// Service to manage permissions (location) of the app.
-        /// </summary>
-        public static ILocationPermission PermissionsService
-        {
-            get
-            {
-                if (_PermissionsService != null)
-                    return _PermissionsService;
+		/// <summary>
+		/// Service to manage permissions (location) of the app.
+		/// </summary>
+		public static ILocationPermission PermissionsService
+		{
+			get
+			{
+				if (_PermissionsService != null)
+					return _PermissionsService;
 
-                _PermissionsService = new TINK.Services.Permissions.Essentials.Permissions();
-                return _PermissionsService;
-            }
-        }
+				_PermissionsService = new TINK.Services.Permissions.Essentials.Permissions();
+				return _PermissionsService;
+			}
+		}
 
-        /// <summary> Service to manage bluetooth stack.</summary>
-        public static Plugin.BLE.Abstractions.Contracts.IBluetoothLE BluetoothService => Plugin.BLE.CrossBluetoothLE.Current;
+		/// <summary> Service to manage bluetooth stack.</summary>
+		public static Plugin.BLE.Abstractions.Contracts.IBluetoothLE BluetoothService => Plugin.BLE.CrossBluetoothLE.Current;
 
-        /// <summary>
-        /// Service container to manage geolocation services.
-        /// </summary>
-        public static IServicesContainer<IGeolocation> LocationServicesContainer { get; }
-            = new ServicesContainerMutableT<IGeolocation>(
-                    new HashSet<IGeolocation> {
-                        new LastKnownGeolocationService(DependencyService.Get<IGeolodationDependent>()),
-                        new SimulatedGeolocationService(DependencyService.Get<IGeolodationDependent>()),
-                        new GeolocationAccuracyMediumService(DependencyService.Get<IGeolodationDependent>()),
-                        new GeolocationAccuracyHighService(DependencyService.Get<IGeolodationDependent>()),
-                        new GeolocationAccuracyBestService(DependencyService.Get<IGeolodationDependent>())},
-                    Model.Settings.Settings.DefaultLocationService.FullName);
-    }
+		/// <summary>
+		/// Service container to manage geolocation services.
+		/// </summary>
+		public static IServicesContainer<IGeolocation> LocationServicesContainer { get; }
+			= new ServicesContainerMutableT<IGeolocation>(
+					new HashSet<IGeolocation> {
+						new LastKnownGeolocationService(DependencyService.Get<IGeolodationDependent>()),
+						new SimulatedGeolocationService(DependencyService.Get<IGeolodationDependent>()),
+						new GeolocationAccuracyMediumService(DependencyService.Get<IGeolodationDependent>()),
+						new GeolocationAccuracyHighService(DependencyService.Get<IGeolodationDependent>()),
+						new GeolocationAccuracyBestService(DependencyService.Get<IGeolodationDependent>())},
+					Model.Settings.Settings.DefaultLocationService.FullName);
+	}
 }
diff --git a/Meinkonrad/TINK/BackdoorMethodHelpers.cs b/Meinkonrad/TINK/BackdoorMethodHelpers.cs
index 068f5ac..f8dd015 100644
--- a/Meinkonrad/TINK/BackdoorMethodHelpers.cs
+++ b/Meinkonrad/TINK/BackdoorMethodHelpers.cs
@@ -5,34 +5,34 @@ using Xamarin.Forms;
 
 namespace TINK
 {
-    public static class BackdoorMethodHelpers
-    {
-        public static void DoTapPage(string stationId)
-        {
-            Serilog.Log.Information($"Request via backdoor to tap station {stationId}.");
-            var currentPage = GetCurrentPage();
-            var mapPageViewModel = (currentPage as MapPage)?.BindingContext as MapPageViewModel;
-            if (mapPageViewModel == null)
-            {
-                Serilog.Log.Error($"Request via backdoor to tap station {stationId} aborted because current page is not of expected type {typeof(MapPage).Name}. Type detected is {currentPage.GetType().Name}.");
-                return;
-            }
+	public static class BackdoorMethodHelpers
+	{
+		public static void DoTapPage(string stationId)
+		{
+			Serilog.Log.Information($"Request via backdoor to tap station {stationId}.");
+			var currentPage = GetCurrentPage();
+			var mapPageViewModel = (currentPage as MapPage)?.BindingContext as MapPageViewModel;
+			if (mapPageViewModel == null)
+			{
+				Serilog.Log.Error($"Request via backdoor to tap station {stationId} aborted because current page is not of expected type {typeof(MapPage).Name}. Type detected is {currentPage.GetType().Name}.");
+				return;
+			}
 
-            Serilog.Log.Information($"Invoking member to tap.");
-            mapPageViewModel?.OnStationClicked(stationId);
-        }
+			Serilog.Log.Information($"Invoking member to tap.");
+			mapPageViewModel?.OnStationClicked(stationId);
+		}
 
-        /// <summary> Gets the current page assumed that app is master detail page.</summary>
-        /// <returns></returns>
-        static Page GetCurrentPage()
-        {
+		/// <summary> Gets the current page assumed that app is master detail page.</summary>
+		/// <returns></returns>
+		static Page GetCurrentPage()
+		{
 
 #if USEFLYOUT
             return (Application.Current.MainPage as FlyoutPage)?.Detail.Navigation.NavigationStack.LastOrDefault();
 #else
-            return Shell.Current.CurrentPage;
+			return Shell.Current.CurrentPage;
 #endif
-        }
+		}
 
-    }
+	}
 }
diff --git a/Meinkonrad/TINK/Model/Device/SpecialFolder.cs b/Meinkonrad/TINK/Model/Device/SpecialFolder.cs
index 811664e..3a90f3f 100644
--- a/Meinkonrad/TINK/Model/Device/SpecialFolder.cs
+++ b/Meinkonrad/TINK/Model/Device/SpecialFolder.cs
@@ -3,22 +3,22 @@ using Xamarin.Forms;
 
 namespace TINK.Model.Device
 {
-    public class SpecialFolder : ISpecialFolder
-    {
-        /// <summary>
-        /// Get the folder name of external folder to write to.
-        /// </summary>
-        /// <returns></returns>
-        public string GetExternalFilesDir()
-        {
-            return DependencyService.Get<ISpecialFolder>().GetExternalFilesDir();
-        }
+	public class SpecialFolder : ISpecialFolder
+	{
+		/// <summary>
+		/// Get the folder name of external folder to write to.
+		/// </summary>
+		/// <returns></returns>
+		public string GetExternalFilesDir()
+		{
+			return DependencyService.Get<ISpecialFolder>().GetExternalFilesDir();
+		}
 
-        /// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
-        /// <returns>Directory name.</returns>
-        public string GetInternalPersonalDir()
-        {
-            return DependencyService.Get<ISpecialFolder>().GetInternalPersonalDir();
-        }
-    }
+		/// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
+		/// <returns>Directory name.</returns>
+		public string GetInternalPersonalDir()
+		{
+			return DependencyService.Get<ISpecialFolder>().GetInternalPersonalDir();
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/Account/AccountPage.xaml.cs b/Meinkonrad/TINK/View/Account/AccountPage.xaml.cs
index 4216b3e..d470451 100644
--- a/Meinkonrad/TINK/View/Account/AccountPage.xaml.cs
+++ b/Meinkonrad/TINK/View/Account/AccountPage.xaml.cs
@@ -12,80 +12,80 @@ using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 
 namespace TINK.View.Account
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class AccountPage : ContentPage, IViewService, IDetailPage
 #else
-    public partial class AccountPage : ContentPage, IViewService
+	public partial class AccountPage : ContentPage, IViewService
 #endif
-    {
-        /// <summary> Refernce to view model. </summary>
-        AccountPageViewModel m_oViewModel = null;
+	{
+		/// <summary> Refernce to view model. </summary>
+		AccountPageViewModel m_oViewModel = null;
 
-        /// <summary> Constructs a account page. </summary>
-        public AccountPage()
-        {
-            InitializeComponent();
+		/// <summary> Constructs a account page. </summary>
+		public AccountPage()
+		{
+			InitializeComponent();
 
-            var l_oModel = App.ModelRoot;
+			var l_oModel = App.ModelRoot;
 
-            m_oViewModel = new AccountPageViewModel(
-                l_oModel,
-                (url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url),
-                this);
+			m_oViewModel = new AccountPageViewModel(
+				l_oModel,
+				(url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url),
+				this);
 
-            BindingContext = m_oViewModel;
-        }
+			BindingContext = m_oViewModel;
+		}
 
-        /// <summary> Displays alert message. </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string title, string message, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, cancel);
+		/// <summary> Displays alert message. </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string title, string message, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, cancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary>
-        /// Displays an action sheet.
-        /// </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="cancel">Text of button.</param>
-        /// <param name="destruction"></param>
-        /// <param name="p_oButtons">Buttons holding options to select.</param>
-        /// <returns>Text selected</returns>
-        public new async Task<string> DisplayActionSheet(String title, String cancel, String destruction, params String[] p_oButtons)
-                => await base.DisplayActionSheet(title, cancel, destruction, p_oButtons);
+		/// <summary>
+		/// Displays an action sheet.
+		/// </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="cancel">Text of button.</param>
+		/// <param name="destruction"></param>
+		/// <param name="p_oButtons">Buttons holding options to select.</param>
+		/// <returns>Text selected</returns>
+		public new async Task<string> DisplayActionSheet(String title, String cancel, String destruction, params String[] p_oButtons)
+				=> await base.DisplayActionSheet(title, cancel, destruction, p_oButtons);
 
 #if USEFLYOUT
         /// <summary>
@@ -95,19 +95,19 @@ namespace TINK.View.Account
         public void ShowPage(ViewTypes p_oType, string title = null)
             => m_oNavigation.ShowPage(p_oType.GetViewType(), title);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushModalAsync(ViewTypes typeOfPage)
-            => Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushModalAsync(ViewTypes typeOfPage)
+			=> Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync()
-            => throw new NotSupportedException();
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync()
+			=> throw new NotSupportedException();
 
 #if USEFLYOUT
 
@@ -123,34 +123,34 @@ namespace TINK.View.Account
         }
 
 #endif
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        protected async override void OnAppearing()
-            => await m_oViewModel.OnAppearing();
-        /// <summary>
-        /// Invoked when pages is closed/ hidden. 
-        /// Stops update process.
-        /// </summary>
-        protected async override void OnDisappearing()
-        {
-            if (m_oViewModel == null)
-            {
-                // View model might be null.
-                return;
-            }
-            await m_oViewModel.OnDisappearing();
-        }
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		protected async override void OnAppearing()
+			=> await m_oViewModel.OnAppearing();
+		/// <summary>
+		/// Invoked when pages is closed/ hidden. 
+		/// Stops update process.
+		/// </summary>
+		protected async override void OnDisappearing()
+		{
+			if (m_oViewModel == null)
+			{
+				// View model might be null.
+				return;
+			}
+			await m_oViewModel.OnDisappearing();
+		}
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public async Task PushAsync(ViewTypes p_oTypeOfPage)
-            => await Navigation.PushAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public async Task PushAsync(ViewTypes p_oTypeOfPage)
+			=> await Navigation.PushAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/Bike/BCBike.xaml.cs b/Meinkonrad/TINK/View/Bike/BCBike.xaml.cs
index 99225d0..b3d8cf4 100644
--- a/Meinkonrad/TINK/View/Bike/BCBike.xaml.cs
+++ b/Meinkonrad/TINK/View/Bike/BCBike.xaml.cs
@@ -9,12 +9,12 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Bike
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class BCBike : ViewCell
-    {
-        public BCBike()
-        {
-            InitializeComponent();
-        }
-    }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class BCBike : ViewCell
+	{
+		public BCBike()
+		{
+			InitializeComponent();
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/Bike/BikeViewCellTemplateSelector.cs b/Meinkonrad/TINK/View/Bike/BikeViewCellTemplateSelector.cs
index 6a1780d..7826340 100644
--- a/Meinkonrad/TINK/View/Bike/BikeViewCellTemplateSelector.cs
+++ b/Meinkonrad/TINK/View/Bike/BikeViewCellTemplateSelector.cs
@@ -2,25 +2,25 @@
 
 namespace TINK.View.Bike
 {
-    /// <summary>
-    /// Selects different templates for different bike types (BordComputer bikes, iLockIt bikes).
-    /// </summary>
-    public class BikeViewCellTemplateSelector : DataTemplateSelector
-    {
-        DataTemplate bCBike;
-        DataTemplate iLockIBike;
+	/// <summary>
+	/// Selects different templates for different bike types (BordComputer bikes, iLockIt bikes).
+	/// </summary>
+	public class BikeViewCellTemplateSelector : DataTemplateSelector
+	{
+		DataTemplate bCBike;
+		DataTemplate iLockIBike;
 
-        public BikeViewCellTemplateSelector()
-        {
-            bCBike = new DataTemplate(typeof(BCBike));
-            iLockIBike = new DataTemplate(typeof(ILockItBike));
-        }
+		public BikeViewCellTemplateSelector()
+		{
+			bCBike = new DataTemplate(typeof(BCBike));
+			iLockIBike = new DataTemplate(typeof(ILockItBike));
+		}
 
-        protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
-        {
-            return item is TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel
-                ? iLockIBike
-                : bCBike;
-        }
-    }
+		protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
+		{
+			return item is TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel
+				? iLockIBike
+				: bCBike;
+		}
+	}
 }
diff --git a/Meinkonrad/TINK/View/Bike/ILockItBike.xaml.cs b/Meinkonrad/TINK/View/Bike/ILockItBike.xaml.cs
index bdd09dd..ff2a14f 100644
--- a/Meinkonrad/TINK/View/Bike/ILockItBike.xaml.cs
+++ b/Meinkonrad/TINK/View/Bike/ILockItBike.xaml.cs
@@ -9,36 +9,36 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Bike
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class ILockItBike : ViewCell
-    {
-        public ILockItBike()
-        {
-            InitializeComponent();
-        }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class ILockItBike : ViewCell
+	{
+		public ILockItBike()
+		{
+			InitializeComponent();
+		}
 
-        protected override void OnBindingContextChanged()
-        {
-            base.OnBindingContextChanged();
+		protected override void OnBindingContextChanged()
+		{
+			base.OnBindingContextChanged();
 
-            if (Device.RuntimePlatform != Device.iOS)
-                // Update of size is only required for iOS.
-                return;
+			if (Device.RuntimePlatform != Device.iOS)
+				// Update of size is only required for iOS.
+				return;
 
-            var viewModel = BindingContext as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            if (viewModel == null)
-                return;
+			var viewModel = BindingContext as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			if (viewModel == null)
+				return;
 
-            viewModel.PropertyChanged += (sender, e) =>
-            {
-                if (e.PropertyName == nameof(TINK.ViewModel.Bikes.Bike.BC.RequestHandler.Base<IBikeInfoMutable>.IsButtonVisible)
-                || e.PropertyName == nameof(TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler.Base.IsLockitButtonVisible))
-                {
-                    // Force update of view cell on iOS.
-                    // https://hausource.visualstudio.com/TINK/_workitems/edit/132
-                    ForceUpdateSize();
-                }
-            };
-        }
-    }
+			viewModel.PropertyChanged += (sender, e) =>
+			{
+				if (e.PropertyName == nameof(TINK.ViewModel.Bikes.Bike.BC.RequestHandler.Base<IBikeInfoMutable>.IsButtonVisible)
+				|| e.PropertyName == nameof(TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler.Base.IsLockitButtonVisible))
+				{
+					// Force update of view cell on iOS.
+					// https://hausource.visualstudio.com/TINK/_workitems/edit/132
+					ForceUpdateSize();
+				}
+			};
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs b/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
index 3cd71c2..2ac65a4 100644
--- a/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
+++ b/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
@@ -5,38 +5,38 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.BikesAtStation
 {
-    using System;
-    using System.Linq;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using TINK.Model.Device;
+	using System;
+	using System.Linq;
+	using System.Threading;
+	using System.Threading.Tasks;
+	using TINK.Model.Device;
 #if USEFLYOUT
     using TINK.View.MasterDetail;
 #endif
-    using TINK.ViewModel;
-    using TINK.Model;
-    using TINK.Services.BluetoothLock.Tdo;
-    using System.Collections.Generic;
-    using Serilog;
-    using TINK.Services.BluetoothLock;
-    using Plugin.BLE;
-    using TINK.ViewModel.BikesAtStation;
-    using TINK.ViewModel.Bikes;
-    using Xamarin.CommunityToolkit.Extensions;
-    using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
+	using TINK.ViewModel;
+	using TINK.Model;
+	using TINK.Services.BluetoothLock.Tdo;
+	using System.Collections.Generic;
+	using Serilog;
+	using TINK.Services.BluetoothLock;
+	using Plugin.BLE;
+	using TINK.ViewModel.BikesAtStation;
+	using TINK.ViewModel.Bikes;
+	using Xamarin.CommunityToolkit.Extensions;
+	using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class BikesAtStationPage : ContentPage, IViewService, IDetailPage
 #else
-    public partial class BikesAtStationPage : ContentPage, IViewService
+	public partial class BikesAtStationPage : ContentPage, IViewService
 #endif
-    {
+	{
 
-        private BikesAtStationPageViewModel m_oViewModel;
+		private BikesAtStationPageViewModel m_oViewModel;
 
-        /// <summary> Initialization status to ensure initialization logic is not called multiple times. </summary>
-        private bool isInitializationStarted = false;
+		/// <summary> Initialization status to ensure initialization logic is not called multiple times. </summary>
+		private bool isInitializationStarted = false;
 
 #if TRYNOTBACKSTYLE
         public BikesAtStationPage()
@@ -56,140 +56,140 @@ namespace TINK.View.BikesAtStation
         }
 
 #else
-        public BikesAtStationPage()
-        {
-        }
+		public BikesAtStationPage()
+		{
+		}
 #endif
 
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        protected async override void OnAppearing()
-        {
-            // Don't repeat the initialization if it has been completed already.
-            if (isInitializationStarted) return;
-            isInitializationStarted = true;
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		protected async override void OnAppearing()
+		{
+			// Don't repeat the initialization if it has been completed already.
+			if (isInitializationStarted) return;
+			isInitializationStarted = true;
 
-            if (m_oViewModel != null)
-            {
+			if (m_oViewModel != null)
+			{
 #if BACKSTYLE
                 // Hide master- detail menu to force user to navigate using back button.
                 m_oNavigation.IsGestureEnabled = false;
 #endif
 
-                // No need to create view model, set binding context an items source if already done.
-                // If done twice tap events are fired multiple times (when hiding page using home button).
-                await m_oViewModel.OnAppearing();
-                isInitializationStarted = false;
-                return;
-            }
+				// No need to create view model, set binding context an items source if already done.
+				// If done twice tap events are fired multiple times (when hiding page using home button).
+				await m_oViewModel.OnAppearing();
+				isInitializationStarted = false;
+				return;
+			}
 
-            try
-            {
-                var model = App.ModelRoot;
+			try
+			{
+				var model = App.ModelRoot;
 
-                // Backup synchronization context when called from GUI-thread.
-                var synchronizationContext = SynchronizationContext.Current;
+				// Backup synchronization context when called from GUI-thread.
+				var synchronizationContext = SynchronizationContext.Current;
 
-                m_oViewModel = new BikesAtStationPageViewModel(
-                        model.ActiveUser,
-                        App.PermissionsService,
-                        App.BluetoothService,
-                        Device.RuntimePlatform,
-                        model.SelectedStation,
-                        () => model.GetIsConnected(),
-                        (isConnected) => model.GetConnector(isConnected),
-                        App.LocationServicesContainer.Active,
-                        model.LocksServices.Active,
-                        model.Polling,
-                        (url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url),
-                        (d, obj) => synchronizationContext.Post(d, obj),
-                        model.SmartDevice,
-                        this)
-                {
-                    IsReportLevelVerbose = model.IsReportLevelVerbose
-                };
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<BikesAtStationPage>().Error("Displaying bikes at station page failed. {Exception}", exception);
-                await DisplayAlert("Fehler", $"Seite Räder an Station kann nicht angezeigt werden. ${exception.Message}", "OK");
-                isInitializationStarted = false;
-                return;
-            }
+				m_oViewModel = new BikesAtStationPageViewModel(
+						model.ActiveUser,
+						App.PermissionsService,
+						App.BluetoothService,
+						Device.RuntimePlatform,
+						model.SelectedStation,
+						() => model.GetIsConnected(),
+						(isConnected) => model.GetConnector(isConnected),
+						App.LocationServicesContainer.Active,
+						model.LocksServices.Active,
+						model.Polling,
+						(url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url),
+						(d, obj) => synchronizationContext.Post(d, obj),
+						model.SmartDevice,
+						this)
+				{
+					IsReportLevelVerbose = model.IsReportLevelVerbose
+				};
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<BikesAtStationPage>().Error("Displaying bikes at station page failed. {Exception}", exception);
+				await DisplayAlert("Fehler", $"Seite Räder an Station kann nicht angezeigt werden. ${exception.Message}", "OK");
+				isInitializationStarted = false;
+				return;
+			}
 
-            InitializeComponent();
+			InitializeComponent();
 
 #if BACKSTYLE
             // Hide master- detail menu to force user to navigate using back button.
             m_oNavigation.IsGestureEnabled = false;
 #endif
 
-            BindingContext = m_oViewModel;
-            BikesAtStationListView.ItemsSource = m_oViewModel;
+			BindingContext = m_oViewModel;
+			BikesAtStationListView.ItemsSource = m_oViewModel;
 
-            await m_oViewModel.OnAppearing();
-            isInitializationStarted = false;
-        }
+			await m_oViewModel.OnAppearing();
+			isInitializationStarted = false;
+		}
 
-        /// <summary>
-        /// Invoked when pages is closed/ hidden. 
-        /// Stops update process.
-        /// </summary>
-        protected async override void OnDisappearing()
-        {
-            if (m_oViewModel != null)
-            {
-                // View model might be null.
-                await m_oViewModel?.OnDisappearing();
-            }
+		/// <summary>
+		/// Invoked when pages is closed/ hidden. 
+		/// Stops update process.
+		/// </summary>
+		protected async override void OnDisappearing()
+		{
+			if (m_oViewModel != null)
+			{
+				// View model might be null.
+				await m_oViewModel?.OnDisappearing();
+			}
 
 #if BACKSTYLE
             if (m_oNavigation!= null)
                 m_oNavigation.IsGestureEnabled = true; // Enables master- detail menu navigation again when page is unloaded.
 #endif
-        }
+		}
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string title, string message, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string title, string message, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, cancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
 
 #if USEFLYOUT
@@ -199,27 +199,27 @@ namespace TINK.View.BikesAtStation
         public void ShowPage(ViewTypes p_oType, string title = null)
             => m_oNavigation.ShowPage(p_oType.GetViewType(), title);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="typeOfPage">Page to display.</param>
-        public async Task PushModalAsync(ViewTypes typeOfPage)
-            => await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="typeOfPage">Page to display.</param>
+		public async Task PushModalAsync(ViewTypes typeOfPage)
+			=> await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync()
-        {
-            throw new NotSupportedException();
-        }
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync()
+		{
+			throw new NotSupportedException();
+		}
 
-        public Task PushAsync(ViewTypes p_oTypeOfPage)
-        {
-            throw new NotImplementedException();
-        }
+		public Task PushAsync(ViewTypes p_oTypeOfPage)
+		{
+			throw new NotImplementedException();
+		}
 
 #if USEFLYOUT
         /// <summary>
@@ -240,10 +240,10 @@ namespace TINK.View.BikesAtStation
 #if USCSHARP9
         public async Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup());
 #else
-        /// <summary> Displays user feedback popup.</summary>
-        /// <param name="co2Saving"> Co2 saving information.</param>
-        /// <returns>User feedback.</returns>
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
+		/// <summary> Displays user feedback popup.</summary>
+		/// <param name="co2Saving"> Co2 saving information.</param>
+		/// <returns>User feedback.</returns>
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/BoolInverterConverter.cs b/Meinkonrad/TINK/View/BoolInverterConverter.cs
index bbd7296..9fc95cd 100644
--- a/Meinkonrad/TINK/View/BoolInverterConverter.cs
+++ b/Meinkonrad/TINK/View/BoolInverterConverter.cs
@@ -4,16 +4,16 @@ using Xamarin.Forms;
 
 namespace TINK.View
 {
-    /// <summary> Inverts a bool.</summary>
-    public class BoolInverterConverter : IValueConverter
-    {
-        /// <summary> Inverts a bool.</summary>
-        /// <param name="value">Bool to invert.</param>
-        /// <returns>Inverted bool.</returns>
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-            => value is bool flag && !flag;
+	/// <summary> Inverts a bool.</summary>
+	public class BoolInverterConverter : IValueConverter
+	{
+		/// <summary> Inverts a bool.</summary>
+		/// <param name="value">Bool to invert.</param>
+		/// <returns>Inverted bool.</returns>
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+			=> value is bool flag && !flag;
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-            => value is bool flag && !flag;
-    }
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+			=> value is bool flag && !flag;
+	}
 }
diff --git a/Meinkonrad/TINK/View/Contact/ContactPage.xaml b/Meinkonrad/TINK/View/Contact/ContactPage.xaml
index 9b36c89..b082967 100644
--- a/Meinkonrad/TINK/View/Contact/ContactPage.xaml
+++ b/Meinkonrad/TINK/View/Contact/ContactPage.xaml
@@ -51,7 +51,7 @@
                                 IsVisible="{Binding MailAddressText, Converter={StaticResource StringNotNullOrEmpty_Converter}}"
                                 Text="{Binding MailAddressText}"
                                 IsEnabled="{Binding IsSendMailAvailable}"
-                                Command="{Binding OnMailRequest}"/>
+                                Command="{Binding OnMailToOperatorRequest}"/>
                             <!--- Phone -->
                             <Label 
                                 IsVisible="{Binding PhoneNumberText, Converter={StaticResource StringNotNullOrEmpty_Converter}}"
diff --git a/Meinkonrad/TINK/View/Contact/ContactPage.xaml.cs b/Meinkonrad/TINK/View/Contact/ContactPage.xaml.cs
index fcaf867..9fb5d44 100644
--- a/Meinkonrad/TINK/View/Contact/ContactPage.xaml.cs
+++ b/Meinkonrad/TINK/View/Contact/ContactPage.xaml.cs
@@ -10,117 +10,118 @@ using TINK.ViewModel.Info;
 using Xamarin.Essentials;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
+using TINK.Model;
 
 namespace TINK.View.Contact
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class ContactPage : ContentPage, IViewService, IDetailPage
 #else
-    public partial class ContactPage : ContentPage, IViewService
+	public partial class ContactPage : ContentPage, IViewService
 #endif
 
-    {
-        /// <summary> View model to notify view model if page appears. </summary>
-        private ContactPageViewModel ViewModel { get; set; }
+	{
+		/// <summary> View model to notify view model if page appears. </summary>
+		private ContactPageViewModel ViewModel { get; set; }
 
-        public ContactPage()
-        {
-            InitializeComponent();
+		public ContactPage()
+		{
+			InitializeComponent();
 
-            ViewModel = new ContactPageViewModel(App.ModelRoot.Uris.ActiveUri,
-                AppInfo.Name,
-                () => App.CreateAttachment(),
-                () => DependencyService.Get<IExternalBrowserService>().OpenUrl(DependencyService.Get<IAppInfo>().StoreUrl),
-                this);
+			ViewModel = new ContactPageViewModel(
+				App.ModelRoot.Flavor.GetDisplayName(),
+				() => App.CreateAttachment(),
+				() => DependencyService.Get<IExternalBrowserService>().OpenUrl(DependencyService.Get<IAppInfo>().StoreUrl),
+				this);
 
-            ContactPageView.BindingContext = ViewModel;
-        }
+			ContactPageView.BindingContext = ViewModel;
+		}
 
-        /// <summary> Invoked when page is shown. </summary>
-        protected async override void OnAppearing()
-        {
-            try
-            {
-                Log.ForContext<ContentPage>().Verbose("OnAppearing...");
+		/// <summary> Invoked when page is shown. </summary>
+		protected async override void OnAppearing()
+		{
+			try
+			{
+				Log.ForContext<ContentPage>().Verbose("OnAppearing...");
 
-                await ViewModel.OnAppearing(App.ModelRoot.SelectedStation);
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<ContentPage>().Error("Invoking OnAppearing on view model failed. {Exception}", exception);
-                return;
-            }
-        }
+				await ViewModel.OnAppearing(App.ModelRoot.SelectedStation);
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<ContentPage>().Error("Invoking OnAppearing on view model failed. {Exception}", exception);
+				return;
+			}
+		}
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
 #if USEFLYOUT
         public void ShowPage(ViewTypes p_oType, string title = null)
             => NavigationMasterDetail.ShowPage(p_oType.GetViewType(), title);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushModalAsync(ViewTypes p_oTypeOfPage)
-        {
-            throw new NotSupportedException();
-        }
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushModalAsync(ViewTypes p_oTypeOfPage)
+		{
+			throw new NotSupportedException();
+		}
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync()
-        {
-            throw new NotSupportedException();
-        }
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync()
+		{
+			throw new NotSupportedException();
+		}
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="typeOfPage">Page to display.</param>
-        public async Task PushAsync(ViewTypes typeOfPage)
-        {
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="typeOfPage">Page to display.</param>
+		public async Task PushAsync(ViewTypes typeOfPage)
+		{
 #if USEFLYOUT
             var page = Activator.CreateInstance(typeOfPage.GetViewType()) as IDetailPage;
 #else
-            var page = Activator.CreateInstance(typeOfPage.GetViewType());
+			var page = Activator.CreateInstance(typeOfPage.GetViewType());
 #endif
-            if (page == null)
-            {
-                return;
-            }
+			if (page == null)
+			{
+				return;
+			}
 
 #if USEFLYOUT
             page.NavigationMasterDetail = NavigationMasterDetail;
 #endif
-            await Navigation.PushAsync((Page)page);
-        }
+			await Navigation.PushAsync((Page)page);
+		}
 
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
 
 #if USEFLYOUT
@@ -130,5 +131,5 @@ namespace TINK.View.Contact
         /// </summary>
         public INavigationMasterDetail NavigationMasterDetail { set; private get; }
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml.cs b/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml.cs
index 3ca5bd3..772a063 100644
--- a/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml.cs
+++ b/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml.cs
@@ -8,66 +8,66 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Contact
 {
-    using Serilog;
-    using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
-    using TINK.ViewModel.Contact;
+	using Serilog;
+	using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
+	using TINK.ViewModel.Contact;
 
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class SelectStationPage : ContentPage, IViewService, IDetailPage
 #else
-    public partial class SelectStationPage : ContentPage, IViewService
+	public partial class SelectStationPage : ContentPage, IViewService
 #endif
-    {
-        /// <summary> View model to notify about whether page appears or hides. </summary>
-        private SelectStationPageViewModel SelectStationPageViewModel { get; set; }
+	{
+		/// <summary> View model to notify about whether page appears or hides. </summary>
+		private SelectStationPageViewModel SelectStationPageViewModel { get; set; }
 
-        public SelectStationPage()
-        {
-            InitializeComponent();
-        }
+		public SelectStationPage()
+		{
+			InitializeComponent();
+		}
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string title, string message, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, cancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string title, string message, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, cancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
 
 #if USEFLYOUT
         /// <summary>
@@ -77,45 +77,45 @@ namespace TINK.View.Contact
         public void ShowPage(ViewTypes type, string title = null)
             => NavigationMasterDetail.ShowPage(type.GetViewType(), title);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="typeOfPage">Type of page to display.</param>
-        public async Task PushModalAsync(ViewTypes typeOfPage)
-            => await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="typeOfPage">Type of page to display.</param>
+		public async Task PushModalAsync(ViewTypes typeOfPage)
+			=> await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public async Task PopModalAsync()
-            => await Navigation.PopModalAsync();
+		/// <summary> Pops a page from the modal stack. </summary>
+		public async Task PopModalAsync()
+			=> await Navigation.PopModalAsync();
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="typeOfPage">Page to display.</param>
-        public async Task PushAsync(ViewTypes typeOfPage)
-        {
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="typeOfPage">Page to display.</param>
+		public async Task PushAsync(ViewTypes typeOfPage)
+		{
 #if USEFLYOUT
             var page = Activator.CreateInstance(typeOfPage.GetViewType()) as IDetailPage;
 #else
-            var page = Activator.CreateInstance(typeOfPage.GetViewType());
+			var page = Activator.CreateInstance(typeOfPage.GetViewType());
 #endif
-            if (page == null)
-            {
-                return;
-            }
+			if (page == null)
+			{
+				return;
+			}
 
 #if USEFLYOUT
             page.NavigationMasterDetail = NavigationMasterDetail;
 #endif
 
-            await Navigation.PushAsync((Page)page);
-        }
+			await Navigation.PushAsync((Page)page);
+		}
 
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
 
 #if USEFLYOUT
@@ -123,86 +123,86 @@ namespace TINK.View.Contact
         public INavigationMasterDetail NavigationMasterDetail { private get; set; }
 
 #endif
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        protected async override void OnAppearing()
-        {
-            // Pass reference to member Navigation to show bikes at station x dialog.
-            try
-            {
-                Log.ForContext<SelectStationPageViewModel>().Verbose("Constructing select station view model.");
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		protected async override void OnAppearing()
+		{
+			// Pass reference to member Navigation to show bikes at station x dialog.
+			try
+			{
+				Log.ForContext<SelectStationPageViewModel>().Verbose("Constructing select station view model.");
 
 #if TRYNOTBACKSTYLE
                 SelectStationPageViewModel = new SelectStationPageViewModel();
 #else
-                SelectStationPageViewModel = new SelectStationPageViewModel(
-                    App.ModelRoot,
-                    App.PermissionsService,
-                    App.BluetoothService,
-                    App.LocationServicesContainer.Active,
-                    (mapspan) => MyMap.MoveToRegion(mapspan),
-                    this,
-                    Navigation);
+				SelectStationPageViewModel = new SelectStationPageViewModel(
+					App.ModelRoot,
+					App.PermissionsService,
+					App.BluetoothService,
+					App.LocationServicesContainer.Active,
+					(mapspan) => MyMap.MoveToRegion(mapspan),
+					this,
+					Navigation);
 #endif
-            }
-            catch (Exception exception)
-            {
+			}
+			catch (Exception exception)
+			{
 
-                Log.ForContext<SelectStationPageViewModel>().Error("Constructing select station view model failed. {Exception}", exception);
-                return;
-            }
+				Log.ForContext<SelectStationPageViewModel>().Error("Constructing select station view model failed. {Exception}", exception);
+				return;
+			}
 
-            try
-            {
-                BindingContext = SelectStationPageViewModel;
+			try
+			{
+				BindingContext = SelectStationPageViewModel;
 
 #if USEFLYOUT
                 SelectStationPageViewModel.NavigationMasterDetail = NavigationMasterDetail;
 #endif
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<SelectStationPageViewModel>().Error("Setting binding/ navigaton on select station failed. {Exception}", exception);
-                return;
-            }
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<SelectStationPageViewModel>().Error("Setting binding/ navigaton on select station failed. {Exception}", exception);
+				return;
+			}
 
-            try
-            {
-                base.OnAppearing();
-            }
-            catch (Exception exception)
-            {
-                // Continue because styling is not essential.
-                Log.ForContext<SelectStationPageViewModel>().Error("Invoking OnAppearing of base failed. {Exception}", exception);
-                return;
-            }
+			try
+			{
+				base.OnAppearing();
+			}
+			catch (Exception exception)
+			{
+				// Continue because styling is not essential.
+				Log.ForContext<SelectStationPageViewModel>().Error("Invoking OnAppearing of base failed. {Exception}", exception);
+				return;
+			}
 
-            try
-            {
-                // Pre move and scanle maps to avoid initial display of map in Rome.
-                Log.ForContext<SelectStationPageViewModel>().Verbose("Moving and scaling map.");
-                SelectStationPageViewModel.MoveAndScale(
-                    (mapSpan) => MyMap.MoveToRegion(mapSpan),
-                    App.ModelRoot.Uris.ActiveUri);
-            }
-            catch (Exception exception)
-            {
-                // Continue because a map not beeing moved/ scaled is no reason for aborting startup.
-                Log.ForContext<SelectStationPageViewModel>().Error("Moving and scaling map failed. {Exception}", exception);
-            }
+			try
+			{
+				// Pre move and scanle maps to avoid initial display of map in Rome.
+				Log.ForContext<SelectStationPageViewModel>().Verbose("Moving and scaling map.");
+				SelectStationPageViewModel.MoveAndScale(
+					(mapSpan) => MyMap.MoveToRegion(mapSpan),
+					App.ModelRoot.Uris.ActiveUri);
+			}
+			catch (Exception exception)
+			{
+				// Continue because a map not beeing moved/ scaled is no reason for aborting startup.
+				Log.ForContext<SelectStationPageViewModel>().Error("Moving and scaling map failed. {Exception}", exception);
+			}
 
-            try
-            {
-                Log.ForContext<SelectStationPageViewModel>().Verbose("Invoking OnAppearing on select station view model.");
-                await SelectStationPageViewModel.OnAppearing();
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<SelectStationPageViewModel>().Error("Invoking OnAppearing on select station view model failed. {Exception}", exception);
-                return;
-            }
-        }
-    }
+			try
+			{
+				Log.ForContext<SelectStationPageViewModel>().Verbose("Invoking OnAppearing on select station view model.");
+				await SelectStationPageViewModel.OnAppearing();
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<SelectStationPageViewModel>().Error("Invoking OnAppearing on select station view model failed. {Exception}", exception);
+				return;
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/CopriWebView/ManageAccountPage.xaml.cs b/Meinkonrad/TINK/View/CopriWebView/ManageAccountPage.xaml.cs
index 7469312..68feb69 100644
--- a/Meinkonrad/TINK/View/CopriWebView/ManageAccountPage.xaml.cs
+++ b/Meinkonrad/TINK/View/CopriWebView/ManageAccountPage.xaml.cs
@@ -7,53 +7,53 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.CopriWebView
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class ManageAccountPage : ContentPage
-    {
-        public ManageAccountPage()
-        {
-            InitializeComponent();
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class ManageAccountPage : ContentPage
+	{
+		public ManageAccountPage()
+		{
+			InitializeComponent();
 
-            ManageAccount.Navigating += (sender, ev) =>
-            {
-                if (!ev.Url.ToUpper().EndsWith(".PDF"))
-                {
-                    // Stay inside web view except for downloading pdf- files.
-                    this.IsEnabled = false;
-                    ActivityIndicatorLoading.IsVisible = true;
-                    ActivityIndicatorLoading.IsRunning = true;
-                    return;
-                }
+			ManageAccount.Navigating += (sender, ev) =>
+			{
+				if (!ev.Url.ToUpper().EndsWith(".PDF"))
+				{
+					// Stay inside web view except for downloading pdf- files.
+					this.IsEnabled = false;
+					ActivityIndicatorLoading.IsVisible = true;
+					ActivityIndicatorLoading.IsRunning = true;
+					return;
+				}
 
-                DependencyService.Get<IExternalBrowserService>().OpenUrl(ev.Url);
-            };
+				DependencyService.Get<IExternalBrowserService>().OpenUrl(ev.Url);
+			};
 
-            ManageAccount.Navigated += (sender, ev) =>
-            {
-                if (ev.Result == WebNavigationResult.Success)
-                {
-                    this.IsEnabled = true;
-                    ActivityIndicatorLoading.IsVisible = false;
-                    ActivityIndicatorLoading.IsRunning = false;
-                    return;
-                }
+			ManageAccount.Navigated += (sender, ev) =>
+			{
+				if (ev.Result == WebNavigationResult.Success)
+				{
+					this.IsEnabled = true;
+					ActivityIndicatorLoading.IsVisible = false;
+					ActivityIndicatorLoading.IsRunning = false;
+					return;
+				}
 
-                Log.ForContext<ManageAccountPage>().Error("Navigation did not succeed.{@Event}{@Sender}", ev, sender);
-                ManageAccount.Source = new HtmlWebViewSource
-                {
-                    Html = "<html><b>Kann persönliche Daten nicht anzeigen/ verwalten!</b><br>Verbindung mit Internet ok?</html>"
-                };
+				Log.ForContext<ManageAccountPage>().Error("Navigation did not succeed.{@Event}{@Sender}", ev, sender);
+				ManageAccount.Source = new HtmlWebViewSource
+				{
+					Html = "<html><b>Kann persönliche Daten nicht anzeigen/ verwalten!</b><br>Verbindung mit Internet ok?</html>"
+				};
 
-                this.IsEnabled = true;
-                ActivityIndicatorLoading.IsVisible = false;
-                ActivityIndicatorLoading.IsRunning = false;
-            };
+				this.IsEnabled = true;
+				ActivityIndicatorLoading.IsVisible = false;
+				ActivityIndicatorLoading.IsRunning = false;
+			};
 
-            ManageAccount.BindingContext = new ManageAccountViewModel(
-                App.ModelRoot.ActiveUser.SessionCookie,
-                Model.TinkApp.MerchantId,
-                CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
-                App.ModelRoot.NextActiveUri.Host);
-        }
-    }
+			ManageAccount.BindingContext = new ManageAccountViewModel(
+				App.ModelRoot.ActiveUser.SessionCookie,
+				Model.TinkApp.MerchantId,
+				CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
+				App.ModelRoot.NextActiveUri.Host);
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs b/Meinkonrad/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs
index 666b74c..c906c33 100644
--- a/Meinkonrad/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs
+++ b/Meinkonrad/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs
@@ -7,45 +7,45 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.CopriWebView
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class PasswordForgottenPage : ContentPage
-    {
-        public PasswordForgottenPage()
-        {
-            InitializeComponent();
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class PasswordForgottenPage : ContentPage
+	{
+		public PasswordForgottenPage()
+		{
+			InitializeComponent();
 
-            PasswordForgottenWebView.Navigating += (sender, ev) =>
-            {
-                this.IsEnabled = false;
-                ActivityIndicatorLoading.IsVisible = true;
-                ActivityIndicatorLoading.IsRunning = true;
-            };
+			PasswordForgottenWebView.Navigating += (sender, ev) =>
+			{
+				this.IsEnabled = false;
+				ActivityIndicatorLoading.IsVisible = true;
+				ActivityIndicatorLoading.IsRunning = true;
+			};
 
-            PasswordForgottenWebView.Navigated += (sender, ev) =>
-            {
-                if (ev.Result == WebNavigationResult.Success)
-                {
-                    this.IsEnabled = true;
-                    ActivityIndicatorLoading.IsVisible = false;
-                    ActivityIndicatorLoading.IsRunning = false;
-                    return;
-                }
+			PasswordForgottenWebView.Navigated += (sender, ev) =>
+			{
+				if (ev.Result == WebNavigationResult.Success)
+				{
+					this.IsEnabled = true;
+					ActivityIndicatorLoading.IsVisible = false;
+					ActivityIndicatorLoading.IsRunning = false;
+					return;
+				}
 
-                Log.ForContext<PasswordForgottenPage>().Error("Navigation did not succeed. {@Event}", ev);
-                PasswordForgottenWebView.Source = new HtmlWebViewSource
-                {
-                    Html = "<html><b>Kann Passwort vergessen Seite nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>"
-                };
+				Log.ForContext<PasswordForgottenPage>().Error("Navigation did not succeed. {@Event}", ev);
+				PasswordForgottenWebView.Source = new HtmlWebViewSource
+				{
+					Html = "<html><b>Kann Passwort vergessen Seite nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>"
+				};
 
-                this.IsEnabled = true;
-                ActivityIndicatorLoading.IsVisible = false;
-                ActivityIndicatorLoading.IsRunning = false;
-            };
+				this.IsEnabled = true;
+				ActivityIndicatorLoading.IsVisible = false;
+				ActivityIndicatorLoading.IsRunning = false;
+			};
 
-            PasswordForgottenWebView.BindingContext = new PasswordForgottonViewModel(
-                Model.TinkApp.MerchantId,
-                CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
-                App.ModelRoot.NextActiveUri.Host);
-        }
-    }
+			PasswordForgottenWebView.BindingContext = new PasswordForgottonViewModel(
+				Model.TinkApp.MerchantId,
+				CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
+				App.ModelRoot.NextActiveUri.Host);
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/CopriWebView/RegisterPage.xaml.cs b/Meinkonrad/TINK/View/CopriWebView/RegisterPage.xaml.cs
index 6d5fd7b..e69cd6b 100644
--- a/Meinkonrad/TINK/View/CopriWebView/RegisterPage.xaml.cs
+++ b/Meinkonrad/TINK/View/CopriWebView/RegisterPage.xaml.cs
@@ -8,48 +8,48 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.CopriWebView
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class RegisterPage : ContentPage
-    {
-        public RegisterPage()
-        {
-            DependencyService.Get<IWebView>().ClearCookies();
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class RegisterPage : ContentPage
+	{
+		public RegisterPage()
+		{
+			DependencyService.Get<IWebView>().ClearCookies();
 
-            InitializeComponent();
+			InitializeComponent();
 
-            RegisterView.Navigating += (sender, ev) =>
-            {
-                this.IsEnabled = false;
-                ActivityIndicatorLoading.IsVisible = true;
-                ActivityIndicatorLoading.IsRunning = true;
-            };
+			RegisterView.Navigating += (sender, ev) =>
+			{
+				this.IsEnabled = false;
+				ActivityIndicatorLoading.IsVisible = true;
+				ActivityIndicatorLoading.IsRunning = true;
+			};
 
-            RegisterView.Navigated += (sender, ev) =>
-            {
-                if (ev.Result == WebNavigationResult.Success)
-                {
-                    this.IsEnabled = true;
-                    ActivityIndicatorLoading.IsVisible = false;
-                    ActivityIndicatorLoading.IsRunning = false;
-                    return;
-                }
+			RegisterView.Navigated += (sender, ev) =>
+			{
+				if (ev.Result == WebNavigationResult.Success)
+				{
+					this.IsEnabled = true;
+					ActivityIndicatorLoading.IsVisible = false;
+					ActivityIndicatorLoading.IsRunning = false;
+					return;
+				}
 
-                Log.ForContext<RegisterPage>().Error("Navigation did not succeed. {@Event}", ev);
-                RegisterView.Source = new HtmlWebViewSource
-                {
-                    Html = "<html><b>Kann Anmeldeseite nicht anzeigen</b>!<br>Verbindung mit Internet ok?</html>"
-                };
+				Log.ForContext<RegisterPage>().Error("Navigation did not succeed. {@Event}", ev);
+				RegisterView.Source = new HtmlWebViewSource
+				{
+					Html = "<html><b>Kann Anmeldeseite nicht anzeigen</b>!<br>Verbindung mit Internet ok?</html>"
+				};
 
-                this.IsEnabled = true;
-                ActivityIndicatorLoading.IsVisible = false;
-                ActivityIndicatorLoading.IsRunning = false;
-            };
+				this.IsEnabled = true;
+				ActivityIndicatorLoading.IsVisible = false;
+				ActivityIndicatorLoading.IsRunning = false;
+			};
 
-            RegisterView.BindingContext = new RegisterPageViewModel(
-                Model.TinkApp.MerchantId,
-                CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
-                App.ModelRoot.NextActiveUri.Host);
+			RegisterView.BindingContext = new RegisterPageViewModel(
+				Model.TinkApp.MerchantId,
+				CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
+				App.ModelRoot.NextActiveUri.Host);
 
-        }
-    }
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/FeedbackPopup.xaml b/Meinkonrad/TINK/View/FeedbackPopup.xaml
index a2697c8..5178d64 100644
--- a/Meinkonrad/TINK/View/FeedbackPopup.xaml
+++ b/Meinkonrad/TINK/View/FeedbackPopup.xaml
@@ -10,104 +10,74 @@
     <xct:Popup.Resources>
         <x:String x:Key="check_circle">&#xf058;</x:String>
     </xct:Popup.Resources>
-    <Grid>
-        <Grid.RowDefinitions>
-            <!-- Head and title row -->
-            <RowDefinition Height="auto"/>
-            <!--- Co2saving-->
-            <RowDefinition Height="auto"/>
-            <!--- checkbox and input elements-->
-            <RowDefinition Height="*"/>
-            <!--- ok button-->
-            <RowDefinition Height="auto"/>
-        </Grid.RowDefinitions>
-        
-        <!-- Head and title - Grid.Row 0 -->
-        <Grid Grid.Row="0"
+    <StackLayout>
+
+        <!-- Head and title -->
+        <StackLayout
             Padding="30"
             BackgroundColor="{DynamicResource primary-back-title-color}">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="auto"/>
-                <RowDefinition Height="auto"/>
-            </Grid.RowDefinitions>
-            <Label Grid.Row="0"
+            <Label
                     HorizontalTextAlignment="Center"
                     FontSize="Large"
                     TextColor="White"
                     Text="{x:Static resources:AppResources.MarkingReturnBikeMainMessage}"/>
-            <Image Grid.Row="1">
+            <Image>
                 <Image.Source>
-                    <FontImageSource Size="Title" Glyph="{StaticResource check_circle}" FontFamily="FA-S"/>
+                    <FontImageSource Size="60" Glyph="{StaticResource check_circle}" FontFamily="FA-S" Color="White"/>
                 </Image.Source>
             </Image>
-        </Grid>
-        
-        <!-- Co2saving - Grid.Row 1-->
+        </StackLayout>
+
+        <!-- Co2saving -->
         <Frame 
-            x:Name="Co2SavingFrame"
-            Grid.Row="1">
+            x:Name="Co2SavingFrame">
             <Label 
                 x:Name="Co2SavingLabel"            
                 Text=""/>
         </Frame>
-        
-        <!-- Checkbox and input elements - Grid.Row 2-->
-        <ScrollView Grid.Row="2">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <!--- Battery charge level -->
-                    <RowDefinition Height="Auto"/>
-                    <!--- Bike is ok GUI -->
-                    <RowDefinition Height="Auto"/>
-                    <!--- Feedback edit GUI -->
-                    <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
+
+        <!-- Checkbox and input elements -->
+        <ScrollView>
+            <StackLayout>
                 <!-- Battery level -->
-                <sharedGui:BarLevelInputView Grid.Row="0"
+                <sharedGui:BarLevelInputView 
                             x:Name="BarLevelInputView"
                             HorizontalOptions="Center"/>
-                <Grid Grid.Row="1">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-                        <!-- Checkbox Is Broken -->
-                        <CheckBox x:Name="brockenCheckBox" IsChecked="True"/>
-                        <Label 
-                            Grid.Column="1" 
+                <!-- Checkbox Is Broken -->
+                <StackLayout Orientation="Horizontal">
+                    <CheckBox x:Name="brockenCheckBox" IsChecked="True" HeightRequest="20"/>
+                    <Label 
                             FontSize="Medium"
                             Text= "{x:Static resources:AppResources.MarkingReturnBikeBikeStateIsOK}"/>
-                    </Grid>
-                    <Editor 
-                        Grid.Row="2"
+                </StackLayout>
+                <Editor 
                         x:Name="feedbackMessage"
                         AutoSize="TextChanges"  
                         Placeholder="{x:Static resources:AppResources.MarkingReturnBikeFeedbackInputPlaceholder}"
                         Text="">
-                        <Editor.Triggers>
-                            <DataTrigger TargetType="Editor"
+                    <Editor.Triggers>
+                        <DataTrigger TargetType="Editor"
                                         Binding="{Binding Source={x:Reference brockenCheckBox}, Path=IsChecked}"
                                         Value="true">
-                                <Setter Property="Placeholder"
+                            <Setter Property="Placeholder"
                                             Value="{x:Static resources:AppResources.MarkingReturnBikeFeedbackInputPlaceholder}" />
-                            </DataTrigger>
-                            <DataTrigger TargetType="Editor"
+                        </DataTrigger>
+                        <DataTrigger TargetType="Editor"
                                         Binding="{Binding Source={x:Reference brockenCheckBox}, Path=IsChecked}"
                                         Value="false">
-                                <Setter Property="Placeholder"
+                            <Setter Property="Placeholder"
                                             Value="{x:Static resources:AppResources.MarkingReturnBikeErrorDescriptionInputPlaceholder}" />
-                            </DataTrigger>
-                        </Editor.Triggers>
-                    </Editor>
-            </Grid>
+                        </DataTrigger>
+                    </Editor.Triggers>
+                </Editor>
+            </StackLayout>
         </ScrollView>
-        
-        <!-- Buttons - Grid.Row 3 -->
+
+        <!-- Buttons -->
         <Button 
-                Grid.Row="3"
                 WidthRequest="100"
                 Clicked="OnOkClicked"
                 Text="OK"
                 Margin="0,0,0,3"/>
-    </Grid>
+    </StackLayout>
 </xct:Popup>
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/FeedbackPopup.xaml.cs b/Meinkonrad/TINK/View/FeedbackPopup.xaml.cs
index 7292eea..c5b1ae3 100644
--- a/Meinkonrad/TINK/View/FeedbackPopup.xaml.cs
+++ b/Meinkonrad/TINK/View/FeedbackPopup.xaml.cs
@@ -5,87 +5,87 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class FeedbackPopup : Popup<FeedbackPopup.Result>
-    {
-        /// <summary> Constructs user feedback popup.</summary>
-        /// <param name="battery">Object holding info about battery. For some batteries charging level might need to be updated by user.</param>
-        /// <param name="co2Saving"> Co2 saving information.</param>
-        public FeedbackPopup(
-            IBattery battery = null,
-            string co2Saving = null)
-        {
-            InitializeComponent();
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class FeedbackPopup : Popup<FeedbackPopup.Result>
+	{
+		/// <summary> Constructs user feedback popup.</summary>
+		/// <param name="battery">Object holding info about battery. For some batteries charging level might need to be updated by user.</param>
+		/// <param name="co2Saving"> Co2 saving information.</param>
+		public FeedbackPopup(
+			IBattery battery = null,
+			string co2Saving = null)
+		{
+			InitializeComponent();
 
-            if (string.IsNullOrEmpty(co2Saving))
-                Co2SavingFrame.IsVisible = false;
-            else
-                Co2SavingLabel.Text = co2Saving;
+			if (string.IsNullOrEmpty(co2Saving))
+				Co2SavingFrame.IsVisible = false;
+			else
+				Co2SavingLabel.Text = co2Saving;
 
-            if (battery == null
-                || (battery.IsBackendAccessible.HasValue && battery.IsBackendAccessible.Value))
-            {
-                // Either 
-                // - bike has no engine or
-                // - backend can access battery level information
-                // No need to ask user for input.
-                return;
-            }
+			if (battery == null
+				|| (battery.IsBackendAccessible.HasValue && battery.IsBackendAccessible.Value))
+			{
+				// Either 
+				// - bike has no engine or
+				// - backend can access battery level information
+				// No need to ask user for input.
+				return;
+			}
 
-            BarLevelInputView.IsVisible = battery?.MaxChargeBars != null;
-            BarLevelInputView.Current = battery?.CurrentChargeBars?.ToString() ?? string.Empty;
-            BarLevelInputView.Maximum = battery?.MaxChargeBars != null ? battery?.MaxChargeBars.ToString() : String.Empty;
+			BarLevelInputView.IsVisible = battery?.MaxChargeBars != null;
+			BarLevelInputView.Current = battery?.CurrentChargeBars?.ToString() ?? string.Empty;
+			BarLevelInputView.Maximum = battery?.MaxChargeBars != null ? battery?.MaxChargeBars.ToString() : String.Empty;
 
-        }
+		}
 
-        protected override FeedbackPopup.Result GetLightDismissResult()
-        {
-            return new Result
-            {
-                CurrentChargeBars = int.TryParse(BarLevelInputView.Current, out int current) ? (int?)current : null,
-                IsBikeBroken = brockenCheckBox.IsChecked,
-                Message = feedbackMessage.Text
-            };
-        }
+		protected override FeedbackPopup.Result GetLightDismissResult()
+		{
+			return new Result
+			{
+				CurrentChargeBars = int.TryParse(BarLevelInputView.Current, out int current) ? (int?)current : null,
+				IsBikeBroken = brockenCheckBox.IsChecked,
+				Message = feedbackMessage.Text
+			};
+		}
 
-        private void OnOkClicked(object sender, EventArgs eventArgs)
-        {
-            var result = new Result
-            {
-                CurrentChargeBars = int.TryParse(BarLevelInputView.Current, out int current) ? (int?)current : null,
-                IsBikeBroken = brockenCheckBox.IsChecked,
-                Message = feedbackMessage.Text
-            };
+		private void OnOkClicked(object sender, EventArgs eventArgs)
+		{
+			var result = new Result
+			{
+				CurrentChargeBars = int.TryParse(BarLevelInputView.Current, out int current) ? (int?)current : null,
+				IsBikeBroken = brockenCheckBox.IsChecked,
+				Message = feedbackMessage.Text
+			};
 
-            Dismiss(result);
-        }
+			Dismiss(result);
+		}
 
-        /// <summary>
-        /// Feedback given by user when returning bike.
-        /// </summary>
+		/// <summary>
+		/// Feedback given by user when returning bike.
+		/// </summary>
 #if USCSHARP9
 		public class Result : IViewService.IUserFeedback
 #else
-        public new class Result : IUserFeedback
+		public new class Result : IUserFeedback
 #endif
-        {
-            /// <summary>
-            /// Holds the current chargeing level of the battery entered by user in bars, null if unkonwn.
-            /// </summary>
-            public int? CurrentChargeBars { get; set; }
+		{
+			/// <summary>
+			/// Holds the current chargeing level of the battery entered by user in bars, null if unkonwn.
+			/// </summary>
+			public int? CurrentChargeBars { get; set; }
 
-            /// <summary>
-            /// Holds whether bike is broken or not.
-            /// </summary>
-            public bool IsBikeBroken { get; set; }
+			/// <summary>
+			/// Holds whether bike is broken or not.
+			/// </summary>
+			public bool IsBikeBroken { get; set; }
 
-            /// <summary>
-            /// Holds either 
-            /// - general feedback
-            /// - error description of broken bike 
-            /// or both.
-            /// </summary>
-            public string Message { get; set; }
-        }
-    }
+			/// <summary>
+			/// Holds either 
+			/// - general feedback
+			/// - error description of broken bike 
+			/// or both.
+			/// </summary>
+			public string Message { get; set; }
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml.cs b/Meinkonrad/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml.cs
index 7379ff7..b2e564f 100644
--- a/Meinkonrad/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml.cs
+++ b/Meinkonrad/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml.cs
@@ -5,34 +5,34 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Contact
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class FeesAndBikesPage : TabbedPage
-    {
-        public FeesAndBikesPageViewModel ViewModel { get; }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class FeesAndBikesPage : TabbedPage
+	{
+		public FeesAndBikesPageViewModel ViewModel { get; }
 
-        public FeesAndBikesPage()
-        {
-            InitializeComponent();
+		public FeesAndBikesPage()
+		{
+			InitializeComponent();
 
-            ViewModel = new FeesAndBikesPageViewModel(
-                App.ModelRoot.NextActiveUri.Host,
-                App.ModelRoot.ResourceUrls.FeesResourcePath,
-                App.ModelRoot.ResourceUrls.BikesResourcePath,
-                App.ModelRoot.IsSiteCachingOn);
+			ViewModel = new FeesAndBikesPageViewModel(
+				App.ModelRoot.NextActiveUri.Host,
+				App.ModelRoot.ResourceUrls.FeesResourcePath,
+				App.ModelRoot.ResourceUrls.BikesResourcePath,
+				App.ModelRoot.IsSiteCachingOn);
 
-            BindingContext = ViewModel;
+			BindingContext = ViewModel;
 
-            /// Info about renting.
-            InfoRentBikeWebView.Navigating += ViewModelHelper.OnNavigating;
+			/// Info about renting.
+			InfoRentBikeWebView.Navigating += ViewModelHelper.OnNavigating;
 
-            /// Info about types of bikes.
-            InfoTypesOfBikesWebView.Navigating += ViewModelHelper.OnNavigating;
-        }
+			/// Info about types of bikes.
+			InfoTypesOfBikesWebView.Navigating += ViewModelHelper.OnNavigating;
+		}
 
-        /// <summary> Called when page is shown. </summary>
-        protected override void OnAppearing()
-        {
-            ViewModel.OnAppearing();
-        }
-    }
+		/// <summary> Called when page is shown. </summary>
+		protected override void OnAppearing()
+		{
+			ViewModel.OnAppearing();
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml.cs b/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml.cs
index 5ae38c4..1b8d527 100644
--- a/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml.cs
+++ b/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml.cs
@@ -11,138 +11,138 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.FindBike
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class FindBikePage : ContentPage, IViewService
-    {
-        /// <summary> Refernce to view model. </summary>
-        FindBikePageViewModel m_oViewModel = null;
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class FindBikePage : ContentPage, IViewService
+	{
+		/// <summary> Refernce to view model. </summary>
+		FindBikePageViewModel m_oViewModel = null;
 
-        public FindBikePage() { }
+		public FindBikePage() { }
 
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        protected async override void OnAppearing()
-        {
-            if (m_oViewModel != null)
-            {
-                // No need to create view model, set binding context an items source if already done.
-                // If done twice tap events are fired multiple times (when hiding page using home button).
-                await m_oViewModel.OnAppearing();
-                return;
-            }
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		protected async override void OnAppearing()
+		{
+			if (m_oViewModel != null)
+			{
+				// No need to create view model, set binding context an items source if already done.
+				// If done twice tap events are fired multiple times (when hiding page using home button).
+				await m_oViewModel.OnAppearing();
+				return;
+			}
 
-            try
-            {
-                var model = App.ModelRoot;
+			try
+			{
+				var model = App.ModelRoot;
 
-                // Backup synchronization context when called from GUI-thread.
-                var synchronizationContext = SynchronizationContext.Current;
+				// Backup synchronization context when called from GUI-thread.
+				var synchronizationContext = SynchronizationContext.Current;
 
-                m_oViewModel = new FindBikePageViewModel(
-                    model.ActiveUser,
-                    App.PermissionsService,
-                    App.BluetoothService,
-                    Device.RuntimePlatform,
-                    () => model.GetIsConnected(),
-                    (isConnected) => model.GetConnector(isConnected),
-                    App.LocationServicesContainer.Active,
-                    model.LocksServices.Active,
-                    model.Stations,
-                    model.Polling,
-                    (d, obj) => synchronizationContext.Post(d, obj),
-                    model.SmartDevice,
-                    this,
-                    (url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url))
-                {
-                    IsReportLevelVerbose = model.IsReportLevelVerbose
-                };
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<FindBikePage>().Error("Displaying bikes at station page failed. {Exception}", exception);
-                await DisplayAlert("Fehler", $"Seite Fahrrad Wählen kann nicht angezeigt werden. ${exception.Message}", "OK");
-                return;
+				m_oViewModel = new FindBikePageViewModel(
+					model.ActiveUser,
+					App.PermissionsService,
+					App.BluetoothService,
+					Device.RuntimePlatform,
+					() => model.GetIsConnected(),
+					(isConnected) => model.GetConnector(isConnected),
+					App.LocationServicesContainer.Active,
+					model.LocksServices.Active,
+					model.Stations,
+					model.Polling,
+					(d, obj) => synchronizationContext.Post(d, obj),
+					model.SmartDevice,
+					this,
+					(url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url))
+				{
+					IsReportLevelVerbose = model.IsReportLevelVerbose
+				};
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<FindBikePage>().Error("Displaying bikes at station page failed. {Exception}", exception);
+				await DisplayAlert("Fehler", $"Seite Fahrrad Wählen kann nicht angezeigt werden. ${exception.Message}", "OK");
+				return;
 
-            }
+			}
 
-            InitializeComponent();
+			InitializeComponent();
 
-            BindingContext = m_oViewModel;
-            FindBikeListView.ItemsSource = m_oViewModel;
+			BindingContext = m_oViewModel;
+			FindBikeListView.ItemsSource = m_oViewModel;
 
-            await m_oViewModel.OnAppearing();
-        }
+			await m_oViewModel.OnAppearing();
+		}
 
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strCancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strCancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strAccept">Text of accept button.</param>
-        /// <param name="p_strCancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strAccept">Text of accept button.</param>
+		/// <param name="p_strCancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
 
 #if USEFLYOUT
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => throw new NotImplementedException();
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="typeOfPage">Page to display.</param>
-        public async Task PushModalAsync(ViewTypes typeOfPage)
-            => await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="typeOfPage">Page to display.</param>
+		public async Task PushModalAsync(ViewTypes typeOfPage)
+			=> await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync() => throw new NotSupportedException();
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync() => throw new NotSupportedException();
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
 
 #if USCSHARP9
         public async Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup());
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs b/Meinkonrad/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs
index 8aa6c88..49a938b 100644
--- a/Meinkonrad/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs
+++ b/Meinkonrad/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs
@@ -11,65 +11,65 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Info.BikeInfo
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class BikeInfoCarouselPage : CarouselPage, IViewService, IDetailPage
 #else
-    public partial class BikeInfoCarouselPage : CarouselPage, IViewService
+	public partial class BikeInfoCarouselPage : CarouselPage, IViewService
 #endif
-    {
-        public BikeInfoCarouselPage()
-        {
-            InitializeComponent();
+	{
+		public BikeInfoCarouselPage()
+		{
+			InitializeComponent();
 
-            ItemsSource = new BikeInfoViewModel(
-                resourceName => ImageSource.FromResource($"{ViewModelResourceHelper.RessourcePrefix}Images.{resourceName}"),
-                this).CarouselItems;
-        }
+			ItemsSource = new BikeInfoViewModel(
+				resourceName => ImageSource.FromResource($"{ViewModelResourceHelper.RessourcePrefix}Images.{resourceName}"),
+				this).CarouselItems;
+		}
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strCancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
-             => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strCancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
+			 => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strAccept">Text of accept button.</param>
-        /// <param name="p_strCancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
-        {
-            return await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
-        }
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strAccept">Text of accept button.</param>
+		/// <param name="p_strCancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
+		{
+			return await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
+		}
 
 #if USEFLYOUT
         /// <summary>
@@ -79,31 +79,31 @@ namespace TINK.View.Info.BikeInfo
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => m_oNavigation.ShowPage(p_oType.GetViewType(), p_strTitle);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushModalAsync(ViewTypes p_oTypeOfPage)
-        {
-            throw new NotSupportedException();
-        }
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushModalAsync(ViewTypes p_oTypeOfPage)
+		{
+			throw new NotSupportedException();
+		}
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync()
-        {
-            throw new NotSupportedException();
-        }
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync()
+		{
+			throw new NotSupportedException();
+		}
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushAsync(ViewTypes p_oTypeOfPage)
-        {
-            throw new NotImplementedException();
-        }
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushAsync(ViewTypes p_oTypeOfPage)
+		{
+			throw new NotImplementedException();
+		}
 
 #if USEFLYOUT
         /// <summary>
@@ -123,7 +123,7 @@ namespace TINK.View.Info.BikeInfo
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/Info/InfoTabbedPage.xaml.cs b/Meinkonrad/TINK/View/Info/InfoTabbedPage.xaml.cs
index e4ca437..17f0bba 100644
--- a/Meinkonrad/TINK/View/Info/InfoTabbedPage.xaml.cs
+++ b/Meinkonrad/TINK/View/Info/InfoTabbedPage.xaml.cs
@@ -6,36 +6,36 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Info
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class InfoPage : TabbedPage
-    {
-        public InfoPageViewModel ViewModel { get; }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class InfoPage : TabbedPage
+	{
+		public InfoPageViewModel ViewModel { get; }
 
-        public InfoPage()
-        {
-            InitializeComponent();
+		public InfoPage()
+		{
+			InitializeComponent();
 
-            ViewModel = new InfoPageViewModel(
-                App.ModelRoot.NextActiveUri.Host,
-                App.ModelRoot.ResourceUrls.AgbResourcePath,
-                App.ModelRoot.ResourceUrls.PrivacyResourcePath,
-                App.ModelRoot.ResourceUrls.ImpressResourcePath,
-                App.ModelRoot.IsSiteCachingOn,
-                CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
-                resourceName => ViewModelResourceHelper.GetSource(resourceName));
-            TabbedInfoPage.BindingContext = ViewModel;
+			ViewModel = new InfoPageViewModel(
+				App.ModelRoot.NextActiveUri.Host,
+				App.ModelRoot.ResourceUrls.AgbResourcePath,
+				App.ModelRoot.ResourceUrls.PrivacyResourcePath,
+				App.ModelRoot.ResourceUrls.ImpressResourcePath,
+				App.ModelRoot.IsSiteCachingOn,
+				CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
+				resourceName => ViewModelResourceHelper.GetSource(resourceName));
+			TabbedInfoPage.BindingContext = ViewModel;
 
-            InfoLicenses.Navigating += ViewModelHelper.OnNavigating;
-            InfoDatenschutz.Navigating += ViewModelHelper.OnNavigating;
-            InfoABG.Navigating += ViewModelHelper.OnNavigating;
+			InfoLicenses.Navigating += ViewModelHelper.OnNavigating;
+			InfoDatenschutz.Navigating += ViewModelHelper.OnNavigating;
+			InfoABG.Navigating += ViewModelHelper.OnNavigating;
 
-            InfoImpressum.Navigating += ViewModelHelper.OnNavigating;
-        }
+			InfoImpressum.Navigating += ViewModelHelper.OnNavigating;
+		}
 
-        /// <summary> Called when page is shown. </summary>
-        protected override void OnAppearing()
-        {
-            ViewModel.OnAppearing();
-        }
-    }
+		/// <summary> Called when page is shown. </summary>
+		protected override void OnAppearing()
+		{
+			ViewModel.OnAppearing();
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/ListViewAttachedBehavior.cs b/Meinkonrad/TINK/View/ListViewAttachedBehavior.cs
index 0b13485..ec0cc89 100644
--- a/Meinkonrad/TINK/View/ListViewAttachedBehavior.cs
+++ b/Meinkonrad/TINK/View/ListViewAttachedBehavior.cs
@@ -3,33 +3,33 @@ using Xamarin.Forms;
 
 namespace TINK.View
 {
-    public static class ListViewAttachedBehavior
-    {
-        public static readonly BindableProperty CommandProperty =
-            BindableProperty.CreateAttached(
-                "Command",
-                typeof(ICommand),
-                typeof(ListViewAttachedBehavior),
-                null,
-                propertyChanged: OnCommandChanged);
+	public static class ListViewAttachedBehavior
+	{
+		public static readonly BindableProperty CommandProperty =
+			BindableProperty.CreateAttached(
+				"Command",
+				typeof(ICommand),
+				typeof(ListViewAttachedBehavior),
+				null,
+				propertyChanged: OnCommandChanged);
 
-        static void OnCommandChanged(BindableObject view, object oldValue, object newValue)
-        {
-            var entry = view as ListView;
-            if (entry == null)
-                return;
+		static void OnCommandChanged(BindableObject view, object oldValue, object newValue)
+		{
+			var entry = view as ListView;
+			if (entry == null)
+				return;
 
-            entry.ItemTapped += (sender, e) =>
-            {
-                var command = (newValue as ICommand);
-                if (command == null)
-                    return;
+			entry.ItemTapped += (sender, e) =>
+			{
+				var command = (newValue as ICommand);
+				if (command == null)
+					return;
 
-                if (command.CanExecute(e.Item))
-                {
-                    command.Execute(e.Item);
-                }
-            };
-        }
-    }
+				if (command.CanExecute(e.Item))
+				{
+					command.Execute(e.Item);
+				}
+			};
+		}
+	}
 }
diff --git a/Meinkonrad/TINK/View/Login/LoginPage.xaml.cs b/Meinkonrad/TINK/View/Login/LoginPage.xaml.cs
index 03e860c..b1e85fb 100644
--- a/Meinkonrad/TINK/View/Login/LoginPage.xaml.cs
+++ b/Meinkonrad/TINK/View/Login/LoginPage.xaml.cs
@@ -11,60 +11,60 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Login
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class LoginPage : ContentPage, IViewService, IDetailPage
 #else
-    public partial class LoginPage : ContentPage, IViewService
+	public partial class LoginPage : ContentPage, IViewService
 #endif
-    {
-        public LoginPage()
-        {
-            InitializeComponent();
+	{
+		public LoginPage()
+		{
+			InitializeComponent();
 
-            var l_oModel = App.ModelRoot;
+			var l_oModel = App.ModelRoot;
 #if !BACKSTYLE
-            var l_oViewModel = new LoginPageViewModel(
-                l_oModel,
-                (url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url),
-                this);
+			var l_oViewModel = new LoginPageViewModel(
+				l_oModel,
+				(url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url),
+				this);
 
-            LoginPageView.BindingContext = l_oViewModel;
+			LoginPageView.BindingContext = l_oViewModel;
 #else
             LoginPageView.BindingContext = new LoginPageViewModel(l_oModel.ActiveUser, this, Navigation);
 #endif
-        }
+		}
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strCancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strCancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
 #if USEFLYOUT
         /// <summary>
@@ -74,30 +74,30 @@ namespace TINK.View.Login
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => m_oNavigation.ShowPage(p_oType.GetViewType(), p_strTitle);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public async Task PushModalAsync(ViewTypes typeOfPage)
-            => await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public async Task PushModalAsync(ViewTypes typeOfPage)
+			=> await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
 
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync()
-        {
-            throw new NotSupportedException();
-        }
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync()
+		{
+			throw new NotSupportedException();
+		}
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public async Task PushAsync(ViewTypes p_oTypeOfPage)
-        {
-            await Navigation.PushAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
-        }
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public async Task PushAsync(ViewTypes p_oTypeOfPage)
+		{
+			await Navigation.PushAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
+		}
 
 #if USEFLYOUT
         /// <summary>
@@ -117,7 +117,7 @@ namespace TINK.View.Login
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/Map/MapPage.xaml.cs b/Meinkonrad/TINK/View/Map/MapPage.xaml.cs
index e512d74..5f147bf 100644
--- a/Meinkonrad/TINK/View/Map/MapPage.xaml.cs
+++ b/Meinkonrad/TINK/View/Map/MapPage.xaml.cs
@@ -8,72 +8,72 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Map
 {
-    using Serilog;
-    using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
-    using TINK.ViewModel.Map;
+	using Serilog;
+	using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
+	using TINK.ViewModel.Map;
 
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class MapPage : ContentPage, IViewService, IDetailPage
 #else
-    public partial class MapPage : ContentPage, IViewService
+	public partial class MapPage : ContentPage, IViewService
 #endif
-    {
-        /// <summary> View model to notify about whether page appears or hides. </summary>
-        private MapPageViewModel MapPageViewModel { get; set; }
+	{
+		/// <summary> View model to notify about whether page appears or hides. </summary>
+		private MapPageViewModel MapPageViewModel { get; set; }
 
-        /// <summary> Initialization status to ensure initialization logic is not called multiple times. </summary>
-        private bool isInitializationStarted = false;
+		/// <summary> Initialization status to ensure initialization logic is not called multiple times. </summary>
+		private bool isInitializationStarted = false;
 
-        /// <summary>
-        /// Constructs map page instance.
-        /// </summary>
-        public MapPage()
-        {
-            InitializeComponent();
-        }
+		/// <summary>
+		/// Constructs map page instance.
+		/// </summary>
+		public MapPage()
+		{
+			InitializeComponent();
+		}
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string title, string message, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, cancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string title, string message, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, cancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
 
 #if USEFLYOUT
         /// <summary>
@@ -83,45 +83,45 @@ namespace TINK.View.Map
         public void ShowPage(ViewTypes type, string title = null)
             => NavigationMasterDetail.ShowPage(type.GetViewType(), title);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="typeOfPage">Type of page to display.</param>
-        public async Task PushModalAsync(ViewTypes typeOfPage)
-            => await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="typeOfPage">Type of page to display.</param>
+		public async Task PushModalAsync(ViewTypes typeOfPage)
+			=> await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public async Task PopModalAsync()
-            => await Navigation.PopModalAsync();
+		/// <summary> Pops a page from the modal stack. </summary>
+		public async Task PopModalAsync()
+			=> await Navigation.PopModalAsync();
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="typeOfPage">Page to display.</param>
-        public async Task PushAsync(ViewTypes typeOfPage)
-        {
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="typeOfPage">Page to display.</param>
+		public async Task PushAsync(ViewTypes typeOfPage)
+		{
 #if USEFLYOUT
             var page = Activator.CreateInstance(typeOfPage.GetViewType()) as IDetailPage;
 #else
-            var page = Activator.CreateInstance(typeOfPage.GetViewType());
+			var page = Activator.CreateInstance(typeOfPage.GetViewType());
 #endif
-            if (page == null)
-            {
-                return;
-            }
+			if (page == null)
+			{
+				return;
+			}
 
 #if USEFLYOUT
             page.NavigationMasterDetail = NavigationMasterDetail;
 #endif
 
-            await Navigation.PushAsync((Page)page);
-        }
+			await Navigation.PushAsync((Page)page);
+		}
 
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
 
 #if USEFLYOUT
@@ -129,153 +129,153 @@ namespace TINK.View.Map
         public INavigationMasterDetail NavigationMasterDetail { private get; set; }
 
 #endif
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        protected async override void OnAppearing()
-        {
-            // Don't repeat the initialization if it has been completed already.
-            if (isInitializationStarted) return;
-            isInitializationStarted = true;
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		protected async override void OnAppearing()
+		{
+			// Don't repeat the initialization if it has been completed already.
+			if (isInitializationStarted) return;
+			isInitializationStarted = true;
 
-            // Pass reference to member Navigation to show bikes at station x dialog.
-            try
-            {
-                Log.ForContext<MapPage>().Verbose("Constructing map page view model.");
+			// Pass reference to member Navigation to show bikes at station x dialog.
+			try
+			{
+				Log.ForContext<MapPage>().Verbose("Constructing map page view model.");
 
 #if TRYNOTBACKSTYLE
                 MapPageViewModel = new MapPageViewModel();
 #else
-                MapPageViewModel = CreateMapPageViewModel();
+				MapPageViewModel = CreateMapPageViewModel();
 #endif
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<MapPage>().Error("Constructing map page view model failed. {Exception}", exception);
-                isInitializationStarted = false;
-                return;
-            }
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<MapPage>().Error("Constructing map page view model failed. {Exception}", exception);
+				isInitializationStarted = false;
+				return;
+			}
 
-            try
-            {
-                BindingContext = MapPageViewModel;
+			try
+			{
+				BindingContext = MapPageViewModel;
 
 #if USEFLYOUT
                 MapPageViewModel.NavigationMasterDetail = NavigationMasterDetail;
 #endif
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<MapPage>().Error("Setting binding/ navigaton on map page failed. {Exception}", exception);
-                isInitializationStarted = false;
-                return;
-            }
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<MapPage>().Error("Setting binding/ navigaton on map page failed. {Exception}", exception);
+				isInitializationStarted = false;
+				return;
+			}
 
-            try
-            {
-                ApplyCustomiOSStyling();
-            }
-            catch (Exception exception)
-            {
-                // Continue because styling is not essential.
-                Log.ForContext<MapPage>().Error("IOS specific styling of map page failed. {Exception}", exception);
-            }
+			try
+			{
+				ApplyCustomiOSStyling();
+			}
+			catch (Exception exception)
+			{
+				// Continue because styling is not essential.
+				Log.ForContext<MapPage>().Error("IOS specific styling of map page failed. {Exception}", exception);
+			}
 
-            try
-            {
-                base.OnAppearing();
-            }
-            catch (Exception exception)
-            {
-                // Continue because styling is not essential.
-                Log.ForContext<MapPage>().Error("Invoking OnAppearing of base failed. {Exception}", exception);
-                isInitializationStarted = false;
-                return;
-            }
+			try
+			{
+				base.OnAppearing();
+			}
+			catch (Exception exception)
+			{
+				// Continue because styling is not essential.
+				Log.ForContext<MapPage>().Error("Invoking OnAppearing of base failed. {Exception}", exception);
+				isInitializationStarted = false;
+				return;
+			}
 
-            try
-            {
-                // Pre move and scanle maps to avoid initial display of map in Rome.
-                PremoveAndScaleMap();
-            }
-            catch (Exception exception)
-            {
-                // Continue because a map not beeing moved/ scaled is no reason for aborting startup.
-                Log.ForContext<MapPage>().Error("Moving and scaling map failed. {Exception}", exception);
-            }
+			try
+			{
+				// Pre move and scanle maps to avoid initial display of map in Rome.
+				PremoveAndScaleMap();
+			}
+			catch (Exception exception)
+			{
+				// Continue because a map not beeing moved/ scaled is no reason for aborting startup.
+				Log.ForContext<MapPage>().Error("Moving and scaling map failed. {Exception}", exception);
+			}
 
-            try
-            {
-                Log.ForContext<MapPage>().Verbose("Invoking OnAppearing on map page view model.");
-                await MapPageViewModel.OnAppearing();
+			try
+			{
+				Log.ForContext<MapPage>().Verbose("Invoking OnAppearing on map page view model.");
+				await MapPageViewModel.OnAppearing();
 
-                isInitializationStarted = false;
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<MapPage>().Error("Invoking OnAppearing on map page view model failed. {Exception}", exception);
-                isInitializationStarted = false;
-                return;
-            }
-        }
+				isInitializationStarted = false;
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<MapPage>().Error("Invoking OnAppearing on map page view model failed. {Exception}", exception);
+				isInitializationStarted = false;
+				return;
+			}
+		}
 
-        /// <summary>
-        /// Premoves the Map to a certain location.
-        /// </summary>
-        private void PremoveAndScaleMap()
-        {
-            Log.ForContext<MapPage>().Verbose("Moving and scaling map.");
-            MapPageViewModel.MoveAndScale(
-                (mapSpan) => MyMap.MoveToRegion(mapSpan),
-                App.ModelRoot.ActiveMapSpan);
-        }
+		/// <summary>
+		/// Premoves the Map to a certain location.
+		/// </summary>
+		private void PremoveAndScaleMap()
+		{
+			Log.ForContext<MapPage>().Verbose("Moving and scaling map.");
+			MapPageViewModel.MoveAndScale(
+				(mapSpan) => MyMap.MoveToRegion(mapSpan),
+				App.ModelRoot.ActiveMapSpan);
+		}
 
-        /// <summary>
-        /// Creates the Map Page's view model.
-        /// </summary>
-        private MapPageViewModel CreateMapPageViewModel()
-        {
-            Log.ForContext<MapPage>().Verbose("Constructing map page view model.");
-            return new MapPageViewModel(
-                App.ModelRoot,
-                App.PermissionsService,
-                App.BluetoothService,
-                App.LocationServicesContainer.Active,
-                (mapspan) => MyMap.MoveToRegion(mapspan),
-                this,
-                Navigation);
-        }
+		/// <summary>
+		/// Creates the Map Page's view model.
+		/// </summary>
+		private MapPageViewModel CreateMapPageViewModel()
+		{
+			Log.ForContext<MapPage>().Verbose("Constructing map page view model.");
+			return new MapPageViewModel(
+				App.ModelRoot,
+				App.PermissionsService,
+				App.BluetoothService,
+				App.LocationServicesContainer.Active,
+				(mapspan) => MyMap.MoveToRegion(mapspan),
+				this,
+				Navigation);
+		}
 
-        /// <summary>
-        /// Applies iOS specific styling to branded Buttons.
-        /// </summary>
-        private void ApplyCustomiOSStyling()
-        {
-            if (Device.RuntimePlatform == Device.iOS)
-            {
-                TINKButton.BackgroundColor = Color.LightGray;
-                TINKButton.BorderColor = Color.Black;
-                TINKButton.Margin = new Thickness(10, 10, 10, 10);
-                KonradButton.BackgroundColor = Color.LightGray;
-                KonradButton.BorderColor = Color.Black;
-                KonradButton.Margin = new Thickness(10, 10, 10, 10);
-            }
-        }
+		/// <summary>
+		/// Applies iOS specific styling to branded Buttons.
+		/// </summary>
+		private void ApplyCustomiOSStyling()
+		{
+			if (Device.RuntimePlatform == Device.iOS)
+			{
+				TINKButton.BackgroundColor = Color.LightGray;
+				TINKButton.BorderColor = Color.Black;
+				TINKButton.Margin = new Thickness(10, 10, 10, 10);
+				KonradButton.BackgroundColor = Color.LightGray;
+				KonradButton.BorderColor = Color.Black;
+				KonradButton.Margin = new Thickness(10, 10, 10, 10);
+			}
+		}
 
-        /// <summary>
-        /// Invoked when pages is closed/ hidden. 
-        /// Stops update process.
-        /// </summary>
-        protected override async void OnDisappearing()
-        {
-            if (MapPageViewModel != null)
-            {
-                // View model might be null.
-                await MapPageViewModel?.OnDisappearing();
-            }
+		/// <summary>
+		/// Invoked when pages is closed/ hidden. 
+		/// Stops update process.
+		/// </summary>
+		protected override async void OnDisappearing()
+		{
+			if (MapPageViewModel != null)
+			{
+				// View model might be null.
+				await MapPageViewModel?.OnDisappearing();
+			}
 
-            base.OnDisappearing();
-        }
-    }
+			base.OnDisappearing();
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs b/Meinkonrad/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs
index 138d9df..872e5bc 100644
--- a/Meinkonrad/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs
+++ b/Meinkonrad/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs
@@ -8,92 +8,92 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.MiniSurvey
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class MiniSurveyPage : ContentPage, IViewService
-    {
-        public MiniSurveyPage()
-        {
-            var model = App.ModelRoot;
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class MiniSurveyPage : ContentPage, IViewService
+	{
+		public MiniSurveyPage()
+		{
+			var model = App.ModelRoot;
 
-            var vm = new MiniSurveyViewModel(
-                () => model.GetIsConnected(),
-                (isConnected) => model.GetConnector(isConnected),
-                this);
+			var vm = new MiniSurveyViewModel(
+				() => model.GetIsConnected(),
+				(isConnected) => model.GetConnector(isConnected),
+				this);
 
-            InitializeComponent();
+			InitializeComponent();
 
-            BindingContext = vm;
-            MiniSurveyListView.ItemsSource = vm;
-        }
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strCancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
+			BindingContext = vm;
+			MiniSurveyListView.ItemsSource = vm;
+		}
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strCancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strAccept">Text of accept button.</param>
-        /// <param name="p_strCancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strAccept">Text of accept button.</param>
+		/// <param name="p_strCancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
 
 #if USEFLYOUT
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => throw new NotImplementedException();
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushModalAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushModalAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync() => Navigation.PopModalAsync();
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync() => Navigation.PopModalAsync();
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
 
 #if USCSHARP9
         public async Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup());
 #else
-        /// <summary> Displays user feedback popup.</summary>
-        /// <param name="co2Saving"> Co2 saving information.</param>
-        /// <returns>User feedback.</returns>
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
+		/// <summary> Displays user feedback popup.</summary>
+		/// <param name="co2Saving"> Co2 saving information.</param>
+		/// <returns>User feedback.</returns>
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/MiniSurvey/Question/CheckOneViewCell.xaml.cs b/Meinkonrad/TINK/View/MiniSurvey/Question/CheckOneViewCell.xaml.cs
index d18c3dd..fd88eff 100644
--- a/Meinkonrad/TINK/View/MiniSurvey/Question/CheckOneViewCell.xaml.cs
+++ b/Meinkonrad/TINK/View/MiniSurvey/Question/CheckOneViewCell.xaml.cs
@@ -3,12 +3,12 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.MiniSurvey.Question
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class CheckOneViewCell : ViewCell
-    {
-        public CheckOneViewCell()
-        {
-            InitializeComponent();
-        }
-    }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class CheckOneViewCell : ViewCell
+	{
+		public CheckOneViewCell()
+		{
+			InitializeComponent();
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/MiniSurvey/Question/FreeTextViewCell.xaml.cs b/Meinkonrad/TINK/View/MiniSurvey/Question/FreeTextViewCell.xaml.cs
index 2f7c71e..e1304d9 100644
--- a/Meinkonrad/TINK/View/MiniSurvey/Question/FreeTextViewCell.xaml.cs
+++ b/Meinkonrad/TINK/View/MiniSurvey/Question/FreeTextViewCell.xaml.cs
@@ -4,12 +4,12 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.MiniSurvey.Question
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class FreeTextViewCell : ViewCell
-    {
-        public FreeTextViewCell()
-        {
-            InitializeComponent();
-        }
-    }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class FreeTextViewCell : ViewCell
+	{
+		public FreeTextViewCell()
+		{
+			InitializeComponent();
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/MiniSurvey/Question/QuestionViewCellTemplateSelector.cs b/Meinkonrad/TINK/View/MiniSurvey/Question/QuestionViewCellTemplateSelector.cs
index a5f70ff..0c6357c 100644
--- a/Meinkonrad/TINK/View/MiniSurvey/Question/QuestionViewCellTemplateSelector.cs
+++ b/Meinkonrad/TINK/View/MiniSurvey/Question/QuestionViewCellTemplateSelector.cs
@@ -2,25 +2,25 @@
 
 namespace TINK.View.MiniSurvey.Question
 {
-    /// <summary>
-    /// Selects different templates for different question types.
-    /// </summary>    
-    public class QuestionViewCellTemplateSelector : DataTemplateSelector
-    {
-        DataTemplate checkOneViewCell;
-        DataTemplate freeTextViewCell;
+	/// <summary>
+	/// Selects different templates for different question types.
+	/// </summary>    
+	public class QuestionViewCellTemplateSelector : DataTemplateSelector
+	{
+		DataTemplate checkOneViewCell;
+		DataTemplate freeTextViewCell;
 
-        public QuestionViewCellTemplateSelector()
-        {
-            checkOneViewCell = new DataTemplate(typeof(CheckOneViewCell));
-            freeTextViewCell = new DataTemplate(typeof(FreeTextViewCell));
-        }
+		public QuestionViewCellTemplateSelector()
+		{
+			checkOneViewCell = new DataTemplate(typeof(CheckOneViewCell));
+			freeTextViewCell = new DataTemplate(typeof(FreeTextViewCell));
+		}
 
-        protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
-        {
-            return item is ViewModel.MiniSurvey.Question.FreeTextViewModel
-                ? freeTextViewCell
-                : checkOneViewCell;
-        }
-    }
+		protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
+		{
+			return item is ViewModel.MiniSurvey.Question.FreeTextViewModel
+				? freeTextViewCell
+				: checkOneViewCell;
+		}
+	}
 }
diff --git a/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml.cs b/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml.cs
index 071db56..903878a 100644
--- a/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml.cs
+++ b/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml.cs
@@ -10,177 +10,177 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.MyBikes
 {
-    using Serilog;
-    using TINK.Model;
-    using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
-    using TINK.Model.Device;
-    using TINK.ViewModel.MyBikes;
-    using Xamarin.CommunityToolkit.Extensions;
+	using Serilog;
+	using TINK.Model;
+	using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
+	using TINK.Model.Device;
+	using TINK.ViewModel.MyBikes;
+	using Xamarin.CommunityToolkit.Extensions;
 
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class MyBikesPage : ContentPage, IViewService
-    {
-        /// <summary> Refernce to view model. </summary>
-        MyBikesPageViewModel m_oViewModel = null;
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class MyBikesPage : ContentPage, IViewService
+	{
+		/// <summary> Refernce to view model. </summary>
+		MyBikesPageViewModel m_oViewModel = null;
 
-        /// <summary> Initialization status to ensure initialization logic is not called multiple times. </summary>
-        private bool isInitializationStarted = false;
+		/// <summary> Initialization status to ensure initialization logic is not called multiple times. </summary>
+		private bool isInitializationStarted = false;
 
-        /// <summary>
-        /// Constructs a my bikes page.
-        /// </summary>
-        public MyBikesPage()
-        {
-        }
+		/// <summary>
+		/// Constructs a my bikes page.
+		/// </summary>
+		public MyBikesPage()
+		{
+		}
 
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        protected async override void OnAppearing()
-        {
-            // Don't repeat the initialization if it has been completed already.
-            if (isInitializationStarted) return;
-            isInitializationStarted = true;
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		protected async override void OnAppearing()
+		{
+			// Don't repeat the initialization if it has been completed already.
+			if (isInitializationStarted) return;
+			isInitializationStarted = true;
 
-            if (m_oViewModel != null)
-            {
-                // No need to create view model, set binding context an items source if already done.
-                // If done twice tap events are fired multiple times (when hiding page using home button).
-                await m_oViewModel.OnAppearing();
-                isInitializationStarted = false;
-                return;
-            }
+			if (m_oViewModel != null)
+			{
+				// No need to create view model, set binding context an items source if already done.
+				// If done twice tap events are fired multiple times (when hiding page using home button).
+				await m_oViewModel.OnAppearing();
+				isInitializationStarted = false;
+				return;
+			}
 
-            try
-            {
-                var model = App.ModelRoot;
+			try
+			{
+				var model = App.ModelRoot;
 
-                // Backup synchronization context when called from GUI-thread.
-                var synchronizationContext = SynchronizationContext.Current;
+				// Backup synchronization context when called from GUI-thread.
+				var synchronizationContext = SynchronizationContext.Current;
 
-                m_oViewModel = new MyBikesPageViewModel(
-                    model.ActiveUser,
-                    App.PermissionsService,
-                    App.BluetoothService,
-                    Device.RuntimePlatform,
-                    () => model.GetIsConnected(),
-                    (isConnected) => model.GetConnector(isConnected),
-                    App.LocationServicesContainer.Active,
-                    model.LocksServices.Active,
-                    model.Stations,
-                    model.Polling,
-                    (d, obj) => synchronizationContext.Post(d, obj),
-                    model.SmartDevice,
-                    this,
-                    (url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url))
-                {
-                    IsReportLevelVerbose = model.IsReportLevelVerbose
-                };
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<MyBikesPage>().Error("Displaying bikes at station page failed. {Exception}", exception);
-                await DisplayAlert("Fehler", $"Seite Räder an Station kann nicht angezeigt werden. ${exception.Message}", "OK");
-                isInitializationStarted = false;
-                return;
-            }
+				m_oViewModel = new MyBikesPageViewModel(
+					model.ActiveUser,
+					App.PermissionsService,
+					App.BluetoothService,
+					Device.RuntimePlatform,
+					() => model.GetIsConnected(),
+					(isConnected) => model.GetConnector(isConnected),
+					App.LocationServicesContainer.Active,
+					model.LocksServices.Active,
+					model.Stations,
+					model.Polling,
+					(d, obj) => synchronizationContext.Post(d, obj),
+					model.SmartDevice,
+					this,
+					(url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url))
+				{
+					IsReportLevelVerbose = model.IsReportLevelVerbose
+				};
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<MyBikesPage>().Error("Displaying bikes at station page failed. {Exception}", exception);
+				await DisplayAlert("Fehler", $"Seite Räder an Station kann nicht angezeigt werden. ${exception.Message}", "OK");
+				isInitializationStarted = false;
+				return;
+			}
 
-            InitializeComponent();
+			InitializeComponent();
 
-            BindingContext = m_oViewModel;
-            MyBikesListView.ItemsSource = m_oViewModel;
+			BindingContext = m_oViewModel;
+			MyBikesListView.ItemsSource = m_oViewModel;
 
-            await m_oViewModel.OnAppearing();
-            isInitializationStarted = false;
-        }
+			await m_oViewModel.OnAppearing();
+			isInitializationStarted = false;
+		}
 
-        /// <summary>
-        /// Invoked when pages is closed/ hidden. 
-        /// Stops update process.
-        /// </summary>
-        protected async override void OnDisappearing()
-        {
-            if (m_oViewModel == null)
-            {
-                // View model might be null (Example: Occured when page to querry for location permissions was opened)
-                return;
-            }
+		/// <summary>
+		/// Invoked when pages is closed/ hidden. 
+		/// Stops update process.
+		/// </summary>
+		protected async override void OnDisappearing()
+		{
+			if (m_oViewModel == null)
+			{
+				// View model might be null (Example: Occured when page to querry for location permissions was opened)
+				return;
+			}
 
-            await m_oViewModel.OnDisappearing();
-        }
+			await m_oViewModel.OnDisappearing();
+		}
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strCancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strCancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strAccept">Text of accept button.</param>
-        /// <param name="p_strCancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strAccept">Text of accept button.</param>
+		/// <param name="p_strCancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
 
 #if USEFLYOUT
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => throw new NotImplementedException();
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="typeOfPage">Page to display.</param>
-        public async Task PushModalAsync(ViewTypes typeOfPage)
-            => await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="typeOfPage">Page to display.</param>
+		public async Task PushModalAsync(ViewTypes typeOfPage)
+			=> await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
 
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync() => throw new NotSupportedException();
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync() => throw new NotSupportedException();
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
 
 #if USCSHARP9
         public async Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup());
 #else
-        /// <summary> Displays user feedback popup.</summary>
-        /// <param name="co2Saving"> Co2 saving information.</param>
-        /// <returns>User feedback.</returns>
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
+		/// <summary> Displays user feedback popup.</summary>
+		/// <param name="co2Saving"> Co2 saving information.</param>
+		/// <returns>User feedback.</returns>
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/RootFlyout/RootPage.xaml.cs b/Meinkonrad/TINK/View/RootFlyout/RootPage.xaml.cs
index f3a52bb..7a0ecd0 100644
--- a/Meinkonrad/TINK/View/RootFlyout/RootPage.xaml.cs
+++ b/Meinkonrad/TINK/View/RootFlyout/RootPage.xaml.cs
@@ -8,35 +8,35 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Root
 {
-    /// <summary>
-    /// Mamages creation of detail pages if a flyout page menu entry is selected.
-    /// Exposes flyout page style navigation which is used by detail pages.
-    /// </summary>
-    /// <remarks>
-    /// Examples of use cases when detail pages do navigation:
-    // - switch to map page after succesfully logging in/ logging out
-    // - switch to login page form bikes at station page if not yet logged in
-    /// </remarks>
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	/// <summary>
+	/// Mamages creation of detail pages if a flyout page menu entry is selected.
+	/// Exposes flyout page style navigation which is used by detail pages.
+	/// </summary>
+	/// <remarks>
+	/// Examples of use cases when detail pages do navigation:
+	// - switch to map page after succesfully logging in/ logging out
+	// - switch to login page form bikes at station page if not yet logged in
+	/// </remarks>
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class RootPage : FlyoutPage, INavigationMasterDetail
 #else
-    public partial class RootPage : FlyoutPage
+	public partial class RootPage : FlyoutPage
 #endif
-    {
-        public RootPage()
-        {
-            InitializeComponent();
-            FlyoutPage.ListView.ItemSelected += OnListViewItemSelected;
+	{
+		public RootPage()
+		{
+			InitializeComponent();
+			FlyoutPage.ListView.ItemSelected += OnListViewItemSelected;
 
-            // Any type of split behaviour conflics with map shifting functionality (assuming FlyoutPage behaves same like MasterDetailPage).
-            FlyoutLayoutBehavior = FlyoutLayoutBehavior.Popover;
+			// Any type of split behaviour conflics with map shifting functionality (assuming FlyoutPage behaves same like MasterDetailPage).
+			FlyoutLayoutBehavior = FlyoutLayoutBehavior.Popover;
 
-            var navigationPage = Detail as NavigationPage;
-            if (navigationPage == null)
-            {
-                return;
-            }
+			var navigationPage = Detail as NavigationPage;
+			if (navigationPage == null)
+			{
+				return;
+			}
 
 #if USEFLYOUT
             var detailPage = navigationPage.RootPage as IDetailPage;
@@ -47,38 +47,38 @@ namespace TINK.View.Root
 
             detailPage.NavigationMasterDetail = this;
 #endif
-        }
+		}
 
-        /// <summary>
-        /// Is called if a flyout page menu entry is selected.
-        /// Creates  a new page.
-        /// </summary>
-        private void OnListViewItemSelected(object sender, SelectedItemChangedEventArgs e)
-        {
-            if (!(e.SelectedItem is RootPageFlyoutMenuItem item))
-            {
-                // Unexpected argument detected.
-                return;
-            }
+		/// <summary>
+		/// Is called if a flyout page menu entry is selected.
+		/// Creates  a new page.
+		/// </summary>
+		private void OnListViewItemSelected(object sender, SelectedItemChangedEventArgs e)
+		{
+			if (!(e.SelectedItem is RootPageFlyoutMenuItem item))
+			{
+				// Unexpected argument detected.
+				return;
+			}
 
-            // Set selected station to new 
-            App.ModelRoot.SelectedStation = new NullStation();
+			// Set selected station to new 
+			App.ModelRoot.SelectedStation = new NullStation();
 
-            ShowPage(item.TargetType, item.Title);
+			ShowPage(item.TargetType, item.Title);
 
-            IsPresented = false;
-            FlyoutPage.ListView.SelectedItem = null;
-        }
+			IsPresented = false;
+			FlyoutPage.ListView.SelectedItem = null;
+		}
 
-        /// <summary>
-        /// Shows a detail page.
-        /// </summary>
-        /// <param name="typeOfPage">Type of page to show.</param>
-        /// <param name="title">Title of page.</param>
-        public void ShowPage(Type typeOfPage, string title)
-        {
-            var page = (Page)Activator.CreateInstance(typeOfPage);
-            page.Title = title;
+		/// <summary>
+		/// Shows a detail page.
+		/// </summary>
+		/// <param name="typeOfPage">Type of page to show.</param>
+		/// <param name="title">Title of page.</param>
+		public void ShowPage(Type typeOfPage, string title)
+		{
+			var page = (Page)Activator.CreateInstance(typeOfPage);
+			page.Title = title;
 
 #if USEFLYOUT
             if (page is IDetailPage detailPage)
@@ -89,7 +89,7 @@ namespace TINK.View.Root
             }
 #endif
 
-            Detail = new NavigationPage(page);
-        }
-    }
+			Detail = new NavigationPage(page);
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/RootFlyout/RootPageFlyout.xaml.cs b/Meinkonrad/TINK/View/RootFlyout/RootPageFlyout.xaml.cs
index 5134fa0..0b6a960 100644
--- a/Meinkonrad/TINK/View/RootFlyout/RootPageFlyout.xaml.cs
+++ b/Meinkonrad/TINK/View/RootFlyout/RootPageFlyout.xaml.cs
@@ -18,19 +18,19 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Root
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class RootPageFlyout : ContentPage
-    {
-        public ListView ListView;
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class RootPageFlyout : ContentPage
+	{
+		public ListView ListView;
 
-        public RootPageFlyout()
-        {
-            InitializeComponent();
+		public RootPageFlyout()
+		{
+			InitializeComponent();
 
-            BindingContext = new RootPageFlyoutViewModel();
+			BindingContext = new RootPageFlyoutViewModel();
 
-            ListView = MenuItemsListView;
-        }
+			ListView = MenuItemsListView;
+		}
 
-    }
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/RootFlyout/RootPageFlyoutMenuItem.cs b/Meinkonrad/TINK/View/RootFlyout/RootPageFlyoutMenuItem.cs
index 4756def..850e69f 100644
--- a/Meinkonrad/TINK/View/RootFlyout/RootPageFlyoutMenuItem.cs
+++ b/Meinkonrad/TINK/View/RootFlyout/RootPageFlyoutMenuItem.cs
@@ -3,18 +3,18 @@
 namespace TINK.View.Root
 {
 
-    public class RootPageFlyoutMenuItem
-    {
-        public RootPageFlyoutMenuItem()
-        {
-            TargetType = typeof(RootPageFlyoutMenuItem);
-        }
-        public int Id { get; set; }
+	public class RootPageFlyoutMenuItem
+	{
+		public RootPageFlyoutMenuItem()
+		{
+			TargetType = typeof(RootPageFlyoutMenuItem);
+		}
+		public int Id { get; set; }
 
-        public string GlyphCode { get; set; }
+		public string GlyphCode { get; set; }
 
-        public string Title { get; set; }
+		public string Title { get; set; }
 
-        public Type TargetType { get; set; }
-    }
+		public Type TargetType { get; set; }
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/RootMasterDetail/MainPageMenuItem.cs b/Meinkonrad/TINK/View/RootMasterDetail/MainPageMenuItem.cs
index ca04b1e..5fe31de 100644
--- a/Meinkonrad/TINK/View/RootMasterDetail/MainPageMenuItem.cs
+++ b/Meinkonrad/TINK/View/RootMasterDetail/MainPageMenuItem.cs
@@ -4,39 +4,39 @@ using TINK.ViewModel.MasterDetail;
 
 namespace TINK.View
 {
-    public class MainPageMenuItem
-    {
-        public MainPageMenuItem()
-        {
-            TargetType = typeof(MapPage);
-        }
+	public class MainPageMenuItem
+	{
+		public MainPageMenuItem()
+		{
+			TargetType = typeof(MapPage);
+		}
 
-        public MainPageMenuItem(
-            int p_iId,
-            Type p_oTypeOfPage,
-            string p_strTitle = null)
-        {
-            TargetType = p_oTypeOfPage;
-            Id = p_iId;
-            Title = p_strTitle ?? Helper.GetCaption(p_oTypeOfPage);
-        }
+		public MainPageMenuItem(
+			int p_iId,
+			Type p_oTypeOfPage,
+			string p_strTitle = null)
+		{
+			TargetType = p_oTypeOfPage;
+			Id = p_iId;
+			Title = p_strTitle ?? Helper.GetCaption(p_oTypeOfPage);
+		}
 
-        public int Id
-        {
-            get;
-            private set;
-        }
+		public int Id
+		{
+			get;
+			private set;
+		}
 
-        public string Title
-        {
-            get;
-            private set;
-        }
+		public string Title
+		{
+			get;
+			private set;
+		}
 
-        public Type TargetType
-        {
-            get;
-            private set;
-        }
-    }
+		public Type TargetType
+		{
+			get;
+			private set;
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/RootShell/AppShell.xaml.cs b/Meinkonrad/TINK/View/RootShell/AppShell.xaml.cs
index 71f7994..b27cdc1 100644
--- a/Meinkonrad/TINK/View/RootShell/AppShell.xaml.cs
+++ b/Meinkonrad/TINK/View/RootShell/AppShell.xaml.cs
@@ -4,12 +4,12 @@ using Xamarin.Forms;
 
 namespace TINK.View.RootShell
 {
-    public partial class AppShell : Shell
-    {
-        public AppShell()
-        {
-            InitializeComponent();
-            BindingContext = new AppShellViewModel();
-        }
-    }
+	public partial class AppShell : Shell
+	{
+		public AppShell()
+		{
+			InitializeComponent();
+			BindingContext = new AppShellViewModel();
+		}
+	}
 }
diff --git a/Meinkonrad/TINK/View/RootShell/FlyoutFooter.xaml.cs b/Meinkonrad/TINK/View/RootShell/FlyoutFooter.xaml.cs
index f29fa78..e2e0474 100644
--- a/Meinkonrad/TINK/View/RootShell/FlyoutFooter.xaml.cs
+++ b/Meinkonrad/TINK/View/RootShell/FlyoutFooter.xaml.cs
@@ -9,12 +9,12 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.RootShell
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class FlyoutFooter : ContentView
-    {
-        public FlyoutFooter()
-        {
-            InitializeComponent();
-        }
-    }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class FlyoutFooter : ContentView
+	{
+		public FlyoutFooter()
+		{
+			InitializeComponent();
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/RootShell/FlyoutHeader.xaml.cs b/Meinkonrad/TINK/View/RootShell/FlyoutHeader.xaml.cs
index 8dda9e4..67382d5 100644
--- a/Meinkonrad/TINK/View/RootShell/FlyoutHeader.xaml.cs
+++ b/Meinkonrad/TINK/View/RootShell/FlyoutHeader.xaml.cs
@@ -9,12 +9,12 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.RootShell
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class FlyoutHeader : ContentView
-    {
-        public FlyoutHeader()
-        {
-            InitializeComponent();
-        }
-    }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class FlyoutHeader : ContentView
+	{
+		public FlyoutHeader()
+		{
+			InitializeComponent();
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/Settings/SettingsPage.xaml.cs b/Meinkonrad/TINK/View/Settings/SettingsPage.xaml.cs
index 8166aa5..00d3271 100644
--- a/Meinkonrad/TINK/View/Settings/SettingsPage.xaml.cs
+++ b/Meinkonrad/TINK/View/Settings/SettingsPage.xaml.cs
@@ -12,82 +12,82 @@ using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 
 namespace TINK.View.Settings
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class SettingsPage : ContentPage, IViewService, IDetailPage
 #else
-    public partial class SettingsPage : ContentPage, IViewService
+	public partial class SettingsPage : ContentPage, IViewService
 #endif
-    {
-        /// <summary> Refernce to view model. </summary>
-        SettingsPageViewModel m_oViewModel = null;
+	{
+		/// <summary> Refernce to view model. </summary>
+		SettingsPageViewModel m_oViewModel = null;
 
-        /// <summary> Constructs a settings page. </summary>
-        public SettingsPage()
-        {
-            InitializeComponent();
+		/// <summary> Constructs a settings page. </summary>
+		public SettingsPage()
+		{
+			InitializeComponent();
 
-            var l_oModel = App.ModelRoot;
+			var l_oModel = App.ModelRoot;
 
-            m_oViewModel = new SettingsPageViewModel(
-                l_oModel,
-                App.LocationServicesContainer,
-                this);
+			m_oViewModel = new SettingsPageViewModel(
+				l_oModel,
+				App.LocationServicesContainer,
+				this);
 
-            BindingContext = m_oViewModel;
+			BindingContext = m_oViewModel;
 
-            Filters.ItemsSource = m_oViewModel.GroupFilter;
-        }
+			Filters.ItemsSource = m_oViewModel.GroupFilter;
+		}
 
-        /// <summary> Displays alert message. </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strCancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
+		/// <summary> Displays alert message. </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strCancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strAccept">Text of accept button.</param>
-        /// <param name="p_strCancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strAccept">Text of accept button.</param>
+		/// <param name="p_strCancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
 
-        /// <summary>
-        /// Displays an action sheet.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strCancel">Text of button.</param>
-        /// <param name="destruction"></param>
-        /// <param name="p_oButtons">Buttons holding options to select.</param>
-        /// <returns>Text selected</returns>
-        public new async Task<string> DisplayActionSheet(String p_strTitle, String p_strCancel, String destruction, params String[] p_oButtons)
-                => await base.DisplayActionSheet(p_strTitle, p_strCancel, destruction, p_oButtons);
+		/// <summary>
+		/// Displays an action sheet.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strCancel">Text of button.</param>
+		/// <param name="destruction"></param>
+		/// <param name="p_oButtons">Buttons holding options to select.</param>
+		/// <returns>Text selected</returns>
+		public new async Task<string> DisplayActionSheet(String p_strTitle, String p_strCancel, String destruction, params String[] p_oButtons)
+				=> await base.DisplayActionSheet(p_strTitle, p_strCancel, destruction, p_oButtons);
 
 #if USEFLYOUT
         /// <summary>
@@ -97,19 +97,19 @@ namespace TINK.View.Settings
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => m_oNavigation.ShowPage(p_oType.GetViewType(), p_strTitle);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushModalAsync(ViewTypes p_oTypeOfPage)
-            => throw new NotImplementedException();
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushModalAsync(ViewTypes p_oTypeOfPage)
+			=> throw new NotImplementedException();
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync()
-            => throw new NotSupportedException();
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync()
+			=> throw new NotSupportedException();
 
 #if USEFLYOUT
         /// <summary>Delegate to perform navigation.</summary>
@@ -124,33 +124,33 @@ namespace TINK.View.Settings
         }
 
 #endif
-        /// <summary>
-        /// Invoked when pages is closed/ hidden. 
-        /// Stops update process.
-        /// </summary>
-        protected async override void OnDisappearing()
-        {
-            if (m_oViewModel == null)
-            {
-                // View model might be null.
-                return;
-            }
+		/// <summary>
+		/// Invoked when pages is closed/ hidden. 
+		/// Stops update process.
+		/// </summary>
+		protected async override void OnDisappearing()
+		{
+			if (m_oViewModel == null)
+			{
+				// View model might be null.
+				return;
+			}
 
-            await m_oViewModel?.OnDisappearing();
-        }
+			await m_oViewModel?.OnDisappearing();
+		}
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public async Task PushAsync(ViewTypes p_oTypeOfPage)
-            => await Navigation.PushAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public async Task PushAsync(ViewTypes p_oTypeOfPage)
+			=> await Navigation.PushAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
 
 #if USCSHARP9
         public async Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup());
 #else
-        /// <summary> Displays user feedback popup.</summary>
-        /// <param name="co2Saving"> Co2 saving information.</param>
-        /// <returns>User feedback.</returns>
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
+		/// <summary> Displays user feedback popup.</summary>
+		/// <param name="co2Saving"> Co2 saving information.</param>
+		/// <returns>User feedback.</returns>
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
 #endif
 
 #if USERFEEDBACKDLG_TRYOUT
@@ -164,5 +164,5 @@ namespace TINK.View.Settings
                 "OK");
         }
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/StringNotNullOrEmptyToVisibleConverter.cs b/Meinkonrad/TINK/View/StringNotNullOrEmptyToVisibleConverter.cs
index ebf2361..d4c2f32 100644
--- a/Meinkonrad/TINK/View/StringNotNullOrEmptyToVisibleConverter.cs
+++ b/Meinkonrad/TINK/View/StringNotNullOrEmptyToVisibleConverter.cs
@@ -4,20 +4,20 @@ using Xamarin.Forms;
 
 namespace TINK.View
 {
-    /// <summary> Converts a string into visible state. If string is null or empty element becomes invisible.</summary>
-    public class StringNotNullOrEmptyToVisibleConverter : IValueConverter
-    {
-        /// <summary> Converts a string into visible state.</summary>
-        /// <param name="value">Text value from view model used to derive whether object is visible or not.</param>
-        /// <returns>Boolean value indicating whether object is visible or not.</returns>
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return value != null && value is string text && !string.IsNullOrEmpty(text);
-        }
+	/// <summary> Converts a string into visible state. If string is null or empty element becomes invisible.</summary>
+	public class StringNotNullOrEmptyToVisibleConverter : IValueConverter
+	{
+		/// <summary> Converts a string into visible state.</summary>
+		/// <param name="value">Text value from view model used to derive whether object is visible or not.</param>
+		/// <returns>Boolean value indicating whether object is visible or not.</returns>
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			return value != null && value is string text && !string.IsNullOrEmpty(text);
+		}
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return "";
-        }
-    }
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			return "";
+		}
+	}
 }
diff --git a/Meinkonrad/TINK/View/ViewTypesTypeProvider.cs b/Meinkonrad/TINK/View/ViewTypesTypeProvider.cs
index d5c0c76..30d8cd7 100644
--- a/Meinkonrad/TINK/View/ViewTypesTypeProvider.cs
+++ b/Meinkonrad/TINK/View/ViewTypesTypeProvider.cs
@@ -15,63 +15,63 @@ using Xamarin.Forms;
 
 namespace TINK.View
 {
-    public static class ViewTypesTypeProvider
-    {
-        public static Type GetViewType(this ViewTypes viewType)
-        {
-            switch (viewType)
-            {
-                case ViewTypes.LoginPage:
-                    return typeof(LoginPage);
+	public static class ViewTypesTypeProvider
+	{
+		public static Type GetViewType(this ViewTypes viewType)
+		{
+			switch (viewType)
+			{
+				case ViewTypes.LoginPage:
+					return typeof(LoginPage);
 
-                case ViewTypes.MapPage:
-                    return typeof(MapPage);
+				case ViewTypes.MapPage:
+					return typeof(MapPage);
 
-                case ViewTypes.RegisterPage:
-                    return typeof(RegisterPage);
+				case ViewTypes.RegisterPage:
+					return typeof(RegisterPage);
 
-                case ViewTypes.PasswordForgottenPage:
-                    return typeof(PasswordForgottenPage);
+				case ViewTypes.PasswordForgottenPage:
+					return typeof(PasswordForgottenPage);
 
-                case ViewTypes.BikeInfoCarouselPage:
-                    return typeof(BikeInfoCarouselPage);
+				case ViewTypes.BikeInfoCarouselPage:
+					return typeof(BikeInfoCarouselPage);
 
-                case ViewTypes.MyBikesPage:
-                    return typeof(MyBikesPage);
+				case ViewTypes.MyBikesPage:
+					return typeof(MyBikesPage);
 
-                case ViewTypes.SettingsPage:
-                    return typeof(SettingsPage);
+				case ViewTypes.SettingsPage:
+					return typeof(SettingsPage);
 
-                case ViewTypes.TabbedPageInfo:
-                    return typeof(InfoPage);
+				case ViewTypes.TabbedPageInfo:
+					return typeof(InfoPage);
 
-                case ViewTypes.FeesAndBikesPage:
-                    return typeof(FeesAndBikesPage);
+				case ViewTypes.FeesAndBikesPage:
+					return typeof(FeesAndBikesPage);
 
-                case ViewTypes.ManageAccountPage:
-                    return typeof(ManageAccountPage);
+				case ViewTypes.ManageAccountPage:
+					return typeof(ManageAccountPage);
 
-                case ViewTypes.AgbPage:
-                    return typeof(AgbPage);
+				case ViewTypes.AgbPage:
+					return typeof(AgbPage);
 
-                case ViewTypes.WhatsNewPage:
-                    return typeof(WhatsNewPage);
+				case ViewTypes.WhatsNewPage:
+					return typeof(WhatsNewPage);
 
-                case ViewTypes.BikesAtStation:
-                    return typeof(BikesAtStationPage);
+				case ViewTypes.BikesAtStation:
+					return typeof(BikesAtStationPage);
 
-                case ViewTypes.ContactPage:
-                    return typeof(ContactPage);
+				case ViewTypes.ContactPage:
+					return typeof(ContactPage);
 
-                case ViewTypes.SelectStationPage:
-                    return typeof(SelectStationPage);
+				case ViewTypes.SelectStationPage:
+					return typeof(SelectStationPage);
 
-                case ViewTypes.MiniSurvey:
-                    return typeof(MiniSurveyPage);
+				case ViewTypes.MiniSurvey:
+					return typeof(MiniSurveyPage);
 
-                default:
-                    return typeof(ContentPage);
-            }
-        }
-    }
+				default:
+					return typeof(ContentPage);
+			}
+		}
+	}
 }
diff --git a/Meinkonrad/TINK/View/WhatsNew/Agb/AgbPage.xaml.cs b/Meinkonrad/TINK/View/WhatsNew/Agb/AgbPage.xaml.cs
index ccaeb0f..cb114dd 100644
--- a/Meinkonrad/TINK/View/WhatsNew/Agb/AgbPage.xaml.cs
+++ b/Meinkonrad/TINK/View/WhatsNew/Agb/AgbPage.xaml.cs
@@ -9,76 +9,76 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.WhatsNew.Agb
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class AgbPage : ContentPage, IViewService
-    {
-        public AgbPage()
-        {
-            InitializeComponent();
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class AgbPage : ContentPage, IViewService
+	{
+		public AgbPage()
+		{
+			InitializeComponent();
 
-            agbViewModel = new AgbViewModel(
-                App.ModelRoot.NextActiveUri.Host,
-                App.ModelRoot.IsSiteCachingOn,
-                CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
-                (resourceName) => ViewModelResourceHelper.GetSource(resourceName),
-                this);
+			agbViewModel = new AgbViewModel(
+				App.ModelRoot.NextActiveUri.Host,
+				App.ModelRoot.IsSiteCachingOn,
+				CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
+				(resourceName) => ViewModelResourceHelper.GetSource(resourceName),
+				this);
 
-            BindingContext = agbViewModel;
-        }
+			BindingContext = agbViewModel;
+		}
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary> Invoked when page is shown. </summary>
-        protected async override void OnAppearing()
-            => await agbViewModel.OnAppearing();
+		/// <summary> Invoked when page is shown. </summary>
+		protected async override void OnAppearing()
+			=> await agbViewModel.OnAppearing();
 
-        /// <summary> Reference to view model.</summary>
-        AgbViewModel agbViewModel;
+		/// <summary> Reference to view model.</summary>
+		AgbViewModel agbViewModel;
 
-        public async Task PopModalAsync()
-            => await Navigation.PopModalAsync();
+		public async Task PopModalAsync()
+			=> await Navigation.PopModalAsync();
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushAsync(ViewTypes p_oTypeOfPage)
-            => throw new NotImplementedException();
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushAsync(ViewTypes p_oTypeOfPage)
+			=> throw new NotImplementedException();
 
-        public Task PushModalAsync(ViewTypes p_oTypeOfPage)
-            => throw new NotImplementedException();
+		public Task PushModalAsync(ViewTypes p_oTypeOfPage)
+			=> throw new NotImplementedException();
 
 #if USEFLYOUT
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => throw new NotImplementedException();
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/WhatsNew/WhatsNewPage.xaml.cs b/Meinkonrad/TINK/View/WhatsNew/WhatsNewPage.xaml.cs
index f519596..c1c1a2c 100644
--- a/Meinkonrad/TINK/View/WhatsNew/WhatsNewPage.xaml.cs
+++ b/Meinkonrad/TINK/View/WhatsNew/WhatsNewPage.xaml.cs
@@ -7,100 +7,100 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.WhatsNew
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class WhatsNewPage : ContentPage, IViewService
-    {
-        /// <summary> Holds a reference on the view model. </summary>
-        private ViewModel.WhatsNew.WhatsNewViewModel WhatsNewViewModel;
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class WhatsNewPage : ContentPage, IViewService
+	{
+		/// <summary> Holds a reference on the view model. </summary>
+		private ViewModel.WhatsNew.WhatsNewViewModel WhatsNewViewModel;
 
-        /// <summary> Constructs whats new page.</summary>
-        /// <param name="showMasterDetail">Action to invoke master detail page.</param>
-        public WhatsNewPage(Action showMasterDetail)
-        {
-            InitializeComponent();
+		/// <summary> Constructs whats new page.</summary>
+		/// <param name="showMasterDetail">Action to invoke master detail page.</param>
+		public WhatsNewPage(Action showMasterDetail)
+		{
+			InitializeComponent();
 
-            WhatsNewViewModel = new ViewModel.WhatsNew.WhatsNewViewModel(
-                DependencyService.Get<IAppInfo>().Version,
-                App.ModelRoot.WhatsNew.WhatsNewText,
-                App.ModelRoot.WhatsNew.IsShowAgbRequired,
-                showMasterDetail,
-                this);
+			WhatsNewViewModel = new ViewModel.WhatsNew.WhatsNewViewModel(
+				DependencyService.Get<IAppInfo>().Version,
+				App.ModelRoot.WhatsNew.WhatsNewText,
+				App.ModelRoot.WhatsNew.IsShowAgbRequired,
+				showMasterDetail,
+				this);
 
-            BindingContext = WhatsNewViewModel;
-        }
+			BindingContext = WhatsNewViewModel;
+		}
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        public Task PopModalAsync()
-        {
-            throw new NotImplementedException(); ;
-        }
+		public Task PopModalAsync()
+		{
+			throw new NotImplementedException(); ;
+		}
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushAsync(ViewTypes p_oTypeOfPage)
-        {
-            throw new NotImplementedException();
-        }
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushAsync(ViewTypes p_oTypeOfPage)
+		{
+			throw new NotImplementedException();
+		}
 
-        public async Task PushModalAsync(ViewTypes p_oTypeOfPage)
-        {
-            await Navigation.PushModalAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
-        }
+		public async Task PushModalAsync(ViewTypes p_oTypeOfPage)
+		{
+			await Navigation.PushModalAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
+		}
 
 #if USEFLYOUT
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => throw new NotImplementedException();
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
 
-        /// <summary>
-        /// Invoked when pages is closed/ hidden.
-        /// /// </summary>
-        protected override void OnDisappearing()
-        {
-            base.OnDisappearing();
+		/// <summary>
+		/// Invoked when pages is closed/ hidden.
+		/// /// </summary>
+		protected override void OnDisappearing()
+		{
+			base.OnDisappearing();
 
-            if (WhatsNewViewModel == null)
-            {
-                // View model might be null.
-                return;
-            }
+			if (WhatsNewViewModel == null)
+			{
+				// View model might be null.
+				return;
+			}
 
-            WhatsNewViewModel?.OnDisappearing(() =>
-            {
-                App.ModelRoot.WhatsNew.WasShownInCurrentSession = true;
-                App.ModelRoot.Save();
-            });
-        }
-    }
+			WhatsNewViewModel?.OnDisappearing(() =>
+			{
+				App.ModelRoot.WhatsNew.WasShownInCurrentSession = true;
+				App.ModelRoot.Save();
+			});
+		}
+	}
 }
\ No newline at end of file
diff --git a/Meinkonrad/TINK/ViewModel/RootFlyout/RootPageViewModel.cs b/Meinkonrad/TINK/ViewModel/RootFlyout/RootPageViewModel.cs
index f019b66..ca63e06 100644
--- a/Meinkonrad/TINK/ViewModel/RootFlyout/RootPageViewModel.cs
+++ b/Meinkonrad/TINK/ViewModel/RootFlyout/RootPageViewModel.cs
@@ -24,175 +24,175 @@ using TINK.View.Themes;
 
 namespace TINK.ViewModel.Root
 {
-    /// <summary>
-    /// View model for flyout menu entries. Respositility
-    /// - populates entries depending on app state on showing menu
-    /// - updates menu denpending on app state change, i.e. user logs in/ out. 
-    /// </summary>
-    public class RootPageFlyoutViewModel : INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Dictionary to manage collection of menu items.
-        /// </summary>
-        private Dictionary<Type, int> m_oEntryDictionary;
+	/// <summary>
+	/// View model for flyout menu entries. Respositility
+	/// - populates entries depending on app state on showing menu
+	/// - updates menu denpending on app state change, i.e. user logs in/ out. 
+	/// </summary>
+	public class RootPageFlyoutViewModel : INotifyPropertyChanged
+	{
+		/// <summary>
+		/// Dictionary to manage collection of menu items.
+		/// </summary>
+		private Dictionary<Type, int> m_oEntryDictionary;
 
-        public event PropertyChangedEventHandler PropertyChanged;
+		public event PropertyChangedEventHandler PropertyChanged;
 
-        /// <summary> Updates menu entries depending on state. </summary>
-        private void UpdateMenuEntries()
-        {
-            for (int l_iIndex = MenuItems.Count - 1; l_iIndex >= 0; l_iIndex--)
-            {
-                MenuItems.Clear();
-                m_oEntryDictionary.Clear();
-            }
+		/// <summary> Updates menu entries depending on state. </summary>
+		private void UpdateMenuEntries()
+		{
+			for (int l_iIndex = MenuItems.Count - 1; l_iIndex >= 0; l_iIndex--)
+			{
+				MenuItems.Clear();
+				m_oEntryDictionary.Clear();
+			}
 
-            CheckAddItem(typeof(MapPage));
+			CheckAddItem(typeof(MapPage));
 
-            if (App.ModelRoot.ActiveUser.IsLoggedIn)
-            {
-                CheckAddItem(typeof(MyBikesPage));
-                CheckAddItem(typeof(FindBikePage));
-                CheckAddItem(typeof(AccountPage));
-            }
-            else
-            {
-                CheckAddItem(typeof(LoginPage));
-            }
+			if (App.ModelRoot.ActiveUser.IsLoggedIn)
+			{
+				CheckAddItem(typeof(MyBikesPage));
+				CheckAddItem(typeof(FindBikePage));
+				CheckAddItem(typeof(AccountPage));
+			}
+			else
+			{
+				CheckAddItem(typeof(LoginPage));
+			}
 
-            if (App.ModelRoot.Uris.ActiveUri.Host.GetIsCopri()
-                || App.ModelRoot.ActiveUser.IsLoggedIn)
-            {
-                CheckAddItem(typeof(SettingsPage));
-            }
+			if (App.ModelRoot.Uris.ActiveUri.Host.GetIsCopri()
+				|| App.ModelRoot.ActiveUser.IsLoggedIn)
+			{
+				CheckAddItem(typeof(SettingsPage));
+			}
 
-            CheckAddItem(typeof(FeesAndBikesPage)); // Fees and bikes
+			CheckAddItem(typeof(FeesAndBikesPage)); // Fees and bikes
 
-            CheckAddItem(typeof(ContactPage)); // Feedback and contact
+			CheckAddItem(typeof(ContactPage)); // Feedback and contact
 
-            CheckAddItem(typeof(InfoPage)); // About sharee.bike
-        }
+			CheckAddItem(typeof(InfoPage)); // About sharee.bike
+		}
 
-        /// <summary>Adds a menu item to master detail menu.</summary>
-        /// <param name="p_oType">Type decribing entry to be added.</param>
-        private void CheckAddItem(Type p_oType)
-        {
-            if (m_oEntryDictionary.ContainsKey(p_oType))
-            {
-                // Nothing to do because has already been added.
-                return;
-            }
+		/// <summary>Adds a menu item to master detail menu.</summary>
+		/// <param name="p_oType">Type decribing entry to be added.</param>
+		private void CheckAddItem(Type p_oType)
+		{
+			if (m_oEntryDictionary.ContainsKey(p_oType))
+			{
+				// Nothing to do because has already been added.
+				return;
+			}
 
-            m_oEntryDictionary.Add(
-                p_oType,
-                m_oEntryDictionary.Count);
+			m_oEntryDictionary.Add(
+				p_oType,
+				m_oEntryDictionary.Count);
 
-            MenuItems.Add(new RootPageFlyoutMenuItem
-            {
-                TargetType = p_oType,
-                GlyphCode = Helper.GetGlyphCode(p_oType),
-                Title = Helper.GetCaption(p_oType),
-                Id = m_oEntryDictionary[p_oType]
-            });
-        }
+			MenuItems.Add(new RootPageFlyoutMenuItem
+			{
+				TargetType = p_oType,
+				GlyphCode = Helper.GetGlyphCode(p_oType),
+				Title = Helper.GetCaption(p_oType),
+				Id = m_oEntryDictionary[p_oType]
+			});
+		}
 
-        /// <summary> Removes a page from menu.</summary>
-        /// <param name="p_oType"></param>
-        private void RemoveItem(Type p_oType)
-        {
-            if (!m_oEntryDictionary.ContainsKey(p_oType))
-            {
-                // Nothing to do because item was never added/ already removed.
-                return;
-            }
+		/// <summary> Removes a page from menu.</summary>
+		/// <param name="p_oType"></param>
+		private void RemoveItem(Type p_oType)
+		{
+			if (!m_oEntryDictionary.ContainsKey(p_oType))
+			{
+				// Nothing to do because item was never added/ already removed.
+				return;
+			}
 
-            MenuItems.Remove(MenuItems[m_oEntryDictionary[p_oType]]);
-            m_oEntryDictionary.Remove(p_oType);
-        }
+			MenuItems.Remove(MenuItems[m_oEntryDictionary[p_oType]]);
+			m_oEntryDictionary.Remove(p_oType);
+		}
 
-        public RootPageFlyoutViewModel()
-        {
-            MenuItems = new ObservableCollection<RootPageFlyoutMenuItem>();
-            m_oEntryDictionary = new Dictionary<Type, int>();
+		public RootPageFlyoutViewModel()
+		{
+			MenuItems = new ObservableCollection<RootPageFlyoutMenuItem>();
+			m_oEntryDictionary = new Dictionary<Type, int>();
 
-            // Update menu entries on login/ logout actions.
-            App.ModelRoot.ActiveUser.StateChanged += (sender, eventargs) => OnUpdateRequired();
+			// Update menu entries on login/ logout actions.
+			App.ModelRoot.ActiveUser.StateChanged += (sender, eventargs) => OnUpdateRequired();
 
-            // Update flyout view model whenever theme is switched.
-            App.ModelRoot.Themes.PropertyChanged += (sender, eventargs) =>
-            {
-                if (!(sender is ServicesContainerMutableT<object> themes))
-                    return;
+			// Update flyout view model whenever theme is switched.
+			App.ModelRoot.Themes.PropertyChanged += (sender, eventargs) =>
+			{
+				if (!(sender is ServicesContainerMutableT<object> themes))
+					return;
 
-                MasterDetailMenuTitlte = GetMasterDetailMenuTitle(themes.Active);
+				MasterDetailMenuTitlte = GetMasterDetailMenuTitle(themes.Active);
 
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(MasterDetailMenuTitlte)));
-            };
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(MasterDetailMenuTitlte)));
+			};
 
-            MasterDetailMenuTitlte = GetMasterDetailMenuTitle(App.ModelRoot.Themes.Active);
+			MasterDetailMenuTitlte = GetMasterDetailMenuTitle(App.ModelRoot.Themes.Active);
 
-            UpdateMenuEntries();
-        }
+			UpdateMenuEntries();
+		}
 
-        /// <summary>
-        /// Gets the flyout title from theme name
-        /// </summary>
-        /// <param name="theme">Name of theme.</param>
-        /// <returns>Flyout title.</returns>
-        private string GetMasterDetailMenuTitle(object theme)
-        {
-            if (!(theme is ITheme active))
-                return Themes.Konrad.OPERATORINFO;
+		/// <summary>
+		/// Gets the flyout title from theme name
+		/// </summary>
+		/// <param name="theme">Name of theme.</param>
+		/// <returns>Flyout title.</returns>
+		private string GetMasterDetailMenuTitle(object theme)
+		{
+			if (!(theme is ITheme active))
+				return Themes.Konrad.OPERATORINFO;
 
-            return $"{(!string.IsNullOrEmpty(active.OperatorInfo) ? ($"{active.OperatorInfo}") : "sharee.bike")}";
-        }
+			return $"{(!string.IsNullOrEmpty(active.OperatorInfo) ? ($"{active.OperatorInfo}") : "sharee.bike")}";
+		}
 
-        /// <summary>
-        /// Holds the title of the fylout page.
-        /// </summary>
-        public string MasterDetailMenuTitlte { get; private set; }
+		/// <summary>
+		/// Holds the title of the fylout page.
+		/// </summary>
+		public string MasterDetailMenuTitlte { get; private set; }
 
 
-        /// <summary>
-        /// Provides collection of menu items for master page.
-        /// </summary>
-        public ObservableCollection<RootPageFlyoutMenuItem> MenuItems
-        {
-            get; private set;
-        }
+		/// <summary>
+		/// Provides collection of menu items for master page.
+		/// </summary>
+		public ObservableCollection<RootPageFlyoutMenuItem> MenuItems
+		{
+			get; private set;
+		}
 
-        /// <summary>
-        /// Gets or sets the selected item.
-        /// </summary>
-        public MainPageMenuItem SelectedMenuItem
-        {
-            get;
-            set;
-        }
+		/// <summary>
+		/// Gets or sets the selected item.
+		/// </summary>
+		public MainPageMenuItem SelectedMenuItem
+		{
+			get;
+			set;
+		}
 
-        /// <summary>
-        /// Command object which is invoked from view when an item is selected.
-        /// </summary>
-        public Command MenuItemSelected
-        {
-            get
-            {
-                return new Command(OnUpdateRequired);
-            }
+		/// <summary>
+		/// Command object which is invoked from view when an item is selected.
+		/// </summary>
+		public Command MenuItemSelected
+		{
+			get
+			{
+				return new Command(OnUpdateRequired);
+			}
 
-        }
+		}
 
-        /// <summary> Manges updates required due to selection of a menu or login events.</summary>
-        public void OnUpdateRequired()
-        {
+		/// <summary> Manges updates required due to selection of a menu or login events.</summary>
+		public void OnUpdateRequired()
+		{
 
-            UpdateMenuEntries();
+			UpdateMenuEntries();
 
-            if (SelectedMenuItem == null)
-            {
-                // Nothing to do if no menu entry is selected.
-                return;
-            }
-        }
-    }
+			if (SelectedMenuItem == null)
+			{
+				// Nothing to do if no menu entry is selected.
+				return;
+			}
+		}
+	}
 }
diff --git a/Meinkonrad/TINK/ViewModel/RootMasterDetail/Helper.cs b/Meinkonrad/TINK/ViewModel/RootMasterDetail/Helper.cs
index d43f497..efa35d6 100644
--- a/Meinkonrad/TINK/ViewModel/RootMasterDetail/Helper.cs
+++ b/Meinkonrad/TINK/ViewModel/RootMasterDetail/Helper.cs
@@ -12,104 +12,104 @@ using TINK.ViewModel.Info;
 
 namespace TINK.ViewModel.MasterDetail
 {
-    public static class Helper
-    {
-        /// <summary>
-        /// Gets a description for a map page used as menu item entry and caption.
-        /// </summary>
-        /// <param name="type">Type of page to get caption for.</param>
-        /// <returns></returns>
-        public static string GetCaption(Type type)
-        {
-            if (type == typeof(MapPage)) // Bikes sites
-            {
-                return AppResources.MarkingMapPage;
-            }
-            else if (type == typeof(FindBikePage)) // Find Bike
-            {
-                return AppResources.MarkingFindBike;
-            }
-            else if (type == typeof(MyBikesPage)) // My Bikes
-            {
-                return AppResources.MarkingMyBikes;
-            }
-            else if (type == typeof(AccountPage)) // Account
-            {
-                return AppResources.MarkingAccount;
-            }
-            else if (type == typeof(LoginPage))  // Login
-            {
-                return AppResources.MarkingLogin;
-            }
-            else if (type == typeof(SettingsPage)) // Settings
-            {
-                return AppResources.MarkingSettings;
-            }
-            else if (type == typeof(FeesAndBikesPage))
-            {
-                return AppResources.MarkingFeesAndBikes;
-            }
-            else if (type == typeof(ContactPage))
-            {
-                return AppResources.MarkingFeedbackAndContact;
-            }
-            else if (type == typeof(InfoPage))
-            {
-                return AppResources.MarkingAbout;
-            }
-            else
-            {
-                return type.Name;
-            }
-        }
+	public static class Helper
+	{
+		/// <summary>
+		/// Gets a description for a map page used as menu item entry and caption.
+		/// </summary>
+		/// <param name="type">Type of page to get caption for.</param>
+		/// <returns></returns>
+		public static string GetCaption(Type type)
+		{
+			if (type == typeof(MapPage)) // Bikes sites
+			{
+				return AppResources.MarkingMapPage;
+			}
+			else if (type == typeof(FindBikePage)) // Find Bike
+			{
+				return AppResources.MarkingFindBike;
+			}
+			else if (type == typeof(MyBikesPage)) // My Bikes
+			{
+				return AppResources.MarkingMyBikes;
+			}
+			else if (type == typeof(AccountPage)) // Account
+			{
+				return AppResources.MarkingAccount;
+			}
+			else if (type == typeof(LoginPage))  // Login
+			{
+				return AppResources.MarkingLogin;
+			}
+			else if (type == typeof(SettingsPage)) // Settings
+			{
+				return AppResources.MarkingSettings;
+			}
+			else if (type == typeof(FeesAndBikesPage))
+			{
+				return AppResources.MarkingFeesAndBikes;
+			}
+			else if (type == typeof(ContactPage))
+			{
+				return AppResources.MarkingFeedbackAndContact;
+			}
+			else if (type == typeof(InfoPage))
+			{
+				return AppResources.MarkingAbout;
+			}
+			else
+			{
+				return type.Name;
+			}
+		}
 
-        /// <summary>
-        /// Gets a description for a map page used as menu item entry and caption.
-        /// </summary>
-        /// <param name="type">Type of page to get caption for.</param>
-        /// <returns></returns>
-        public static string GetGlyphCode(Type type)
-        {
-            if (type == typeof(MapPage)) // Bikes sites
-            {
-                return "\uf5a0";
-            }
-            else if (type == typeof(FindBikePage)) // My Bikes
-            {
-                return "\uf002";
-            }
-            else if (type == typeof(MyBikesPage)) // My Bikes
-            {
-                return "\uf206";
-            }
-            else if (type == typeof(AccountPage)) // Account
-            {
-                return "\uf007";
-            }
-            else if (type == typeof(LoginPage))  // Login
-            {
-                return "\uf2f6";
-            }
-            else if (type == typeof(SettingsPage)) // Settings
-            {
-                return "\uf013";
-            }
-            else if (type == typeof(FeesAndBikesPage))
-            {
-                return "\uf7d9";
-            }
-            else if (type == typeof(ContactPage))
-            {
-                return "\uf095";
-            }
-            else if (type == typeof(InfoPage))
-            {
-                return "\uf05a";
-            }
-            else
-            {
-                return type.Name;
-            }
-        }
-    }
+		/// <summary>
+		/// Gets a description for a map page used as menu item entry and caption.
+		/// </summary>
+		/// <param name="type">Type of page to get caption for.</param>
+		/// <returns></returns>
+		public static string GetGlyphCode(Type type)
+		{
+			if (type == typeof(MapPage)) // Bikes sites
+			{
+				return "\uf5a0";
+			}
+			else if (type == typeof(FindBikePage)) // My Bikes
+			{
+				return "\uf002";
+			}
+			else if (type == typeof(MyBikesPage)) // My Bikes
+			{
+				return "\uf206";
+			}
+			else if (type == typeof(AccountPage)) // Account
+			{
+				return "\uf007";
+			}
+			else if (type == typeof(LoginPage))  // Login
+			{
+				return "\uf2f6";
+			}
+			else if (type == typeof(SettingsPage)) // Settings
+			{
+				return "\uf013";
+			}
+			else if (type == typeof(FeesAndBikesPage))
+			{
+				return "\uf7d9";
+			}
+			else if (type == typeof(ContactPage))
+			{
+				return "\uf095";
+			}
+			else if (type == typeof(InfoPage))
+			{
+				return "\uf05a";
+			}
+			else
+			{
+				return type.Name;
+			}
+		}
+	}
 }
diff --git a/Meinkonrad/TINK/ViewModel/RootShell/AppShellViewModel.cs b/Meinkonrad/TINK/ViewModel/RootShell/AppShellViewModel.cs
index a827874..0aa79bf 100644
--- a/Meinkonrad/TINK/ViewModel/RootShell/AppShellViewModel.cs
+++ b/Meinkonrad/TINK/ViewModel/RootShell/AppShellViewModel.cs
@@ -7,66 +7,66 @@ using TINK.ViewModel.Info;
 
 namespace TINK.ViewModel.RootShell
 {
-    public class AppShellViewModel : INotifyPropertyChanged
-    {
-        public AppShellViewModel()
-        {
-            App.ModelRoot.ActiveUser.StateChanged += (sender, eventargs) =>
-            {
-                // Login state changed. Update related menu entries.
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsMyBikesPageVisible)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsFindBikePageVisible)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsAccountPageVisible)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLoginPageVisible)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsSettingsPageVisible)));
-            };
+	public class AppShellViewModel : INotifyPropertyChanged
+	{
+		public AppShellViewModel()
+		{
+			App.ModelRoot.ActiveUser.StateChanged += (sender, eventargs) =>
+			{
+				// Login state changed. Update related menu entries.
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsMyBikesPageVisible)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsFindBikePageVisible)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsAccountPageVisible)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLoginPageVisible)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsSettingsPageVisible)));
+			};
 
-            // Update flyout view model whenever theme is switched.
-            App.ModelRoot.Themes.PropertyChanged += (sender, eventargs) =>
-            {
-                if (!(sender is ServicesContainerMutableT<object> themes))
-                    return;
+			// Update flyout view model whenever theme is switched.
+			App.ModelRoot.Themes.PropertyChanged += (sender, eventargs) =>
+			{
+				if (!(sender is ServicesContainerMutableT<object> themes))
+					return;
 
-                MasterDetailMenuTitlte = GetMasterDetailMenuTitle(themes.Active);
+				MasterDetailMenuTitlte = GetMasterDetailMenuTitle(themes.Active);
 
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(MasterDetailMenuTitlte)));
-            };
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(MasterDetailMenuTitlte)));
+			};
 
-            MasterDetailMenuTitlte = GetMasterDetailMenuTitle(App.ModelRoot.Themes.Active);
-        }
+			MasterDetailMenuTitlte = GetMasterDetailMenuTitle(App.ModelRoot.Themes.Active);
+		}
 
-        /// <summary>
-        /// Gets the flyout title from theme name
-        /// </summary>
-        /// <param name="theme">Name of theme.</param>
-        /// <returns>Flyout title.</returns>
-        private string GetMasterDetailMenuTitle(object theme)
-        {
-            if (!(theme is ITheme active))
-                return "sharee.bike";
+		/// <summary>
+		/// Gets the flyout title from theme name
+		/// </summary>
+		/// <param name="theme">Name of theme.</param>
+		/// <returns>Flyout title.</returns>
+		private string GetMasterDetailMenuTitle(object theme)
+		{
+			if (!(theme is ITheme active))
+				return "sharee.bike";
 
-            return $"{(!string.IsNullOrEmpty(active.OperatorInfo) ? ($"{active.OperatorInfo}") : "sharee.bike")}";
-        }
+			return $"{(!string.IsNullOrEmpty(active.OperatorInfo) ? ($"{active.OperatorInfo}") : "sharee.bike")}";
+		}
 
-        /// <summary>
-        /// Holds the title of the fylout page.
-        /// </summary>
-        public string MasterDetailMenuTitlte { get; private set; }
+		/// <summary>
+		/// Holds the title of the fylout page.
+		/// </summary>
+		public string MasterDetailMenuTitlte { get; private set; }
 
-        public event PropertyChangedEventHandler PropertyChanged;
+		public event PropertyChangedEventHandler PropertyChanged;
 
-        public bool IsMyBikesPageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
+		public bool IsMyBikesPageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
 
-        public bool IsFindBikePageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
+		public bool IsFindBikePageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
 
-        public bool IsAccountPageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
+		public bool IsAccountPageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
 
-        public bool IsLoginPageVisible => !App.ModelRoot.ActiveUser.IsLoggedIn;
+		public bool IsLoginPageVisible => !App.ModelRoot.ActiveUser.IsLoggedIn;
 
-        public bool IsSettingsPageVisible => App.ModelRoot.Uris.ActiveUri.Host.GetIsCopri()
-                || App.ModelRoot.ActiveUser.IsLoggedIn;
+		public bool IsSettingsPageVisible => App.ModelRoot.Uris.ActiveUri.Host.GetIsCopri()
+				|| App.ModelRoot.ActiveUser.IsLoggedIn;
 
-        public string TabbedPageIngoTitle => AppResources.MarkingAbout;
+		public string TabbedPageIngoTitle => AppResources.MarkingAbout;
 
-    }
+	}
 }
diff --git a/Meinkonrad/TINK/ViewModel/ViewModelResourceHelper.cs b/Meinkonrad/TINK/ViewModel/ViewModelResourceHelper.cs
index 363155a..979fc70 100644
--- a/Meinkonrad/TINK/ViewModel/ViewModelResourceHelper.cs
+++ b/Meinkonrad/TINK/ViewModel/ViewModelResourceHelper.cs
@@ -5,38 +5,38 @@ using Serilog;
 
 namespace TINK.ViewModel
 {
-    public static class ViewModelResourceHelper
-    {
-        /// <summary> Get ressource prefix depending on platform.</summary>
-        public static string RessourcePrefix
-        {
-            get
-            {
+	public static class ViewModelResourceHelper
+	{
+		/// <summary> Get ressource prefix depending on platform.</summary>
+		public static string RessourcePrefix
+		{
+			get
+			{
 #if __IOS__
-                return "TINK.iOS.";
+				return "TINK.iOS.";
 #endif
 #if __ANDROID__
-                return "TINK.Droid.";
+				return "TINK.Droid.";
 #endif
 #if WINDOWS_UWP
                 return "TINK.WinPhone.";
 #endif
-            }
-        }
+			}
+		}
 
-        /// <summary> Gets an an embedded html ressource.</summary>
-        /// <param name="resrouceName">Name of resource to get.</param>
-        /// <returns></returns>
-        public static string GetSource(string resrouceName)
-        {
-            var l_oRessourceName = RessourcePrefix + resrouceName;
-            Log.Verbose($"Using this resource prefix {RessourcePrefix}.");
-            // note that the prefix includes the trailing period '.' that is required
-            var assembly = typeof(ViewModelResourceHelper).GetTypeInfo().Assembly;
-            var stream = assembly.GetManifestResourceStream(l_oRessourceName);
-            return stream != null
-                ? (new StreamReader(stream, Encoding.UTF8)).ReadToEnd()
-                 : string.Format("<!DOCTYPE html><html lang=\"de\"><body>An error occurred loading html- ressource {0}.</body>", l_oRessourceName);
-        }
-    }
+		/// <summary> Gets an an embedded html ressource.</summary>
+		/// <param name="resrouceName">Name of resource to get.</param>
+		/// <returns></returns>
+		public static string GetSource(string resrouceName)
+		{
+			var l_oRessourceName = RessourcePrefix + resrouceName;
+			Log.Verbose($"Using this resource prefix {RessourcePrefix}.");
+			// note that the prefix includes the trailing period '.' that is required
+			var assembly = typeof(ViewModelResourceHelper).GetTypeInfo().Assembly;
+			var stream = assembly.GetManifestResourceStream(l_oRessourceName);
+			return stream != null
+				? (new StreamReader(stream, Encoding.UTF8)).ReadToEnd()
+				 : string.Format("<!DOCTYPE html><html lang=\"de\"><body>An error occurred loading html- ressource {0}.</body>", l_oRessourceName);
+		}
+	}
 }
diff --git a/ShareeSharedGuiLib/View/BarLevelInputView.xaml.cs b/ShareeSharedGuiLib/View/BarLevelInputView.xaml.cs
index 8a440f2..0d5bb80 100644
--- a/ShareeSharedGuiLib/View/BarLevelInputView.xaml.cs
+++ b/ShareeSharedGuiLib/View/BarLevelInputView.xaml.cs
@@ -9,102 +9,102 @@ using Xamarin.Forms.Xaml;
 
 namespace ShareeSharedGuiLib.View
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class BarLevelInputView : ContentView
-    {
-        private BarLevelInputViewModel _LocalViewModel;
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class BarLevelInputView : ContentView
+	{
+		private BarLevelInputViewModel _LocalViewModel;
 
-        public BarLevelInputView()
-        {
-            InitializeComponent();
+		public BarLevelInputView()
+		{
+			InitializeComponent();
 
-            _LocalViewModel = new BarLevelInputViewModel();
+			_LocalViewModel = new BarLevelInputViewModel();
 
-            _LocalViewModel.PropertyChanged += (sender, args) =>
-            {
-                // Update Current property from view model on user input.
-                if (args.PropertyName != nameof(BarLevelInputViewModel.Current))
-                    return;
+			_LocalViewModel.PropertyChanged += (sender, args) =>
+			{
+				// Update Current property from view model on user input.
+				if (args.PropertyName != nameof(BarLevelInputViewModel.Current))
+					return;
 
-                var viewModel = sender as BarLevelInputViewModel;
-                Current = viewModel?.Current != null
-                    ? viewModel?.Current.Value.ToString()
-                    : String.Empty;
-            };
+				var viewModel = sender as BarLevelInputViewModel;
+				Current = viewModel?.Current != null
+					? viewModel?.Current.Value.ToString()
+					: String.Empty;
+			};
 
-            // Do not bind entire control to local view model. Doing this would break binding of BatteryView control. 
-            this.BarLevelElement.BindingContext = _LocalViewModel;
-            this.BarLevelStepper.BindingContext = _LocalViewModel;
-        }
+			// Do not bind entire control to local view model. Doing this would break binding of BatteryView control. 
+			this.BarLevelElement.BindingContext = _LocalViewModel;
+			this.BarLevelStepper.BindingContext = _LocalViewModel;
+		}
 
-        /// <summary>
-        /// Create bindable property to to allow "Maximum"- proptery to act as a valid target for data binding.
-        /// </summary>
-        public static readonly BindableProperty MaximumProperty = BindableProperty.Create(
-           "Maximum",
-           typeof(string),
-           typeof(BarLevelInputView),
-           "7",
-           propertyChanged: OnMaximumChanged);
+		/// <summary>
+		/// Create bindable property to to allow "Maximum"- proptery to act as a valid target for data binding.
+		/// </summary>
+		public static readonly BindableProperty MaximumProperty = BindableProperty.Create(
+		   "Maximum",
+		   typeof(string),
+		   typeof(BarLevelInputView),
+		   "7",
+		   propertyChanged: OnMaximumChanged);
 
-        /// <summary>
-        /// Holds the count of bars wich represent charing level full.
-        /// </summary>
-        public string Maximum
-        {
-            get => (string)GetValue(MaximumProperty);
-            set => SetValue(MaximumProperty, value);
-        }
+		/// <summary>
+		/// Holds the count of bars wich represent charing level full.
+		/// </summary>
+		public string Maximum
+		{
+			get => (string)GetValue(MaximumProperty);
+			set => SetValue(MaximumProperty, value);
+		}
 
-        /// <summary>
-        /// Notifies when value changes. Is required to make binding work.
-        /// </summary>
-        static void OnMaximumChanged(BindableObject bindable, object oldValue, object newValue)
-        {
-            if (newValue != oldValue)
-            {
-                var batteryView = bindable as BarLevelInputView;
-                batteryView?.SetMaximum(int.TryParse(newValue.ToString(), out int maximum) ? (int?)maximum : null);
-            }
-        }
+		/// <summary>
+		/// Notifies when value changes. Is required to make binding work.
+		/// </summary>
+		static void OnMaximumChanged(BindableObject bindable, object oldValue, object newValue)
+		{
+			if (newValue != oldValue)
+			{
+				var batteryView = bindable as BarLevelInputView;
+				batteryView?.SetMaximum(int.TryParse(newValue.ToString(), out int maximum) ? (int?)maximum : null);
+			}
+		}
 
-        public void SetMaximum(int? maximum) => _LocalViewModel.Maximum = maximum;
+		public void SetMaximum(int? maximum) => _LocalViewModel.Maximum = maximum;
 
 
-        /// <summary>
-        /// Create bindable property to to allow "Current"- proptery to act as a valid target for data binding.
-        /// </summary>
-        public static readonly BindableProperty CurrentProperty = BindableProperty.Create(
-           "Current",
-           typeof(string),
-           typeof(BarLevelInputView),
-           "7",
-           BindingMode.TwoWay,
-           propertyChanged: OnCurrentChanged);
+		/// <summary>
+		/// Create bindable property to to allow "Current"- proptery to act as a valid target for data binding.
+		/// </summary>
+		public static readonly BindableProperty CurrentProperty = BindableProperty.Create(
+		   "Current",
+		   typeof(string),
+		   typeof(BarLevelInputView),
+		   "7",
+		   BindingMode.TwoWay,
+		   propertyChanged: OnCurrentChanged);
 
-        /// <summary>
-        /// Holds the count of bars wich represent the current charing level.
-        /// </summary>
-        public string Current
-        {
-            get => (string)GetValue(CurrentProperty);
-            set => SetValue(CurrentProperty, value);
-        }
+		/// <summary>
+		/// Holds the count of bars wich represent the current charing level.
+		/// </summary>
+		public string Current
+		{
+			get => (string)GetValue(CurrentProperty);
+			set => SetValue(CurrentProperty, value);
+		}
 
-        /// <summary>
-        /// Notifies when value changes. Is required to make binding work.
-        /// </summary>
-        static void OnCurrentChanged(BindableObject bindable, object oldValue, object newValue)
-        {
-            if (newValue != oldValue)
-            {
-                var batteryView = bindable as BarLevelInputView;
-                int current;
-                batteryView?.SetCurrent(int.TryParse(newValue.ToString(), out current) ? (int?)current : null);
-            }
-        }
+		/// <summary>
+		/// Notifies when value changes. Is required to make binding work.
+		/// </summary>
+		static void OnCurrentChanged(BindableObject bindable, object oldValue, object newValue)
+		{
+			if (newValue != oldValue)
+			{
+				var batteryView = bindable as BarLevelInputView;
+				int current;
+				batteryView?.SetCurrent(int.TryParse(newValue.ToString(), out current) ? (int?)current : null);
+			}
+		}
 
-        public void SetCurrent(int? current) => _LocalViewModel.Current = current;
+		public void SetCurrent(int? current) => _LocalViewModel.Current = current;
 
-    }
+	}
 }
\ No newline at end of file
diff --git a/ShareeSharedGuiLib/View/BarLevelView.xaml.cs b/ShareeSharedGuiLib/View/BarLevelView.xaml.cs
index c6f49e7..69f663e 100644
--- a/ShareeSharedGuiLib/View/BarLevelView.xaml.cs
+++ b/ShareeSharedGuiLib/View/BarLevelView.xaml.cs
@@ -9,86 +9,86 @@ using Xamarin.Forms.Xaml;
 
 namespace ShareeSharedGuiLib.View
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class BarLevelView : ContentView
-    {
-        private BarLevelViewModel _LocalViewModel = new BarLevelViewModel();
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class BarLevelView : ContentView
+	{
+		private BarLevelViewModel _LocalViewModel = new BarLevelViewModel();
 
-        public BarLevelView()
-        {
-            InitializeComponent();
+		public BarLevelView()
+		{
+			InitializeComponent();
 
-            // Do not bind entire control to local view model. Doing this would break binding of BatteryView control. 
-            this.BarLevelLabel.BindingContext = _LocalViewModel;
-            this.BarLevelImage.BindingContext = _LocalViewModel;
-        }
+			// Do not bind entire control to local view model. Doing this would break binding of BatteryView control. 
+			this.BarLevelLabel.BindingContext = _LocalViewModel;
+			this.BarLevelImage.BindingContext = _LocalViewModel;
+		}
 
-        /// <summary>
-        /// Create bindable property to to allow "Maximum"- proptery to act as a valid target for data binding.
-        /// </summary>
-        public static readonly BindableProperty MaximumProperty = BindableProperty.Create(
-           "Maximum",
-           typeof(string),
-           typeof(BarLevelView),
-           "", // Default value must match default value of view model object. Otherwise there might be an update issue.
-           propertyChanged: OnMaximumChanged);
+		/// <summary>
+		/// Create bindable property to to allow "Maximum"- proptery to act as a valid target for data binding.
+		/// </summary>
+		public static readonly BindableProperty MaximumProperty = BindableProperty.Create(
+		   "Maximum",
+		   typeof(string),
+		   typeof(BarLevelView),
+		   "", // Default value must match default value of view model object. Otherwise there might be an update issue.
+		   propertyChanged: OnMaximumChanged);
 
-        /// <summary>
-        /// Holds the count of bars wich represent charing level full.
-        /// </summary>
-        public string Maximum
-        {
-            get => (string)GetValue(MaximumProperty);
-            set => SetValue(MaximumProperty, value);
-        }
+		/// <summary>
+		/// Holds the count of bars wich represent charing level full.
+		/// </summary>
+		public string Maximum
+		{
+			get => (string)GetValue(MaximumProperty);
+			set => SetValue(MaximumProperty, value);
+		}
 
-        /// <summary>
-        /// Notifies when value changes. Is required to make binding work.
-        /// </summary>
-        static void OnMaximumChanged(BindableObject bindable, object oldValue, object newValue)
-        {
-            if (newValue != oldValue)
-            {
-                var batteryView = bindable as BarLevelView;
-                batteryView?.SetMaximum(int.TryParse(newValue.ToString(), out int maximum) ? (int?)maximum : null);
-            }
-        }
+		/// <summary>
+		/// Notifies when value changes. Is required to make binding work.
+		/// </summary>
+		static void OnMaximumChanged(BindableObject bindable, object oldValue, object newValue)
+		{
+			if (newValue != oldValue)
+			{
+				var batteryView = bindable as BarLevelView;
+				batteryView?.SetMaximum(int.TryParse(newValue.ToString(), out int maximum) ? (int?)maximum : null);
+			}
+		}
 
-        public void SetMaximum(int? maximum) => _LocalViewModel.Maximum = maximum;
+		public void SetMaximum(int? maximum) => _LocalViewModel.Maximum = maximum;
 
 
-        /// <summary>
-        /// Create bindable property to to allow "Current"- proptery to act as a valid target for data binding.
-        /// </summary>
-        public static readonly BindableProperty CurrentProperty = BindableProperty.Create(
-           "Current",
-           typeof(string),
-           typeof(BarLevelView),
-           "", // Default value must match default value of view model object. Otherwise there might be an update issue.
-           propertyChanged: OnCurrentChanged);
+		/// <summary>
+		/// Create bindable property to to allow "Current"- proptery to act as a valid target for data binding.
+		/// </summary>
+		public static readonly BindableProperty CurrentProperty = BindableProperty.Create(
+		   "Current",
+		   typeof(string),
+		   typeof(BarLevelView),
+		   "", // Default value must match default value of view model object. Otherwise there might be an update issue.
+		   propertyChanged: OnCurrentChanged);
 
-        /// <summary>
-        /// Holds the count of bars wich represent the current charing level.
-        /// </summary>
-        public string Current
-        {
-            get => (string)GetValue(CurrentProperty);
-            set => SetValue(CurrentProperty, value);
-        }
+		/// <summary>
+		/// Holds the count of bars wich represent the current charing level.
+		/// </summary>
+		public string Current
+		{
+			get => (string)GetValue(CurrentProperty);
+			set => SetValue(CurrentProperty, value);
+		}
 
-        /// <summary>
-        /// Notifies when value changes. Is required to make binding work.
-        /// </summary>
-        static void OnCurrentChanged(BindableObject bindable, object oldValue, object newValue)
-        {
-            if (newValue != oldValue)
-            {
-                var batteryView = bindable as BarLevelView;
-                int current;
-                batteryView?.SetCurrent(int.TryParse(newValue.ToString(), out current) ? (int?)current : null);
-            }
-        }
+		/// <summary>
+		/// Notifies when value changes. Is required to make binding work.
+		/// </summary>
+		static void OnCurrentChanged(BindableObject bindable, object oldValue, object newValue)
+		{
+			if (newValue != oldValue)
+			{
+				var batteryView = bindable as BarLevelView;
+				int current;
+				batteryView?.SetCurrent(int.TryParse(newValue.ToString(), out current) ? (int?)current : null);
+			}
+		}
 
-        public void SetCurrent(int? current) => _LocalViewModel.Current = current;
-    }
+		public void SetCurrent(int? current) => _LocalViewModel.Current = current;
+	}
 }
\ No newline at end of file
diff --git a/ShareeSharedGuiLib/ViewModel/Bar.cs b/ShareeSharedGuiLib/ViewModel/Bar.cs
index 0bc37d4..145314d 100644
--- a/ShareeSharedGuiLib/ViewModel/Bar.cs
+++ b/ShareeSharedGuiLib/ViewModel/Bar.cs
@@ -4,34 +4,34 @@ using System.Text;
 
 namespace ShareeSharedGuiLib.ViewModel
 {
-    public enum ChargingState
-    {
-        Loaded,
-        Empty
-    }
+	public enum ChargingState
+	{
+		Loaded,
+		Empty
+	}
 
-    public class Bar
-    {
-        public Bar(ChargingState? state = null)
-        {
-            State = state;
-        }
+	public class Bar
+	{
+		public Bar(ChargingState? state = null)
+		{
+			State = state;
+		}
 
-        /// <summary>
-        /// Gets a value indicating whether bar is charged or not. Null if state is unknown.
-        /// </summary>
-        public ChargingState? State { get; private set; } = null;
+		/// <summary>
+		/// Gets a value indicating whether bar is charged or not. Null if state is unknown.
+		/// </summary>
+		public ChargingState? State { get; private set; } = null;
 
-        public string Text
-        {
-            get
-            {
-                if (State == null)
-                    return string.Empty;
+		public string Text
+		{
+			get
+			{
+				if (State == null)
+					return string.Empty;
 
-                return State == ChargingState.Loaded ? " +  " : " - ";
-            }
+				return State == ChargingState.Loaded ? " +  " : " - ";
+			}
 
-        }
-    }
+		}
+	}
 }
diff --git a/ShareeSharedGuiLib/ViewModel/BarLevelInputViewModel.cs b/ShareeSharedGuiLib/ViewModel/BarLevelInputViewModel.cs
index 1634dae..54b00ef 100644
--- a/ShareeSharedGuiLib/ViewModel/BarLevelInputViewModel.cs
+++ b/ShareeSharedGuiLib/ViewModel/BarLevelInputViewModel.cs
@@ -7,61 +7,61 @@ using Xamarin.Forms;
 
 namespace ShareeSharedGuiLib.ViewModel
 {
-    /// <summary>
-    /// Bar based filling level view which shows filling level and allows to edit this level.
-    /// </summary>
-    public class BarLevelInputViewModel : INotifyPropertyChanged
-    {
-        public new event PropertyChangedEventHandler PropertyChanged;
+	/// <summary>
+	/// Bar based filling level view which shows filling level and allows to edit this level.
+	/// </summary>
+	public class BarLevelInputViewModel : INotifyPropertyChanged
+	{
+		public new event PropertyChangedEventHandler PropertyChanged;
 
-        public int? _Maximum = null;
+		public int? _Maximum = null;
 
-        public int? Maximum
-        {
-            get => _Maximum;
-            set
-            {
-                if (_Maximum == value)
-                {
-                    // Nothing to do because nothing changed.
-                    return;
-                }
+		public int? Maximum
+		{
+			get => _Maximum;
+			set
+			{
+				if (_Maximum == value)
+				{
+					// Nothing to do because nothing changed.
+					return;
+				}
 
-                _Maximum = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(MaximumText)));
-            }
-        }
+				_Maximum = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(MaximumText)));
+			}
+		}
 
-        public string MaximumText => Maximum != null
-            ? Maximum.Value.ToString()
-            : string.Empty;
+		public string MaximumText => Maximum != null
+			? Maximum.Value.ToString()
+			: string.Empty;
 
-        public int? _Current = null;
+		public int? _Current = null;
 
-        public int? Current
-        {
-            get => _Current;
-            set
-            {
-                if (_Current == value)
-                {
-                    // Nothing to do because nothing changed.
-                    return;
-                }
+		public int? Current
+		{
+			get => _Current;
+			set
+			{
+				if (_Current == value)
+				{
+					// Nothing to do because nothing changed.
+					return;
+				}
 
-                _Current = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Current)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(CurrentText)));
-            }
-        }
+				_Current = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Current)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(CurrentText)));
+			}
+		}
 
-        public string CurrentText
-        {
-            get => Current != null
-            ? Current.Value.ToString()
-            : string.Empty;
+		public string CurrentText
+		{
+			get => Current != null
+			? Current.Value.ToString()
+			: string.Empty;
 
-            set => Current = int.TryParse(value, out int newCurrent) ? (int?)newCurrent : null;
-        }
-    }
+			set => Current = int.TryParse(value, out int newCurrent) ? (int?)newCurrent : null;
+		}
+	}
 }
diff --git a/ShareeSharedGuiLib/ViewModel/BarLevelViewModel.cs b/ShareeSharedGuiLib/ViewModel/BarLevelViewModel.cs
index 728ba16..f90a281 100644
--- a/ShareeSharedGuiLib/ViewModel/BarLevelViewModel.cs
+++ b/ShareeSharedGuiLib/ViewModel/BarLevelViewModel.cs
@@ -3,87 +3,87 @@ using TINK.MultilingualResources;
 
 namespace ShareeSharedGuiLib.ViewModel
 {
-    /// <summary>
-    /// Bar based filling level indicator view.
-    /// </summary>
-    public class BarLevelViewModel : INotifyPropertyChanged
-    {
-        public event PropertyChangedEventHandler PropertyChanged;
+	/// <summary>
+	/// Bar based filling level indicator view.
+	/// </summary>
+	public class BarLevelViewModel : INotifyPropertyChanged
+	{
+		public event PropertyChangedEventHandler PropertyChanged;
 
-        public int? _Maximum = null;
+		public int? _Maximum = null;
 
-        /// <summary>
-        /// Holds the maximum count of bars.
-        /// </summary>
-        public int? Maximum
-        {
-            get => _Maximum;
-            set
-            {
-                if (_Maximum == value)
-                {
-                    // Nothing to do because nothing changed.
-                    return;
-                }
+		/// <summary>
+		/// Holds the maximum count of bars.
+		/// </summary>
+		public int? Maximum
+		{
+			get => _Maximum;
+			set
+			{
+				if (_Maximum == value)
+				{
+					// Nothing to do because nothing changed.
+					return;
+				}
 
-                _Maximum = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsBatteryChargeLevelLabelVisible)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BatteryChargeLevelBarsText)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BatteryChargeLevelImageSourceString)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsBatteryChargeLevelImageVisible)));
-            }
-        }
+				_Maximum = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsBatteryChargeLevelLabelVisible)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BatteryChargeLevelBarsText)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BatteryChargeLevelImageSourceString)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsBatteryChargeLevelImageVisible)));
+			}
+		}
 
-        public int? _Current = null;
+		public int? _Current = null;
 
-        /// <summary>
-        /// Holds the current count of bars.
-        /// </summary>
-        public int? Current
-        {
-            get => _Current;
-            set
-            {
-                if (_Current == value)
-                {
-                    // Nothing to do because nothing changed.
-                    return;
-                }
+		/// <summary>
+		/// Holds the current count of bars.
+		/// </summary>
+		public int? Current
+		{
+			get => _Current;
+			set
+			{
+				if (_Current == value)
+				{
+					// Nothing to do because nothing changed.
+					return;
+				}
 
-                _Current = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsBatteryChargeLevelLabelVisible)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BatteryChargeLevelBarsText)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BatteryChargeLevelImageSourceString)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsBatteryChargeLevelImageVisible)));
-            }
-        }
+				_Current = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsBatteryChargeLevelLabelVisible)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BatteryChargeLevelBarsText)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BatteryChargeLevelImageSourceString)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsBatteryChargeLevelImageVisible)));
+			}
+		}
 
-        /// <summary>
-        /// Gets the battery filling level or pedelecs.
-        /// </summary>
-        public string BatteryChargeLevelBarsText => Maximum != null
-            ? string.Format(
-                AppResources.MarkingDriveBatteryChargingLevel,
-                Current != null ? Current.ToString() : "-",
-                Maximum != null ? Maximum.ToString() : "-")
-            : AppResources.MarkingDriveBatteryChargingLevelNotAvailable;
+		/// <summary>
+		/// Gets the battery filling level or pedelecs.
+		/// </summary>
+		public string BatteryChargeLevelBarsText => Maximum != null
+			? string.Format(
+				AppResources.MarkingDriveBatteryChargingLevel,
+				Current != null ? Current.ToString() : "-",
+				Maximum != null ? Maximum.ToString() : "-")
+			: AppResources.MarkingDriveBatteryChargingLevelNotAvailable;
 
-        /// <summary>
-        /// Gets a value indicating whether battery label is visible or not.
-        /// </summary>
-        public bool IsBatteryChargeLevelLabelVisible => Maximum.HasValue && Maximum.Value != 5;
+		/// <summary>
+		/// Gets a value indicating whether battery label is visible or not.
+		/// </summary>
+		public bool IsBatteryChargeLevelLabelVisible => Maximum.HasValue && Maximum.Value != 5;
 
-        /// <summary>
-        /// Gets name of battery image ressource.
-        /// </summary>
-        public string BatteryChargeLevelImageSourceString => Current.HasValue && Maximum.HasValue && Maximum.Value == 5
-            ? $"battery_{Current.Value}_{Maximum.Value}.png"
-            : "battery_undefined.png";
+		/// <summary>
+		/// Gets name of battery image ressource.
+		/// </summary>
+		public string BatteryChargeLevelImageSourceString => Current.HasValue && Maximum.HasValue && Maximum.Value == 5
+			? $"battery_{Current.Value}_{Maximum.Value}.png"
+			: "battery_undefined.png";
 
-        /// <summary>
-        /// Gets a value indicating whether battery image is visible or not.
-        /// </summary>
-        public bool IsBatteryChargeLevelImageVisible => Maximum.HasValue && Maximum.Value == 5;
+		/// <summary>
+		/// Gets a value indicating whether battery image is visible or not.
+		/// </summary>
+		public bool IsBatteryChargeLevelImageVisible => Maximum.HasValue && Maximum.Value == 5;
 
-    }
+	}
 }
diff --git a/TINK/TINK.Android/MainActivity.cs b/TINK/TINK.Android/MainActivity.cs
index e63741a..60b3f70 100644
--- a/TINK/TINK.Android/MainActivity.cs
+++ b/TINK/TINK.Android/MainActivity.cs
@@ -12,96 +12,96 @@ using Xamarin.Forms.Platform.Android.AppLinks;
 
 namespace TINK.Droid
 {
-    [Activity(Label = "Sharee", Icon = "@drawable/sharee", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
+	[Activity(Label = "Sharee", Icon = "@drawable/sharee", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
 
-    [IntentFilter(new[] { Intent.ActionView },
-              Categories = new[] { Intent.ActionView, Intent.CategoryBrowsable, Intent.CategoryDefault },
-              DataScheme = "https",
-              DataHost = "sharee.bike",
-              DataPathPrefix = "/sharee",
-              AutoVerify = true)]
+	[IntentFilter(new[] { Intent.ActionView },
+			  Categories = new[] { Intent.ActionView, Intent.CategoryBrowsable, Intent.CategoryDefault },
+			  DataScheme = "https",
+			  DataHost = "sharee.bike",
+			  DataPathPrefix = "/sharee",
+			  AutoVerify = true)]
 
-    [IntentFilter(new[] { Intent.ActionView },
-              Categories = new[] { Intent.ActionView, Intent.CategoryBrowsable, Intent.CategoryDefault },
-              DataScheme = "http",
-              DataHost = "sharee.bike",
-              DataPathPrefix = "/sharee",
-              AutoVerify = true)]
+	[IntentFilter(new[] { Intent.ActionView },
+			  Categories = new[] { Intent.ActionView, Intent.CategoryBrowsable, Intent.CategoryDefault },
+			  DataScheme = "http",
+			  DataHost = "sharee.bike",
+			  DataPathPrefix = "/sharee",
+			  AutoVerify = true)]
 
-    public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
-    {
-        private void initFontScale()
-        {
-            Configuration configuration = Resources.Configuration;
-            configuration.FontScale = (float)1;
-            //0.85 small, 1 standard, 1.15 big，1.3 more bigger ，1.45 supper big 
-            DisplayMetrics metrics = new DisplayMetrics();
-            WindowManager.DefaultDisplay.GetMetrics(metrics);
-            metrics.ScaledDensity = configuration.FontScale * metrics.Density;
-            BaseContext.Resources.UpdateConfiguration(configuration, metrics);
-        }
-        protected override void OnCreate(Bundle bundle)
-        {
-            initFontScale();
+	public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
+	{
+		private void initFontScale()
+		{
+			Configuration configuration = Resources.Configuration;
+			configuration.FontScale = (float)1;
+			//0.85 small, 1 standard, 1.15 big，1.3 more bigger ，1.45 supper big 
+			DisplayMetrics metrics = new DisplayMetrics();
+			WindowManager.DefaultDisplay.GetMetrics(metrics);
+			metrics.ScaledDensity = configuration.FontScale * metrics.Density;
+			BaseContext.Resources.UpdateConfiguration(configuration, metrics);
+		}
+		protected override void OnCreate(Bundle bundle)
+		{
+			initFontScale();
 
-            TabLayoutResource = Resource.Layout.Tabbar;
-            ToolbarResource = Resource.Layout.Toolbar;
+			TabLayoutResource = Resource.Layout.Tabbar;
+			ToolbarResource = Resource.Layout.Toolbar;
 
-            base.OnCreate(bundle);
+			base.OnCreate(bundle);
 
-            global::Xamarin.Forms.Forms.Init(this, bundle);
+			global::Xamarin.Forms.Forms.Init(this, bundle);
 
-            FirebaseApp.InitializeApp(this);
-            AndroidAppLinks.Init(this);
+			FirebaseApp.InitializeApp(this);
+			AndroidAppLinks.Init(this);
 
-            // Initialize xamarin.essentials, see https://docs.microsoft.com/en-us/xamarin/essentials/get-started?tabs=macos%2Candroid.
-            Xamarin.Essentials.Platform.Init(this, bundle);
+			// Initialize xamarin.essentials, see https://docs.microsoft.com/en-us/xamarin/essentials/get-started?tabs=macos%2Candroid.
+			Xamarin.Essentials.Platform.Init(this, bundle);
 
-            // Required for initialization of Maps, see https://developer.xamarin.com/guides/xamarin-forms/user-interface/map/
-            Xamarin.FormsGoogleMaps.Init(this, bundle);
+			// Required for initialization of Maps, see https://developer.xamarin.com/guides/xamarin-forms/user-interface/map/
+			Xamarin.FormsGoogleMaps.Init(this, bundle);
 
-            // Required for initialization of binding package, see  https://github.com/nuitsjp/Xamarin.Forms.GoogleMaps.Bindings.
-            Xamarin.FormsGoogleMapsBindings.Init();
+			// Required for initialization of binding package, see  https://github.com/nuitsjp/Xamarin.Forms.GoogleMaps.Bindings.
+			Xamarin.FormsGoogleMapsBindings.Init();
 
-            // Get version name of app.
-            Context context = ApplicationContext;
-            new Model.Device.AppInfo(context.PackageManager.GetPackageInfo(context.PackageName, 0).VersionName);
+			// Get version name of app.
+			Context context = ApplicationContext;
+			new Model.Device.AppInfo(context.PackageManager.GetPackageInfo(context.PackageName, 0).VersionName);
 
-            Xamarin.Forms.Forms.ViewInitialized += (object sender, Xamarin.Forms.ViewInitializedEventArgs e) =>
-            {
-                if (!string.IsNullOrWhiteSpace(e.View.AutomationId))
-                {
-                    e.NativeView.ContentDescription = e.View.AutomationId;
-                }
-            };
+			Xamarin.Forms.Forms.ViewInitialized += (object sender, Xamarin.Forms.ViewInitializedEventArgs e) =>
+			{
+				if (!string.IsNullOrWhiteSpace(e.View.AutomationId))
+				{
+					e.NativeView.ContentDescription = e.View.AutomationId;
+				}
+			};
 
-            LoadApplication(new App());
-        }
+			LoadApplication(new App());
+		}
 
-        /// <summary>
-        /// Handles opening the dialog to request for permissions.
-        /// </summary>
-        public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Android.Content.PM.Permission[] grantResults)
-        {
-            if (App.PermissionsService.GetType() == typeof(TINK.Services.Permissions.Essentials.Permissions))
-            {
-                Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-            }
-            else if (App.PermissionsService.GetType() == typeof(TINK.Services.Permissions.Plugin.Permissions))
-            {
-                // Bug in 3.0.244 and earlier versions of sharee.bike app: Call of PermissionsImplementation.Current.OnRequestedPermission result was missing.
-                // see https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/136 for further details.
-                PermissionsImplementation.Current.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-            }
+		/// <summary>
+		/// Handles opening the dialog to request for permissions.
+		/// </summary>
+		public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Android.Content.PM.Permission[] grantResults)
+		{
+			if (App.PermissionsService.GetType() == typeof(TINK.Services.Permissions.Essentials.Permissions))
+			{
+				Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+			}
+			else if (App.PermissionsService.GetType() == typeof(TINK.Services.Permissions.Plugin.Permissions))
+			{
+				// Bug in 3.0.244 and earlier versions of sharee.bike app: Call of PermissionsImplementation.Current.OnRequestedPermission result was missing.
+				// see https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/136 for further details.
+				PermissionsImplementation.Current.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+			}
 
-            base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-        }
+			base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+		}
 
-        [Export("TapStation")]
-        public void TapStation(string stationNr)
-        {
-            BackdoorMethodHelpers.DoTapPage(stationNr);
-        }
-    }
+		[Export("TapStation")]
+		public void TapStation(string stationNr)
+		{
+			BackdoorMethodHelpers.DoTapPage(stationNr);
+		}
+	}
 }
 
diff --git a/TINK/TINK.Android/Model/Device/AppInfo.cs b/TINK/TINK.Android/Model/Device/AppInfo.cs
index 58b23f0..8febfc6 100644
--- a/TINK/TINK.Android/Model/Device/AppInfo.cs
+++ b/TINK/TINK.Android/Model/Device/AppInfo.cs
@@ -6,40 +6,40 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(AppInfo))]
 namespace TINK.Droid.Model.Device
 {
-    /// <summary> Holds information about the TINK- app. </summary>
-    public class AppInfo : IAppInfo
-    {
-        /// <summary> Holds the the version of the app.</summary>
-        private static Version m_oVersion = null;
+	/// <summary> Holds information about the TINK- app. </summary>
+	public class AppInfo : IAppInfo
+	{
+		/// <summary> Holds the the version of the app.</summary>
+		private static Version m_oVersion = null;
 
-        /// <summary> Constructs a app info object. </summary>
-        public AppInfo()
-        {
-        }
+		/// <summary> Constructs a app info object. </summary>
+		public AppInfo()
+		{
+		}
 
-        /// <summary> Constructs a app info object for initialization. </summary>
-        /// <param name="p_strVersionText"> Version to initializ object with.</param>
-        internal AppInfo(string p_strVersionText)
-        {
-            if (m_oVersion != null)
-            {
-                // Set version only once.
-                return;
-            }
+		/// <summary> Constructs a app info object for initialization. </summary>
+		/// <param name="p_strVersionText"> Version to initializ object with.</param>
+		internal AppInfo(string p_strVersionText)
+		{
+			if (m_oVersion != null)
+			{
+				// Set version only once.
+				return;
+			}
 
-            if (!Version.TryParse(p_strVersionText, out Version l_oVersion))
-            {
-                m_oVersion = new Version(0, 8);
-            }
+			if (!Version.TryParse(p_strVersionText, out Version l_oVersion))
+			{
+				m_oVersion = new Version(0, 8);
+			}
 
-            m_oVersion = l_oVersion;
-        }
+			m_oVersion = l_oVersion;
+		}
 
-        /// <summary> Get the version of the app. </summary>
-        public Version Version => m_oVersion ?? new Version(0, 9);
+		/// <summary> Get the version of the app. </summary>
+		public Version Version => m_oVersion ?? new Version(0, 9);
 
-        /// <summary> Gets the URL to the app store. </summary>
-        /// <value>The store URL.</value>
-        public string StoreUrl => $"https://play.google.com/store/apps/details?id={Android.App.Application.Context.PackageName}";
-    }
+		/// <summary> Gets the URL to the app store. </summary>
+		/// <value>The store URL.</value>
+		public string StoreUrl => $"https://play.google.com/store/apps/details?id={Android.App.Application.Context.PackageName}";
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK.Android/Model/Device/Device.cs b/TINK/TINK.Android/Model/Device/Device.cs
index d01840b..d4c162b 100644
--- a/TINK/TINK.Android/Model/Device/Device.cs
+++ b/TINK/TINK.Android/Model/Device/Device.cs
@@ -5,19 +5,19 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(TINK.Droid.Model.Device.Device))]
 namespace TINK.Droid.Model.Device
 {
-    public class Device : ISmartDevice
-    {
-        public string Manufacturer => DeviceInfo.Manufacturer;
+	public class Device : ISmartDevice
+	{
+		public string Manufacturer => DeviceInfo.Manufacturer;
 
-        public string Model => DeviceInfo.Model;
+		public string Model => DeviceInfo.Model;
 
-        public DevicePlatform Platform => DeviceInfo.Platform;
+		public DevicePlatform Platform => DeviceInfo.Platform;
 
-        public string VersionText => DeviceInfo.VersionString;
+		public string VersionText => DeviceInfo.VersionString;
 
-        /// <summary> Gets unitque device identifier. </summary>
-        /// <returns>Gets the identifies specifying device.</returns>
-        public string Identifier
-            => Android.Provider.Settings.Secure.GetString(Android.App.Application.Context.ContentResolver, Android.Provider.Settings.Secure.AndroidId);
-    }
+		/// <summary> Gets unitque device identifier. </summary>
+		/// <returns>Gets the identifies specifying device.</returns>
+		public string Identifier
+			=> Android.Provider.Settings.Secure.GetString(Android.App.Application.Context.ContentResolver, Android.Provider.Settings.Secure.AndroidId);
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK.Android/Model/Device/ExternalBrowseService.cs b/TINK/TINK.Android/Model/Device/ExternalBrowseService.cs
index a971c11..15bb1e6 100644
--- a/TINK/TINK.Android/Model/Device/ExternalBrowseService.cs
+++ b/TINK/TINK.Android/Model/Device/ExternalBrowseService.cs
@@ -6,18 +6,18 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(ExternalBrowseService))]
 namespace TINK.Droid.Model.Device
 {
-    public class ExternalBrowseService : IExternalBrowserService
-    {
-        /// <summary> Opens an external browser. </summary>
-        /// <param name="p_strUrl">Url to open.</param>
-        public void OpenUrl(string p_strUrl)
-        {
-            var uri = Android.Net.Uri.Parse(p_strUrl);
-            var intent = new Intent(Intent.ActionView, uri);
+	public class ExternalBrowseService : IExternalBrowserService
+	{
+		/// <summary> Opens an external browser. </summary>
+		/// <param name="p_strUrl">Url to open.</param>
+		public void OpenUrl(string p_strUrl)
+		{
+			var uri = Android.Net.Uri.Parse(p_strUrl);
+			var intent = new Intent(Intent.ActionView, uri);
 
-            intent.AddFlags(ActivityFlags.NewTask);
+			intent.AddFlags(ActivityFlags.NewTask);
 
-            Android.App.Application.Context.StartActivity(intent);
-        }
-    }
+			Android.App.Application.Context.StartActivity(intent);
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK.Android/Model/Device/Gps.cs b/TINK/TINK.Android/Model/Device/Gps.cs
index dfa055f..9087413 100644
--- a/TINK/TINK.Android/Model/Device/Gps.cs
+++ b/TINK/TINK.Android/Model/Device/Gps.cs
@@ -16,15 +16,15 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(TINK.Droid.Model.Device.Gps))]
 namespace TINK.Droid.Model.Device
 {
-    public class Gps : IGeolodationDependent
-    {
-        public bool IsGeolcationEnabled
-        {
-            get
-            {
-                LocationManager locationManager = (LocationManager)Android.App.Application.Context.GetSystemService(Context.LocationService);
-                return locationManager.IsProviderEnabled(LocationManager.GpsProvider);
-            }
-        }
-    }
+	public class Gps : IGeolodationDependent
+	{
+		public bool IsGeolcationEnabled
+		{
+			get
+			{
+				LocationManager locationManager = (LocationManager)Android.App.Application.Context.GetSystemService(Context.LocationService);
+				return locationManager.IsProviderEnabled(LocationManager.GpsProvider);
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK.Android/Model/Device/SpecialFolder.cs b/TINK/TINK.Android/Model/Device/SpecialFolder.cs
index 3ca8eae..d07b4cb 100644
--- a/TINK/TINK.Android/Model/Device/SpecialFolder.cs
+++ b/TINK/TINK.Android/Model/Device/SpecialFolder.cs
@@ -6,44 +6,44 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(TINK.Droid.Model.Device.SpecialFolder))]
 namespace TINK.Droid.Model.Device
 {
-    public class SpecialFolder : ISpecialFolder
-    {
-        /// <summary> Get the folder name of external folder to write to. </summary>
-        /// <returns> Name of the external folder. </returns>
-        public string GetExternalFilesDir()
-        {
-            string baseFolderPath = string.Empty;
-            try
-            {
-                var context = Android.App.Application.Context;
-                Java.IO.File[] dirs = context.GetExternalFilesDirs(null);
+	public class SpecialFolder : ISpecialFolder
+	{
+		/// <summary> Get the folder name of external folder to write to. </summary>
+		/// <returns> Name of the external folder. </returns>
+		public string GetExternalFilesDir()
+		{
+			string baseFolderPath = string.Empty;
+			try
+			{
+				var context = Android.App.Application.Context;
+				Java.IO.File[] dirs = context.GetExternalFilesDirs(null);
 
-                foreach (Java.IO.File folder in dirs)
-                {
-                    bool IsRemovable = Android.OS.Environment.InvokeIsExternalStorageRemovable(folder);
-                    bool IsEmulated = Android.OS.Environment.InvokeIsExternalStorageEmulated(folder);
+				foreach (Java.IO.File folder in dirs)
+				{
+					bool IsRemovable = Android.OS.Environment.InvokeIsExternalStorageRemovable(folder);
+					bool IsEmulated = Android.OS.Environment.InvokeIsExternalStorageEmulated(folder);
 
-                    if (IsRemovable
-                        && !IsEmulated)
-                    {
-                        baseFolderPath = folder.Path;
-                    }
-                }
-            }
+					if (IsRemovable
+						&& !IsEmulated)
+					{
+						baseFolderPath = folder.Path;
+					}
+				}
+			}
 
-            catch (Exception l_oException)
-            {
-                Log.Error("Getting external files directory failed. {@l_oException}", l_oException);
-            }
+			catch (Exception l_oException)
+			{
+				Log.Error("Getting external files directory failed. {@l_oException}", l_oException);
+			}
 
-            return baseFolderPath;
-        }
+			return baseFolderPath;
+		}
 
-        /// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
-        /// <returns>Directory name.</returns>
-        public string GetInternalPersonalDir()
-        {
-            return Environment.GetFolderPath(Environment.SpecialFolder.Personal);
-        }
-    }
+		/// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
+		/// <returns>Directory name.</returns>
+		public string GetInternalPersonalDir()
+		{
+			return Environment.GetFolderPath(Environment.SpecialFolder.Personal);
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK.Android/Model/Device/WebView.cs b/TINK/TINK.Android/Model/Device/WebView.cs
index dacf5dd..409c1c9 100644
--- a/TINK/TINK.Android/Model/Device/WebView.cs
+++ b/TINK/TINK.Android/Model/Device/WebView.cs
@@ -4,13 +4,13 @@ using TINK.Model.Device;
 [assembly: Xamarin.Forms.Dependency(typeof(TINK.Droid.Model.Device.WebView))]
 namespace TINK.Droid.Model.Device
 {
-    public class WebView : IWebView
-    {
-        /// <summary> Clears the cookie cache for all web views. </summary>
-        public void ClearCookies()
-        {
-            var cookieManager = CookieManager.Instance;
-            cookieManager.RemoveAllCookie();
-        }
-    }
+	public class WebView : IWebView
+	{
+		/// <summary> Clears the cookie cache for all web views. </summary>
+		public void ClearCookies()
+		{
+			var cookieManager = CookieManager.Instance;
+			cookieManager.RemoveAllCookie();
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK.Android/Properties/AndroidManifest.xml b/TINK/TINK.Android/Properties/AndroidManifest.xml
index 3a6cf81..7dae90f 100644
--- a/TINK/TINK.Android/Properties/AndroidManifest.xml
+++ b/TINK/TINK.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="preferExternal" package="com.hauffware.sharee" android:versionName="3.0.337" android:versionCode="337">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.hauffware.sharee" android:versionName="3.0.338" android:versionCode="338">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
 	<!-- Google Maps related permissions -->
 	<!-- Permission to receive remote notifications from Google Play Services -->
diff --git a/TINK/TINK.Android/Resources/Resource.Designer.cs b/TINK/TINK.Android/Resources/Resource.Designer.cs
index cb1a812..4780141 100644
--- a/TINK/TINK.Android/Resources/Resource.Designer.cs
+++ b/TINK/TINK.Android/Resources/Resource.Designer.cs
@@ -23276,874 +23276,886 @@ namespace TINK.Droid
 			public const int battery_undefined = 2131165277;
 			
 			// aapt resource value: 0x7F07005E
-			public const int btn_checkbox_checked_mtrl = 2131165278;
+			public const int bike_Cargo_Pedelec_Two = 2131165278;
 			
 			// aapt resource value: 0x7F07005F
-			public const int btn_checkbox_checked_to_unchecked_mtrl_animation = 2131165279;
+			public const int bike_Cargo_SoleHumanPowered_Trike = 2131165279;
 			
 			// aapt resource value: 0x7F070060
-			public const int btn_checkbox_unchecked_mtrl = 2131165280;
+			public const int bike_Cargo_SoleHumanPowered_Two = 2131165280;
 			
 			// aapt resource value: 0x7F070061
-			public const int btn_checkbox_unchecked_to_checked_mtrl_animation = 2131165281;
+			public const int bike_City_SoleHumanPowered_Two = 2131165281;
 			
 			// aapt resource value: 0x7F070062
-			public const int btn_radio_off_mtrl = 2131165282;
+			public const int btn_checkbox_checked_mtrl = 2131165282;
 			
 			// aapt resource value: 0x7F070063
-			public const int btn_radio_off_to_on_mtrl_animation = 2131165283;
+			public const int btn_checkbox_checked_to_unchecked_mtrl_animation = 2131165283;
 			
 			// aapt resource value: 0x7F070064
-			public const int btn_radio_on_mtrl = 2131165284;
+			public const int btn_checkbox_unchecked_mtrl = 2131165284;
 			
 			// aapt resource value: 0x7F070065
-			public const int btn_radio_on_to_off_mtrl_animation = 2131165285;
+			public const int btn_checkbox_unchecked_to_checked_mtrl_animation = 2131165285;
 			
 			// aapt resource value: 0x7F070066
-			public const int common_full_open_on_phone = 2131165286;
+			public const int btn_radio_off_mtrl = 2131165286;
 			
 			// aapt resource value: 0x7F070067
-			public const int common_google_signin_btn_icon_dark = 2131165287;
+			public const int btn_radio_off_to_on_mtrl_animation = 2131165287;
 			
 			// aapt resource value: 0x7F070068
-			public const int common_google_signin_btn_icon_dark_focused = 2131165288;
+			public const int btn_radio_on_mtrl = 2131165288;
 			
 			// aapt resource value: 0x7F070069
-			public const int common_google_signin_btn_icon_dark_normal = 2131165289;
+			public const int btn_radio_on_to_off_mtrl_animation = 2131165289;
 			
 			// aapt resource value: 0x7F07006A
-			public const int common_google_signin_btn_icon_dark_normal_background = 2131165290;
+			public const int common_full_open_on_phone = 2131165290;
 			
 			// aapt resource value: 0x7F07006B
-			public const int common_google_signin_btn_icon_disabled = 2131165291;
+			public const int common_google_signin_btn_icon_dark = 2131165291;
 			
 			// aapt resource value: 0x7F07006C
-			public const int common_google_signin_btn_icon_light = 2131165292;
+			public const int common_google_signin_btn_icon_dark_focused = 2131165292;
 			
 			// aapt resource value: 0x7F07006D
-			public const int common_google_signin_btn_icon_light_focused = 2131165293;
+			public const int common_google_signin_btn_icon_dark_normal = 2131165293;
 			
 			// aapt resource value: 0x7F07006E
-			public const int common_google_signin_btn_icon_light_normal = 2131165294;
+			public const int common_google_signin_btn_icon_dark_normal_background = 2131165294;
 			
 			// aapt resource value: 0x7F07006F
-			public const int common_google_signin_btn_icon_light_normal_background = 2131165295;
+			public const int common_google_signin_btn_icon_disabled = 2131165295;
 			
 			// aapt resource value: 0x7F070070
-			public const int common_google_signin_btn_text_dark = 2131165296;
+			public const int common_google_signin_btn_icon_light = 2131165296;
 			
 			// aapt resource value: 0x7F070071
-			public const int common_google_signin_btn_text_dark_focused = 2131165297;
+			public const int common_google_signin_btn_icon_light_focused = 2131165297;
 			
 			// aapt resource value: 0x7F070072
-			public const int common_google_signin_btn_text_dark_normal = 2131165298;
+			public const int common_google_signin_btn_icon_light_normal = 2131165298;
 			
 			// aapt resource value: 0x7F070073
-			public const int common_google_signin_btn_text_dark_normal_background = 2131165299;
+			public const int common_google_signin_btn_icon_light_normal_background = 2131165299;
 			
 			// aapt resource value: 0x7F070074
-			public const int common_google_signin_btn_text_disabled = 2131165300;
+			public const int common_google_signin_btn_text_dark = 2131165300;
 			
 			// aapt resource value: 0x7F070075
-			public const int common_google_signin_btn_text_light = 2131165301;
+			public const int common_google_signin_btn_text_dark_focused = 2131165301;
 			
 			// aapt resource value: 0x7F070076
-			public const int common_google_signin_btn_text_light_focused = 2131165302;
+			public const int common_google_signin_btn_text_dark_normal = 2131165302;
 			
 			// aapt resource value: 0x7F070077
-			public const int common_google_signin_btn_text_light_normal = 2131165303;
+			public const int common_google_signin_btn_text_dark_normal_background = 2131165303;
 			
 			// aapt resource value: 0x7F070078
-			public const int common_google_signin_btn_text_light_normal_background = 2131165304;
+			public const int common_google_signin_btn_text_disabled = 2131165304;
 			
 			// aapt resource value: 0x7F070079
-			public const int design_fab_background = 2131165305;
+			public const int common_google_signin_btn_text_light = 2131165305;
 			
 			// aapt resource value: 0x7F07007A
-			public const int design_ic_visibility = 2131165306;
+			public const int common_google_signin_btn_text_light_focused = 2131165306;
 			
 			// aapt resource value: 0x7F07007B
-			public const int design_ic_visibility_off = 2131165307;
+			public const int common_google_signin_btn_text_light_normal = 2131165307;
 			
 			// aapt resource value: 0x7F07007C
-			public const int design_password_eye = 2131165308;
+			public const int common_google_signin_btn_text_light_normal_background = 2131165308;
 			
 			// aapt resource value: 0x7F07007D
-			public const int design_snackbar_background = 2131165309;
+			public const int design_fab_background = 2131165309;
 			
 			// aapt resource value: 0x7F07007E
-			public const int googleg_disabled_color_18 = 2131165310;
+			public const int design_ic_visibility = 2131165310;
 			
 			// aapt resource value: 0x7F07007F
-			public const int googleg_standard_color_18 = 2131165311;
+			public const int design_ic_visibility_off = 2131165311;
 			
 			// aapt resource value: 0x7F070080
-			public const int ic_arrow_back = 2131165312;
+			public const int design_password_eye = 2131165312;
 			
 			// aapt resource value: 0x7F070081
-			public const int ic_arrow_down_24dp = 2131165313;
+			public const int design_snackbar_background = 2131165313;
 			
 			// aapt resource value: 0x7F070082
-			public const int ic_audiotrack_dark = 2131165314;
+			public const int googleg_disabled_color_18 = 2131165314;
 			
 			// aapt resource value: 0x7F070083
-			public const int ic_audiotrack_light = 2131165315;
+			public const int googleg_standard_color_18 = 2131165315;
 			
 			// aapt resource value: 0x7F070084
-			public const int ic_checked_checkbox = 2131165316;
+			public const int ic_arrow_back = 2131165316;
 			
 			// aapt resource value: 0x7F070085
-			public const int ic_clock_black_24dp = 2131165317;
+			public const int ic_arrow_down_24dp = 2131165317;
 			
 			// aapt resource value: 0x7F070086
-			public const int ic_dialog_close_dark = 2131165318;
+			public const int ic_audiotrack_dark = 2131165318;
 			
 			// aapt resource value: 0x7F070087
-			public const int ic_dialog_close_light = 2131165319;
+			public const int ic_audiotrack_light = 2131165319;
 			
 			// aapt resource value: 0x7F070088
-			public const int ic_group_collapse_00 = 2131165320;
+			public const int ic_checked_checkbox = 2131165320;
 			
 			// aapt resource value: 0x7F070089
-			public const int ic_group_collapse_01 = 2131165321;
+			public const int ic_clock_black_24dp = 2131165321;
 			
 			// aapt resource value: 0x7F07008A
-			public const int ic_group_collapse_02 = 2131165322;
+			public const int ic_dialog_close_dark = 2131165322;
 			
 			// aapt resource value: 0x7F07008B
-			public const int ic_group_collapse_03 = 2131165323;
+			public const int ic_dialog_close_light = 2131165323;
 			
 			// aapt resource value: 0x7F07008C
-			public const int ic_group_collapse_04 = 2131165324;
+			public const int ic_group_collapse_00 = 2131165324;
 			
 			// aapt resource value: 0x7F07008D
-			public const int ic_group_collapse_05 = 2131165325;
+			public const int ic_group_collapse_01 = 2131165325;
 			
 			// aapt resource value: 0x7F07008E
-			public const int ic_group_collapse_06 = 2131165326;
+			public const int ic_group_collapse_02 = 2131165326;
 			
 			// aapt resource value: 0x7F07008F
-			public const int ic_group_collapse_07 = 2131165327;
+			public const int ic_group_collapse_03 = 2131165327;
 			
 			// aapt resource value: 0x7F070090
-			public const int ic_group_collapse_08 = 2131165328;
+			public const int ic_group_collapse_04 = 2131165328;
 			
 			// aapt resource value: 0x7F070091
-			public const int ic_group_collapse_09 = 2131165329;
+			public const int ic_group_collapse_05 = 2131165329;
 			
 			// aapt resource value: 0x7F070092
-			public const int ic_group_collapse_10 = 2131165330;
+			public const int ic_group_collapse_06 = 2131165330;
 			
 			// aapt resource value: 0x7F070093
-			public const int ic_group_collapse_11 = 2131165331;
+			public const int ic_group_collapse_07 = 2131165331;
 			
 			// aapt resource value: 0x7F070094
-			public const int ic_group_collapse_12 = 2131165332;
+			public const int ic_group_collapse_08 = 2131165332;
 			
 			// aapt resource value: 0x7F070095
-			public const int ic_group_collapse_13 = 2131165333;
+			public const int ic_group_collapse_09 = 2131165333;
 			
 			// aapt resource value: 0x7F070096
-			public const int ic_group_collapse_14 = 2131165334;
+			public const int ic_group_collapse_10 = 2131165334;
 			
 			// aapt resource value: 0x7F070097
-			public const int ic_group_collapse_15 = 2131165335;
+			public const int ic_group_collapse_11 = 2131165335;
 			
 			// aapt resource value: 0x7F070098
-			public const int ic_group_expand_00 = 2131165336;
+			public const int ic_group_collapse_12 = 2131165336;
 			
 			// aapt resource value: 0x7F070099
-			public const int ic_group_expand_01 = 2131165337;
+			public const int ic_group_collapse_13 = 2131165337;
 			
 			// aapt resource value: 0x7F07009A
-			public const int ic_group_expand_02 = 2131165338;
+			public const int ic_group_collapse_14 = 2131165338;
 			
 			// aapt resource value: 0x7F07009B
-			public const int ic_group_expand_03 = 2131165339;
+			public const int ic_group_collapse_15 = 2131165339;
 			
 			// aapt resource value: 0x7F07009C
-			public const int ic_group_expand_04 = 2131165340;
+			public const int ic_group_expand_00 = 2131165340;
 			
 			// aapt resource value: 0x7F07009D
-			public const int ic_group_expand_05 = 2131165341;
+			public const int ic_group_expand_01 = 2131165341;
 			
 			// aapt resource value: 0x7F07009E
-			public const int ic_group_expand_06 = 2131165342;
+			public const int ic_group_expand_02 = 2131165342;
 			
 			// aapt resource value: 0x7F07009F
-			public const int ic_group_expand_07 = 2131165343;
+			public const int ic_group_expand_03 = 2131165343;
 			
 			// aapt resource value: 0x7F0700A0
-			public const int ic_group_expand_08 = 2131165344;
+			public const int ic_group_expand_04 = 2131165344;
 			
 			// aapt resource value: 0x7F0700A1
-			public const int ic_group_expand_09 = 2131165345;
+			public const int ic_group_expand_05 = 2131165345;
 			
 			// aapt resource value: 0x7F0700A2
-			public const int ic_group_expand_10 = 2131165346;
+			public const int ic_group_expand_06 = 2131165346;
 			
 			// aapt resource value: 0x7F0700A3
-			public const int ic_group_expand_11 = 2131165347;
+			public const int ic_group_expand_07 = 2131165347;
 			
 			// aapt resource value: 0x7F0700A4
-			public const int ic_group_expand_12 = 2131165348;
+			public const int ic_group_expand_08 = 2131165348;
 			
 			// aapt resource value: 0x7F0700A5
-			public const int ic_group_expand_13 = 2131165349;
+			public const int ic_group_expand_09 = 2131165349;
 			
 			// aapt resource value: 0x7F0700A6
-			public const int ic_group_expand_14 = 2131165350;
+			public const int ic_group_expand_10 = 2131165350;
 			
 			// aapt resource value: 0x7F0700A7
-			public const int ic_group_expand_15 = 2131165351;
+			public const int ic_group_expand_11 = 2131165351;
 			
 			// aapt resource value: 0x7F0700A8
-			public const int ic_keyboard_black_24dp = 2131165352;
+			public const int ic_group_expand_12 = 2131165352;
 			
 			// aapt resource value: 0x7F0700A9
-			public const int ic_media_pause_dark = 2131165353;
+			public const int ic_group_expand_13 = 2131165353;
 			
 			// aapt resource value: 0x7F0700AA
-			public const int ic_media_pause_light = 2131165354;
+			public const int ic_group_expand_14 = 2131165354;
 			
 			// aapt resource value: 0x7F0700AB
-			public const int ic_media_play_dark = 2131165355;
+			public const int ic_group_expand_15 = 2131165355;
 			
 			// aapt resource value: 0x7F0700AC
-			public const int ic_media_play_light = 2131165356;
+			public const int ic_keyboard_black_24dp = 2131165356;
 			
 			// aapt resource value: 0x7F0700AD
-			public const int ic_media_stop_dark = 2131165357;
+			public const int ic_media_pause_dark = 2131165357;
 			
 			// aapt resource value: 0x7F0700AE
-			public const int ic_media_stop_light = 2131165358;
+			public const int ic_media_pause_light = 2131165358;
 			
 			// aapt resource value: 0x7F0700AF
-			public const int ic_mr_button_connected_00_dark = 2131165359;
+			public const int ic_media_play_dark = 2131165359;
 			
 			// aapt resource value: 0x7F0700B0
-			public const int ic_mr_button_connected_00_light = 2131165360;
+			public const int ic_media_play_light = 2131165360;
 			
 			// aapt resource value: 0x7F0700B1
-			public const int ic_mr_button_connected_01_dark = 2131165361;
+			public const int ic_media_stop_dark = 2131165361;
 			
 			// aapt resource value: 0x7F0700B2
-			public const int ic_mr_button_connected_01_light = 2131165362;
+			public const int ic_media_stop_light = 2131165362;
 			
 			// aapt resource value: 0x7F0700B3
-			public const int ic_mr_button_connected_02_dark = 2131165363;
+			public const int ic_mr_button_connected_00_dark = 2131165363;
 			
 			// aapt resource value: 0x7F0700B4
-			public const int ic_mr_button_connected_02_light = 2131165364;
+			public const int ic_mr_button_connected_00_light = 2131165364;
 			
 			// aapt resource value: 0x7F0700B5
-			public const int ic_mr_button_connected_03_dark = 2131165365;
+			public const int ic_mr_button_connected_01_dark = 2131165365;
 			
 			// aapt resource value: 0x7F0700B6
-			public const int ic_mr_button_connected_03_light = 2131165366;
+			public const int ic_mr_button_connected_01_light = 2131165366;
 			
 			// aapt resource value: 0x7F0700B7
-			public const int ic_mr_button_connected_04_dark = 2131165367;
+			public const int ic_mr_button_connected_02_dark = 2131165367;
 			
 			// aapt resource value: 0x7F0700B8
-			public const int ic_mr_button_connected_04_light = 2131165368;
+			public const int ic_mr_button_connected_02_light = 2131165368;
 			
 			// aapt resource value: 0x7F0700B9
-			public const int ic_mr_button_connected_05_dark = 2131165369;
+			public const int ic_mr_button_connected_03_dark = 2131165369;
 			
 			// aapt resource value: 0x7F0700BA
-			public const int ic_mr_button_connected_05_light = 2131165370;
+			public const int ic_mr_button_connected_03_light = 2131165370;
 			
 			// aapt resource value: 0x7F0700BB
-			public const int ic_mr_button_connected_06_dark = 2131165371;
+			public const int ic_mr_button_connected_04_dark = 2131165371;
 			
 			// aapt resource value: 0x7F0700BC
-			public const int ic_mr_button_connected_06_light = 2131165372;
+			public const int ic_mr_button_connected_04_light = 2131165372;
 			
 			// aapt resource value: 0x7F0700BD
-			public const int ic_mr_button_connected_07_dark = 2131165373;
+			public const int ic_mr_button_connected_05_dark = 2131165373;
 			
 			// aapt resource value: 0x7F0700BE
-			public const int ic_mr_button_connected_07_light = 2131165374;
+			public const int ic_mr_button_connected_05_light = 2131165374;
 			
 			// aapt resource value: 0x7F0700BF
-			public const int ic_mr_button_connected_08_dark = 2131165375;
+			public const int ic_mr_button_connected_06_dark = 2131165375;
 			
 			// aapt resource value: 0x7F0700C0
-			public const int ic_mr_button_connected_08_light = 2131165376;
+			public const int ic_mr_button_connected_06_light = 2131165376;
 			
 			// aapt resource value: 0x7F0700C1
-			public const int ic_mr_button_connected_09_dark = 2131165377;
+			public const int ic_mr_button_connected_07_dark = 2131165377;
 			
 			// aapt resource value: 0x7F0700C2
-			public const int ic_mr_button_connected_09_light = 2131165378;
+			public const int ic_mr_button_connected_07_light = 2131165378;
 			
 			// aapt resource value: 0x7F0700C3
-			public const int ic_mr_button_connected_10_dark = 2131165379;
+			public const int ic_mr_button_connected_08_dark = 2131165379;
 			
 			// aapt resource value: 0x7F0700C4
-			public const int ic_mr_button_connected_10_light = 2131165380;
+			public const int ic_mr_button_connected_08_light = 2131165380;
 			
 			// aapt resource value: 0x7F0700C5
-			public const int ic_mr_button_connected_11_dark = 2131165381;
+			public const int ic_mr_button_connected_09_dark = 2131165381;
 			
 			// aapt resource value: 0x7F0700C6
-			public const int ic_mr_button_connected_11_light = 2131165382;
+			public const int ic_mr_button_connected_09_light = 2131165382;
 			
 			// aapt resource value: 0x7F0700C7
-			public const int ic_mr_button_connected_12_dark = 2131165383;
+			public const int ic_mr_button_connected_10_dark = 2131165383;
 			
 			// aapt resource value: 0x7F0700C8
-			public const int ic_mr_button_connected_12_light = 2131165384;
+			public const int ic_mr_button_connected_10_light = 2131165384;
 			
 			// aapt resource value: 0x7F0700C9
-			public const int ic_mr_button_connected_13_dark = 2131165385;
+			public const int ic_mr_button_connected_11_dark = 2131165385;
 			
 			// aapt resource value: 0x7F0700CA
-			public const int ic_mr_button_connected_13_light = 2131165386;
+			public const int ic_mr_button_connected_11_light = 2131165386;
 			
 			// aapt resource value: 0x7F0700CB
-			public const int ic_mr_button_connected_14_dark = 2131165387;
+			public const int ic_mr_button_connected_12_dark = 2131165387;
 			
 			// aapt resource value: 0x7F0700CC
-			public const int ic_mr_button_connected_14_light = 2131165388;
+			public const int ic_mr_button_connected_12_light = 2131165388;
 			
 			// aapt resource value: 0x7F0700CD
-			public const int ic_mr_button_connected_15_dark = 2131165389;
+			public const int ic_mr_button_connected_13_dark = 2131165389;
 			
 			// aapt resource value: 0x7F0700CE
-			public const int ic_mr_button_connected_15_light = 2131165390;
+			public const int ic_mr_button_connected_13_light = 2131165390;
 			
 			// aapt resource value: 0x7F0700CF
-			public const int ic_mr_button_connected_16_dark = 2131165391;
+			public const int ic_mr_button_connected_14_dark = 2131165391;
 			
 			// aapt resource value: 0x7F0700D0
-			public const int ic_mr_button_connected_16_light = 2131165392;
+			public const int ic_mr_button_connected_14_light = 2131165392;
 			
 			// aapt resource value: 0x7F0700D1
-			public const int ic_mr_button_connected_17_dark = 2131165393;
+			public const int ic_mr_button_connected_15_dark = 2131165393;
 			
 			// aapt resource value: 0x7F0700D2
-			public const int ic_mr_button_connected_17_light = 2131165394;
+			public const int ic_mr_button_connected_15_light = 2131165394;
 			
 			// aapt resource value: 0x7F0700D3
-			public const int ic_mr_button_connected_18_dark = 2131165395;
+			public const int ic_mr_button_connected_16_dark = 2131165395;
 			
 			// aapt resource value: 0x7F0700D4
-			public const int ic_mr_button_connected_18_light = 2131165396;
+			public const int ic_mr_button_connected_16_light = 2131165396;
 			
 			// aapt resource value: 0x7F0700D5
-			public const int ic_mr_button_connected_19_dark = 2131165397;
+			public const int ic_mr_button_connected_17_dark = 2131165397;
 			
 			// aapt resource value: 0x7F0700D6
-			public const int ic_mr_button_connected_19_light = 2131165398;
+			public const int ic_mr_button_connected_17_light = 2131165398;
 			
 			// aapt resource value: 0x7F0700D7
-			public const int ic_mr_button_connected_20_dark = 2131165399;
+			public const int ic_mr_button_connected_18_dark = 2131165399;
 			
 			// aapt resource value: 0x7F0700D8
-			public const int ic_mr_button_connected_20_light = 2131165400;
+			public const int ic_mr_button_connected_18_light = 2131165400;
 			
 			// aapt resource value: 0x7F0700D9
-			public const int ic_mr_button_connected_21_dark = 2131165401;
+			public const int ic_mr_button_connected_19_dark = 2131165401;
 			
 			// aapt resource value: 0x7F0700DA
-			public const int ic_mr_button_connected_21_light = 2131165402;
+			public const int ic_mr_button_connected_19_light = 2131165402;
 			
 			// aapt resource value: 0x7F0700DB
-			public const int ic_mr_button_connected_22_dark = 2131165403;
+			public const int ic_mr_button_connected_20_dark = 2131165403;
 			
 			// aapt resource value: 0x7F0700DC
-			public const int ic_mr_button_connected_22_light = 2131165404;
+			public const int ic_mr_button_connected_20_light = 2131165404;
 			
 			// aapt resource value: 0x7F0700DD
-			public const int ic_mr_button_connected_23_dark = 2131165405;
+			public const int ic_mr_button_connected_21_dark = 2131165405;
 			
 			// aapt resource value: 0x7F0700DE
-			public const int ic_mr_button_connected_23_light = 2131165406;
+			public const int ic_mr_button_connected_21_light = 2131165406;
 			
 			// aapt resource value: 0x7F0700DF
-			public const int ic_mr_button_connected_24_dark = 2131165407;
+			public const int ic_mr_button_connected_22_dark = 2131165407;
 			
 			// aapt resource value: 0x7F0700E0
-			public const int ic_mr_button_connected_24_light = 2131165408;
+			public const int ic_mr_button_connected_22_light = 2131165408;
 			
 			// aapt resource value: 0x7F0700E1
-			public const int ic_mr_button_connected_25_dark = 2131165409;
+			public const int ic_mr_button_connected_23_dark = 2131165409;
 			
 			// aapt resource value: 0x7F0700E2
-			public const int ic_mr_button_connected_25_light = 2131165410;
+			public const int ic_mr_button_connected_23_light = 2131165410;
 			
 			// aapt resource value: 0x7F0700E3
-			public const int ic_mr_button_connected_26_dark = 2131165411;
+			public const int ic_mr_button_connected_24_dark = 2131165411;
 			
 			// aapt resource value: 0x7F0700E4
-			public const int ic_mr_button_connected_26_light = 2131165412;
+			public const int ic_mr_button_connected_24_light = 2131165412;
 			
 			// aapt resource value: 0x7F0700E5
-			public const int ic_mr_button_connected_27_dark = 2131165413;
+			public const int ic_mr_button_connected_25_dark = 2131165413;
 			
 			// aapt resource value: 0x7F0700E6
-			public const int ic_mr_button_connected_27_light = 2131165414;
+			public const int ic_mr_button_connected_25_light = 2131165414;
 			
 			// aapt resource value: 0x7F0700E7
-			public const int ic_mr_button_connected_28_dark = 2131165415;
+			public const int ic_mr_button_connected_26_dark = 2131165415;
 			
 			// aapt resource value: 0x7F0700E8
-			public const int ic_mr_button_connected_28_light = 2131165416;
+			public const int ic_mr_button_connected_26_light = 2131165416;
 			
 			// aapt resource value: 0x7F0700E9
-			public const int ic_mr_button_connected_29_dark = 2131165417;
+			public const int ic_mr_button_connected_27_dark = 2131165417;
 			
 			// aapt resource value: 0x7F0700EA
-			public const int ic_mr_button_connected_29_light = 2131165418;
+			public const int ic_mr_button_connected_27_light = 2131165418;
 			
 			// aapt resource value: 0x7F0700EB
-			public const int ic_mr_button_connected_30_dark = 2131165419;
+			public const int ic_mr_button_connected_28_dark = 2131165419;
 			
 			// aapt resource value: 0x7F0700EC
-			public const int ic_mr_button_connected_30_light = 2131165420;
+			public const int ic_mr_button_connected_28_light = 2131165420;
 			
 			// aapt resource value: 0x7F0700ED
-			public const int ic_mr_button_connecting_00_dark = 2131165421;
+			public const int ic_mr_button_connected_29_dark = 2131165421;
 			
 			// aapt resource value: 0x7F0700EE
-			public const int ic_mr_button_connecting_00_light = 2131165422;
+			public const int ic_mr_button_connected_29_light = 2131165422;
 			
 			// aapt resource value: 0x7F0700EF
-			public const int ic_mr_button_connecting_01_dark = 2131165423;
+			public const int ic_mr_button_connected_30_dark = 2131165423;
 			
 			// aapt resource value: 0x7F0700F0
-			public const int ic_mr_button_connecting_01_light = 2131165424;
+			public const int ic_mr_button_connected_30_light = 2131165424;
 			
 			// aapt resource value: 0x7F0700F1
-			public const int ic_mr_button_connecting_02_dark = 2131165425;
+			public const int ic_mr_button_connecting_00_dark = 2131165425;
 			
 			// aapt resource value: 0x7F0700F2
-			public const int ic_mr_button_connecting_02_light = 2131165426;
+			public const int ic_mr_button_connecting_00_light = 2131165426;
 			
 			// aapt resource value: 0x7F0700F3
-			public const int ic_mr_button_connecting_03_dark = 2131165427;
+			public const int ic_mr_button_connecting_01_dark = 2131165427;
 			
 			// aapt resource value: 0x7F0700F4
-			public const int ic_mr_button_connecting_03_light = 2131165428;
+			public const int ic_mr_button_connecting_01_light = 2131165428;
 			
 			// aapt resource value: 0x7F0700F5
-			public const int ic_mr_button_connecting_04_dark = 2131165429;
+			public const int ic_mr_button_connecting_02_dark = 2131165429;
 			
 			// aapt resource value: 0x7F0700F6
-			public const int ic_mr_button_connecting_04_light = 2131165430;
+			public const int ic_mr_button_connecting_02_light = 2131165430;
 			
 			// aapt resource value: 0x7F0700F7
-			public const int ic_mr_button_connecting_05_dark = 2131165431;
+			public const int ic_mr_button_connecting_03_dark = 2131165431;
 			
 			// aapt resource value: 0x7F0700F8
-			public const int ic_mr_button_connecting_05_light = 2131165432;
+			public const int ic_mr_button_connecting_03_light = 2131165432;
 			
 			// aapt resource value: 0x7F0700F9
-			public const int ic_mr_button_connecting_06_dark = 2131165433;
+			public const int ic_mr_button_connecting_04_dark = 2131165433;
 			
 			// aapt resource value: 0x7F0700FA
-			public const int ic_mr_button_connecting_06_light = 2131165434;
+			public const int ic_mr_button_connecting_04_light = 2131165434;
 			
 			// aapt resource value: 0x7F0700FB
-			public const int ic_mr_button_connecting_07_dark = 2131165435;
+			public const int ic_mr_button_connecting_05_dark = 2131165435;
 			
 			// aapt resource value: 0x7F0700FC
-			public const int ic_mr_button_connecting_07_light = 2131165436;
+			public const int ic_mr_button_connecting_05_light = 2131165436;
 			
 			// aapt resource value: 0x7F0700FD
-			public const int ic_mr_button_connecting_08_dark = 2131165437;
+			public const int ic_mr_button_connecting_06_dark = 2131165437;
 			
 			// aapt resource value: 0x7F0700FE
-			public const int ic_mr_button_connecting_08_light = 2131165438;
+			public const int ic_mr_button_connecting_06_light = 2131165438;
 			
 			// aapt resource value: 0x7F0700FF
-			public const int ic_mr_button_connecting_09_dark = 2131165439;
+			public const int ic_mr_button_connecting_07_dark = 2131165439;
 			
 			// aapt resource value: 0x7F070100
-			public const int ic_mr_button_connecting_09_light = 2131165440;
+			public const int ic_mr_button_connecting_07_light = 2131165440;
 			
 			// aapt resource value: 0x7F070101
-			public const int ic_mr_button_connecting_10_dark = 2131165441;
+			public const int ic_mr_button_connecting_08_dark = 2131165441;
 			
 			// aapt resource value: 0x7F070102
-			public const int ic_mr_button_connecting_10_light = 2131165442;
+			public const int ic_mr_button_connecting_08_light = 2131165442;
 			
 			// aapt resource value: 0x7F070103
-			public const int ic_mr_button_connecting_11_dark = 2131165443;
+			public const int ic_mr_button_connecting_09_dark = 2131165443;
 			
 			// aapt resource value: 0x7F070104
-			public const int ic_mr_button_connecting_11_light = 2131165444;
+			public const int ic_mr_button_connecting_09_light = 2131165444;
 			
 			// aapt resource value: 0x7F070105
-			public const int ic_mr_button_connecting_12_dark = 2131165445;
+			public const int ic_mr_button_connecting_10_dark = 2131165445;
 			
 			// aapt resource value: 0x7F070106
-			public const int ic_mr_button_connecting_12_light = 2131165446;
+			public const int ic_mr_button_connecting_10_light = 2131165446;
 			
 			// aapt resource value: 0x7F070107
-			public const int ic_mr_button_connecting_13_dark = 2131165447;
+			public const int ic_mr_button_connecting_11_dark = 2131165447;
 			
 			// aapt resource value: 0x7F070108
-			public const int ic_mr_button_connecting_13_light = 2131165448;
+			public const int ic_mr_button_connecting_11_light = 2131165448;
 			
 			// aapt resource value: 0x7F070109
-			public const int ic_mr_button_connecting_14_dark = 2131165449;
+			public const int ic_mr_button_connecting_12_dark = 2131165449;
 			
 			// aapt resource value: 0x7F07010A
-			public const int ic_mr_button_connecting_14_light = 2131165450;
+			public const int ic_mr_button_connecting_12_light = 2131165450;
 			
 			// aapt resource value: 0x7F07010B
-			public const int ic_mr_button_connecting_15_dark = 2131165451;
+			public const int ic_mr_button_connecting_13_dark = 2131165451;
 			
 			// aapt resource value: 0x7F07010C
-			public const int ic_mr_button_connecting_15_light = 2131165452;
+			public const int ic_mr_button_connecting_13_light = 2131165452;
 			
 			// aapt resource value: 0x7F07010D
-			public const int ic_mr_button_connecting_16_dark = 2131165453;
+			public const int ic_mr_button_connecting_14_dark = 2131165453;
 			
 			// aapt resource value: 0x7F07010E
-			public const int ic_mr_button_connecting_16_light = 2131165454;
+			public const int ic_mr_button_connecting_14_light = 2131165454;
 			
 			// aapt resource value: 0x7F07010F
-			public const int ic_mr_button_connecting_17_dark = 2131165455;
+			public const int ic_mr_button_connecting_15_dark = 2131165455;
 			
 			// aapt resource value: 0x7F070110
-			public const int ic_mr_button_connecting_17_light = 2131165456;
+			public const int ic_mr_button_connecting_15_light = 2131165456;
 			
 			// aapt resource value: 0x7F070111
-			public const int ic_mr_button_connecting_18_dark = 2131165457;
+			public const int ic_mr_button_connecting_16_dark = 2131165457;
 			
 			// aapt resource value: 0x7F070112
-			public const int ic_mr_button_connecting_18_light = 2131165458;
+			public const int ic_mr_button_connecting_16_light = 2131165458;
 			
 			// aapt resource value: 0x7F070113
-			public const int ic_mr_button_connecting_19_dark = 2131165459;
+			public const int ic_mr_button_connecting_17_dark = 2131165459;
 			
 			// aapt resource value: 0x7F070114
-			public const int ic_mr_button_connecting_19_light = 2131165460;
+			public const int ic_mr_button_connecting_17_light = 2131165460;
 			
 			// aapt resource value: 0x7F070115
-			public const int ic_mr_button_connecting_20_dark = 2131165461;
+			public const int ic_mr_button_connecting_18_dark = 2131165461;
 			
 			// aapt resource value: 0x7F070116
-			public const int ic_mr_button_connecting_20_light = 2131165462;
+			public const int ic_mr_button_connecting_18_light = 2131165462;
 			
 			// aapt resource value: 0x7F070117
-			public const int ic_mr_button_connecting_21_dark = 2131165463;
+			public const int ic_mr_button_connecting_19_dark = 2131165463;
 			
 			// aapt resource value: 0x7F070118
-			public const int ic_mr_button_connecting_21_light = 2131165464;
+			public const int ic_mr_button_connecting_19_light = 2131165464;
 			
 			// aapt resource value: 0x7F070119
-			public const int ic_mr_button_connecting_22_dark = 2131165465;
+			public const int ic_mr_button_connecting_20_dark = 2131165465;
 			
 			// aapt resource value: 0x7F07011A
-			public const int ic_mr_button_connecting_22_light = 2131165466;
+			public const int ic_mr_button_connecting_20_light = 2131165466;
 			
 			// aapt resource value: 0x7F07011B
-			public const int ic_mr_button_connecting_23_dark = 2131165467;
+			public const int ic_mr_button_connecting_21_dark = 2131165467;
 			
 			// aapt resource value: 0x7F07011C
-			public const int ic_mr_button_connecting_23_light = 2131165468;
+			public const int ic_mr_button_connecting_21_light = 2131165468;
 			
 			// aapt resource value: 0x7F07011D
-			public const int ic_mr_button_connecting_24_dark = 2131165469;
+			public const int ic_mr_button_connecting_22_dark = 2131165469;
 			
 			// aapt resource value: 0x7F07011E
-			public const int ic_mr_button_connecting_24_light = 2131165470;
+			public const int ic_mr_button_connecting_22_light = 2131165470;
 			
 			// aapt resource value: 0x7F07011F
-			public const int ic_mr_button_connecting_25_dark = 2131165471;
+			public const int ic_mr_button_connecting_23_dark = 2131165471;
 			
 			// aapt resource value: 0x7F070120
-			public const int ic_mr_button_connecting_25_light = 2131165472;
+			public const int ic_mr_button_connecting_23_light = 2131165472;
 			
 			// aapt resource value: 0x7F070121
-			public const int ic_mr_button_connecting_26_dark = 2131165473;
+			public const int ic_mr_button_connecting_24_dark = 2131165473;
 			
 			// aapt resource value: 0x7F070122
-			public const int ic_mr_button_connecting_26_light = 2131165474;
+			public const int ic_mr_button_connecting_24_light = 2131165474;
 			
 			// aapt resource value: 0x7F070123
-			public const int ic_mr_button_connecting_27_dark = 2131165475;
+			public const int ic_mr_button_connecting_25_dark = 2131165475;
 			
 			// aapt resource value: 0x7F070124
-			public const int ic_mr_button_connecting_27_light = 2131165476;
+			public const int ic_mr_button_connecting_25_light = 2131165476;
 			
 			// aapt resource value: 0x7F070125
-			public const int ic_mr_button_connecting_28_dark = 2131165477;
+			public const int ic_mr_button_connecting_26_dark = 2131165477;
 			
 			// aapt resource value: 0x7F070126
-			public const int ic_mr_button_connecting_28_light = 2131165478;
+			public const int ic_mr_button_connecting_26_light = 2131165478;
 			
 			// aapt resource value: 0x7F070127
-			public const int ic_mr_button_connecting_29_dark = 2131165479;
+			public const int ic_mr_button_connecting_27_dark = 2131165479;
 			
 			// aapt resource value: 0x7F070128
-			public const int ic_mr_button_connecting_29_light = 2131165480;
+			public const int ic_mr_button_connecting_27_light = 2131165480;
 			
 			// aapt resource value: 0x7F070129
-			public const int ic_mr_button_connecting_30_dark = 2131165481;
+			public const int ic_mr_button_connecting_28_dark = 2131165481;
 			
 			// aapt resource value: 0x7F07012A
-			public const int ic_mr_button_connecting_30_light = 2131165482;
+			public const int ic_mr_button_connecting_28_light = 2131165482;
 			
 			// aapt resource value: 0x7F07012B
-			public const int ic_mr_button_disabled_dark = 2131165483;
+			public const int ic_mr_button_connecting_29_dark = 2131165483;
 			
 			// aapt resource value: 0x7F07012C
-			public const int ic_mr_button_disabled_light = 2131165484;
+			public const int ic_mr_button_connecting_29_light = 2131165484;
 			
 			// aapt resource value: 0x7F07012D
-			public const int ic_mr_button_disconnected_dark = 2131165485;
+			public const int ic_mr_button_connecting_30_dark = 2131165485;
 			
 			// aapt resource value: 0x7F07012E
-			public const int ic_mr_button_disconnected_light = 2131165486;
+			public const int ic_mr_button_connecting_30_light = 2131165486;
 			
 			// aapt resource value: 0x7F07012F
-			public const int ic_mr_button_grey = 2131165487;
+			public const int ic_mr_button_disabled_dark = 2131165487;
 			
 			// aapt resource value: 0x7F070130
-			public const int ic_mtrl_checked_circle = 2131165488;
+			public const int ic_mr_button_disabled_light = 2131165488;
 			
 			// aapt resource value: 0x7F070131
-			public const int ic_mtrl_chip_checked_black = 2131165489;
+			public const int ic_mr_button_disconnected_dark = 2131165489;
 			
 			// aapt resource value: 0x7F070132
-			public const int ic_mtrl_chip_checked_circle = 2131165490;
+			public const int ic_mr_button_disconnected_light = 2131165490;
 			
 			// aapt resource value: 0x7F070133
-			public const int ic_mtrl_chip_close_circle = 2131165491;
+			public const int ic_mr_button_grey = 2131165491;
 			
 			// aapt resource value: 0x7F070134
-			public const int ic_unchecked_checkbox = 2131165492;
+			public const int ic_mtrl_checked_circle = 2131165492;
 			
 			// aapt resource value: 0x7F070135
-			public const int ic_vol_mute = 2131165493;
+			public const int ic_mtrl_chip_checked_black = 2131165493;
 			
 			// aapt resource value: 0x7F070136
-			public const int ic_vol_type_speaker_dark = 2131165494;
+			public const int ic_mtrl_chip_checked_circle = 2131165494;
 			
 			// aapt resource value: 0x7F070137
-			public const int ic_vol_type_speaker_group_dark = 2131165495;
+			public const int ic_mtrl_chip_close_circle = 2131165495;
 			
 			// aapt resource value: 0x7F070138
-			public const int ic_vol_type_speaker_group_light = 2131165496;
+			public const int ic_unchecked_checkbox = 2131165496;
 			
 			// aapt resource value: 0x7F070139
-			public const int ic_vol_type_speaker_light = 2131165497;
+			public const int ic_vol_mute = 2131165497;
 			
 			// aapt resource value: 0x7F07013A
-			public const int ic_vol_type_tv_dark = 2131165498;
+			public const int ic_vol_type_speaker_dark = 2131165498;
 			
 			// aapt resource value: 0x7F07013B
-			public const int ic_vol_type_tv_light = 2131165499;
+			public const int ic_vol_type_speaker_group_dark = 2131165499;
 			
 			// aapt resource value: 0x7F07013C
-			public const int ic_vol_unmute = 2131165500;
+			public const int ic_vol_type_speaker_group_light = 2131165500;
 			
 			// aapt resource value: 0x7F07013D
-			public const int material_cursor_drawable = 2131165501;
+			public const int ic_vol_type_speaker_light = 2131165501;
 			
 			// aapt resource value: 0x7F07013E
-			public const int material_ic_calendar_black_24dp = 2131165502;
+			public const int ic_vol_type_tv_dark = 2131165502;
 			
 			// aapt resource value: 0x7F07013F
-			public const int material_ic_clear_black_24dp = 2131165503;
+			public const int ic_vol_type_tv_light = 2131165503;
 			
 			// aapt resource value: 0x7F070140
-			public const int material_ic_edit_black_24dp = 2131165504;
+			public const int ic_vol_unmute = 2131165504;
 			
 			// aapt resource value: 0x7F070141
-			public const int material_ic_keyboard_arrow_left_black_24dp = 2131165505;
+			public const int material_cursor_drawable = 2131165505;
 			
 			// aapt resource value: 0x7F070142
-			public const int material_ic_keyboard_arrow_next_black_24dp = 2131165506;
+			public const int material_ic_calendar_black_24dp = 2131165506;
 			
 			// aapt resource value: 0x7F070143
-			public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165507;
+			public const int material_ic_clear_black_24dp = 2131165507;
 			
 			// aapt resource value: 0x7F070144
-			public const int material_ic_keyboard_arrow_right_black_24dp = 2131165508;
+			public const int material_ic_edit_black_24dp = 2131165508;
 			
 			// aapt resource value: 0x7F070145
-			public const int material_ic_menu_arrow_down_black_24dp = 2131165509;
+			public const int material_ic_keyboard_arrow_left_black_24dp = 2131165509;
 			
 			// aapt resource value: 0x7F070146
-			public const int material_ic_menu_arrow_up_black_24dp = 2131165510;
+			public const int material_ic_keyboard_arrow_next_black_24dp = 2131165510;
 			
 			// aapt resource value: 0x7F070147
-			public const int mr_button_connected_dark = 2131165511;
+			public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165511;
 			
 			// aapt resource value: 0x7F070148
-			public const int mr_button_connected_light = 2131165512;
+			public const int material_ic_keyboard_arrow_right_black_24dp = 2131165512;
 			
 			// aapt resource value: 0x7F070149
-			public const int mr_button_connecting_dark = 2131165513;
+			public const int material_ic_menu_arrow_down_black_24dp = 2131165513;
 			
 			// aapt resource value: 0x7F07014A
-			public const int mr_button_connecting_light = 2131165514;
+			public const int material_ic_menu_arrow_up_black_24dp = 2131165514;
 			
 			// aapt resource value: 0x7F07014B
-			public const int mr_button_dark = 2131165515;
+			public const int mr_button_connected_dark = 2131165515;
 			
 			// aapt resource value: 0x7F07014C
-			public const int mr_button_dark_static = 2131165516;
+			public const int mr_button_connected_light = 2131165516;
 			
 			// aapt resource value: 0x7F07014D
-			public const int mr_button_light = 2131165517;
+			public const int mr_button_connecting_dark = 2131165517;
 			
 			// aapt resource value: 0x7F07014E
-			public const int mr_button_light_static = 2131165518;
+			public const int mr_button_connecting_light = 2131165518;
 			
 			// aapt resource value: 0x7F07014F
-			public const int mr_cast_checkbox = 2131165519;
+			public const int mr_button_dark = 2131165519;
 			
 			// aapt resource value: 0x7F070150
-			public const int mr_cast_group_seekbar_track = 2131165520;
+			public const int mr_button_dark_static = 2131165520;
 			
 			// aapt resource value: 0x7F070151
-			public const int mr_cast_mute_button = 2131165521;
+			public const int mr_button_light = 2131165521;
 			
 			// aapt resource value: 0x7F070152
-			public const int mr_cast_route_seekbar_track = 2131165522;
+			public const int mr_button_light_static = 2131165522;
 			
 			// aapt resource value: 0x7F070153
-			public const int mr_cast_stop = 2131165523;
+			public const int mr_cast_checkbox = 2131165523;
 			
 			// aapt resource value: 0x7F070154
-			public const int mr_cast_thumb = 2131165524;
+			public const int mr_cast_group_seekbar_track = 2131165524;
 			
 			// aapt resource value: 0x7F070155
-			public const int mr_dialog_close_dark = 2131165525;
+			public const int mr_cast_mute_button = 2131165525;
 			
 			// aapt resource value: 0x7F070156
-			public const int mr_dialog_close_light = 2131165526;
+			public const int mr_cast_route_seekbar_track = 2131165526;
 			
 			// aapt resource value: 0x7F070157
-			public const int mr_dialog_material_background_dark = 2131165527;
+			public const int mr_cast_stop = 2131165527;
 			
 			// aapt resource value: 0x7F070158
-			public const int mr_dialog_material_background_light = 2131165528;
+			public const int mr_cast_thumb = 2131165528;
 			
 			// aapt resource value: 0x7F070159
-			public const int mr_group_collapse = 2131165529;
+			public const int mr_dialog_close_dark = 2131165529;
 			
 			// aapt resource value: 0x7F07015A
-			public const int mr_group_expand = 2131165530;
+			public const int mr_dialog_close_light = 2131165530;
 			
 			// aapt resource value: 0x7F07015B
-			public const int mr_media_pause_dark = 2131165531;
+			public const int mr_dialog_material_background_dark = 2131165531;
 			
 			// aapt resource value: 0x7F07015C
-			public const int mr_media_pause_light = 2131165532;
+			public const int mr_dialog_material_background_light = 2131165532;
 			
 			// aapt resource value: 0x7F07015D
-			public const int mr_media_play_dark = 2131165533;
+			public const int mr_group_collapse = 2131165533;
 			
 			// aapt resource value: 0x7F07015E
-			public const int mr_media_play_light = 2131165534;
+			public const int mr_group_expand = 2131165534;
 			
 			// aapt resource value: 0x7F07015F
-			public const int mr_media_stop_dark = 2131165535;
+			public const int mr_media_pause_dark = 2131165535;
 			
 			// aapt resource value: 0x7F070160
-			public const int mr_media_stop_light = 2131165536;
+			public const int mr_media_pause_light = 2131165536;
 			
 			// aapt resource value: 0x7F070161
-			public const int mr_vol_type_audiotrack_dark = 2131165537;
+			public const int mr_media_play_dark = 2131165537;
 			
 			// aapt resource value: 0x7F070162
-			public const int mr_vol_type_audiotrack_light = 2131165538;
+			public const int mr_media_play_light = 2131165538;
 			
 			// aapt resource value: 0x7F070163
-			public const int mtrl_dialog_background = 2131165539;
+			public const int mr_media_stop_dark = 2131165539;
 			
 			// aapt resource value: 0x7F070164
-			public const int mtrl_dropdown_arrow = 2131165540;
+			public const int mr_media_stop_light = 2131165540;
 			
 			// aapt resource value: 0x7F070165
-			public const int mtrl_ic_arrow_drop_down = 2131165541;
+			public const int mr_vol_type_audiotrack_dark = 2131165541;
 			
 			// aapt resource value: 0x7F070166
-			public const int mtrl_ic_arrow_drop_up = 2131165542;
+			public const int mr_vol_type_audiotrack_light = 2131165542;
 			
 			// aapt resource value: 0x7F070167
-			public const int mtrl_ic_cancel = 2131165543;
+			public const int mtrl_dialog_background = 2131165543;
 			
 			// aapt resource value: 0x7F070168
-			public const int mtrl_ic_error = 2131165544;
+			public const int mtrl_dropdown_arrow = 2131165544;
 			
 			// aapt resource value: 0x7F070169
-			public const int mtrl_navigation_bar_item_background = 2131165545;
+			public const int mtrl_ic_arrow_drop_down = 2131165545;
 			
 			// aapt resource value: 0x7F07016A
-			public const int mtrl_popupmenu_background = 2131165546;
+			public const int mtrl_ic_arrow_drop_up = 2131165546;
 			
 			// aapt resource value: 0x7F07016B
-			public const int mtrl_popupmenu_background_dark = 2131165547;
+			public const int mtrl_ic_cancel = 2131165547;
 			
 			// aapt resource value: 0x7F07016C
-			public const int mtrl_tabs_default_indicator = 2131165548;
+			public const int mtrl_ic_error = 2131165548;
 			
 			// aapt resource value: 0x7F07016D
-			public const int navigation_empty_icon = 2131165549;
+			public const int mtrl_navigation_bar_item_background = 2131165549;
 			
 			// aapt resource value: 0x7F07016E
-			public const int notification_action_background = 2131165550;
+			public const int mtrl_popupmenu_background = 2131165550;
 			
 			// aapt resource value: 0x7F07016F
-			public const int notification_bg = 2131165551;
+			public const int mtrl_popupmenu_background_dark = 2131165551;
 			
 			// aapt resource value: 0x7F070170
-			public const int notification_bg_low = 2131165552;
+			public const int mtrl_tabs_default_indicator = 2131165552;
 			
 			// aapt resource value: 0x7F070171
-			public const int notification_bg_low_normal = 2131165553;
+			public const int navigation_empty_icon = 2131165553;
 			
 			// aapt resource value: 0x7F070172
-			public const int notification_bg_low_pressed = 2131165554;
+			public const int notification_action_background = 2131165554;
 			
 			// aapt resource value: 0x7F070173
-			public const int notification_bg_normal = 2131165555;
+			public const int notification_bg = 2131165555;
 			
 			// aapt resource value: 0x7F070174
-			public const int notification_bg_normal_pressed = 2131165556;
+			public const int notification_bg_low = 2131165556;
 			
 			// aapt resource value: 0x7F070175
-			public const int notification_icon_background = 2131165557;
+			public const int notification_bg_low_normal = 2131165557;
 			
 			// aapt resource value: 0x7F070176
-			public const int notification_template_icon_bg = 2131165558;
+			public const int notification_bg_low_pressed = 2131165558;
 			
 			// aapt resource value: 0x7F070177
-			public const int notification_template_icon_low_bg = 2131165559;
+			public const int notification_bg_normal = 2131165559;
 			
 			// aapt resource value: 0x7F070178
-			public const int notification_tile_bg = 2131165560;
+			public const int notification_bg_normal_pressed = 2131165560;
 			
 			// aapt resource value: 0x7F070179
-			public const int notify_panel_notification_icon_bg = 2131165561;
+			public const int notification_icon_background = 2131165561;
 			
 			// aapt resource value: 0x7F07017A
-			public const int preference_list_divider_material = 2131165562;
+			public const int notification_template_icon_bg = 2131165562;
 			
 			// aapt resource value: 0x7F07017B
-			public const int sharee = 2131165563;
+			public const int notification_template_icon_low_bg = 2131165563;
 			
 			// aapt resource value: 0x7F07017C
-			public const int sharee_no_background = 2131165564;
+			public const int notification_tile_bg = 2131165564;
 			
 			// aapt resource value: 0x7F07017D
-			public const int test_custom_background = 2131165565;
+			public const int notify_panel_notification_icon_bg = 2131165565;
 			
 			// aapt resource value: 0x7F07017E
-			public const int tooltip_frame_dark = 2131165566;
+			public const int preference_list_divider_material = 2131165566;
 			
 			// aapt resource value: 0x7F07017F
-			public const int tooltip_frame_light = 2131165567;
+			public const int sharee = 2131165567;
+			
+			// aapt resource value: 0x7F070180
+			public const int sharee_no_background = 2131165568;
+			
+			// aapt resource value: 0x7F070181
+			public const int test_custom_background = 2131165569;
+			
+			// aapt resource value: 0x7F070182
+			public const int tooltip_frame_dark = 2131165570;
+			
+			// aapt resource value: 0x7F070183
+			public const int tooltip_frame_light = 2131165571;
 			
 			static Drawable()
 			{
diff --git a/TINK/TINK.Android/Resources/drawable/bike_Cargo_Pedelec_Two.png b/TINK/TINK.Android/Resources/drawable/bike_Cargo_Pedelec_Two.png
new file mode 100644
index 0000000..5b491a4
Binary files /dev/null and b/TINK/TINK.Android/Resources/drawable/bike_Cargo_Pedelec_Two.png differ
diff --git a/TINK/TINK.Android/Resources/drawable/bike_Cargo_SoleHumanPowered_Trike.png b/TINK/TINK.Android/Resources/drawable/bike_Cargo_SoleHumanPowered_Trike.png
new file mode 100644
index 0000000..3634424
Binary files /dev/null and b/TINK/TINK.Android/Resources/drawable/bike_Cargo_SoleHumanPowered_Trike.png differ
diff --git a/TINK/TINK.Android/Resources/drawable/bike_Cargo_SoleHumanPowered_Two.png b/TINK/TINK.Android/Resources/drawable/bike_Cargo_SoleHumanPowered_Two.png
new file mode 100644
index 0000000..7bada85
Binary files /dev/null and b/TINK/TINK.Android/Resources/drawable/bike_Cargo_SoleHumanPowered_Two.png differ
diff --git a/TINK/TINK.Android/Resources/drawable/bike_City_SoleHumanPowered_Two.png b/TINK/TINK.Android/Resources/drawable/bike_City_SoleHumanPowered_Two.png
new file mode 100644
index 0000000..0f1937c
Binary files /dev/null and b/TINK/TINK.Android/Resources/drawable/bike_City_SoleHumanPowered_Two.png differ
diff --git a/TINK/TINK.Android/Resources/drawable/sharee_no_background.png b/TINK/TINK.Android/Resources/drawable/sharee_no_background.png
index e417ff8..59f04e0 100644
Binary files a/TINK/TINK.Android/Resources/drawable/sharee_no_background.png and b/TINK/TINK.Android/Resources/drawable/sharee_no_background.png differ
diff --git a/TINK/TINK.Android/TINK.Android.csproj b/TINK/TINK.Android/TINK.Android.csproj
index d04adee..57d7c6d 100644
--- a/TINK/TINK.Android/TINK.Android.csproj
+++ b/TINK/TINK.Android/TINK.Android.csproj
@@ -303,6 +303,18 @@
       <Generator>MSBuild:UpdateGeneratedFiles</Generator>
     </AndroidResource>
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\bike_City_SoleHumanPowered_Two.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\bike_Cargo_SoleHumanPowered_Two.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\bike_Cargo_SoleHumanPowered_Trike.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\bike_Cargo_Pedelec_Two.png" />
+  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\battery_undefined.png" />
   </ItemGroup>
diff --git a/TINK/TINK.iOS/AppDelegate.cs b/TINK/TINK.iOS/AppDelegate.cs
index 20f9554..6477bd0 100644
--- a/TINK/TINK.iOS/AppDelegate.cs
+++ b/TINK/TINK.iOS/AppDelegate.cs
@@ -5,45 +5,45 @@ using Xamarin.Forms.Platform.iOS;
 
 namespace TINK.iOS
 {
-    // The UIApplicationDelegate for the application. This class is responsible for launching the 
-    // User Interface of the application, as well as listening (and optionally responding) to 
-    // application events from iOS.
-    [Register("AppDelegate")]
-    public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate
-    {
-        //
-        // This method is invoked when the application has loaded and is ready to run. In this 
-        // method you should instantiate the window, load the UI into it and then make the window
-        // visible.
-        //
-        // You have 17 seconds to return from this method, or iOS will terminate your application.
-        //
-        public override bool FinishedLaunching(UIApplication app, NSDictionary options)
-        {
-            global::Xamarin.Forms.Forms.Init();
+	// The UIApplicationDelegate for the application. This class is responsible for launching the 
+	// User Interface of the application, as well as listening (and optionally responding) to 
+	// application events from iOS.
+	[Register("AppDelegate")]
+	public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate
+	{
+		//
+		// This method is invoked when the application has loaded and is ready to run. In this 
+		// method you should instantiate the window, load the UI into it and then make the window
+		// visible.
+		//
+		// You have 17 seconds to return from this method, or iOS will terminate your application.
+		//
+		public override bool FinishedLaunching(UIApplication app, NSDictionary options)
+		{
+			global::Xamarin.Forms.Forms.Init();
 
-            //Color of Icons in Navigation bar (e.g. burger menu and back arrow)
-            UINavigationBar.Appearance.TintColor = Color.White.ToUIColor();
+			//Color of Icons in Navigation bar (e.g. burger menu and back arrow)
+			UINavigationBar.Appearance.TintColor = Color.White.ToUIColor();
 
-            new iOS.Device.AppInfo(NSBundle.MainBundle.InfoDictionary[new NSString("CFBundleShortVersionString")]?.ToString() ?? string.Empty);
+			new iOS.Device.AppInfo(NSBundle.MainBundle.InfoDictionary[new NSString("CFBundleShortVersionString")]?.ToString() ?? string.Empty);
 
-            Forms.ViewInitialized += (object sender, ViewInitializedEventArgs e) =>
-            {
-                // http://developer.xamarin.com/recipes/testcloud/set-accessibilityidentifier-ios/
-                if (null != e.View.AutomationId)
-                {
-                    e.NativeView.AccessibilityIdentifier = e.View.AutomationId;
-                }
-            };
-            LoadApplication(new TINK.App());
+			Forms.ViewInitialized += (object sender, ViewInitializedEventArgs e) =>
+			{
+				// http://developer.xamarin.com/recipes/testcloud/set-accessibilityidentifier-ios/
+				if (null != e.View.AutomationId)
+				{
+					e.NativeView.AccessibilityIdentifier = e.View.AutomationId;
+				}
+			};
+			LoadApplication(new TINK.App());
 
-            // Required for initialization of Maps, see https://developer.xamarin.com/guides/xamarin-forms/user-interface/map/
-            Xamarin.FormsGoogleMaps.Init("000000000000000000000000000000000000000");
+			// Required for initialization of Maps, see https://developer.xamarin.com/guides/xamarin-forms/user-interface/map/
+			Xamarin.FormsGoogleMaps.Init("000000000000000000000000000000000000000");
 
-            // Required for initialization of binding package, see  https://github.com/nuitsjp/Xamarin.Forms.GoogleMaps.Bindings.
-            Xamarin.FormsGoogleMapsBindings.Init();
+			// Required for initialization of binding package, see  https://github.com/nuitsjp/Xamarin.Forms.GoogleMaps.Bindings.
+			Xamarin.FormsGoogleMapsBindings.Init();
 
-            return base.FinishedLaunching(app, options);
-        }
-    }
+			return base.FinishedLaunching(app, options);
+		}
+	}
 }
diff --git a/TINK/TINK.iOS/Device/AppInfo.cs b/TINK/TINK.iOS/Device/AppInfo.cs
index 22cec2a..8c62628 100644
--- a/TINK/TINK.iOS/Device/AppInfo.cs
+++ b/TINK/TINK.iOS/Device/AppInfo.cs
@@ -7,41 +7,41 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(AppInfo))]
 namespace TINK.iOS.Device
 {
-    /// <summary> Holds information about the TINK- app. </summary>
-    public class AppInfo : IAppInfo
-    {
-        /// <summary> Holds the the version of the app.</summary>
-        private static Version m_oVersion = null;
+	/// <summary> Holds information about the TINK- app. </summary>
+	public class AppInfo : IAppInfo
+	{
+		/// <summary> Holds the the version of the app.</summary>
+		private static Version m_oVersion = null;
 
-        /// <summary> Constructs a app info object. </summary>
-        public AppInfo()
-        {
-        }
+		/// <summary> Constructs a app info object. </summary>
+		public AppInfo()
+		{
+		}
 
-        /// <summary> Constructs a app info object for initialization. </summary>
-        /// <param name="p_strVersionText"> Version to initializ object with.</param>
-        internal AppInfo(string p_strVersionText)
-        {
-            if (m_oVersion != null)
-            {
-                // Set version only once.
-                return;
-            }
+		/// <summary> Constructs a app info object for initialization. </summary>
+		/// <param name="p_strVersionText"> Version to initializ object with.</param>
+		internal AppInfo(string p_strVersionText)
+		{
+			if (m_oVersion != null)
+			{
+				// Set version only once.
+				return;
+			}
 
-            if (!Version.TryParse(p_strVersionText, out Version l_oVersion))
-            {
-                m_oVersion = new Version(0, 8);
-            }
+			if (!Version.TryParse(p_strVersionText, out Version l_oVersion))
+			{
+				m_oVersion = new Version(0, 8);
+			}
 
-            m_oVersion = l_oVersion;
-        }
+			m_oVersion = l_oVersion;
+		}
 
-        /// <summary> Get the version of the app. </summary>
-        public Version Version => m_oVersion ?? new Version(0, 9);
+		/// <summary> Get the version of the app. </summary>
+		public Version Version => m_oVersion ?? new Version(0, 9);
 
-        /// <summary> Gets the URL to the app store. </summary>
-        /// <remarks> TINK Url was @"http://itunes.apple.com/de/app/tink-konstanz/id1181519270?mt=8"</remarks>
-        /// <value>The store URL.</value>
-        public string StoreUrl => $"https://itunes.apple.com/de/app/apple-store/{NSBundle.MainBundle.BundleIdentifier}?mt=8";
-    }
+		/// <summary> Gets the URL to the app store. </summary>
+		/// <remarks> TINK Url was @"http://itunes.apple.com/de/app/tink-konstanz/id1181519270?mt=8"</remarks>
+		/// <value>The store URL.</value>
+		public string StoreUrl => $"https://itunes.apple.com/de/app/apple-store/{NSBundle.MainBundle.BundleIdentifier}?mt=8";
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK.iOS/Device/Device.cs b/TINK/TINK.iOS/Device/Device.cs
index a715f2b..9fc0b4a 100644
--- a/TINK/TINK.iOS/Device/Device.cs
+++ b/TINK/TINK.iOS/Device/Device.cs
@@ -6,30 +6,30 @@ using Xamarin.Essentials;
 [assembly: Xamarin.Forms.Dependency(typeof(TINK.iOS.Device.Device))]
 namespace TINK.iOS.Device
 {
-    public class Device : ISmartDevice
-    {
-        [DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
-        private static extern uint IOServiceGetMatchingService(uint masterPort, IntPtr matching);
+	public class Device : ISmartDevice
+	{
+		[DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
+		private static extern uint IOServiceGetMatchingService(uint masterPort, IntPtr matching);
 
-        [DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
-        private static extern IntPtr IOServiceMatching(string s);
+		[DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
+		private static extern IntPtr IOServiceMatching(string s);
 
-        [DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
-        private static extern IntPtr IORegistryEntryCreateCFProperty(uint entry, IntPtr key, IntPtr allocator, uint options);
+		[DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
+		private static extern IntPtr IORegistryEntryCreateCFProperty(uint entry, IntPtr key, IntPtr allocator, uint options);
 
-        [DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
-        private static extern int IOObjectRelease(uint o);
+		[DllImport("/System/Library/Frameworks/IOKit.framework/IOKit")]
+		private static extern int IOObjectRelease(uint o);
 
-        public string Manufacturer => DeviceInfo.Manufacturer;
+		public string Manufacturer => DeviceInfo.Manufacturer;
 
-        public string Model => DeviceInfo.Model;
+		public string Model => DeviceInfo.Model;
 
-        public DevicePlatform Platform => DeviceInfo.Platform;
+		public DevicePlatform Platform => DeviceInfo.Platform;
 
-        public string VersionText => DeviceInfo.VersionString;
-        /// <summary> Gets unitque device identifier. </summary>
-        /// <returns>Gets the identifies specifying device.</returns>
-        public string Identifier
-            => UIKit.UIDevice.CurrentDevice?.IdentifierForVendor?.AsString() ?? string.Empty;
-    }
+		public string VersionText => DeviceInfo.VersionString;
+		/// <summary> Gets unitque device identifier. </summary>
+		/// <returns>Gets the identifies specifying device.</returns>
+		public string Identifier
+			=> UIKit.UIDevice.CurrentDevice?.IdentifierForVendor?.AsString() ?? string.Empty;
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK.iOS/Device/ExternalBrowseService.cs b/TINK/TINK.iOS/Device/ExternalBrowseService.cs
index c9a7998..b0ac186 100644
--- a/TINK/TINK.iOS/Device/ExternalBrowseService.cs
+++ b/TINK/TINK.iOS/Device/ExternalBrowseService.cs
@@ -7,17 +7,17 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(ExternalBrowseService))]
 namespace TINK.iOS.Device
 {
-    public class ExternalBrowseService : IExternalBrowserService
-    {
-        /// <summary> Opens an external browser. </summary>
-        /// <param name="p_strUrl">Url to open.</param>
-        public void OpenUrl(string p_strUrl)
-        {
-            var l_oUrl = NSUrl.FromString(p_strUrl);
-            if (l_oUrl == null)
-                return;
+	public class ExternalBrowseService : IExternalBrowserService
+	{
+		/// <summary> Opens an external browser. </summary>
+		/// <param name="p_strUrl">Url to open.</param>
+		public void OpenUrl(string p_strUrl)
+		{
+			var l_oUrl = NSUrl.FromString(p_strUrl);
+			if (l_oUrl == null)
+				return;
 
-            UIApplication.SharedApplication.OpenUrl(l_oUrl);
-        }
-    }
+			UIApplication.SharedApplication.OpenUrl(l_oUrl);
+		}
+	}
 }
diff --git a/TINK/TINK.iOS/Device/Gps.cs b/TINK/TINK.iOS/Device/Gps.cs
index 6728593..21c425b 100644
--- a/TINK/TINK.iOS/Device/Gps.cs
+++ b/TINK/TINK.iOS/Device/Gps.cs
@@ -3,8 +3,8 @@
 [assembly: Xamarin.Forms.Dependency(typeof(TINK.iOS.Device.Gps))]
 namespace TINK.iOS.Device
 {
-    public class Gps : IGeolodationDependent
-    {
-        public bool IsGeolcationEnabled => true;
-    }
+	public class Gps : IGeolodationDependent
+	{
+		public bool IsGeolcationEnabled => true;
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK.iOS/Device/SpecialFolder.cs b/TINK/TINK.iOS/Device/SpecialFolder.cs
index 9434b04..5230371 100644
--- a/TINK/TINK.iOS/Device/SpecialFolder.cs
+++ b/TINK/TINK.iOS/Device/SpecialFolder.cs
@@ -5,23 +5,23 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(TINK.iOS.Device.SpecialFolder))]
 namespace TINK.iOS.Device
 {
-    public class SpecialFolder : ISpecialFolder
-    {
-        /// <summary>
-        /// Get the folder name of external folder to write to.
-        /// </summary>
-        /// <returns></returns>
-        public string GetExternalFilesDir()
-        {
-            return Environment.GetFolderPath(Environment.SpecialFolder.Personal);
-        }
+	public class SpecialFolder : ISpecialFolder
+	{
+		/// <summary>
+		/// Get the folder name of external folder to write to.
+		/// </summary>
+		/// <returns></returns>
+		public string GetExternalFilesDir()
+		{
+			return Environment.GetFolderPath(Environment.SpecialFolder.Personal);
+		}
 
-        /// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
-        /// <returns>Directory name.</returns>
-        public string GetInternalPersonalDir()
-        {
-            return Environment.GetFolderPath(Environment.SpecialFolder.Personal);
-        }
+		/// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
+		/// <returns>Directory name.</returns>
+		public string GetInternalPersonalDir()
+		{
+			return Environment.GetFolderPath(Environment.SpecialFolder.Personal);
+		}
 
-    }
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK.iOS/Device/WebView.cs b/TINK/TINK.iOS/Device/WebView.cs
index 5a5a5cb..f490266 100644
--- a/TINK/TINK.iOS/Device/WebView.cs
+++ b/TINK/TINK.iOS/Device/WebView.cs
@@ -5,14 +5,14 @@ using TINK.Model.Device;
 [assembly: Xamarin.Forms.Dependency(typeof(TINK.iOS.Device.WebView))]
 namespace TINK.iOS.Device
 {
-    public class WebView : IWebView
-    {
-        /// <summary> Clears the cookie cache for all web views. </summary>
-        public void ClearCookies()
-        {
-            NSHttpCookieStorage CookieStorage = NSHttpCookieStorage.SharedStorage;
-            foreach (var cookie in CookieStorage.Cookies)
-                CookieStorage.DeleteCookie(cookie);
-        }
-    }
+	public class WebView : IWebView
+	{
+		/// <summary> Clears the cookie cache for all web views. </summary>
+		public void ClearCookies()
+		{
+			NSHttpCookieStorage CookieStorage = NSHttpCookieStorage.SharedStorage;
+			foreach (var cookie in CookieStorage.Cookies)
+				CookieStorage.DeleteCookie(cookie);
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK.iOS/Device/iOSCipher.cs b/TINK/TINK.iOS/Device/iOSCipher.cs
index 4dc6464..fa4a22e 100644
--- a/TINK/TINK.iOS/Device/iOSCipher.cs
+++ b/TINK/TINK.iOS/Device/iOSCipher.cs
@@ -5,24 +5,24 @@ using Xamarin.Forms;
 [assembly: Dependency(typeof(TINK.iOS.Device.IOSCipher))]
 namespace TINK.iOS.Device
 {
-    public class IOSCipher : ICipher
-    {
-        /// <summary> Encrypt data.</summary>
-        /// <param name="key">Key to encrypt data.</param>
-        /// <param name="clear">Data to entrycpt.</param>
-        /// <returns></returns>
-        public byte[] Encrypt(byte[] key, byte[] clear)
-        {
-            throw new NotSupportedException();
-        }
+	public class IOSCipher : ICipher
+	{
+		/// <summary> Encrypt data.</summary>
+		/// <param name="key">Key to encrypt data.</param>
+		/// <param name="clear">Data to entrycpt.</param>
+		/// <returns></returns>
+		public byte[] Encrypt(byte[] key, byte[] clear)
+		{
+			throw new NotSupportedException();
+		}
 
-        /// <summary> Decrypt data. </summary>
-        /// <param name="key">Key to decrypt data with.</param>
-        /// <param name="encrypted">Encrpyted data to decrypt.</param>
-        /// <returns>Decrypted data.</returns>
-        public byte[] Decrypt(byte[] key, byte[] encrypted)
-        {
-            throw new NotSupportedException();
-        }
-    }
+		/// <summary> Decrypt data. </summary>
+		/// <param name="key">Key to decrypt data with.</param>
+		/// <param name="encrypted">Encrpyted data to decrypt.</param>
+		/// <returns>Decrypted data.</returns>
+		public byte[] Decrypt(byte[] key, byte[] encrypted)
+		{
+			throw new NotSupportedException();
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK.iOS/Info.plist b/TINK/TINK.iOS/Info.plist
index d07637f..f5f5779 100644
--- a/TINK/TINK.iOS/Info.plist
+++ b/TINK/TINK.iOS/Info.plist
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
@@ -6,8 +6,8 @@
 	<array>
 		<string>bluetooth-peripheral</string>
 	</array>
-        <key>UIUserInterfaceStyle</key>
-        <string>Light</string>
+	<key>UIUserInterfaceStyle</key>
+	<string>Light</string>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>1</integer>
@@ -49,14 +49,14 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.TeilRad.sharee.bike</string>
 	<key>MinimumOSVersion</key>
-	<string>9.0</string>
+	<string>13.0</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Location access is needed to show map at current position and pass position to server when returning bikes.</string>
 	<key>CFBundleDisplayName</key>
 	<string>sharee.bike</string>
 	<key>CFBundleVersion</key>
-	<string>337</string>
+	<string>338</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.337</string>
+	<string>3.0.338</string>
 </dict>
 </plist>
diff --git a/TINK/TINK.iOS/Main.cs b/TINK/TINK.iOS/Main.cs
index c766ee2..7a40150 100644
--- a/TINK/TINK.iOS/Main.cs
+++ b/TINK/TINK.iOS/Main.cs
@@ -2,14 +2,14 @@
 
 namespace TINK.iOS
 {
-    public class Application
-    {
-        // This is the main entry point of the application.
-        static void Main(string[] args)
-        {
-            // if you want to use a different Application Delegate class from "AppDelegate"
-            // you can specify it here.
-            UIApplication.Main(args, null, "AppDelegate");
-        }
-    }
+	public class Application
+	{
+		// This is the main entry point of the application.
+		static void Main(string[] args)
+		{
+			// if you want to use a different Application Delegate class from "AppDelegate"
+			// you can specify it here.
+			UIApplication.Main(args, null, "AppDelegate");
+		}
+	}
 }
diff --git a/TINK/TINK.iOS/Media.xcassets/Open_Blue.imageset/StationMarkerOpenBlue.pdf b/TINK/TINK.iOS/Media.xcassets/Open_Blue.imageset/StationMarkerOpenBlue.pdf
index ac8e360..c974253 100644
Binary files a/TINK/TINK.iOS/Media.xcassets/Open_Blue.imageset/StationMarkerOpenBlue.pdf and b/TINK/TINK.iOS/Media.xcassets/Open_Blue.imageset/StationMarkerOpenBlue.pdf differ
diff --git a/TINK/TINK.iOS/Media.xcassets/Open_Green.imageset/StationMarkerOpenGreen.pdf b/TINK/TINK.iOS/Media.xcassets/Open_Green.imageset/StationMarkerOpenGreen.pdf
index 8481b12..e524aeb 100644
Binary files a/TINK/TINK.iOS/Media.xcassets/Open_Green.imageset/StationMarkerOpenGreen.pdf and b/TINK/TINK.iOS/Media.xcassets/Open_Green.imageset/StationMarkerOpenGreen.pdf differ
diff --git a/TINK/TINK.iOS/Media.xcassets/Open_LightBlue.imageset/StationMarkerOpenLightBlue.pdf b/TINK/TINK.iOS/Media.xcassets/Open_LightBlue.imageset/StationMarkerOpenLightBlue.pdf
index 2f2fce9..d48f0b8 100644
Binary files a/TINK/TINK.iOS/Media.xcassets/Open_LightBlue.imageset/StationMarkerOpenLightBlue.pdf and b/TINK/TINK.iOS/Media.xcassets/Open_LightBlue.imageset/StationMarkerOpenLightBlue.pdf differ
diff --git a/TINK/TINK.iOS/Media.xcassets/Open_Red.imageset/StationMarkerOpenRed.pdf b/TINK/TINK.iOS/Media.xcassets/Open_Red.imageset/StationMarkerOpenRed.pdf
index 07c59e9..09b9376 100644
Binary files a/TINK/TINK.iOS/Media.xcassets/Open_Red.imageset/StationMarkerOpenRed.pdf and b/TINK/TINK.iOS/Media.xcassets/Open_Red.imageset/StationMarkerOpenRed.pdf differ
diff --git a/TINK/TINK.iOS/Media.xcassets/bike_Cargo_Pedelec_Two.imageset/Contents.json b/TINK/TINK.iOS/Media.xcassets/bike_Cargo_Pedelec_Two.imageset/Contents.json
new file mode 100644
index 0000000..4435375
--- /dev/null
+++ b/TINK/TINK.iOS/Media.xcassets/bike_Cargo_Pedelec_Two.imageset/Contents.json
@@ -0,0 +1,393 @@
+{
+  "images" : [
+    {
+      "filename" : "bike_Cargo_Pedelec_Two.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "subtype" : "retina4"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "subtype" : "retina4"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "subtype" : "retina4"
+    },
+    {
+      "idiom" : "ipad"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "ipad"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "ipad"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "car",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "car",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "car",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "car",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "car",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "car",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/TINK/TINK.iOS/Media.xcassets/bike_Cargo_Pedelec_Two.imageset/bike_Cargo_Pedelec_Two.svg b/TINK/TINK.iOS/Media.xcassets/bike_Cargo_Pedelec_Two.imageset/bike_Cargo_Pedelec_Two.svg
new file mode 100644
index 0000000..be32398
--- /dev/null
+++ b/TINK/TINK.iOS/Media.xcassets/bike_Cargo_Pedelec_Two.imageset/bike_Cargo_Pedelec_Two.svg
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 101.92409 64.545211"
+   version="1.1"
+   id="svg15"
+   sodipodi:docname="bike_Cargo_Pedelec_Two.svg"
+   inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
+   inkscape:export-filename="C:\Users\Anja\Desktop\bike_Cargo_Pedelec_Two.png"
+   inkscape:export-xdpi="160"
+   inkscape:export-ydpi="160"
+   width="101.9241"
+   height="64.545212"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview17"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="8"
+     inkscape:cx="30.375"
+     inkscape:cy="30.5"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g1756"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <defs
+     id="defs11">
+    <linearGradient
+       id="linearGradient21170"
+       inkscape:swatch="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop21168" />
+    </linearGradient>
+    <style
+       id="style2">.a{fill:url(#a);}</style>
+    <linearGradient
+       id="a"
+       x1="5.6700001"
+       y1="42.59"
+       x2="107.72"
+       y2="42.59"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-color="#e3000f"
+         id="stop4" />
+      <stop
+         offset="0.35"
+         stop-color="#e50064"
+         id="stop6" />
+      <stop
+         offset="0.7"
+         stop-color="#e3000f"
+         id="stop8" />
+    </linearGradient>
+    <linearGradient
+       id="b"
+       x1="76.912148"
+       y1="27.697437"
+       x2="77.972641"
+       y2="32.467815"
+       xlink:href="#linearGradient2645"
+       gradientTransform="translate(-75.921777,-16.221715)" />
+    <linearGradient
+       id="linearGradient2645"
+       x1="29.34"
+       y1="42.529999"
+       x2="82.709999"
+       y2="42.529999"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-color="#e50064"
+         id="stop2641" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath1157">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g1153"
+         id="use1159"
+         width="100%"
+         height="100%" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath1760">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g1756"
+         id="use1762"
+         width="100%"
+         height="100%" />
+    </clipPath>
+  </defs>
+  <g
+     id="g17575"
+     transform="translate(-0.12590681,13.468085)">
+    <path
+       style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:0.3125;stroke-linejoin:round;stroke-opacity:1"
+       d="m 53.10453,27.496642 c -1.365507,-4.854721 -2.472007,-8.837499 -2.458888,-8.850617 0.01312,-0.01312 0.316185,0.0202 0.67348,0.07403 0.357295,0.05384 3.855878,0.55963 7.774628,1.123984 3.91875,0.564354 10.654687,1.534491 14.96875,2.15586 4.314062,0.621369 9.039062,1.299643 10.5,1.507275 1.460937,0.207633 2.692874,0.389076 2.737637,0.403209 0.05233,0.01652 -0.304708,0.60484 -1,1.647778 -1.59254,2.388813 -5.588598,8.24135 -5.849355,8.566836 -0.423446,0.528559 -1.548293,1.593501 -1.861353,1.762224 l -0.312599,0.168475 -8.93529,0.09474 c -4.91441,0.05211 -10.019561,0.112341 -11.34478,0.133854 l -2.40949,0.03912 z"
+       id="path10538" />
+    <g
+       id="g1155"
+       clip-path="url(#clipPath1157)">
+      <g
+         inkscape:label="Clip"
+         id="g1153">
+        <g
+           id="g1676">
+          <g
+             inkscape:label="Clip"
+             id="g1756">
+            <path
+               class="a"
+               d="m 98.06,48.87 c -1.08675,0.002 -0.3125,0.0625 -0.3125,0.0625 l -1.25625,-9.24 v 0 c 0.04999,-0.0817 -0.33875,0.8225 0,0 -0.330139,-2.17133 -1.75335,-2.193894 -2.369308,-0.218228 L 55.676612,33.666942 51,17.66 c -0.162566,-0.361677 -0.52348,-0.593133 -0.92,-0.59 h -8 c -1.333333,0 -1.333333,2 0,2 h 7.37 l 9.4975,34.465 c 0,0 -7.891361,-0.03193 -11.774542,-0.44597 -0.253575,-0.02704 -0.760725,-1.252257 -0.760725,-1.252257 L 36.81,30.47 h 2.48 c 1.333333,0 1.333333,-2 0,-2 h -7.15 c -1.333333,0 -1.333333,2 0,2 h 2.46 l 1.28,2.84 -4.8,5.61 C 17.735485,29.534713 0.56014352,43.794826 7.3158706,58.635275 10.307452,65.206945 17.328658,68.961292 24.45441,67.797984 31.580212,66.634667 37.044172,60.842047 37.79,53.66 l 6.809262,0.06886 c 0,0 0.706271,1.019124 1.258238,1.181141 4.813226,1.41281 38.4375,0.25 38.4375,0.25 1.296848,0.0041 3.134532,-2.141688 3.855,-3.22 l 6.829277,-10.246859 0.966288,7.461018 c -7.38317,1.624614 -8.627918,8.794136 -6.702179,13.208842 1.925701,4.414616 6.815063,6.728004 11.451424,5.42055 4.63636,-1.307454 7.59673,-5.834467 6.93229,-10.604757 C 106.96264,52.408406 102.87743,48.860173 98.06,48.87 Z m -51.647767,2.966777 c -27.161489,-23.177851 -13.580744,-11.588926 0,0 z M 36.8,35.33 44.16,51.66 h -6.3 C 37.77054,47.281695 35.882608,43.133307 32.64,40.19 Z m -0.95,16.33 h -13 l 8.51,-9.95 c 2.781324,2.572511 4.401296,6.162427 4.49,9.95 z M 21.77,66 C 12.379755,65.910757 5.73832,56.784352 8.5413004,47.821822 11.344281,38.859292 22.002151,35.143146 29.77,40.42 L 19.87,52 c -0.558169,0.652484 -0.08861,1.658681 0.77,1.65 H 35.76 C 34.881746,60.707408 28.881844,66.003962 21.77,66 Z m 64.7,-15.2 c -0.342505,0.521592 -1.98852,2.365305 -2.6125,2.36125 l -22.632789,0.2431 -4.994876,-17.752706 36.905,5.316524 c 1.068416,0.132096 1.233154,-2.54192 0.987107,-1.493864 L 90.94,44.21 c -0.0052,0.02305 -0.0052,0.04695 0,0.07 z M 98.06,66.09 C 90.441219,66.14162 86.565784,53.944828 96.252291,51.02934 L 97.15,59 c 0.16695,0.350555 0.521731,0.57278 0.91,0.57 0.148015,6.4e-5 0.294434,-0.03058 0.43,-0.09 0.517009,-0.223359 0.747671,-0.829412 0.51,-1.34 l -0.91,-7.27 c 0.752402,-0.24499 -0.791283,1.44e-4 0,0 4.20289,0 7.61,3.407113 7.61,7.61 0,4.202887 -3.40711,7.61 -7.61,7.61 z"
+               transform="translate(-5.67,-17.07)"
+               id="path13"
+               style="fill:#000000"
+               sodipodi:nodetypes="cccccccccssccsccsssscccssccsccccsssccccccccccccccscccccccccccccsccccccccss" />
+            <path
+               class="b"
+               d="m 24.754995,-9.3865128 -7.33214,-3.7397952 c -1.512762,-0.785808 -3.34742,-0.170262 -4.087906,1.371589 l -0.63309,1.256408 -4.0089251,-2.171341 c -2.1332702,-1.318731 -3.2138586,0.795626 -1.0131331,1.669574 l 4.0799312,2.3431428 -1.9279665,3.984418 -4.3335107,-2.0965059 c -1.889426,-1.1455656 -3.000817,0.8618846 -0.969749,1.7112586 l 4.4164471,2.2261306 -0.560302,1.2851591 c -0.215908,0.46059 -0.322424,0.96784597 -0.31104,1.48098397 0.0062,1.14296103 0.6635559,2.18548893 1.6827393,2.66870793 l 7.4979008,3.821812 c 3.121621,1.939052 6.029839,0.384269 7.90617,-2.602122 0.521472,-0.829975 0.885647,-1.386181 1.179185,-1.882121 0.07188,-0.12137 4.493305,2.327998 4.625114,2.342684 0.485864,0.05413 1.920831,-0.315256 0.870928,-1.809358 -0.133947,-0.190626 -4.441543,-2.22771893 -4.516806,-2.41140593 -0.130626,-0.318832 0.301309,-1.08736197 0.378436,-1.31973797 1.373204,-4.1372931 0.574222,-6.3585284 -2.942284,-8.1294875 z M 22.616378,3.4933391 c -0.960278,1.5200657 -2.834395,2.077363 -4.303829,1.204932 l -8.237875,-4.58987893 5.634421,-11.64934817 4.343249,2.1491121 -0.161627,2.339236 -5.600275,4.941352 4.970173,0.054161 -1.425714,4.638675 4.172274,-5.9531713 -4.203141,-0.027851 2.086683,-3.653166 0.161627,-2.3392361 3.889954,1.9248139 c 1.60516,0.664411 2.627869,2.1531545 2.20324,3.9092814 -0.690684,3.01533371 -1.800506,4.8140634 -3.52916,7.0510878 z"
+               id="path16"
+               sodipodi:nodetypes="cccccccccccccccsssssscccccccccccccccccc"
+               style="fill-opacity:1;stroke-width:1.53824" />
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/TINK/TINK.iOS/Media.xcassets/bike_Cargo_SoleHumanPowered_Trike.imageset/Contents.json b/TINK/TINK.iOS/Media.xcassets/bike_Cargo_SoleHumanPowered_Trike.imageset/Contents.json
new file mode 100644
index 0000000..fd82e3b
--- /dev/null
+++ b/TINK/TINK.iOS/Media.xcassets/bike_Cargo_SoleHumanPowered_Trike.imageset/Contents.json
@@ -0,0 +1,393 @@
+{
+  "images" : [
+    {
+      "filename" : "bike_Cargo_SoleHumanPowered_Trike.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "subtype" : "retina4"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "subtype" : "retina4"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "subtype" : "retina4"
+    },
+    {
+      "idiom" : "ipad"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "ipad"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "ipad"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "car",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "car",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "car",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "car",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "car",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "car",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/TINK/TINK.iOS/Media.xcassets/bike_Cargo_SoleHumanPowered_Trike.imageset/bike_Cargo_SoleHumanPowered_Trike.svg b/TINK/TINK.iOS/Media.xcassets/bike_Cargo_SoleHumanPowered_Trike.imageset/bike_Cargo_SoleHumanPowered_Trike.svg
new file mode 100644
index 0000000..09ff412
--- /dev/null
+++ b/TINK/TINK.iOS/Media.xcassets/bike_Cargo_SoleHumanPowered_Trike.imageset/bike_Cargo_SoleHumanPowered_Trike.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 91.801248 51.357448"
+   version="1.1"
+   id="svg15"
+   sodipodi:docname="bike_Cargo_SoleHumanPowered_Trike.svg"
+   width="91.801247"
+   height="51.357449"
+   inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
+   inkscape:export-filename="C:\Users\Anja\Desktop\bike_Cargo_SoleHumanPowered_Trike.png"
+   inkscape:export-xdpi="160"
+   inkscape:export-ydpi="160"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview17"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="5.8317717"
+     inkscape:cx="34.46637"
+     inkscape:cy="11.660264"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg15"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <defs
+     id="defs11">
+    <style
+       id="style2">.a{fill:url(#a);}</style>
+    <linearGradient
+       id="a"
+       x1="11.34"
+       y1="42.59"
+       x2="102.05"
+       y2="42.59"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-color="#e3000f"
+         id="stop4" />
+      <stop
+         offset="0.35"
+         stop-color="#e50064"
+         id="stop6" />
+      <stop
+         offset="0.7"
+         stop-color="#e3000f"
+         id="stop8" />
+    </linearGradient>
+  </defs>
+  <path
+     class="a"
+     d="M 48.016289,12.218801 45.096078,0.59 C 44.93499,0.231641 44.578977,8.2e-4 44.186078,0 h -8 c -1.333333,0 0.30636,3.2976596 0,2 h 7.31 l 7.791377,34.208096 -9.995186,0.0306 L 30.966078,13.4 h 2.46 c 1.333333,0 1.333333,-2 0,-2 h -7.1 c -1.333333,0 0.615878,3.18257 0,2 h 2.45 l 1.27,2.84 -4.78,5.61 c -2.690366,-1.941909 -5.922018,-2.991147 -9.24,-3 C 2.1885842,18.854233 -5.1179525,35.231658 4.1200482,45.532232 13.358048,55.832805 30.43125,50.345426 31.936078,36.59 c 0,0 3.143177,-0.0024 6.912435,0.04183 0,0 0.595033,1.753983 2.40706,1.746618 C 46.298177,38.357953 57.696078,38.22 57.696078,38.22 c -0.08852,0.539303 0.01804,-0.546221 0,0 -0.201334,7.19541 5.57678,13.137449 12.775,13.137449 7.19822,0 12.976334,-5.942039 12.775,-13.137449 -0.0015,-0.545138 -0.03819,-1.08961 -0.11,-1.63 h 0.07 c 1.688893,0.0074 3.180011,-1.100733 3.66,-2.72 L 90.364604,21.725697 C 90.981744,19.947459 91.085635,19.19495 91.286825,18.2944 78.095021,16.184174 61.720902,14.259525 48.016289,12.218801 Z M 30.946078,18.26 l 7.32,16.33 h -6.26 c -0.08291,-4.3735 -1.959474,-8.52075 -5.19,-11.47 z m -0.94,16.33 h -12.94 l 8.46,-9.95 c 2.777628,2.574224 4.393892,6.163916 4.48,9.95 z m -13.98,14.34 c -7.7513218,0 -14.0349938,-6.283684 -14.0349938,-14.035 0,-7.751316 6.283672,-14.035 14.0349938,-14.035 2.839528,-0.0048 5.611711,0.864573 7.94,2.49 l -9.83,11.58 c -0.558169,0.652484 -0.08861,1.658681 0.77,1.65 h 15 c -0.835032,7.035815 -6.794815,12.338649 -13.88,12.35 z m 54.704343,0.36008 c -9.643334,0.03568 -14.374032,-12.301066 -7.651182,-18.957144 6.852019,-6.783963 17.658402,-1.700595 18.16397,7.471246 0.01659,5.964685 -4.548103,11.469352 -10.512788,11.485898 z M 88.696078,21.2 l -3.7,12.09 c -0.230581,0.773408 -0.942955,1.3026 -1.75,1.3 h -0.49 c -3.184372,-10.948285 -18.039946,-12.53136 -23.46,-2.5 l -1.524323,3.987808 -4.626021,0.08287 -4.805923,-22.165049 38.765642,5.167498 c 0.529506,0.07076 1.929985,0.469696 1.929985,0.469696 0,0 -0.19484,1.049698 -0.33936,1.567177 z"
+     id="path13"
+     sodipodi:nodetypes="cccssccccssssccccsccsccscccccccccccccccccscccccccsccccccccccccc"
+     style="fill:#000000" />
+  <path
+     style="fill:#999999;stroke:#000000;stroke-width:0.606254;stroke-linejoin:round"
+     d="M 53.220207,36.107626 C 53.112163,35.67535 48.428326,14.1175 48.438406,14.098881 c 0.04051,-0.07484 39.038877,5.189778 39.724278,5.362608 l 0.801507,0.202109 -0.114537,0.565454 c -0.23382,1.154332 -4.005865,13.303935 -4.226723,13.6141 -0.243717,0.342269 -1.019677,0.713316 -1.491739,0.713316 -0.239157,0 -0.327556,-0.120613 -0.555413,-0.757817 -1.310086,-3.663656 -4.237805,-6.541672 -7.898702,-7.764603 -4.540999,-1.516931 -9.586601,-0.442985 -12.944334,2.755176 -1.561782,1.48756 -2.2544,2.597661 -3.220065,5.16099 -0.389405,1.033663 -0.741743,1.913511 -0.782974,1.955218 -0.07332,0.07416 -4.491978,0.272286 -4.509497,0.202194 z"
+     id="path2372" />
+  <ellipse
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.09276;stroke-linejoin:round"
+     id="path849"
+     cx="70.464157"
+     cy="38.653477"
+     rx="1.5"
+     ry="1.4999988" />
+</svg>
diff --git a/TINK/TINK.iOS/Media.xcassets/bike_Cargo_SoleHumanPowered_Two.imageset/Contents.json b/TINK/TINK.iOS/Media.xcassets/bike_Cargo_SoleHumanPowered_Two.imageset/Contents.json
new file mode 100644
index 0000000..010053a
--- /dev/null
+++ b/TINK/TINK.iOS/Media.xcassets/bike_Cargo_SoleHumanPowered_Two.imageset/Contents.json
@@ -0,0 +1,393 @@
+{
+  "images" : [
+    {
+      "filename" : "bike_Cargo_SoleHumanPowered_Two.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "subtype" : "retina4"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "subtype" : "retina4"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "subtype" : "retina4"
+    },
+    {
+      "idiom" : "ipad"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "ipad"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "ipad"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "car",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "car",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "car",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "car",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "car",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "car",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/TINK/TINK.iOS/Media.xcassets/bike_Cargo_SoleHumanPowered_Two.imageset/bike_Cargo_SoleHumanPowered_Two.svg b/TINK/TINK.iOS/Media.xcassets/bike_Cargo_SoleHumanPowered_Two.imageset/bike_Cargo_SoleHumanPowered_Two.svg
new file mode 100644
index 0000000..2d005b1
--- /dev/null
+++ b/TINK/TINK.iOS/Media.xcassets/bike_Cargo_SoleHumanPowered_Two.imageset/bike_Cargo_SoleHumanPowered_Two.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 102.05 51.02"
+   version="1.1"
+   id="svg15"
+   sodipodi:docname="icon_lastenrad.svg"
+   inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview17"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="4"
+     inkscape:cx="27"
+     inkscape:cy="-8.75"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg15" />
+  <defs
+     id="defs11">
+    <style
+       id="style2">.a{fill:url(#a);}</style>
+    <linearGradient
+       id="a"
+       x1="5.67"
+       y1="42.59"
+       x2="107.72"
+       y2="42.59"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-color="#e3000f"
+         id="stop4" />
+      <stop
+         offset="0.35"
+         stop-color="#e50064"
+         id="stop6" />
+      <stop
+         offset="0.7"
+         stop-color="#e3000f"
+         id="stop8" />
+    </linearGradient>
+  </defs>
+  <path
+     class="a"
+     d="m 98.06,48.87 c -1.08675,0.002 -0.3125,0.0625 -0.3125,0.0625 l -1.25625,-9.24 v 0 c 0.04999,-0.0817 -0.33875,0.8225 0,0 -0.330139,-2.17133 -1.75335,-2.193894 -2.369308,-0.218228 L 55.676612,33.666942 51,17.66 c -0.162566,-0.361677 -0.52348,-0.593133 -0.92,-0.59 h -8 c -1.333333,0 -1.333333,2 0,2 h 7.37 l 9.4975,34.465 c 0,0 -7.891361,-0.03193 -11.774542,-0.44597 -0.253575,-0.02704 -0.760725,-1.252257 -0.760725,-1.252257 L 36.81,30.47 h 2.48 c 1.333333,0 1.333333,-2 0,-2 h -7.15 c -1.333333,0 -1.333333,2 0,2 h 2.46 l 1.28,2.84 -4.8,5.61 C 17.735485,29.534713 0.56014352,43.794826 7.3158706,58.635275 10.307452,65.206945 17.328658,68.961292 24.45441,67.797984 31.580212,66.634667 37.044172,60.842047 37.79,53.66 l 6.809262,0.06886 c 0,0 0.706271,1.019124 1.258238,1.181141 4.813226,1.41281 38.4375,0.25 38.4375,0.25 1.296848,0.0041 3.134532,-2.141688 3.855,-3.22 l 6.829277,-10.246859 0.966288,7.461018 c -7.38317,1.624614 -8.627918,8.794136 -6.702179,13.208842 1.925701,4.414616 6.815063,6.728004 11.451424,5.42055 4.63636,-1.307454 7.59673,-5.834467 6.93229,-10.604757 C 106.96264,52.408406 102.87743,48.860173 98.06,48.87 Z m -51.647767,2.966777 c -27.161489,-23.177851 -13.580744,-11.588926 0,0 z M 36.8,35.33 44.16,51.66 h -6.3 C 37.77054,47.281695 35.882608,43.133307 32.64,40.19 Z m -0.95,16.33 h -13 l 8.51,-9.95 c 2.781324,2.572511 4.401296,6.162427 4.49,9.95 z M 21.77,66 C 12.379755,65.910757 5.73832,56.784352 8.5413004,47.821822 11.344281,38.859292 22.002151,35.143146 29.77,40.42 L 19.87,52 c -0.558169,0.652484 -0.08861,1.658681 0.77,1.65 H 35.76 C 34.881746,60.707408 28.881844,66.003962 21.77,66 Z m 64.7,-15.2 c -0.342505,0.521592 -1.98852,2.365305 -2.6125,2.36125 l -22.632789,0.2431 -4.994876,-17.752706 36.905,5.316524 c 1.068416,0.132096 1.233154,-2.54192 0.987107,-1.493864 L 90.94,44.21 c -0.0052,0.02305 -0.0052,0.04695 0,0.07 z M 98.06,66.09 C 90.441219,66.14162 86.565784,53.944828 96.252291,51.02934 L 97.15,59 c 0.16695,0.350555 0.521731,0.57278 0.91,0.57 0.148015,6.4e-5 0.294434,-0.03058 0.43,-0.09 0.517009,-0.223359 0.747671,-0.829412 0.51,-1.34 l -0.91,-7.27 c 0.752402,-0.24499 -0.791283,1.44e-4 0,0 4.20289,0 7.61,3.407113 7.61,7.61 0,4.202887 -3.40711,7.61 -7.61,7.61 z"
+     transform="translate(-5.67,-17.07)"
+     id="path13"
+     style="fill:#000000"
+     sodipodi:nodetypes="cccccccccssccsccsssscccssccsccccsssccccccccccccccscccccccccccccsccccccccss" />
+  <path
+     style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:0.3125;stroke-linejoin:round;stroke-opacity:1"
+     d="m 53.10453,27.496642 c -1.365507,-4.854721 -2.472007,-8.837499 -2.458888,-8.850617 0.01312,-0.01312 0.316185,0.0202 0.67348,0.07403 0.357295,0.05384 3.855878,0.55963 7.774628,1.123984 3.91875,0.564354 10.654687,1.534491 14.96875,2.15586 4.314062,0.621369 9.039062,1.299643 10.5,1.507275 1.460937,0.207633 2.692874,0.389076 2.737637,0.403209 0.05233,0.01652 -0.304708,0.60484 -1,1.647778 -1.59254,2.388813 -5.588598,8.24135 -5.849355,8.566836 -0.423446,0.528559 -1.548293,1.593501 -1.861353,1.762224 l -0.312599,0.168475 -8.93529,0.09474 c -4.91441,0.05211 -10.019561,0.112341 -11.34478,0.133854 l -2.40949,0.03912 z"
+     id="path10538" />
+</svg>
diff --git a/TINK/TINK.iOS/Media.xcassets/bike_City_SoleHumanPowered_Two.imageset/Contents.json b/TINK/TINK.iOS/Media.xcassets/bike_City_SoleHumanPowered_Two.imageset/Contents.json
new file mode 100644
index 0000000..a6d71d9
--- /dev/null
+++ b/TINK/TINK.iOS/Media.xcassets/bike_City_SoleHumanPowered_Two.imageset/Contents.json
@@ -0,0 +1,393 @@
+{
+  "images" : [
+    {
+      "filename" : "bike_City_SoleHumanPowered_Two.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "subtype" : "retina4"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "subtype" : "retina4"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "subtype" : "retina4"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "subtype" : "retina4"
+    },
+    {
+      "idiom" : "ipad"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "ipad"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "ipad"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "ipad",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "ipad",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "car",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "car",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "car",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "car",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "car",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "car",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/TINK/TINK.iOS/Media.xcassets/bike_City_SoleHumanPowered_Two.imageset/bike_City_SoleHumanPowered_Two.svg b/TINK/TINK.iOS/Media.xcassets/bike_City_SoleHumanPowered_Two.imageset/bike_City_SoleHumanPowered_Two.svg
new file mode 100644
index 0000000..d099cb9
--- /dev/null
+++ b/TINK/TINK.iOS/Media.xcassets/bike_City_SoleHumanPowered_Two.imageset/bike_City_SoleHumanPowered_Two.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 80.537954 51.365249"
+   version="1.1"
+   id="svg15"
+   sodipodi:docname="bike_City_SoleHumanPowered_Two.svg"
+   inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
+   width="80.537956"
+   height="51.36525"
+   inkscape:export-filename="C:\Users\Anja\Desktop\bike_City_SoleHumanPowered_Two.png"
+   inkscape:export-xdpi="160"
+   inkscape:export-ydpi="160"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview17"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="4.7152334"
+     inkscape:cx="21.207858"
+     inkscape:cy="-19.935386"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg15"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <defs
+     id="defs11">
+    <style
+       id="style2">.a{fill:url(#a);}</style>
+    <linearGradient
+       id="a"
+       x1="17.049999"
+       y1="42.639999"
+       x2="96.379997"
+       y2="42.639999"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-color="#e3000f"
+         id="stop4" />
+      <stop
+         offset="0.35"
+         stop-color="#e50064"
+         id="stop6" />
+      <stop
+         offset="0.7"
+         stop-color="#e3000f"
+         id="stop8" />
+    </linearGradient>
+  </defs>
+  <path
+     class="a"
+     d="M 65.61155,34.882754 C 59.860052,21.645078 56.372737,12.535602 50.494929,0.58000308 50.33089,0.22554908 49.9755,-9.6292241e-4 49.584929,3.0775894e-6 h -8 c -1.333333,0 -1.333333,2.0000000224106 0,2.0000000224106 h 7.34 l 6.163711,13.3422209 -24.901865,1.393763 1.22369,2.013909 24.426816,-1.456587 C 47.0108,26.450616 47.48674,26.220333 40.690515,33.792942 37.128789,28.327805 30.485433,16.964001 27.284929,11.510003 h 2.26 c 1.333333,0 1.333333,-1.9999999 0,-1.9999999 h -7.12 c -1.333333,0 -1.333333,1.9999999 0,1.9999999 h 2.59 c 0.01476,0.09121 0.04521,0.179181 0.09,0.26 l 3.67,6.27 c -0.02908,0.02042 -0.0559,0.04389 -0.08,0.07 l -3,3.49 C 12.193953,12.00822 -5.2991211,26.430709 1.5266829,41.510267 c 3.021776,6.675705 10.1428891,10.496994 17.3754021,9.322314 7.232564,-1.174688 12.779588,-7.053511 13.532844,-14.342578 6.165532,0.08103 7.249282,0.576389 9.187264,-0.547377 l 15.27392,-16.834241 c 1.329007,3.177414 7.040596,16.581344 7.040596,16.581344 2.101982,1.482199 1.674841,-0.806975 1.674841,-0.806975 z m -35.756621,-15.002751 8.59,14.65 h -5.93 c -0.07159,-4.440483 -1.970829,-8.654995 -5.25,-11.65 z m 0.66,14.65 h -13.26 l 8.7,-10.12 c 2.824032,2.602606 4.469816,6.240654 4.56,10.08 z m -14.22,14.51 C 6.6775779,49.054516 -0.18809906,39.728144 2.6827189,30.549316 5.5535359,21.370487 16.509767,17.618186 24.404929,23.110003 l -10.08,11.77 c -0.230655,0.279688 -0.291874,0.662307 -0.16,1 0.164039,0.354454 0.519429,0.580966 0.91,0.58 h 15.35 c -0.845626,7.166018 -6.914269,12.568957 -14.13,12.58 z m 50.81,-9.81 c -44.693333,-26.153333 -22.346667,-13.076667 0,0 z"
+     id="path13"
+     sodipodi:nodetypes="cccsscccccccsssscccccsscccsccccccccccccscccccccc"
+     style="fill:#000000" />
+  <ellipse
+     style="fill:none;stroke:#000000;stroke-width:1.95112;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path870"
+     cx="64.579956"
+     cy="35.406952"
+     rx="14.982438"
+     ry="14.982738" />
+</svg>
diff --git a/TINK/TINK.iOS/Media.xcassets/sharee_no_background.imageset/ShareeBike NoBackground.pdf b/TINK/TINK.iOS/Media.xcassets/sharee_no_background.imageset/ShareeBike NoBackground.pdf
index 195b699..7cf0444 100644
Binary files a/TINK/TINK.iOS/Media.xcassets/sharee_no_background.imageset/ShareeBike NoBackground.pdf and b/TINK/TINK.iOS/Media.xcassets/sharee_no_background.imageset/ShareeBike NoBackground.pdf differ
diff --git a/TINK/TINK.iOS/TINK.iOS.csproj b/TINK/TINK.iOS/TINK.iOS.csproj
index f43da21..6e29856 100644
--- a/TINK/TINK.iOS/TINK.iOS.csproj
+++ b/TINK/TINK.iOS/TINK.iOS.csproj
@@ -24,7 +24,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchArch>i386, x86_64</MtouchArch>
+    <MtouchArch>x86_64</MtouchArch>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>true</MtouchDebug>
     <CodesignProvision>VS: com.TeilRad.sharee.bike Development</CodesignProvision>
@@ -37,11 +37,12 @@
     <DefineConstants>__IOS__;__MOBILE__;__UNIFIED__</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <MtouchLink>None</MtouchLink>
-    <MtouchArch>i386, x86_64</MtouchArch>
+    <MtouchLink>SdkOnly</MtouchLink>
+    <MtouchArch>x86_64</MtouchArch>
     <ConsolePause>false</ConsolePause>
     <CodesignProvision>VS: com.TeilRad.sharee.bike Development</CodesignProvision>
     <CodesignKey>Apple Development: Oliver Hauff (8SZ7J9P24J)</CodesignKey>
+    <MtouchSdkVersion>15.5</MtouchSdkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,12 +53,12 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
+    <MtouchArch>ARM64</MtouchArch>
     <CodesignKey>Apple Development: Oliver Hauff (8SZ7J9P24J)</CodesignKey>
     <MtouchDebug>true</MtouchDebug>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <CodesignProvision>VS: com.TeilRad.sharee.bike Development</CodesignProvision>
-    <MtouchLink>None</MtouchLink>
+    <MtouchLink>SdkOnly</MtouchLink>
     <MtouchInterpreter>-all</MtouchInterpreter>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
@@ -67,7 +68,7 @@
     <DefineConstants>__IOS__;__MOBILE__;__UNIFIED__</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
+    <MtouchArch>ARM64</MtouchArch>
     <ConsolePause>false</ConsolePause>
     <CodesignKey>Apple Development: Oliver Hauff (8SZ7J9P24J)</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
@@ -77,6 +78,7 @@
     <CrashReportingApiKey>
     </CrashReportingApiKey>
     <MtouchLink>SdkOnly</MtouchLink>
+    <MtouchSdkVersion>15.5</MtouchSdkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
     <DebugType>none</DebugType>
@@ -202,10 +204,10 @@
       <Version>1.7.3</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Forms.GoogleMaps">
-      <Version>3.3.0</Version>
+      <Version>5.0.0</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Forms.GoogleMaps.Bindings" Version="3.0.0" />
-    <PackageReference Include="Xamarin.Google.iOS.Maps" Version="3.9.0" />
+    <PackageReference Include="Xamarin.Google.iOS.Maps" Version="6.0.1.1" />
     <PackageReference Include="PInvoke.BCrypt">
       <Version>0.7.124</Version>
     </PackageReference>
@@ -375,6 +377,30 @@
     <ImageAsset Include="Media.xcassets\AppIcons.appiconset\1024-1.png">
       <Visible>false</Visible>
     </ImageAsset>
+    <ImageAsset Include="Media.xcassets\bike_Cargo_Pedelec_Two.imageset\Contents.json">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Media.xcassets\bike_Cargo_Pedelec_Two.imageset\bike_Cargo_Pedelec_Two.svg">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Media.xcassets\bike_Cargo_SoleHumanPowered_Trike.imageset\Contents.json">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Media.xcassets\bike_Cargo_SoleHumanPowered_Trike.imageset\bike_Cargo_SoleHumanPowered_Trike.svg">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Media.xcassets\bike_Cargo_SoleHumanPowered_Two.imageset\Contents.json">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Media.xcassets\bike_Cargo_SoleHumanPowered_Two.imageset\bike_Cargo_SoleHumanPowered_Two.svg">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Media.xcassets\bike_City_SoleHumanPowered_Two.imageset\Contents.json">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Media.xcassets\bike_City_SoleHumanPowered_Two.imageset\bike_City_SoleHumanPowered_Two.svg">
+      <Visible>false</Visible>
+    </ImageAsset>
     <ImageAsset Include="Media.xcassets\battery_0_5.imageset\Contents.json">
       <Visible>false</Visible>
     </ImageAsset>
@@ -432,6 +458,10 @@
     <Folder Include="Media.xcassets\battery_4_5.imageset\" />
     <Folder Include="Media.xcassets\battery_5_5.imageset\" />
     <Folder Include="Media.xcassets\battery_undefined.imageset\" />
+    <Folder Include="Media.xcassets\bike_Cargo_Pedelec_Two.imageset\" />
+    <Folder Include="Media.xcassets\bike_Cargo_SoleHumanPowered_Trike.imageset\" />
+    <Folder Include="Media.xcassets\bike_Cargo_SoleHumanPowered_Two.imageset\" />
+    <Folder Include="Media.xcassets\bike_City_SoleHumanPowered_Two.imageset\" />
     <Folder Include="Media.xcassets\Open_Blue.imageset\" />
     <Folder Include="Media.xcassets\Open_Green.imageset\" />
     <Folder Include="Media.xcassets\Open_LightBlue.imageset\" />
diff --git a/TINK/TINK/App.xaml.cs b/TINK/TINK/App.xaml.cs
index 8eb66b5..c97fda0 100644
--- a/TINK/TINK/App.xaml.cs
+++ b/TINK/TINK/App.xaml.cs
@@ -29,166 +29,166 @@ using Arendi.BleLibrary.Local;
 [assembly: XamlCompilation(XamlCompilationOptions.Compile)]
 namespace TINK
 {
-    public partial class App : Application
-    {
-        /// <summary>Title of the attachment file.</summary>
-        private const string ATTACHMENTTITLE = "Diagnostics.txt";
+	public partial class App : Application
+	{
+		/// <summary>Title of the attachment file.</summary>
+		private const string ATTACHMENTTITLE = "Diagnostics.txt";
 
-        /// <summary> Model root. </summary>
-        private static TinkApp m_oModelRoot;
+		/// <summary> Model root. </summary>
+		private static TinkApp m_oModelRoot;
 
-        /// <summary>
-        /// Gets the model root.
-        /// </summary>
-        public static TinkApp ModelRoot
-        {
-            get
-            {
-                if (m_oModelRoot != null)
-                {
-                    // Root model already exists, nothing to do.
-                    return m_oModelRoot;
-                }
+		/// <summary>
+		/// Gets the model root.
+		/// </summary>
+		public static TinkApp ModelRoot
+		{
+			get
+			{
+				if (m_oModelRoot != null)
+				{
+					// Root model already exists, nothing to do.
+					return m_oModelRoot;
+				}
 
-                // Get folder where to read settings from
-                var specialFolders = DependencyService.Get<ISpecialFolder>();
-                var internalPersonalDir = specialFolders.GetInternalPersonalDir();
+				// Get folder where to read settings from
+				var specialFolders = DependencyService.Get<ISpecialFolder>();
+				var internalPersonalDir = specialFolders.GetInternalPersonalDir();
 
-                // Delete attachtment from previous session.
-                DeleteAttachment(internalPersonalDir);
+				// Delete attachtment from previous session.
+				DeleteAttachment(internalPersonalDir);
 
-                // Setup logger using default settings. 
-                TinkApp.SetupLogging(
-                    new LoggingLevelSwitch(Model.Settings.Settings.DEFAULTLOGGINLEVEL),
-                    internalPersonalDir);
+				// Setup logger using default settings. 
+				TinkApp.SetupLogging(
+					new LoggingLevelSwitch(Model.Settings.Settings.DEFAULTLOGGINLEVEL),
+					internalPersonalDir);
 
-                // Subscribe to any unhandled/ unobserved exceptions.
-                AppDomain.CurrentDomain.UnhandledException += (sender, unobservedTaskExceptionEventArgs) => { Log.Fatal("Unobserved task exception: {Exception}", unobservedTaskExceptionEventArgs.ExceptionObject); };
-                TaskScheduler.UnobservedTaskException += (sender, unhandledExceptionEventArgs) => { Log.Fatal("Unhandled exception: {Exception}", unhandledExceptionEventArgs.Exception); };
+				// Subscribe to any unhandled/ unobserved exceptions.
+				AppDomain.CurrentDomain.UnhandledException += (sender, unobservedTaskExceptionEventArgs) => { Log.Fatal("Unobserved task exception: {Exception}", unobservedTaskExceptionEventArgs.ExceptionObject); };
+				TaskScheduler.UnobservedTaskException += (sender, unhandledExceptionEventArgs) => { Log.Fatal("Unhandled exception: {Exception}", unhandledExceptionEventArgs.Exception); };
 
-                // Restore last model state from json- file.
-                Dictionary<string, string> settingsJSON = new Dictionary<string, string>();
-                try
-                {
-                    settingsJSON = JsonSettingsDictionary.Deserialize(internalPersonalDir);
-                }
-                catch (Exception exception)
-                {
-                    Log.Error("Reading application settings from file failed.", exception);
-                }
+				// Restore last model state from json- file.
+				Dictionary<string, string> settingsJSON = new Dictionary<string, string>();
+				try
+				{
+					settingsJSON = JsonSettingsDictionary.Deserialize(internalPersonalDir);
+				}
+				catch (Exception exception)
+				{
+					Log.Error("Reading application settings from file failed.", exception);
+				}
 
-                Model.Settings.Settings settings;
-                try
-                {
-                    settings = new Model.Settings.Settings(
-                        null,  // Turn off filtering for sharee.bike- context
-                        null,  // Turn off filtering for sharee.bike- context
-                        JsonSettingsDictionary.GetCopriHostUri(settingsJSON),
-                        JsonSettingsDictionary.GetPollingParameters(settingsJSON),
-                        JsonSettingsDictionary.GetMinimumLoggingLevel(settingsJSON),
-                        JsonSettingsDictionary.GetIsReportLevelVerbose(settingsJSON),
-                        JsonSettingsDictionary.GetExpiresAfter(settingsJSON),
-                        JsonSettingsDictionary.GetActiveLockService(settingsJSON),
-                        JsonSettingsDictionary.GetConnectTimeout(settingsJSON),
-                        JsonSettingsDictionary.GetActiveGeolocationService(settingsJSON),
-                        JsonSettingsDictionary.GetCenterMapToCurrentLocation(settingsJSON),
-                        Xamarin.Forms.GoogleMaps.MapSpan.FromCenterAndRadius(new Xamarin.Forms.GoogleMaps.Position(47.995865, 7.815086), Xamarin.Forms.GoogleMaps.Distance.FromKilometers(2.9)),
-                        JsonSettingsDictionary.GetLogToExternalFolder(settingsJSON),
-                        JsonSettingsDictionary.GetIsSiteCachingOn(settingsJSON),
-                        JsonSettingsDictionary.GetActiveTheme(settingsJSON) ?? typeof(Themes.ShareeBike).Name);
-                }
-                catch (Exception exception)
-                {
-                    Log.Error("Deserializing application settings from dictionary failed.", exception);
-                    settings = new Model.Settings.Settings();
-                }
+				Model.Settings.Settings settings;
+				try
+				{
+					settings = new Model.Settings.Settings(
+						null,  // Turn off filtering for sharee.bike- context
+						null,  // Turn off filtering for sharee.bike- context
+						JsonSettingsDictionary.GetCopriHostUri(settingsJSON),
+						JsonSettingsDictionary.GetPollingParameters(settingsJSON),
+						JsonSettingsDictionary.GetMinimumLoggingLevel(settingsJSON),
+						JsonSettingsDictionary.GetIsReportLevelVerbose(settingsJSON),
+						JsonSettingsDictionary.GetExpiresAfter(settingsJSON),
+						JsonSettingsDictionary.GetActiveLockService(settingsJSON),
+						JsonSettingsDictionary.GetConnectTimeout(settingsJSON),
+						JsonSettingsDictionary.GetActiveGeolocationService(settingsJSON),
+						JsonSettingsDictionary.GetCenterMapToCurrentLocation(settingsJSON),
+						Xamarin.Forms.GoogleMaps.MapSpan.FromCenterAndRadius(new Xamarin.Forms.GoogleMaps.Position(47.995865, 7.815086), Xamarin.Forms.GoogleMaps.Distance.FromKilometers(2.9)),
+						JsonSettingsDictionary.GetLogToExternalFolder(settingsJSON),
+						JsonSettingsDictionary.GetIsSiteCachingOn(settingsJSON),
+						JsonSettingsDictionary.GetActiveTheme(settingsJSON) ?? typeof(Themes.ShareeBike).Name);
+				}
+				catch (Exception exception)
+				{
+					Log.Error("Deserializing application settings from dictionary failed.", exception);
+					settings = new Model.Settings.Settings();
+				}
 
-                if (settings.MinimumLogEventLevel != Model.Settings.Settings.DEFAULTLOGGINLEVEL
-                    || settings.LogToExternalFolder)
-                {
-                    // Eigher
-                    // - logging is not set to default value or
-                    // - logging is performed to external folder.
-                    // Need to reconfigure.
-                    Log.CloseAndFlush(); // Close before modifying logger configuration. Otherwise a sharing vialation occurs.
+				if (settings.MinimumLogEventLevel != Model.Settings.Settings.DEFAULTLOGGINLEVEL
+					|| settings.LogToExternalFolder)
+				{
+					// Eigher
+					// - logging is not set to default value or
+					// - logging is performed to external folder.
+					// Need to reconfigure.
+					Log.CloseAndFlush(); // Close before modifying logger configuration. Otherwise a sharing vialation occurs.
 
-                    TinkApp.SetupLogging(
-                        new LoggingLevelSwitch(settings.MinimumLogEventLevel),
-                        !settings.LogToExternalFolder
-                            ? internalPersonalDir
-                            : specialFolders.GetExternalFilesDir());
-                }
+					TinkApp.SetupLogging(
+						new LoggingLevelSwitch(settings.MinimumLogEventLevel),
+						!settings.LogToExternalFolder
+							? internalPersonalDir
+							: specialFolders.GetExternalFilesDir());
+				}
 
-                // Get auth cookie
-                Log.Debug("Get auth cookie.");
-                IStore store = null;
+				// Get auth cookie
+				Log.Debug("Get auth cookie.");
+				IStore store = null;
 
-                var lastVersion = JsonSettingsDictionary.GetAppVersion(settingsJSON);
-                if (new Version(3, 0, 290) <= lastVersion)
-                {
-                    // App versions newer than 3.0.173 stored geolocation service in configuration.
-                    // Version 3.0.290: Geolocation service "GeolocationService" is no more supported.
-                    // For this reasons a swich of geolocation service is forced when loading configurations from ealier versions.
-                    LocationServicesContainer.SetActive(settings.ActiveGeolocationService);
-                }
+				var lastVersion = JsonSettingsDictionary.GetAppVersion(settingsJSON);
+				if (new Version(3, 0, 290) <= lastVersion)
+				{
+					// App versions newer than 3.0.173 stored geolocation service in configuration.
+					// Version 3.0.290: Geolocation service "GeolocationService" is no more supported.
+					// For this reasons a swich of geolocation service is forced when loading configurations from ealier versions.
+					LocationServicesContainer.SetActive(settings.ActiveGeolocationService);
+				}
 
-                store = new Store();
+				store = new Store();
 
-                Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
+				Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
 
-                var context = SynchronizationContext.Current;
+				var context = SynchronizationContext.Current;
 
-                var appInfoService = DependencyService.Get<IAppInfo>();
+				var appInfoService = DependencyService.Get<IAppInfo>();
 
-                const string MERCHANTID = "0000000000";
+				const string MERCHANTID = "0000000000";
 
-                // Create new app instnace.
-                Log.Debug("Constructing main model...");
-                m_oModelRoot = new TinkApp(
-                    settings,
-                    store, // Manages user account
-                    isConnectedFunc: () => CrossConnectivity.Current.IsConnected,
-                    connectorFactory: (isConnected, activeUri, sessionCookie, mail, expiresAfter) => ConnectorFactory.Create(
-                        isConnected,
-                        activeUri,
-                        new Repository.AppContextInfo(MERCHANTID, AppFlavor.ShareeBike.GetDisplayName().Replace(" ", ""), appInfoService.Version),
-                        CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
-                        sessionCookie,
-                        mail,
-                        expiresAfter),
-                    merchantId: MERCHANTID,
-                    bluetoothService: BluetoothService, /* locksService */
-                    locationPermissionsService: PermissionsService,
-                    locationServicesContainer: LocationServicesContainer,
-                    locksService: null,
-                    device: DependencyService.Get<ISmartDevice>(),
-                    specialFolder: specialFolders,
-                    cipher: new Cipher(),
-                    new TINK.Services.ThemeNS.Theme(Application.Current.Resources.MergedDictionaries),
-                    arendiCentral:
+				// Create new app instnace.
+				Log.Debug("Constructing main model...");
+				m_oModelRoot = new TinkApp(
+					settings,
+					store, // Manages user account
+					isConnectedFunc: () => CrossConnectivity.Current.IsConnected,
+					connectorFactory: (isConnected, activeUri, sessionCookie, mail, expiresAfter) => ConnectorFactory.Create(
+						isConnected,
+						activeUri,
+						new Repository.AppContextInfo(MERCHANTID, AppFlavor.ShareeBike.GetDisplayName().Replace(" ", ""), appInfoService.Version),
+						CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
+						sessionCookie,
+						mail,
+						expiresAfter),
+					merchantId: MERCHANTID,
+					bluetoothService: BluetoothService, /* locksService */
+					locationPermissionsService: PermissionsService,
+					locationServicesContainer: LocationServicesContainer,
+					locksService: null,
+					device: DependencyService.Get<ISmartDevice>(),
+					specialFolder: specialFolders,
+					cipher: new Cipher(),
+					new TINK.Services.ThemeNS.Theme(Application.Current.Resources.MergedDictionaries),
+					arendiCentral:
 #if ARENDI
                     DependencyService.Get<ICentral>(),
 #else
 
-                    null,
-#endif 
-                    postAction: (d, obj) => context.Post(d, obj),
-                    currentVersion: appInfoService.Version,
-                    lastVersion: lastVersion,
-                    whatsNewShownInVersion: JsonSettingsDictionary.GetWhatsNew(settingsJSON) ?? settingsJSON.GetAppVersion(),
-                    appFlavor: AppFlavor.ShareeBike);
+					null,
+#endif
+					postAction: (d, obj) => context.Post(d, obj),
+					currentVersion: appInfoService.Version,
+					lastVersion: lastVersion,
+					whatsNewShownInVersion: JsonSettingsDictionary.GetWhatsNew(settingsJSON) ?? settingsJSON.GetAppVersion(),
+					flavor: AppFlavor.ShareeBike);
 
-                Log.Debug("Main model successfully constructed.");
-                return m_oModelRoot;
-            }
-        }
+				Log.Debug("Main model successfully constructed.");
+				return m_oModelRoot;
+			}
+		}
 
-        /// <summary>
-        /// Entry point of application.
-        /// </summary>
-        public App()
-        {
-            InitializeComponent();
+		/// <summary>
+		/// Entry point of application.
+		/// </summary>
+		public App()
+		{
+			InitializeComponent();
 
 #if USEFLYOUT
             // Use flyout page.
@@ -196,149 +196,149 @@ namespace TINK
                 ? new View.WhatsNew.WhatsNewPage(() => MainPage = new View.Root.RootPage()) // Show whats new info.
                 : (Page)new View.Root.RootPage(); // Just start sharee- app            
 #else
-            // Use shell.
-            MainPage = ModelRoot.WhatsNew.IsShowRequired
-            ? new View.WhatsNew.WhatsNewPage(() => MainPage = new View.RootShell.AppShell()) // Show whats new info.
-                : (Page)new View.RootShell.AppShell(); // Just start sharee- app
+			// Use shell.
+			MainPage = ModelRoot.WhatsNew.IsShowRequired
+			? new View.WhatsNew.WhatsNewPage(() => MainPage = new View.RootShell.AppShell()) // Show whats new info.
+				: (Page)new View.RootShell.AppShell(); // Just start sharee- app
 
 #endif
-        }
+		}
 
-        /// <summary> Concatenates all log files to a single one. </summary>
-        /// <returns>Full file name of attachment.</returns>
-        public static string CreateAttachment()
-        {
-            var sessionLogFiles = Log.Logger.GetLogFiles().ToArray();
+		/// <summary> Concatenates all log files to a single one. </summary>
+		/// <returns>Full file name of attachment.</returns>
+		public static string CreateAttachment()
+		{
+			var sessionLogFiles = Log.Logger.GetLogFiles().ToArray();
 
-            if (sessionLogFiles.Length < 1)
-            {
-                // Either
-                // - there is no logging file 
-                // - an error occurred getting list of log files.
-                return string.Empty;
-            }
+			if (sessionLogFiles.Length < 1)
+			{
+				// Either
+				// - there is no logging file 
+				// - an error occurred getting list of log files.
+				return string.Empty;
+			}
 
-            var fullLogFileName = System.IO.Path.Combine(ModelRoot.LogFileParentFolder, ATTACHMENTTITLE);
+			var fullLogFileName = System.IO.Path.Combine(ModelRoot.LogFileParentFolder, ATTACHMENTTITLE);
 
-            // Stop logging to avoid file access exception.
-            Log.CloseAndFlush();
+			// Stop logging to avoid file access exception.
+			Log.CloseAndFlush();
 
-            System.IO.File.WriteAllLines(
-                fullLogFileName,
-                sessionLogFiles.SelectMany(name =>
-                     (new List<string> { $"{{\"SessionFileName\":\"{name}\"}}" })
-                        .Concat(System.IO.File.ReadLines(name).ToArray())));
+			System.IO.File.WriteAllLines(
+				fullLogFileName,
+				sessionLogFiles.SelectMany(name =>
+					 (new List<string> { $"{{\"SessionFileName\":\"{name}\"}}" })
+						.Concat(System.IO.File.ReadLines(name).ToArray())));
 
-            // Resume logging
-            TinkApp.SetupLogging(
-                ModelRoot.Level,
-                ModelRoot.LogFileParentFolder);
+			// Resume logging
+			TinkApp.SetupLogging(
+				ModelRoot.Level,
+				ModelRoot.LogFileParentFolder);
 
-            return fullLogFileName;
-        }
+			return fullLogFileName;
+		}
 
-        /// <summary>Deletes an attachment if there is one.</summary>
-        /// <param name="folder">Folder to delete, is null folder is queried from model.</param>
-        private static void DeleteAttachment(string folder = null)
-        {
-            var attachment = System.IO.Path.Combine(folder ?? ModelRoot.LogFileParentFolder, ATTACHMENTTITLE);
-            if (!System.IO.File.Exists(attachment))
-            {
-                // No attachment found.
-                return;
-            }
+		/// <summary>Deletes an attachment if there is one.</summary>
+		/// <param name="folder">Folder to delete, is null folder is queried from model.</param>
+		private static void DeleteAttachment(string folder = null)
+		{
+			var attachment = System.IO.Path.Combine(folder ?? ModelRoot.LogFileParentFolder, ATTACHMENTTITLE);
+			if (!System.IO.File.Exists(attachment))
+			{
+				// No attachment found.
+				return;
+			}
 
-            System.IO.File.Delete(attachment);
-        }
+			System.IO.File.Delete(attachment);
+		}
 
-        protected override void OnSleep()
-        {
-            // Handle when your app sleeps
-            Log.CloseAndFlush();
-        }
+		protected override void OnSleep()
+		{
+			// Handle when your app sleeps
+			Log.CloseAndFlush();
+		}
 
-        protected override void OnResume()
-        {
-            DeleteAttachment();
+		protected override void OnResume()
+		{
+			DeleteAttachment();
 
-            TinkApp.SetupLogging(
-                ModelRoot.Level,
-                ModelRoot.LogFileParentFolder);
-        }
+			TinkApp.SetupLogging(
+				ModelRoot.Level,
+				ModelRoot.LogFileParentFolder);
+		}
 
-        /// <param name="uri">The URI for the request.</param>
-        /// <summary>Overriden to respond when the user initiates an app link request.</summary>
-        protected override void OnAppLinkRequestReceived(Uri uri)
-        {
-            base.OnAppLinkRequestReceived(uri);
-            if (uri.Host.ToLower() == "sharee.bike")
-            {
-                // Input e.g. sharee.bike/sharee/?lat=49.921&long=32.51
-                Array segments = Array.ConvertAll(uri.Segments, segment => segment.Replace("/", "")).Skip(1).ToArray();
-                if (uri.Query.Length > 0)
-                {
-                    Dictionary<string, string> queryDict = uri.Query
-                        .Substring(1)
-                        .Split("&")
-                        .Select(query => query.Split('='))
-                        .ToDictionary(query => query.FirstOrDefault(), query => query.Skip(1).FirstOrDefault());
-                }
-                // segments == ["sharee"]
-                // queryDict == [{["lat", "49.921"]}], {["long", "32.51"]}]
-                // => Navigate and pass params depending on linkinput
-                // If no custom navigation is configured, the app just opens as if the user opened it
-            }
-        }
+		/// <param name="uri">The URI for the request.</param>
+		/// <summary>Overriden to respond when the user initiates an app link request.</summary>
+		protected override void OnAppLinkRequestReceived(Uri uri)
+		{
+			base.OnAppLinkRequestReceived(uri);
+			if (uri.Host.ToLower() == "sharee.bike")
+			{
+				// Input e.g. sharee.bike/sharee/?lat=49.921&long=32.51
+				Array segments = Array.ConvertAll(uri.Segments, segment => segment.Replace("/", "")).Skip(1).ToArray();
+				if (uri.Query.Length > 0)
+				{
+					Dictionary<string, string> queryDict = uri.Query
+						.Substring(1)
+						.Split("&")
+						.Select(query => query.Split('='))
+						.ToDictionary(query => query.FirstOrDefault(), query => query.Skip(1).FirstOrDefault());
+				}
+				// segments == ["sharee"]
+				// queryDict == [{["lat", "49.921"]}], {["long", "32.51"]}]
+				// => Navigate and pass params depending on linkinput
+				// If no custom navigation is configured, the app just opens as if the user opened it
+			}
+		}
 
-        /// <summary> Gets the current logging level.</summary>
-        /// <returns></returns>
-        private static LogEventLevel GetCurrentLogEventLevel()
-        {
-            foreach (LogEventLevel level in Enum.GetValues(typeof(LogEventLevel)))
-            {
-                if (Log.IsEnabled(level))
-                    return level;
-            }
+		/// <summary> Gets the current logging level.</summary>
+		/// <returns></returns>
+		private static LogEventLevel GetCurrentLogEventLevel()
+		{
+			foreach (LogEventLevel level in Enum.GetValues(typeof(LogEventLevel)))
+			{
+				if (Log.IsEnabled(level))
+					return level;
+			}
 
-            return LogEventLevel.Error;
-        }
+			return LogEventLevel.Error;
+		}
 
-        /// <summary>
-        /// Holds the permission service instance.
-        /// </summary>
-        private static ILocationPermission _PermissionsService = null;
+		/// <summary>
+		/// Holds the permission service instance.
+		/// </summary>
+		private static ILocationPermission _PermissionsService = null;
 
-        /// <summary>
-        /// Service to manage permissions (location) of the app.
-        /// </summary>
-        public static ILocationPermission PermissionsService
-        {
-            get
-            {
-                if (_PermissionsService != null)
-                    return _PermissionsService;
+		/// <summary>
+		/// Service to manage permissions (location) of the app.
+		/// </summary>
+		public static ILocationPermission PermissionsService
+		{
+			get
+			{
+				if (_PermissionsService != null)
+					return _PermissionsService;
 
-                _PermissionsService = new Services.Permissions.Essentials.Permissions();
-                return _PermissionsService;
-            }
-        }
+				_PermissionsService = new Services.Permissions.Essentials.Permissions();
+				return _PermissionsService;
+			}
+		}
 
-        /// <summary>
-        /// Service to manage bluetooth stack.
-        /// </summary>
-        public static Plugin.BLE.Abstractions.Contracts.IBluetoothLE BluetoothService => Plugin.BLE.CrossBluetoothLE.Current;
+		/// <summary>
+		/// Service to manage bluetooth stack.
+		/// </summary>
+		public static Plugin.BLE.Abstractions.Contracts.IBluetoothLE BluetoothService => Plugin.BLE.CrossBluetoothLE.Current;
 
-        /// <summary>
-        /// Service container to manage geolocation services.
-        /// </summary>
-        public static IServicesContainer<IGeolocation> LocationServicesContainer { get; }
-            = new ServicesContainerMutableT<IGeolocation>(
-                    new HashSet<IGeolocation> {
-                        new LastKnownGeolocationService(DependencyService.Get<IGeolodationDependent>()),
-                        new SimulatedGeolocationService(DependencyService.Get<IGeolodationDependent>()),
-                        new GeolocationAccuracyMediumService(DependencyService.Get<IGeolodationDependent>()),
-                        new GeolocationAccuracyHighService(DependencyService.Get<IGeolodationDependent>()),
-                        new GeolocationAccuracyBestService(DependencyService.Get<IGeolodationDependent>())},
-                     Model.Settings.Settings.DefaultLocationService.FullName);
-    }
+		/// <summary>
+		/// Service container to manage geolocation services.
+		/// </summary>
+		public static IServicesContainer<IGeolocation> LocationServicesContainer { get; }
+			= new ServicesContainerMutableT<IGeolocation>(
+					new HashSet<IGeolocation> {
+						new LastKnownGeolocationService(DependencyService.Get<IGeolodationDependent>()),
+						new SimulatedGeolocationService(DependencyService.Get<IGeolodationDependent>()),
+						new GeolocationAccuracyMediumService(DependencyService.Get<IGeolodationDependent>()),
+						new GeolocationAccuracyHighService(DependencyService.Get<IGeolodationDependent>()),
+						new GeolocationAccuracyBestService(DependencyService.Get<IGeolodationDependent>())},
+					 Model.Settings.Settings.DefaultLocationService.FullName);
+	}
 }
diff --git a/TINK/TINK/BackdoorMethodHelpers.cs b/TINK/TINK/BackdoorMethodHelpers.cs
index 068f5ac..f8dd015 100644
--- a/TINK/TINK/BackdoorMethodHelpers.cs
+++ b/TINK/TINK/BackdoorMethodHelpers.cs
@@ -5,34 +5,34 @@ using Xamarin.Forms;
 
 namespace TINK
 {
-    public static class BackdoorMethodHelpers
-    {
-        public static void DoTapPage(string stationId)
-        {
-            Serilog.Log.Information($"Request via backdoor to tap station {stationId}.");
-            var currentPage = GetCurrentPage();
-            var mapPageViewModel = (currentPage as MapPage)?.BindingContext as MapPageViewModel;
-            if (mapPageViewModel == null)
-            {
-                Serilog.Log.Error($"Request via backdoor to tap station {stationId} aborted because current page is not of expected type {typeof(MapPage).Name}. Type detected is {currentPage.GetType().Name}.");
-                return;
-            }
+	public static class BackdoorMethodHelpers
+	{
+		public static void DoTapPage(string stationId)
+		{
+			Serilog.Log.Information($"Request via backdoor to tap station {stationId}.");
+			var currentPage = GetCurrentPage();
+			var mapPageViewModel = (currentPage as MapPage)?.BindingContext as MapPageViewModel;
+			if (mapPageViewModel == null)
+			{
+				Serilog.Log.Error($"Request via backdoor to tap station {stationId} aborted because current page is not of expected type {typeof(MapPage).Name}. Type detected is {currentPage.GetType().Name}.");
+				return;
+			}
 
-            Serilog.Log.Information($"Invoking member to tap.");
-            mapPageViewModel?.OnStationClicked(stationId);
-        }
+			Serilog.Log.Information($"Invoking member to tap.");
+			mapPageViewModel?.OnStationClicked(stationId);
+		}
 
-        /// <summary> Gets the current page assumed that app is master detail page.</summary>
-        /// <returns></returns>
-        static Page GetCurrentPage()
-        {
+		/// <summary> Gets the current page assumed that app is master detail page.</summary>
+		/// <returns></returns>
+		static Page GetCurrentPage()
+		{
 
 #if USEFLYOUT
             return (Application.Current.MainPage as FlyoutPage)?.Detail.Navigation.NavigationStack.LastOrDefault();
 #else
-            return Shell.Current.CurrentPage;
+			return Shell.Current.CurrentPage;
 #endif
-        }
+		}
 
-    }
+	}
 }
diff --git a/TINK/TINK/Model/Device/SpecialFolder.cs b/TINK/TINK/Model/Device/SpecialFolder.cs
index 811664e..3a90f3f 100644
--- a/TINK/TINK/Model/Device/SpecialFolder.cs
+++ b/TINK/TINK/Model/Device/SpecialFolder.cs
@@ -3,22 +3,22 @@ using Xamarin.Forms;
 
 namespace TINK.Model.Device
 {
-    public class SpecialFolder : ISpecialFolder
-    {
-        /// <summary>
-        /// Get the folder name of external folder to write to.
-        /// </summary>
-        /// <returns></returns>
-        public string GetExternalFilesDir()
-        {
-            return DependencyService.Get<ISpecialFolder>().GetExternalFilesDir();
-        }
+	public class SpecialFolder : ISpecialFolder
+	{
+		/// <summary>
+		/// Get the folder name of external folder to write to.
+		/// </summary>
+		/// <returns></returns>
+		public string GetExternalFilesDir()
+		{
+			return DependencyService.Get<ISpecialFolder>().GetExternalFilesDir();
+		}
 
-        /// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
-        /// <returns>Directory name.</returns>
-        public string GetInternalPersonalDir()
-        {
-            return DependencyService.Get<ISpecialFolder>().GetInternalPersonalDir();
-        }
-    }
+		/// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
+		/// <returns>Directory name.</returns>
+		public string GetInternalPersonalDir()
+		{
+			return DependencyService.Get<ISpecialFolder>().GetInternalPersonalDir();
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/Account/AccountPage.xaml.cs b/TINK/TINK/View/Account/AccountPage.xaml.cs
index 4216b3e..d470451 100644
--- a/TINK/TINK/View/Account/AccountPage.xaml.cs
+++ b/TINK/TINK/View/Account/AccountPage.xaml.cs
@@ -12,80 +12,80 @@ using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 
 namespace TINK.View.Account
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class AccountPage : ContentPage, IViewService, IDetailPage
 #else
-    public partial class AccountPage : ContentPage, IViewService
+	public partial class AccountPage : ContentPage, IViewService
 #endif
-    {
-        /// <summary> Refernce to view model. </summary>
-        AccountPageViewModel m_oViewModel = null;
+	{
+		/// <summary> Refernce to view model. </summary>
+		AccountPageViewModel m_oViewModel = null;
 
-        /// <summary> Constructs a account page. </summary>
-        public AccountPage()
-        {
-            InitializeComponent();
+		/// <summary> Constructs a account page. </summary>
+		public AccountPage()
+		{
+			InitializeComponent();
 
-            var l_oModel = App.ModelRoot;
+			var l_oModel = App.ModelRoot;
 
-            m_oViewModel = new AccountPageViewModel(
-                l_oModel,
-                (url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url),
-                this);
+			m_oViewModel = new AccountPageViewModel(
+				l_oModel,
+				(url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url),
+				this);
 
-            BindingContext = m_oViewModel;
-        }
+			BindingContext = m_oViewModel;
+		}
 
-        /// <summary> Displays alert message. </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string title, string message, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, cancel);
+		/// <summary> Displays alert message. </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string title, string message, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, cancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary>
-        /// Displays an action sheet.
-        /// </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="cancel">Text of button.</param>
-        /// <param name="destruction"></param>
-        /// <param name="p_oButtons">Buttons holding options to select.</param>
-        /// <returns>Text selected</returns>
-        public new async Task<string> DisplayActionSheet(String title, String cancel, String destruction, params String[] p_oButtons)
-                => await base.DisplayActionSheet(title, cancel, destruction, p_oButtons);
+		/// <summary>
+		/// Displays an action sheet.
+		/// </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="cancel">Text of button.</param>
+		/// <param name="destruction"></param>
+		/// <param name="p_oButtons">Buttons holding options to select.</param>
+		/// <returns>Text selected</returns>
+		public new async Task<string> DisplayActionSheet(String title, String cancel, String destruction, params String[] p_oButtons)
+				=> await base.DisplayActionSheet(title, cancel, destruction, p_oButtons);
 
 #if USEFLYOUT
         /// <summary>
@@ -95,19 +95,19 @@ namespace TINK.View.Account
         public void ShowPage(ViewTypes p_oType, string title = null)
             => m_oNavigation.ShowPage(p_oType.GetViewType(), title);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushModalAsync(ViewTypes typeOfPage)
-            => Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushModalAsync(ViewTypes typeOfPage)
+			=> Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync()
-            => throw new NotSupportedException();
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync()
+			=> throw new NotSupportedException();
 
 #if USEFLYOUT
 
@@ -123,34 +123,34 @@ namespace TINK.View.Account
         }
 
 #endif
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        protected async override void OnAppearing()
-            => await m_oViewModel.OnAppearing();
-        /// <summary>
-        /// Invoked when pages is closed/ hidden. 
-        /// Stops update process.
-        /// </summary>
-        protected async override void OnDisappearing()
-        {
-            if (m_oViewModel == null)
-            {
-                // View model might be null.
-                return;
-            }
-            await m_oViewModel.OnDisappearing();
-        }
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		protected async override void OnAppearing()
+			=> await m_oViewModel.OnAppearing();
+		/// <summary>
+		/// Invoked when pages is closed/ hidden. 
+		/// Stops update process.
+		/// </summary>
+		protected async override void OnDisappearing()
+		{
+			if (m_oViewModel == null)
+			{
+				// View model might be null.
+				return;
+			}
+			await m_oViewModel.OnDisappearing();
+		}
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public async Task PushAsync(ViewTypes p_oTypeOfPage)
-            => await Navigation.PushAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public async Task PushAsync(ViewTypes p_oTypeOfPage)
+			=> await Navigation.PushAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/Bike/BCBike.xaml.cs b/TINK/TINK/View/Bike/BCBike.xaml.cs
index 99225d0..b3d8cf4 100644
--- a/TINK/TINK/View/Bike/BCBike.xaml.cs
+++ b/TINK/TINK/View/Bike/BCBike.xaml.cs
@@ -9,12 +9,12 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Bike
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class BCBike : ViewCell
-    {
-        public BCBike()
-        {
-            InitializeComponent();
-        }
-    }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class BCBike : ViewCell
+	{
+		public BCBike()
+		{
+			InitializeComponent();
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/Bike/BikeViewCellTemplateSelector.cs b/TINK/TINK/View/Bike/BikeViewCellTemplateSelector.cs
index 43084a7..cb62d41 100644
--- a/TINK/TINK/View/Bike/BikeViewCellTemplateSelector.cs
+++ b/TINK/TINK/View/Bike/BikeViewCellTemplateSelector.cs
@@ -2,25 +2,25 @@
 
 namespace TINK.View.Bike
 {
-    /// <summary>
-    /// Selects different templates for different bike types (BordComputer bikes, iLockIt bikes).
-    /// </summary>
-    public class BikeViewCellTemplateSelector : DataTemplateSelector
-    {
-        DataTemplate bCBike;
-        DataTemplate iLockIBike;
+	/// <summary>
+	/// Selects different templates for different bike types (BordComputer bikes, iLockIt bikes).
+	/// </summary>
+	public class BikeViewCellTemplateSelector : DataTemplateSelector
+	{
+		DataTemplate bCBike;
+		DataTemplate iLockIBike;
 
-        public BikeViewCellTemplateSelector()
-        {
-            bCBike = new DataTemplate(typeof(BCBike));
-            iLockIBike = new DataTemplate(typeof(ILockItBike));
-        }
+		public BikeViewCellTemplateSelector()
+		{
+			bCBike = new DataTemplate(typeof(BCBike));
+			iLockIBike = new DataTemplate(typeof(ILockItBike));
+		}
 
-        protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
-        {
-            return item is ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel
-                ? iLockIBike
-                : bCBike;
-        }
-    }
+		protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
+		{
+			return item is ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel
+				? iLockIBike
+				: bCBike;
+		}
+	}
 }
diff --git a/TINK/TINK/View/Bike/ILockItBike.xaml b/TINK/TINK/View/Bike/ILockItBike.xaml
index f79e8b1..06d80ba 100644
--- a/TINK/TINK/View/Bike/ILockItBike.xaml
+++ b/TINK/TINK/View/Bike/ILockItBike.xaml
@@ -14,23 +14,42 @@
         </ContentView.Resources>
         <StackLayout 
             Padding="10">
-            <!-- Name of the bike -->
-            <Label 
-                FontAttributes="Bold"
-                FontSize="Large"
-                HorizontalTextAlignment="Center"
-                Text="{Binding Name}"/>
-            <!-- Id of the bike -->
-            <Label 
-                FontAttributes="Bold"
-                HorizontalTextAlignment="Center"
-                IsVisible="{Binding DisplayId, Converter={StaticResource Label_Converter}}"
-                Text="{Binding DisplayId}"/>
-            <!-- Battery level -->
-            <sharedGui:BarLevelView
+            <Grid Padding="0,0,5,10">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <!-- Icon of the bike -->
+                <Image
+                Source="{Binding DisplayedBikeImageSourceString}"
+                    HeightRequest="60"
+                    Aspect="AspectFit"
+                    HorizontalOptions="Start"
+                    VerticalOptions="End"
+                    Grid.Column="0"/>
+                <!-- Battery level -->
+                <sharedGui:BarLevelView
                     Current="{Binding CurrentChargeBars}"
                     Maximum="{Binding MaxChargeBars}"
+                    Grid.Column="1"
+                    VerticalOptions="End"
                     IsVisible="{Binding IsBatteryChargeVisible}"/>
+                <!-- Name of the bike -->
+                <StackLayout Grid.Column="1" Grid.ColumnSpan="2">
+                    <Label 
+                        FontAttributes="Bold"
+                        FontSize="Large"
+                        HorizontalTextAlignment="Right"
+                        Text="{Binding Name}"/>
+                    <!-- Id of the bike -->
+                    <Label 
+                        FontAttributes="Bold"
+                        HorizontalTextAlignment="Right"
+                        IsVisible="{Binding DisplayId, Converter={StaticResource Label_Converter}}"
+                        Text="{Binding DisplayId}"/>
+                </StackLayout>
+            </Grid>
             <!-- Rental state -->
             <Label 
                 Text="{Binding StateText}"
diff --git a/TINK/TINK/View/Bike/ILockItBike.xaml.cs b/TINK/TINK/View/Bike/ILockItBike.xaml.cs
index bdd09dd..ff2a14f 100644
--- a/TINK/TINK/View/Bike/ILockItBike.xaml.cs
+++ b/TINK/TINK/View/Bike/ILockItBike.xaml.cs
@@ -9,36 +9,36 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Bike
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class ILockItBike : ViewCell
-    {
-        public ILockItBike()
-        {
-            InitializeComponent();
-        }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class ILockItBike : ViewCell
+	{
+		public ILockItBike()
+		{
+			InitializeComponent();
+		}
 
-        protected override void OnBindingContextChanged()
-        {
-            base.OnBindingContextChanged();
+		protected override void OnBindingContextChanged()
+		{
+			base.OnBindingContextChanged();
 
-            if (Device.RuntimePlatform != Device.iOS)
-                // Update of size is only required for iOS.
-                return;
+			if (Device.RuntimePlatform != Device.iOS)
+				// Update of size is only required for iOS.
+				return;
 
-            var viewModel = BindingContext as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            if (viewModel == null)
-                return;
+			var viewModel = BindingContext as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			if (viewModel == null)
+				return;
 
-            viewModel.PropertyChanged += (sender, e) =>
-            {
-                if (e.PropertyName == nameof(TINK.ViewModel.Bikes.Bike.BC.RequestHandler.Base<IBikeInfoMutable>.IsButtonVisible)
-                || e.PropertyName == nameof(TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler.Base.IsLockitButtonVisible))
-                {
-                    // Force update of view cell on iOS.
-                    // https://hausource.visualstudio.com/TINK/_workitems/edit/132
-                    ForceUpdateSize();
-                }
-            };
-        }
-    }
+			viewModel.PropertyChanged += (sender, e) =>
+			{
+				if (e.PropertyName == nameof(TINK.ViewModel.Bikes.Bike.BC.RequestHandler.Base<IBikeInfoMutable>.IsButtonVisible)
+				|| e.PropertyName == nameof(TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler.Base.IsLockitButtonVisible))
+				{
+					// Force update of view cell on iOS.
+					// https://hausource.visualstudio.com/TINK/_workitems/edit/132
+					ForceUpdateSize();
+				}
+			};
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs b/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
index 3cd71c2..2ac65a4 100644
--- a/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
+++ b/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
@@ -5,38 +5,38 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.BikesAtStation
 {
-    using System;
-    using System.Linq;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using TINK.Model.Device;
+	using System;
+	using System.Linq;
+	using System.Threading;
+	using System.Threading.Tasks;
+	using TINK.Model.Device;
 #if USEFLYOUT
     using TINK.View.MasterDetail;
 #endif
-    using TINK.ViewModel;
-    using TINK.Model;
-    using TINK.Services.BluetoothLock.Tdo;
-    using System.Collections.Generic;
-    using Serilog;
-    using TINK.Services.BluetoothLock;
-    using Plugin.BLE;
-    using TINK.ViewModel.BikesAtStation;
-    using TINK.ViewModel.Bikes;
-    using Xamarin.CommunityToolkit.Extensions;
-    using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
+	using TINK.ViewModel;
+	using TINK.Model;
+	using TINK.Services.BluetoothLock.Tdo;
+	using System.Collections.Generic;
+	using Serilog;
+	using TINK.Services.BluetoothLock;
+	using Plugin.BLE;
+	using TINK.ViewModel.BikesAtStation;
+	using TINK.ViewModel.Bikes;
+	using Xamarin.CommunityToolkit.Extensions;
+	using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class BikesAtStationPage : ContentPage, IViewService, IDetailPage
 #else
-    public partial class BikesAtStationPage : ContentPage, IViewService
+	public partial class BikesAtStationPage : ContentPage, IViewService
 #endif
-    {
+	{
 
-        private BikesAtStationPageViewModel m_oViewModel;
+		private BikesAtStationPageViewModel m_oViewModel;
 
-        /// <summary> Initialization status to ensure initialization logic is not called multiple times. </summary>
-        private bool isInitializationStarted = false;
+		/// <summary> Initialization status to ensure initialization logic is not called multiple times. </summary>
+		private bool isInitializationStarted = false;
 
 #if TRYNOTBACKSTYLE
         public BikesAtStationPage()
@@ -56,140 +56,140 @@ namespace TINK.View.BikesAtStation
         }
 
 #else
-        public BikesAtStationPage()
-        {
-        }
+		public BikesAtStationPage()
+		{
+		}
 #endif
 
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        protected async override void OnAppearing()
-        {
-            // Don't repeat the initialization if it has been completed already.
-            if (isInitializationStarted) return;
-            isInitializationStarted = true;
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		protected async override void OnAppearing()
+		{
+			// Don't repeat the initialization if it has been completed already.
+			if (isInitializationStarted) return;
+			isInitializationStarted = true;
 
-            if (m_oViewModel != null)
-            {
+			if (m_oViewModel != null)
+			{
 #if BACKSTYLE
                 // Hide master- detail menu to force user to navigate using back button.
                 m_oNavigation.IsGestureEnabled = false;
 #endif
 
-                // No need to create view model, set binding context an items source if already done.
-                // If done twice tap events are fired multiple times (when hiding page using home button).
-                await m_oViewModel.OnAppearing();
-                isInitializationStarted = false;
-                return;
-            }
+				// No need to create view model, set binding context an items source if already done.
+				// If done twice tap events are fired multiple times (when hiding page using home button).
+				await m_oViewModel.OnAppearing();
+				isInitializationStarted = false;
+				return;
+			}
 
-            try
-            {
-                var model = App.ModelRoot;
+			try
+			{
+				var model = App.ModelRoot;
 
-                // Backup synchronization context when called from GUI-thread.
-                var synchronizationContext = SynchronizationContext.Current;
+				// Backup synchronization context when called from GUI-thread.
+				var synchronizationContext = SynchronizationContext.Current;
 
-                m_oViewModel = new BikesAtStationPageViewModel(
-                        model.ActiveUser,
-                        App.PermissionsService,
-                        App.BluetoothService,
-                        Device.RuntimePlatform,
-                        model.SelectedStation,
-                        () => model.GetIsConnected(),
-                        (isConnected) => model.GetConnector(isConnected),
-                        App.LocationServicesContainer.Active,
-                        model.LocksServices.Active,
-                        model.Polling,
-                        (url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url),
-                        (d, obj) => synchronizationContext.Post(d, obj),
-                        model.SmartDevice,
-                        this)
-                {
-                    IsReportLevelVerbose = model.IsReportLevelVerbose
-                };
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<BikesAtStationPage>().Error("Displaying bikes at station page failed. {Exception}", exception);
-                await DisplayAlert("Fehler", $"Seite Räder an Station kann nicht angezeigt werden. ${exception.Message}", "OK");
-                isInitializationStarted = false;
-                return;
-            }
+				m_oViewModel = new BikesAtStationPageViewModel(
+						model.ActiveUser,
+						App.PermissionsService,
+						App.BluetoothService,
+						Device.RuntimePlatform,
+						model.SelectedStation,
+						() => model.GetIsConnected(),
+						(isConnected) => model.GetConnector(isConnected),
+						App.LocationServicesContainer.Active,
+						model.LocksServices.Active,
+						model.Polling,
+						(url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url),
+						(d, obj) => synchronizationContext.Post(d, obj),
+						model.SmartDevice,
+						this)
+				{
+					IsReportLevelVerbose = model.IsReportLevelVerbose
+				};
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<BikesAtStationPage>().Error("Displaying bikes at station page failed. {Exception}", exception);
+				await DisplayAlert("Fehler", $"Seite Räder an Station kann nicht angezeigt werden. ${exception.Message}", "OK");
+				isInitializationStarted = false;
+				return;
+			}
 
-            InitializeComponent();
+			InitializeComponent();
 
 #if BACKSTYLE
             // Hide master- detail menu to force user to navigate using back button.
             m_oNavigation.IsGestureEnabled = false;
 #endif
 
-            BindingContext = m_oViewModel;
-            BikesAtStationListView.ItemsSource = m_oViewModel;
+			BindingContext = m_oViewModel;
+			BikesAtStationListView.ItemsSource = m_oViewModel;
 
-            await m_oViewModel.OnAppearing();
-            isInitializationStarted = false;
-        }
+			await m_oViewModel.OnAppearing();
+			isInitializationStarted = false;
+		}
 
-        /// <summary>
-        /// Invoked when pages is closed/ hidden. 
-        /// Stops update process.
-        /// </summary>
-        protected async override void OnDisappearing()
-        {
-            if (m_oViewModel != null)
-            {
-                // View model might be null.
-                await m_oViewModel?.OnDisappearing();
-            }
+		/// <summary>
+		/// Invoked when pages is closed/ hidden. 
+		/// Stops update process.
+		/// </summary>
+		protected async override void OnDisappearing()
+		{
+			if (m_oViewModel != null)
+			{
+				// View model might be null.
+				await m_oViewModel?.OnDisappearing();
+			}
 
 #if BACKSTYLE
             if (m_oNavigation!= null)
                 m_oNavigation.IsGestureEnabled = true; // Enables master- detail menu navigation again when page is unloaded.
 #endif
-        }
+		}
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string title, string message, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string title, string message, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, cancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
 
 #if USEFLYOUT
@@ -199,27 +199,27 @@ namespace TINK.View.BikesAtStation
         public void ShowPage(ViewTypes p_oType, string title = null)
             => m_oNavigation.ShowPage(p_oType.GetViewType(), title);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="typeOfPage">Page to display.</param>
-        public async Task PushModalAsync(ViewTypes typeOfPage)
-            => await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="typeOfPage">Page to display.</param>
+		public async Task PushModalAsync(ViewTypes typeOfPage)
+			=> await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync()
-        {
-            throw new NotSupportedException();
-        }
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync()
+		{
+			throw new NotSupportedException();
+		}
 
-        public Task PushAsync(ViewTypes p_oTypeOfPage)
-        {
-            throw new NotImplementedException();
-        }
+		public Task PushAsync(ViewTypes p_oTypeOfPage)
+		{
+			throw new NotImplementedException();
+		}
 
 #if USEFLYOUT
         /// <summary>
@@ -240,10 +240,10 @@ namespace TINK.View.BikesAtStation
 #if USCSHARP9
         public async Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup());
 #else
-        /// <summary> Displays user feedback popup.</summary>
-        /// <param name="co2Saving"> Co2 saving information.</param>
-        /// <returns>User feedback.</returns>
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
+		/// <summary> Displays user feedback popup.</summary>
+		/// <param name="co2Saving"> Co2 saving information.</param>
+		/// <returns>User feedback.</returns>
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/BoolInverterConverter.cs b/TINK/TINK/View/BoolInverterConverter.cs
index bbd7296..9fc95cd 100644
--- a/TINK/TINK/View/BoolInverterConverter.cs
+++ b/TINK/TINK/View/BoolInverterConverter.cs
@@ -4,16 +4,16 @@ using Xamarin.Forms;
 
 namespace TINK.View
 {
-    /// <summary> Inverts a bool.</summary>
-    public class BoolInverterConverter : IValueConverter
-    {
-        /// <summary> Inverts a bool.</summary>
-        /// <param name="value">Bool to invert.</param>
-        /// <returns>Inverted bool.</returns>
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-            => value is bool flag && !flag;
+	/// <summary> Inverts a bool.</summary>
+	public class BoolInverterConverter : IValueConverter
+	{
+		/// <summary> Inverts a bool.</summary>
+		/// <param name="value">Bool to invert.</param>
+		/// <returns>Inverted bool.</returns>
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+			=> value is bool flag && !flag;
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-            => value is bool flag && !flag;
-    }
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+			=> value is bool flag && !flag;
+	}
 }
diff --git a/TINK/TINK/View/Contact/ContactPage.xaml b/TINK/TINK/View/Contact/ContactPage.xaml
index f8e2ead..78237ef 100644
--- a/TINK/TINK/View/Contact/ContactPage.xaml
+++ b/TINK/TINK/View/Contact/ContactPage.xaml
@@ -50,7 +50,7 @@
                                 IsVisible="{Binding MailAddressText, Converter={StaticResource StringNotNullOrEmpty_Converter}}"
                                 Text="{Binding MailAddressText}"
                                 IsEnabled="{Binding IsSendMailAvailable}"
-                                Command="{Binding OnMailRequest}"/>
+                                Command="{Binding OnMailToOperatorRequest}"/>
                             <!--- Phone -->
                             <Label 
                                 IsVisible="{Binding PhoneNumberText, Converter={StaticResource StringNotNullOrEmpty_Converter}}"
diff --git a/TINK/TINK/View/Contact/ContactPage.xaml.cs b/TINK/TINK/View/Contact/ContactPage.xaml.cs
index fc50a7e..299b56e 100644
--- a/TINK/TINK/View/Contact/ContactPage.xaml.cs
+++ b/TINK/TINK/View/Contact/ContactPage.xaml.cs
@@ -10,118 +10,119 @@ using TINK.ViewModel.Info;
 using Xamarin.Essentials;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
+using TINK.Model;
 
 namespace TINK.View.Contact
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class ContactPage : ContentPage, IViewService, IDetailPage
 #else
-    public partial class ContactPage : ContentPage, IViewService
+	public partial class ContactPage : ContentPage, IViewService
 #endif
 
-    {
-        /// <summary> View model to notify view model if page appears. </summary>
-        private ContactPageViewModel ViewModel { get; set; }
+	{
+		/// <summary> View model to notify view model if page appears. </summary>
+		private ContactPageViewModel ViewModel { get; set; }
 
-        public ContactPage()
-        {
-            InitializeComponent();
+		public ContactPage()
+		{
+			InitializeComponent();
 
-            ViewModel = new ContactPageViewModel(App.ModelRoot.Uris.ActiveUri,
-                AppInfo.Name,
-                () => App.CreateAttachment(),
-                () => DependencyService.Get<IExternalBrowserService>().OpenUrl(DependencyService.Get<IAppInfo>().StoreUrl),
-                this);
+			ViewModel = new ContactPageViewModel(
+				App.ModelRoot.Flavor.GetDisplayName(),
+				() => App.CreateAttachment(),
+				() => DependencyService.Get<IExternalBrowserService>().OpenUrl(DependencyService.Get<IAppInfo>().StoreUrl),
+				this);
 
-            ContactPageView.BindingContext = ViewModel;
-        }
+			ContactPageView.BindingContext = ViewModel;
+		}
 
-        /// <summary> Invoked when page is shown. </summary>
-        protected async override void OnAppearing()
-        {
-            try
-            {
-                Log.ForContext<ContentPage>().Verbose("OnAppearing...");
+		/// <summary> Invoked when page is shown. </summary>
+		protected async override void OnAppearing()
+		{
+			try
+			{
+				Log.ForContext<ContentPage>().Verbose("OnAppearing...");
 
-                await ViewModel.OnAppearing(App.ModelRoot.SelectedStation);
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<ContentPage>().Error("Invoking OnAppearing on view model failed. {Exception}", exception);
-                return;
-            }
-        }
+				await ViewModel.OnAppearing(App.ModelRoot.SelectedStation);
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<ContentPage>().Error("Invoking OnAppearing on view model failed. {Exception}", exception);
+				return;
+			}
+		}
 
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
 #if USEFLYOUT
         public void ShowPage(ViewTypes p_oType, string title = null)
             => NavigationMasterDetail.ShowPage(p_oType.GetViewType(), title);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushModalAsync(ViewTypes p_oTypeOfPage)
-        {
-            throw new NotSupportedException();
-        }
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushModalAsync(ViewTypes p_oTypeOfPage)
+		{
+			throw new NotSupportedException();
+		}
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync()
-        {
-            throw new NotSupportedException();
-        }
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync()
+		{
+			throw new NotSupportedException();
+		}
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="typeOfPage">Page to display.</param>
-        public async Task PushAsync(ViewTypes typeOfPage)
-        {
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="typeOfPage">Page to display.</param>
+		public async Task PushAsync(ViewTypes typeOfPage)
+		{
 #if USEFLYOUT
             var page = Activator.CreateInstance(typeOfPage.GetViewType()) as IDetailPage;
 #else
-            var page = Activator.CreateInstance(typeOfPage.GetViewType());
+			var page = Activator.CreateInstance(typeOfPage.GetViewType());
 #endif
-            if (page == null)
-            {
-                return;
-            }
+			if (page == null)
+			{
+				return;
+			}
 
 #if USEFLYOUT
             page.NavigationMasterDetail = NavigationMasterDetail;
 #endif
-            await Navigation.PushAsync((Page)page);
-        }
+			await Navigation.PushAsync((Page)page);
+		}
 
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
 
 #if USEFLYOUT
@@ -131,5 +132,5 @@ namespace TINK.View.Contact
         /// </summary>
         public INavigationMasterDetail NavigationMasterDetail { set; private get; }
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/Contact/SelectStationPage.xaml.cs b/TINK/TINK/View/Contact/SelectStationPage.xaml.cs
index 1128a87..587548d 100644
--- a/TINK/TINK/View/Contact/SelectStationPage.xaml.cs
+++ b/TINK/TINK/View/Contact/SelectStationPage.xaml.cs
@@ -8,66 +8,66 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Contact
 {
-    using Serilog;
-    using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
-    using TINK.ViewModel.Contact;
+	using Serilog;
+	using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
+	using TINK.ViewModel.Contact;
 
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class SelectStationPage : ContentPage, IViewService, IDetailPage
 #else
-    public partial class SelectStationPage : ContentPage, IViewService
+	public partial class SelectStationPage : ContentPage, IViewService
 #endif
-    {
-        /// <summary> View model to notify about whether page appears or hides. </summary>
-        private SelectStationPageViewModel SelectStationPageViewModel { get; set; }
+	{
+		/// <summary> View model to notify about whether page appears or hides. </summary>
+		private SelectStationPageViewModel SelectStationPageViewModel { get; set; }
 
-        public SelectStationPage()
-        {
-            InitializeComponent();
-        }
+		public SelectStationPage()
+		{
+			InitializeComponent();
+		}
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string title, string message, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, cancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string title, string message, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, cancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
 
 #if USEFLYOUT
         /// <summary>
@@ -77,44 +77,44 @@ namespace TINK.View.Contact
         public void ShowPage(ViewTypes type, string title = null)
             => NavigationMasterDetail.ShowPage(type.GetViewType(), title);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="typeOfPage">Type of page to display.</param>
-        public async Task PushModalAsync(ViewTypes typeOfPage)
-            => await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="typeOfPage">Type of page to display.</param>
+		public async Task PushModalAsync(ViewTypes typeOfPage)
+			=> await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public async Task PopModalAsync()
-            => await Navigation.PopModalAsync();
+		/// <summary> Pops a page from the modal stack. </summary>
+		public async Task PopModalAsync()
+			=> await Navigation.PopModalAsync();
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="typeOfPage">Page to display.</param>
-        public async Task PushAsync(ViewTypes typeOfPage)
-        {
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="typeOfPage">Page to display.</param>
+		public async Task PushAsync(ViewTypes typeOfPage)
+		{
 #if USEFLYOUT
             var page = Activator.CreateInstance(typeOfPage.GetViewType()) as IDetailPage;
 #else
-            var page = Activator.CreateInstance(typeOfPage.GetViewType());
+			var page = Activator.CreateInstance(typeOfPage.GetViewType());
 #endif
-            if (page == null)
-            {
-                return;
-            }
+			if (page == null)
+			{
+				return;
+			}
 
 #if USEFLYOUT
             page.NavigationMasterDetail = NavigationMasterDetail;
 #endif
-            await Navigation.PushAsync((Page)page);
-        }
+			await Navigation.PushAsync((Page)page);
+		}
 
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
 
 #if USEFLYOUT
@@ -122,86 +122,86 @@ namespace TINK.View.Contact
         public INavigationMasterDetail NavigationMasterDetail { private get; set; }
 
 #endif
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        protected async override void OnAppearing()
-        {
-            // Pass reference to member Navigation to show bikes at station x dialog.
-            try
-            {
-                Log.ForContext<SelectStationPageViewModel>().Verbose("Constructing select station view model.");
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		protected async override void OnAppearing()
+		{
+			// Pass reference to member Navigation to show bikes at station x dialog.
+			try
+			{
+				Log.ForContext<SelectStationPageViewModel>().Verbose("Constructing select station view model.");
 
 #if TRYNOTBACKSTYLE
                 SelectStationPageViewModel = new SelectStationPageViewModel();
 #else
-                SelectStationPageViewModel = new SelectStationPageViewModel(
-                    App.ModelRoot,
-                    App.PermissionsService,
-                    App.BluetoothService,
-                    App.LocationServicesContainer.Active,
-                    (mapspan) => MyMap.MoveToRegion(mapspan),
-                    this,
-                    Navigation);
+				SelectStationPageViewModel = new SelectStationPageViewModel(
+					App.ModelRoot,
+					App.PermissionsService,
+					App.BluetoothService,
+					App.LocationServicesContainer.Active,
+					(mapspan) => MyMap.MoveToRegion(mapspan),
+					this,
+					Navigation);
 #endif
-            }
-            catch (Exception exception)
-            {
+			}
+			catch (Exception exception)
+			{
 
-                Log.ForContext<SelectStationPageViewModel>().Error("Constructing select station view model failed. {Exception}", exception);
-                return;
-            }
+				Log.ForContext<SelectStationPageViewModel>().Error("Constructing select station view model failed. {Exception}", exception);
+				return;
+			}
 
-            try
-            {
-                BindingContext = SelectStationPageViewModel;
+			try
+			{
+				BindingContext = SelectStationPageViewModel;
 
 #if USEFLYOUT
                 SelectStationPageViewModel.NavigationMasterDetail = NavigationMasterDetail;
 #endif
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<SelectStationPageViewModel>().Error("Setting binding/ navigaton on select station failed. {Exception}", exception);
-                return;
-            }
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<SelectStationPageViewModel>().Error("Setting binding/ navigaton on select station failed. {Exception}", exception);
+				return;
+			}
 
-            try
-            {
-                base.OnAppearing();
-            }
-            catch (Exception exception)
-            {
-                // Continue because styling is not essential.
-                Log.ForContext<SelectStationPageViewModel>().Error("Invoking OnAppearing of base failed. {Exception}", exception);
-                return;
-            }
+			try
+			{
+				base.OnAppearing();
+			}
+			catch (Exception exception)
+			{
+				// Continue because styling is not essential.
+				Log.ForContext<SelectStationPageViewModel>().Error("Invoking OnAppearing of base failed. {Exception}", exception);
+				return;
+			}
 
-            try
-            {
-                // Pre move and scanle maps to avoid initial display of map in Rome.
-                Log.ForContext<SelectStationPageViewModel>().Verbose("Moving and scaling map.");
-                SelectStationPageViewModel.MoveAndScale(
-                    (mapSpan) => MyMap.MoveToRegion(mapSpan),
-                    App.ModelRoot.Uris.ActiveUri);
-            }
-            catch (Exception exception)
-            {
-                // Continue because a map not beeing moved/ scaled is no reason for aborting startup.
-                Log.ForContext<SelectStationPageViewModel>().Error("Moving and scaling map failed. {Exception}", exception);
-            }
+			try
+			{
+				// Pre move and scanle maps to avoid initial display of map in Rome.
+				Log.ForContext<SelectStationPageViewModel>().Verbose("Moving and scaling map.");
+				SelectStationPageViewModel.MoveAndScale(
+					(mapSpan) => MyMap.MoveToRegion(mapSpan),
+					App.ModelRoot.Uris.ActiveUri);
+			}
+			catch (Exception exception)
+			{
+				// Continue because a map not beeing moved/ scaled is no reason for aborting startup.
+				Log.ForContext<SelectStationPageViewModel>().Error("Moving and scaling map failed. {Exception}", exception);
+			}
 
-            try
-            {
-                Log.ForContext<SelectStationPageViewModel>().Verbose("Invoking OnAppearing on select station view model.");
-                await SelectStationPageViewModel.OnAppearing();
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<SelectStationPageViewModel>().Error("Invoking OnAppearing on select station view model failed. {Exception}", exception);
-                return;
-            }
-        }
-    }
+			try
+			{
+				Log.ForContext<SelectStationPageViewModel>().Verbose("Invoking OnAppearing on select station view model.");
+				await SelectStationPageViewModel.OnAppearing();
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<SelectStationPageViewModel>().Error("Invoking OnAppearing on select station view model failed. {Exception}", exception);
+				return;
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/CopriWebView/ManageAccountPage.xaml.cs b/TINK/TINK/View/CopriWebView/ManageAccountPage.xaml.cs
index 7469312..68feb69 100644
--- a/TINK/TINK/View/CopriWebView/ManageAccountPage.xaml.cs
+++ b/TINK/TINK/View/CopriWebView/ManageAccountPage.xaml.cs
@@ -7,53 +7,53 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.CopriWebView
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class ManageAccountPage : ContentPage
-    {
-        public ManageAccountPage()
-        {
-            InitializeComponent();
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class ManageAccountPage : ContentPage
+	{
+		public ManageAccountPage()
+		{
+			InitializeComponent();
 
-            ManageAccount.Navigating += (sender, ev) =>
-            {
-                if (!ev.Url.ToUpper().EndsWith(".PDF"))
-                {
-                    // Stay inside web view except for downloading pdf- files.
-                    this.IsEnabled = false;
-                    ActivityIndicatorLoading.IsVisible = true;
-                    ActivityIndicatorLoading.IsRunning = true;
-                    return;
-                }
+			ManageAccount.Navigating += (sender, ev) =>
+			{
+				if (!ev.Url.ToUpper().EndsWith(".PDF"))
+				{
+					// Stay inside web view except for downloading pdf- files.
+					this.IsEnabled = false;
+					ActivityIndicatorLoading.IsVisible = true;
+					ActivityIndicatorLoading.IsRunning = true;
+					return;
+				}
 
-                DependencyService.Get<IExternalBrowserService>().OpenUrl(ev.Url);
-            };
+				DependencyService.Get<IExternalBrowserService>().OpenUrl(ev.Url);
+			};
 
-            ManageAccount.Navigated += (sender, ev) =>
-            {
-                if (ev.Result == WebNavigationResult.Success)
-                {
-                    this.IsEnabled = true;
-                    ActivityIndicatorLoading.IsVisible = false;
-                    ActivityIndicatorLoading.IsRunning = false;
-                    return;
-                }
+			ManageAccount.Navigated += (sender, ev) =>
+			{
+				if (ev.Result == WebNavigationResult.Success)
+				{
+					this.IsEnabled = true;
+					ActivityIndicatorLoading.IsVisible = false;
+					ActivityIndicatorLoading.IsRunning = false;
+					return;
+				}
 
-                Log.ForContext<ManageAccountPage>().Error("Navigation did not succeed.{@Event}{@Sender}", ev, sender);
-                ManageAccount.Source = new HtmlWebViewSource
-                {
-                    Html = "<html><b>Kann persönliche Daten nicht anzeigen/ verwalten!</b><br>Verbindung mit Internet ok?</html>"
-                };
+				Log.ForContext<ManageAccountPage>().Error("Navigation did not succeed.{@Event}{@Sender}", ev, sender);
+				ManageAccount.Source = new HtmlWebViewSource
+				{
+					Html = "<html><b>Kann persönliche Daten nicht anzeigen/ verwalten!</b><br>Verbindung mit Internet ok?</html>"
+				};
 
-                this.IsEnabled = true;
-                ActivityIndicatorLoading.IsVisible = false;
-                ActivityIndicatorLoading.IsRunning = false;
-            };
+				this.IsEnabled = true;
+				ActivityIndicatorLoading.IsVisible = false;
+				ActivityIndicatorLoading.IsRunning = false;
+			};
 
-            ManageAccount.BindingContext = new ManageAccountViewModel(
-                App.ModelRoot.ActiveUser.SessionCookie,
-                Model.TinkApp.MerchantId,
-                CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
-                App.ModelRoot.NextActiveUri.Host);
-        }
-    }
+			ManageAccount.BindingContext = new ManageAccountViewModel(
+				App.ModelRoot.ActiveUser.SessionCookie,
+				Model.TinkApp.MerchantId,
+				CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
+				App.ModelRoot.NextActiveUri.Host);
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs b/TINK/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs
index 666b74c..c906c33 100644
--- a/TINK/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs
+++ b/TINK/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs
@@ -7,45 +7,45 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.CopriWebView
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class PasswordForgottenPage : ContentPage
-    {
-        public PasswordForgottenPage()
-        {
-            InitializeComponent();
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class PasswordForgottenPage : ContentPage
+	{
+		public PasswordForgottenPage()
+		{
+			InitializeComponent();
 
-            PasswordForgottenWebView.Navigating += (sender, ev) =>
-            {
-                this.IsEnabled = false;
-                ActivityIndicatorLoading.IsVisible = true;
-                ActivityIndicatorLoading.IsRunning = true;
-            };
+			PasswordForgottenWebView.Navigating += (sender, ev) =>
+			{
+				this.IsEnabled = false;
+				ActivityIndicatorLoading.IsVisible = true;
+				ActivityIndicatorLoading.IsRunning = true;
+			};
 
-            PasswordForgottenWebView.Navigated += (sender, ev) =>
-            {
-                if (ev.Result == WebNavigationResult.Success)
-                {
-                    this.IsEnabled = true;
-                    ActivityIndicatorLoading.IsVisible = false;
-                    ActivityIndicatorLoading.IsRunning = false;
-                    return;
-                }
+			PasswordForgottenWebView.Navigated += (sender, ev) =>
+			{
+				if (ev.Result == WebNavigationResult.Success)
+				{
+					this.IsEnabled = true;
+					ActivityIndicatorLoading.IsVisible = false;
+					ActivityIndicatorLoading.IsRunning = false;
+					return;
+				}
 
-                Log.ForContext<PasswordForgottenPage>().Error("Navigation did not succeed. {@Event}", ev);
-                PasswordForgottenWebView.Source = new HtmlWebViewSource
-                {
-                    Html = "<html><b>Kann Passwort vergessen Seite nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>"
-                };
+				Log.ForContext<PasswordForgottenPage>().Error("Navigation did not succeed. {@Event}", ev);
+				PasswordForgottenWebView.Source = new HtmlWebViewSource
+				{
+					Html = "<html><b>Kann Passwort vergessen Seite nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>"
+				};
 
-                this.IsEnabled = true;
-                ActivityIndicatorLoading.IsVisible = false;
-                ActivityIndicatorLoading.IsRunning = false;
-            };
+				this.IsEnabled = true;
+				ActivityIndicatorLoading.IsVisible = false;
+				ActivityIndicatorLoading.IsRunning = false;
+			};
 
-            PasswordForgottenWebView.BindingContext = new PasswordForgottonViewModel(
-                Model.TinkApp.MerchantId,
-                CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
-                App.ModelRoot.NextActiveUri.Host);
-        }
-    }
+			PasswordForgottenWebView.BindingContext = new PasswordForgottonViewModel(
+				Model.TinkApp.MerchantId,
+				CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
+				App.ModelRoot.NextActiveUri.Host);
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/CopriWebView/RegisterPage.xaml.cs b/TINK/TINK/View/CopriWebView/RegisterPage.xaml.cs
index 6d5fd7b..e69cd6b 100644
--- a/TINK/TINK/View/CopriWebView/RegisterPage.xaml.cs
+++ b/TINK/TINK/View/CopriWebView/RegisterPage.xaml.cs
@@ -8,48 +8,48 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.CopriWebView
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class RegisterPage : ContentPage
-    {
-        public RegisterPage()
-        {
-            DependencyService.Get<IWebView>().ClearCookies();
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class RegisterPage : ContentPage
+	{
+		public RegisterPage()
+		{
+			DependencyService.Get<IWebView>().ClearCookies();
 
-            InitializeComponent();
+			InitializeComponent();
 
-            RegisterView.Navigating += (sender, ev) =>
-            {
-                this.IsEnabled = false;
-                ActivityIndicatorLoading.IsVisible = true;
-                ActivityIndicatorLoading.IsRunning = true;
-            };
+			RegisterView.Navigating += (sender, ev) =>
+			{
+				this.IsEnabled = false;
+				ActivityIndicatorLoading.IsVisible = true;
+				ActivityIndicatorLoading.IsRunning = true;
+			};
 
-            RegisterView.Navigated += (sender, ev) =>
-            {
-                if (ev.Result == WebNavigationResult.Success)
-                {
-                    this.IsEnabled = true;
-                    ActivityIndicatorLoading.IsVisible = false;
-                    ActivityIndicatorLoading.IsRunning = false;
-                    return;
-                }
+			RegisterView.Navigated += (sender, ev) =>
+			{
+				if (ev.Result == WebNavigationResult.Success)
+				{
+					this.IsEnabled = true;
+					ActivityIndicatorLoading.IsVisible = false;
+					ActivityIndicatorLoading.IsRunning = false;
+					return;
+				}
 
-                Log.ForContext<RegisterPage>().Error("Navigation did not succeed. {@Event}", ev);
-                RegisterView.Source = new HtmlWebViewSource
-                {
-                    Html = "<html><b>Kann Anmeldeseite nicht anzeigen</b>!<br>Verbindung mit Internet ok?</html>"
-                };
+				Log.ForContext<RegisterPage>().Error("Navigation did not succeed. {@Event}", ev);
+				RegisterView.Source = new HtmlWebViewSource
+				{
+					Html = "<html><b>Kann Anmeldeseite nicht anzeigen</b>!<br>Verbindung mit Internet ok?</html>"
+				};
 
-                this.IsEnabled = true;
-                ActivityIndicatorLoading.IsVisible = false;
-                ActivityIndicatorLoading.IsRunning = false;
-            };
+				this.IsEnabled = true;
+				ActivityIndicatorLoading.IsVisible = false;
+				ActivityIndicatorLoading.IsRunning = false;
+			};
 
-            RegisterView.BindingContext = new RegisterPageViewModel(
-                Model.TinkApp.MerchantId,
-                CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
-                App.ModelRoot.NextActiveUri.Host);
+			RegisterView.BindingContext = new RegisterPageViewModel(
+				Model.TinkApp.MerchantId,
+				CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
+				App.ModelRoot.NextActiveUri.Host);
 
-        }
-    }
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/FeedbackPopup.xaml b/TINK/TINK/View/FeedbackPopup.xaml
index 34e36c9..f1abca5 100644
--- a/TINK/TINK/View/FeedbackPopup.xaml
+++ b/TINK/TINK/View/FeedbackPopup.xaml
@@ -10,76 +10,48 @@
     <xct:Popup.Resources>
         <x:String x:Key="check_circle">&#xf058;</x:String>
     </xct:Popup.Resources>
-    <Grid>
-        <Grid.RowDefinitions>
-            <!-- Head and title row -->
-            <RowDefinition Height="auto"/>
-            <!--- Co2saving-->
-            <RowDefinition Height="auto"/>
-            <!--- checkbox and input elements-->
-            <RowDefinition Height="*"/>
-            <!--- ok button-->
-            <RowDefinition Height="auto"/>
-        </Grid.RowDefinitions>
-        
-        <!-- Head and title - Grid.Row 0 -->
-        <Grid Grid.Row="0"
+    
+    <StackLayout>
+      
+        <!-- Head and title -->
+        <StackLayout
             Padding="30"
             BackgroundColor="{DynamicResource primary-back-title-color}">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="auto"/>
-                <RowDefinition Height="auto"/>
-            </Grid.RowDefinitions>
             <Label
                     HorizontalTextAlignment="Center"
                     FontSize="Large"
                     TextColor="White"
                     Text="{x:Static resources:AppResources.MarkingReturnBikeMainMessage}"/>
-            <Image Grid.Row="1">
+            <Image>
                 <Image.Source>
-                    <FontImageSource Size="Title" Glyph="{StaticResource check_circle}" FontFamily="FA-S"/>
+                    <FontImageSource Size="60" Glyph="{StaticResource check_circle}" FontFamily="FA-S" Color="White"/>
                 </Image.Source>
             </Image>
-        </Grid>
+        </StackLayout>
         
-        <!-- Co2saving - Grid.Row 1 -->
+        <!-- Co2saving -->
         <Frame 
-            x:Name="Co2SavingFrame"
-            Grid.Row="1">
+            x:Name="Co2SavingFrame">
             <Label 
                 x:Name="Co2SavingLabel"            
                 Text=""/>
         </Frame>
         
-        <!-- Checkbox and input elements - Grid.Row 2 -->
-        <ScrollView Grid.Row="2">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <!--- Battery charge level -->
-                    <RowDefinition Height="Auto"/>
-                    <!--- Bike is ok GUI -->
-                    <RowDefinition Height="Auto"/>
-                    <!--- Feedback edit GUI -->
-                    <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
+        <!-- Checkbox and input elements -->
+        <ScrollView>
+            <StackLayout>
                 <!-- Battery level -->
-                <sharedGui:BarLevelInputView Grid.Row="0"
+                <sharedGui:BarLevelInputView 
                             x:Name="BarLevelInputView"
                             HorizontalOptions="Center"/>
-                <Grid Grid.Row="1">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-                        <!-- Checkbox Is Broken -->
-                        <CheckBox x:Name="brockenCheckBox" IsChecked="True"/>
-                        <Label 
-                            Grid.Column="1" 
+                <!-- Checkbox Is Broken -->
+                <StackLayout Orientation="Horizontal">
+                    <CheckBox x:Name="brockenCheckBox" IsChecked="True" HeightRequest="20"/>
+                    <Label 
                             FontSize="Medium"
                             Text= "{x:Static resources:AppResources.MarkingReturnBikeBikeStateIsOK}"/>
-                    </Grid>
-                    <Editor 
-                        Grid.Row="2"
+                </StackLayout>
+                <Editor 
                         x:Name="feedbackMessage"
                         AutoSize="TextChanges"  
                         Placeholder="{x:Static resources:AppResources.MarkingReturnBikeFeedbackInputPlaceholder}"
@@ -99,15 +71,14 @@
                             </DataTrigger>
                         </Editor.Triggers>
                     </Editor>
-            </Grid>
+            </StackLayout>
         </ScrollView>
         
-        <!-- Buttons - Grid.Row 3 -->
+        <!-- Buttons -->
         <Button 
-                Grid.Row="3"
                 WidthRequest="100"
                 Clicked="OnOkClicked"
                 Text="OK"
                 Margin="0,0,0,3"/>
-    </Grid>
+    </StackLayout>
 </xct:Popup>
\ No newline at end of file
diff --git a/TINK/TINK/View/FeedbackPopup.xaml.cs b/TINK/TINK/View/FeedbackPopup.xaml.cs
index 4ae1f98..2c73611 100644
--- a/TINK/TINK/View/FeedbackPopup.xaml.cs
+++ b/TINK/TINK/View/FeedbackPopup.xaml.cs
@@ -5,86 +5,86 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class FeedbackPopup : Popup<FeedbackPopup.Result>
-    {
-        /// <summary> Constructs user feedback popup.</summary>
-        /// <param name="battery">Object holding info about battery. For some batteries charging level might need to be updated by user.</param>
-        /// <param name="co2Saving"> Co2 saving information.</param>
-        public FeedbackPopup(
-            IBattery battery = null,
-            string co2Saving = null)
-        {
-            InitializeComponent();
-            if (string.IsNullOrEmpty(co2Saving))
-                Co2SavingFrame.IsVisible = false;
-            else
-                Co2SavingLabel.Text = co2Saving;
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class FeedbackPopup : Popup<FeedbackPopup.Result>
+	{
+		/// <summary> Constructs user feedback popup.</summary>
+		/// <param name="battery">Object holding info about battery. For some batteries charging level might need to be updated by user.</param>
+		/// <param name="co2Saving"> Co2 saving information.</param>
+		public FeedbackPopup(
+			IBattery battery = null,
+			string co2Saving = null)
+		{
+			InitializeComponent();
+			if (string.IsNullOrEmpty(co2Saving))
+				Co2SavingFrame.IsVisible = false;
+			else
+				Co2SavingLabel.Text = co2Saving;
 
-            if (battery == null
-                || (battery.IsBackendAccessible.HasValue && battery.IsBackendAccessible.Value))
-            {
-                // Either 
-                // - bike has no engine or
-                // - backend can access battery level information
-                // No need to ask user for input.
-                return;
-            }
+			if (battery == null
+				|| (battery.IsBackendAccessible.HasValue && battery.IsBackendAccessible.Value))
+			{
+				// Either 
+				// - bike has no engine or
+				// - backend can access battery level information
+				// No need to ask user for input.
+				return;
+			}
 
-            BarLevelInputView.IsVisible = battery?.MaxChargeBars != null;
-            BarLevelInputView.Current = battery?.CurrentChargeBars?.ToString() ?? string.Empty;
-            BarLevelInputView.Maximum = battery?.MaxChargeBars != null ? battery?.MaxChargeBars.ToString() : String.Empty;
+			BarLevelInputView.IsVisible = battery?.MaxChargeBars != null;
+			BarLevelInputView.Current = battery?.CurrentChargeBars?.ToString() ?? string.Empty;
+			BarLevelInputView.Maximum = battery?.MaxChargeBars != null ? battery?.MaxChargeBars.ToString() : String.Empty;
 
-        }
+		}
 
-        protected override FeedbackPopup.Result GetLightDismissResult()
-        {
-            return new Result
-            {
-                CurrentChargeBars = int.TryParse(BarLevelInputView.Current, out int current) ? (int?)current : null,
-                IsBikeBroken = brockenCheckBox.IsChecked,
-                Message = feedbackMessage.Text
-            };
-        }
+		protected override FeedbackPopup.Result GetLightDismissResult()
+		{
+			return new Result
+			{
+				CurrentChargeBars = int.TryParse(BarLevelInputView.Current, out int current) ? (int?)current : null,
+				IsBikeBroken = brockenCheckBox.IsChecked,
+				Message = feedbackMessage.Text
+			};
+		}
 
-        private void OnOkClicked(object sender, EventArgs eventArgs)
-        {
-            var result = new Result
-            {
-                CurrentChargeBars = int.TryParse(BarLevelInputView.Current, out int current) ? (int?)current : null,
-                IsBikeBroken = brockenCheckBox.IsChecked,
-                Message = feedbackMessage.Text
-            };
+		private void OnOkClicked(object sender, EventArgs eventArgs)
+		{
+			var result = new Result
+			{
+				CurrentChargeBars = int.TryParse(BarLevelInputView.Current, out int current) ? (int?)current : null,
+				IsBikeBroken = brockenCheckBox.IsChecked,
+				Message = feedbackMessage.Text
+			};
 
-            Dismiss(result);
-        }
+			Dismiss(result);
+		}
 
-        /// <summary>
-        /// Feedback given by user when returning bike.
-        /// </summary>
+		/// <summary>
+		/// Feedback given by user when returning bike.
+		/// </summary>
 #if USCSHARP9
 		public class Result : IViewService.IUserFeedback
 #else
-        public new class Result : IUserFeedback
+		public new class Result : IUserFeedback
 #endif
-        {
-            /// <summary>
-            /// Holds the current chargeing level of the battery entered by user in bars, null if unkonwn.
-            /// </summary>
-            public int? CurrentChargeBars { get; set; }
+		{
+			/// <summary>
+			/// Holds the current chargeing level of the battery entered by user in bars, null if unkonwn.
+			/// </summary>
+			public int? CurrentChargeBars { get; set; }
 
-            /// <summary>
-            /// Holds whether bike is broken or not.
-            /// </summary>
-            public bool IsBikeBroken { get; set; }
+			/// <summary>
+			/// Holds whether bike is broken or not.
+			/// </summary>
+			public bool IsBikeBroken { get; set; }
 
-            /// <summary>
-            /// Holds either 
-            /// - general feedback
-            /// - error description of broken bike 
-            /// or both.
-            /// </summary>
-            public string Message { get; set; }
-        }
-    }
+			/// <summary>
+			/// Holds either 
+			/// - general feedback
+			/// - error description of broken bike 
+			/// or both.
+			/// </summary>
+			public string Message { get; set; }
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml.cs b/TINK/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml.cs
index 7379ff7..b2e564f 100644
--- a/TINK/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml.cs
+++ b/TINK/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml.cs
@@ -5,34 +5,34 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Contact
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class FeesAndBikesPage : TabbedPage
-    {
-        public FeesAndBikesPageViewModel ViewModel { get; }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class FeesAndBikesPage : TabbedPage
+	{
+		public FeesAndBikesPageViewModel ViewModel { get; }
 
-        public FeesAndBikesPage()
-        {
-            InitializeComponent();
+		public FeesAndBikesPage()
+		{
+			InitializeComponent();
 
-            ViewModel = new FeesAndBikesPageViewModel(
-                App.ModelRoot.NextActiveUri.Host,
-                App.ModelRoot.ResourceUrls.FeesResourcePath,
-                App.ModelRoot.ResourceUrls.BikesResourcePath,
-                App.ModelRoot.IsSiteCachingOn);
+			ViewModel = new FeesAndBikesPageViewModel(
+				App.ModelRoot.NextActiveUri.Host,
+				App.ModelRoot.ResourceUrls.FeesResourcePath,
+				App.ModelRoot.ResourceUrls.BikesResourcePath,
+				App.ModelRoot.IsSiteCachingOn);
 
-            BindingContext = ViewModel;
+			BindingContext = ViewModel;
 
-            /// Info about renting.
-            InfoRentBikeWebView.Navigating += ViewModelHelper.OnNavigating;
+			/// Info about renting.
+			InfoRentBikeWebView.Navigating += ViewModelHelper.OnNavigating;
 
-            /// Info about types of bikes.
-            InfoTypesOfBikesWebView.Navigating += ViewModelHelper.OnNavigating;
-        }
+			/// Info about types of bikes.
+			InfoTypesOfBikesWebView.Navigating += ViewModelHelper.OnNavigating;
+		}
 
-        /// <summary> Called when page is shown. </summary>
-        protected override void OnAppearing()
-        {
-            ViewModel.OnAppearing();
-        }
-    }
+		/// <summary> Called when page is shown. </summary>
+		protected override void OnAppearing()
+		{
+			ViewModel.OnAppearing();
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/FindBike/FindBikePage.xaml.cs b/TINK/TINK/View/FindBike/FindBikePage.xaml.cs
index 678e087..ef10fa7 100644
--- a/TINK/TINK/View/FindBike/FindBikePage.xaml.cs
+++ b/TINK/TINK/View/FindBike/FindBikePage.xaml.cs
@@ -11,141 +11,141 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.FindBike
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class FindBikePage : ContentPage, IViewService
-    {
-        /// <summary> Refernce to view model. </summary>
-        FindBikePageViewModel m_oViewModel = null;
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class FindBikePage : ContentPage, IViewService
+	{
+		/// <summary> Refernce to view model. </summary>
+		FindBikePageViewModel m_oViewModel = null;
 
-        public FindBikePage() { }
+		public FindBikePage() { }
 
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        protected async override void OnAppearing()
-        {
-            if (m_oViewModel != null)
-            {
-                // No need to create view model, set binding context an items source if already done.
-                // If done twice tap events are fired multiple times (when hiding page using home button).
-                await m_oViewModel.OnAppearing();
-                return;
-            }
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		protected async override void OnAppearing()
+		{
+			if (m_oViewModel != null)
+			{
+				// No need to create view model, set binding context an items source if already done.
+				// If done twice tap events are fired multiple times (when hiding page using home button).
+				await m_oViewModel.OnAppearing();
+				return;
+			}
 
-            try
-            {
-                var model = App.ModelRoot;
+			try
+			{
+				var model = App.ModelRoot;
 
-                // Backup synchronization context when called from GUI-thread.
-                var synchronizationContext = SynchronizationContext.Current;
+				// Backup synchronization context when called from GUI-thread.
+				var synchronizationContext = SynchronizationContext.Current;
 
-                m_oViewModel = new FindBikePageViewModel(
-                    model.ActiveUser,
-                    App.PermissionsService,
-                    App.BluetoothService,
-                    Device.RuntimePlatform,
-                    () => model.GetIsConnected(),
-                    (isConnected) => model.GetConnector(isConnected),
-                    App.LocationServicesContainer.Active,
-                    model.LocksServices.Active,
-                    model.Stations,
-                    model.Polling,
-                    (d, obj) => synchronizationContext.Post(d, obj),
-                    model.SmartDevice,
-                    this,
-                    (url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url))
-                {
-                    IsReportLevelVerbose = model.IsReportLevelVerbose
-                };
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<FindBikePage>().Error("Displaying bikes at station page failed. {Exception}", exception);
-                await DisplayAlert("Fehler", $"Seite Fahrrad Wählen kann nicht angezeigt werden. ${exception.Message}", "OK");
-                return;
+				m_oViewModel = new FindBikePageViewModel(
+					model.ActiveUser,
+					App.PermissionsService,
+					App.BluetoothService,
+					Device.RuntimePlatform,
+					() => model.GetIsConnected(),
+					(isConnected) => model.GetConnector(isConnected),
+					App.LocationServicesContainer.Active,
+					model.LocksServices.Active,
+					model.Stations,
+					model.Polling,
+					(d, obj) => synchronizationContext.Post(d, obj),
+					model.SmartDevice,
+					this,
+					(url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url))
+				{
+					IsReportLevelVerbose = model.IsReportLevelVerbose
+				};
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<FindBikePage>().Error("Displaying bikes at station page failed. {Exception}", exception);
+				await DisplayAlert("Fehler", $"Seite Fahrrad Wählen kann nicht angezeigt werden. ${exception.Message}", "OK");
+				return;
 
-            }
+			}
 
-            InitializeComponent();
+			InitializeComponent();
 
-            BindingContext = m_oViewModel;
-            FindBikeListView.ItemsSource = m_oViewModel;
+			BindingContext = m_oViewModel;
+			FindBikeListView.ItemsSource = m_oViewModel;
 
-            await m_oViewModel.OnAppearing();
-        }
+			await m_oViewModel.OnAppearing();
+		}
 
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strCancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strCancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strAccept">Text of accept button.</param>
-        /// <param name="p_strCancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strAccept">Text of accept button.</param>
+		/// <param name="p_strCancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
 
 #if USEFLYOUT
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => throw new NotImplementedException();
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="typeOfPage">Page to display.</param>
-        public async Task PushModalAsync(ViewTypes typeOfPage)
-            => await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="typeOfPage">Page to display.</param>
+		public async Task PushModalAsync(ViewTypes typeOfPage)
+			=> await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync() => throw new NotSupportedException();
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync() => throw new NotSupportedException();
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
 
 #if USCSHARP9
         public async Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup());
 #else
-        /// <summary> Displays user feedback popup.</summary>
-        /// <param name="co2Saving"> Co2 saving information.</param>
-        /// <returns>User feedback.</returns>
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
+		/// <summary> Displays user feedback popup.</summary>
+		/// <param name="co2Saving"> Co2 saving information.</param>
+		/// <returns>User feedback.</returns>
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs b/TINK/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs
index 8aa6c88..49a938b 100644
--- a/TINK/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs
+++ b/TINK/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs
@@ -11,65 +11,65 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Info.BikeInfo
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class BikeInfoCarouselPage : CarouselPage, IViewService, IDetailPage
 #else
-    public partial class BikeInfoCarouselPage : CarouselPage, IViewService
+	public partial class BikeInfoCarouselPage : CarouselPage, IViewService
 #endif
-    {
-        public BikeInfoCarouselPage()
-        {
-            InitializeComponent();
+	{
+		public BikeInfoCarouselPage()
+		{
+			InitializeComponent();
 
-            ItemsSource = new BikeInfoViewModel(
-                resourceName => ImageSource.FromResource($"{ViewModelResourceHelper.RessourcePrefix}Images.{resourceName}"),
-                this).CarouselItems;
-        }
+			ItemsSource = new BikeInfoViewModel(
+				resourceName => ImageSource.FromResource($"{ViewModelResourceHelper.RessourcePrefix}Images.{resourceName}"),
+				this).CarouselItems;
+		}
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strCancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
-             => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strCancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
+			 => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strAccept">Text of accept button.</param>
-        /// <param name="p_strCancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
-        {
-            return await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
-        }
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strAccept">Text of accept button.</param>
+		/// <param name="p_strCancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
+		{
+			return await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
+		}
 
 #if USEFLYOUT
         /// <summary>
@@ -79,31 +79,31 @@ namespace TINK.View.Info.BikeInfo
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => m_oNavigation.ShowPage(p_oType.GetViewType(), p_strTitle);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushModalAsync(ViewTypes p_oTypeOfPage)
-        {
-            throw new NotSupportedException();
-        }
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushModalAsync(ViewTypes p_oTypeOfPage)
+		{
+			throw new NotSupportedException();
+		}
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync()
-        {
-            throw new NotSupportedException();
-        }
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync()
+		{
+			throw new NotSupportedException();
+		}
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushAsync(ViewTypes p_oTypeOfPage)
-        {
-            throw new NotImplementedException();
-        }
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushAsync(ViewTypes p_oTypeOfPage)
+		{
+			throw new NotImplementedException();
+		}
 
 #if USEFLYOUT
         /// <summary>
@@ -123,7 +123,7 @@ namespace TINK.View.Info.BikeInfo
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/Info/InfoTabbedPage.xaml.cs b/TINK/TINK/View/Info/InfoTabbedPage.xaml.cs
index e4ca437..17f0bba 100644
--- a/TINK/TINK/View/Info/InfoTabbedPage.xaml.cs
+++ b/TINK/TINK/View/Info/InfoTabbedPage.xaml.cs
@@ -6,36 +6,36 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Info
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class InfoPage : TabbedPage
-    {
-        public InfoPageViewModel ViewModel { get; }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class InfoPage : TabbedPage
+	{
+		public InfoPageViewModel ViewModel { get; }
 
-        public InfoPage()
-        {
-            InitializeComponent();
+		public InfoPage()
+		{
+			InitializeComponent();
 
-            ViewModel = new InfoPageViewModel(
-                App.ModelRoot.NextActiveUri.Host,
-                App.ModelRoot.ResourceUrls.AgbResourcePath,
-                App.ModelRoot.ResourceUrls.PrivacyResourcePath,
-                App.ModelRoot.ResourceUrls.ImpressResourcePath,
-                App.ModelRoot.IsSiteCachingOn,
-                CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
-                resourceName => ViewModelResourceHelper.GetSource(resourceName));
-            TabbedInfoPage.BindingContext = ViewModel;
+			ViewModel = new InfoPageViewModel(
+				App.ModelRoot.NextActiveUri.Host,
+				App.ModelRoot.ResourceUrls.AgbResourcePath,
+				App.ModelRoot.ResourceUrls.PrivacyResourcePath,
+				App.ModelRoot.ResourceUrls.ImpressResourcePath,
+				App.ModelRoot.IsSiteCachingOn,
+				CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
+				resourceName => ViewModelResourceHelper.GetSource(resourceName));
+			TabbedInfoPage.BindingContext = ViewModel;
 
-            InfoLicenses.Navigating += ViewModelHelper.OnNavigating;
-            InfoDatenschutz.Navigating += ViewModelHelper.OnNavigating;
-            InfoABG.Navigating += ViewModelHelper.OnNavigating;
+			InfoLicenses.Navigating += ViewModelHelper.OnNavigating;
+			InfoDatenschutz.Navigating += ViewModelHelper.OnNavigating;
+			InfoABG.Navigating += ViewModelHelper.OnNavigating;
 
-            InfoImpressum.Navigating += ViewModelHelper.OnNavigating;
-        }
+			InfoImpressum.Navigating += ViewModelHelper.OnNavigating;
+		}
 
-        /// <summary> Called when page is shown. </summary>
-        protected override void OnAppearing()
-        {
-            ViewModel.OnAppearing();
-        }
-    }
+		/// <summary> Called when page is shown. </summary>
+		protected override void OnAppearing()
+		{
+			ViewModel.OnAppearing();
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/ListViewAttachedBehavior.cs b/TINK/TINK/View/ListViewAttachedBehavior.cs
index 0b13485..ec0cc89 100644
--- a/TINK/TINK/View/ListViewAttachedBehavior.cs
+++ b/TINK/TINK/View/ListViewAttachedBehavior.cs
@@ -3,33 +3,33 @@ using Xamarin.Forms;
 
 namespace TINK.View
 {
-    public static class ListViewAttachedBehavior
-    {
-        public static readonly BindableProperty CommandProperty =
-            BindableProperty.CreateAttached(
-                "Command",
-                typeof(ICommand),
-                typeof(ListViewAttachedBehavior),
-                null,
-                propertyChanged: OnCommandChanged);
+	public static class ListViewAttachedBehavior
+	{
+		public static readonly BindableProperty CommandProperty =
+			BindableProperty.CreateAttached(
+				"Command",
+				typeof(ICommand),
+				typeof(ListViewAttachedBehavior),
+				null,
+				propertyChanged: OnCommandChanged);
 
-        static void OnCommandChanged(BindableObject view, object oldValue, object newValue)
-        {
-            var entry = view as ListView;
-            if (entry == null)
-                return;
+		static void OnCommandChanged(BindableObject view, object oldValue, object newValue)
+		{
+			var entry = view as ListView;
+			if (entry == null)
+				return;
 
-            entry.ItemTapped += (sender, e) =>
-            {
-                var command = (newValue as ICommand);
-                if (command == null)
-                    return;
+			entry.ItemTapped += (sender, e) =>
+			{
+				var command = (newValue as ICommand);
+				if (command == null)
+					return;
 
-                if (command.CanExecute(e.Item))
-                {
-                    command.Execute(e.Item);
-                }
-            };
-        }
-    }
+				if (command.CanExecute(e.Item))
+				{
+					command.Execute(e.Item);
+				}
+			};
+		}
+	}
 }
diff --git a/TINK/TINK/View/Login/LoginPage.xaml.cs b/TINK/TINK/View/Login/LoginPage.xaml.cs
index 03e860c..b1e85fb 100644
--- a/TINK/TINK/View/Login/LoginPage.xaml.cs
+++ b/TINK/TINK/View/Login/LoginPage.xaml.cs
@@ -11,60 +11,60 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Login
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class LoginPage : ContentPage, IViewService, IDetailPage
 #else
-    public partial class LoginPage : ContentPage, IViewService
+	public partial class LoginPage : ContentPage, IViewService
 #endif
-    {
-        public LoginPage()
-        {
-            InitializeComponent();
+	{
+		public LoginPage()
+		{
+			InitializeComponent();
 
-            var l_oModel = App.ModelRoot;
+			var l_oModel = App.ModelRoot;
 #if !BACKSTYLE
-            var l_oViewModel = new LoginPageViewModel(
-                l_oModel,
-                (url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url),
-                this);
+			var l_oViewModel = new LoginPageViewModel(
+				l_oModel,
+				(url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url),
+				this);
 
-            LoginPageView.BindingContext = l_oViewModel;
+			LoginPageView.BindingContext = l_oViewModel;
 #else
             LoginPageView.BindingContext = new LoginPageViewModel(l_oModel.ActiveUser, this, Navigation);
 #endif
-        }
+		}
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strCancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strCancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
 #if USEFLYOUT
         /// <summary>
@@ -74,30 +74,30 @@ namespace TINK.View.Login
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => m_oNavigation.ShowPage(p_oType.GetViewType(), p_strTitle);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public async Task PushModalAsync(ViewTypes typeOfPage)
-            => await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public async Task PushModalAsync(ViewTypes typeOfPage)
+			=> await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
 
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync()
-        {
-            throw new NotSupportedException();
-        }
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync()
+		{
+			throw new NotSupportedException();
+		}
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public async Task PushAsync(ViewTypes p_oTypeOfPage)
-        {
-            await Navigation.PushAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
-        }
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public async Task PushAsync(ViewTypes p_oTypeOfPage)
+		{
+			await Navigation.PushAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
+		}
 
 #if USEFLYOUT
         /// <summary>
@@ -117,7 +117,7 @@ namespace TINK.View.Login
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/Map/MapPage.xaml.cs b/TINK/TINK/View/Map/MapPage.xaml.cs
index e512d74..5f147bf 100644
--- a/TINK/TINK/View/Map/MapPage.xaml.cs
+++ b/TINK/TINK/View/Map/MapPage.xaml.cs
@@ -8,72 +8,72 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Map
 {
-    using Serilog;
-    using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
-    using TINK.ViewModel.Map;
+	using Serilog;
+	using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
+	using TINK.ViewModel.Map;
 
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class MapPage : ContentPage, IViewService, IDetailPage
 #else
-    public partial class MapPage : ContentPage, IViewService
+	public partial class MapPage : ContentPage, IViewService
 #endif
-    {
-        /// <summary> View model to notify about whether page appears or hides. </summary>
-        private MapPageViewModel MapPageViewModel { get; set; }
+	{
+		/// <summary> View model to notify about whether page appears or hides. </summary>
+		private MapPageViewModel MapPageViewModel { get; set; }
 
-        /// <summary> Initialization status to ensure initialization logic is not called multiple times. </summary>
-        private bool isInitializationStarted = false;
+		/// <summary> Initialization status to ensure initialization logic is not called multiple times. </summary>
+		private bool isInitializationStarted = false;
 
-        /// <summary>
-        /// Constructs map page instance.
-        /// </summary>
-        public MapPage()
-        {
-            InitializeComponent();
-        }
+		/// <summary>
+		/// Constructs map page instance.
+		/// </summary>
+		public MapPage()
+		{
+			InitializeComponent();
+		}
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string title, string message, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, cancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string title, string message, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, cancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string title, string message, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, message, accept, cancel);
 
 #if USEFLYOUT
         /// <summary>
@@ -83,45 +83,45 @@ namespace TINK.View.Map
         public void ShowPage(ViewTypes type, string title = null)
             => NavigationMasterDetail.ShowPage(type.GetViewType(), title);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="typeOfPage">Type of page to display.</param>
-        public async Task PushModalAsync(ViewTypes typeOfPage)
-            => await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="typeOfPage">Type of page to display.</param>
+		public async Task PushModalAsync(ViewTypes typeOfPage)
+			=> await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public async Task PopModalAsync()
-            => await Navigation.PopModalAsync();
+		/// <summary> Pops a page from the modal stack. </summary>
+		public async Task PopModalAsync()
+			=> await Navigation.PopModalAsync();
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="typeOfPage">Page to display.</param>
-        public async Task PushAsync(ViewTypes typeOfPage)
-        {
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="typeOfPage">Page to display.</param>
+		public async Task PushAsync(ViewTypes typeOfPage)
+		{
 #if USEFLYOUT
             var page = Activator.CreateInstance(typeOfPage.GetViewType()) as IDetailPage;
 #else
-            var page = Activator.CreateInstance(typeOfPage.GetViewType());
+			var page = Activator.CreateInstance(typeOfPage.GetViewType());
 #endif
-            if (page == null)
-            {
-                return;
-            }
+			if (page == null)
+			{
+				return;
+			}
 
 #if USEFLYOUT
             page.NavigationMasterDetail = NavigationMasterDetail;
 #endif
 
-            await Navigation.PushAsync((Page)page);
-        }
+			await Navigation.PushAsync((Page)page);
+		}
 
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
 
 #if USEFLYOUT
@@ -129,153 +129,153 @@ namespace TINK.View.Map
         public INavigationMasterDetail NavigationMasterDetail { private get; set; }
 
 #endif
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        protected async override void OnAppearing()
-        {
-            // Don't repeat the initialization if it has been completed already.
-            if (isInitializationStarted) return;
-            isInitializationStarted = true;
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		protected async override void OnAppearing()
+		{
+			// Don't repeat the initialization if it has been completed already.
+			if (isInitializationStarted) return;
+			isInitializationStarted = true;
 
-            // Pass reference to member Navigation to show bikes at station x dialog.
-            try
-            {
-                Log.ForContext<MapPage>().Verbose("Constructing map page view model.");
+			// Pass reference to member Navigation to show bikes at station x dialog.
+			try
+			{
+				Log.ForContext<MapPage>().Verbose("Constructing map page view model.");
 
 #if TRYNOTBACKSTYLE
                 MapPageViewModel = new MapPageViewModel();
 #else
-                MapPageViewModel = CreateMapPageViewModel();
+				MapPageViewModel = CreateMapPageViewModel();
 #endif
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<MapPage>().Error("Constructing map page view model failed. {Exception}", exception);
-                isInitializationStarted = false;
-                return;
-            }
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<MapPage>().Error("Constructing map page view model failed. {Exception}", exception);
+				isInitializationStarted = false;
+				return;
+			}
 
-            try
-            {
-                BindingContext = MapPageViewModel;
+			try
+			{
+				BindingContext = MapPageViewModel;
 
 #if USEFLYOUT
                 MapPageViewModel.NavigationMasterDetail = NavigationMasterDetail;
 #endif
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<MapPage>().Error("Setting binding/ navigaton on map page failed. {Exception}", exception);
-                isInitializationStarted = false;
-                return;
-            }
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<MapPage>().Error("Setting binding/ navigaton on map page failed. {Exception}", exception);
+				isInitializationStarted = false;
+				return;
+			}
 
-            try
-            {
-                ApplyCustomiOSStyling();
-            }
-            catch (Exception exception)
-            {
-                // Continue because styling is not essential.
-                Log.ForContext<MapPage>().Error("IOS specific styling of map page failed. {Exception}", exception);
-            }
+			try
+			{
+				ApplyCustomiOSStyling();
+			}
+			catch (Exception exception)
+			{
+				// Continue because styling is not essential.
+				Log.ForContext<MapPage>().Error("IOS specific styling of map page failed. {Exception}", exception);
+			}
 
-            try
-            {
-                base.OnAppearing();
-            }
-            catch (Exception exception)
-            {
-                // Continue because styling is not essential.
-                Log.ForContext<MapPage>().Error("Invoking OnAppearing of base failed. {Exception}", exception);
-                isInitializationStarted = false;
-                return;
-            }
+			try
+			{
+				base.OnAppearing();
+			}
+			catch (Exception exception)
+			{
+				// Continue because styling is not essential.
+				Log.ForContext<MapPage>().Error("Invoking OnAppearing of base failed. {Exception}", exception);
+				isInitializationStarted = false;
+				return;
+			}
 
-            try
-            {
-                // Pre move and scanle maps to avoid initial display of map in Rome.
-                PremoveAndScaleMap();
-            }
-            catch (Exception exception)
-            {
-                // Continue because a map not beeing moved/ scaled is no reason for aborting startup.
-                Log.ForContext<MapPage>().Error("Moving and scaling map failed. {Exception}", exception);
-            }
+			try
+			{
+				// Pre move and scanle maps to avoid initial display of map in Rome.
+				PremoveAndScaleMap();
+			}
+			catch (Exception exception)
+			{
+				// Continue because a map not beeing moved/ scaled is no reason for aborting startup.
+				Log.ForContext<MapPage>().Error("Moving and scaling map failed. {Exception}", exception);
+			}
 
-            try
-            {
-                Log.ForContext<MapPage>().Verbose("Invoking OnAppearing on map page view model.");
-                await MapPageViewModel.OnAppearing();
+			try
+			{
+				Log.ForContext<MapPage>().Verbose("Invoking OnAppearing on map page view model.");
+				await MapPageViewModel.OnAppearing();
 
-                isInitializationStarted = false;
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<MapPage>().Error("Invoking OnAppearing on map page view model failed. {Exception}", exception);
-                isInitializationStarted = false;
-                return;
-            }
-        }
+				isInitializationStarted = false;
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<MapPage>().Error("Invoking OnAppearing on map page view model failed. {Exception}", exception);
+				isInitializationStarted = false;
+				return;
+			}
+		}
 
-        /// <summary>
-        /// Premoves the Map to a certain location.
-        /// </summary>
-        private void PremoveAndScaleMap()
-        {
-            Log.ForContext<MapPage>().Verbose("Moving and scaling map.");
-            MapPageViewModel.MoveAndScale(
-                (mapSpan) => MyMap.MoveToRegion(mapSpan),
-                App.ModelRoot.ActiveMapSpan);
-        }
+		/// <summary>
+		/// Premoves the Map to a certain location.
+		/// </summary>
+		private void PremoveAndScaleMap()
+		{
+			Log.ForContext<MapPage>().Verbose("Moving and scaling map.");
+			MapPageViewModel.MoveAndScale(
+				(mapSpan) => MyMap.MoveToRegion(mapSpan),
+				App.ModelRoot.ActiveMapSpan);
+		}
 
-        /// <summary>
-        /// Creates the Map Page's view model.
-        /// </summary>
-        private MapPageViewModel CreateMapPageViewModel()
-        {
-            Log.ForContext<MapPage>().Verbose("Constructing map page view model.");
-            return new MapPageViewModel(
-                App.ModelRoot,
-                App.PermissionsService,
-                App.BluetoothService,
-                App.LocationServicesContainer.Active,
-                (mapspan) => MyMap.MoveToRegion(mapspan),
-                this,
-                Navigation);
-        }
+		/// <summary>
+		/// Creates the Map Page's view model.
+		/// </summary>
+		private MapPageViewModel CreateMapPageViewModel()
+		{
+			Log.ForContext<MapPage>().Verbose("Constructing map page view model.");
+			return new MapPageViewModel(
+				App.ModelRoot,
+				App.PermissionsService,
+				App.BluetoothService,
+				App.LocationServicesContainer.Active,
+				(mapspan) => MyMap.MoveToRegion(mapspan),
+				this,
+				Navigation);
+		}
 
-        /// <summary>
-        /// Applies iOS specific styling to branded Buttons.
-        /// </summary>
-        private void ApplyCustomiOSStyling()
-        {
-            if (Device.RuntimePlatform == Device.iOS)
-            {
-                TINKButton.BackgroundColor = Color.LightGray;
-                TINKButton.BorderColor = Color.Black;
-                TINKButton.Margin = new Thickness(10, 10, 10, 10);
-                KonradButton.BackgroundColor = Color.LightGray;
-                KonradButton.BorderColor = Color.Black;
-                KonradButton.Margin = new Thickness(10, 10, 10, 10);
-            }
-        }
+		/// <summary>
+		/// Applies iOS specific styling to branded Buttons.
+		/// </summary>
+		private void ApplyCustomiOSStyling()
+		{
+			if (Device.RuntimePlatform == Device.iOS)
+			{
+				TINKButton.BackgroundColor = Color.LightGray;
+				TINKButton.BorderColor = Color.Black;
+				TINKButton.Margin = new Thickness(10, 10, 10, 10);
+				KonradButton.BackgroundColor = Color.LightGray;
+				KonradButton.BorderColor = Color.Black;
+				KonradButton.Margin = new Thickness(10, 10, 10, 10);
+			}
+		}
 
-        /// <summary>
-        /// Invoked when pages is closed/ hidden. 
-        /// Stops update process.
-        /// </summary>
-        protected override async void OnDisappearing()
-        {
-            if (MapPageViewModel != null)
-            {
-                // View model might be null.
-                await MapPageViewModel?.OnDisappearing();
-            }
+		/// <summary>
+		/// Invoked when pages is closed/ hidden. 
+		/// Stops update process.
+		/// </summary>
+		protected override async void OnDisappearing()
+		{
+			if (MapPageViewModel != null)
+			{
+				// View model might be null.
+				await MapPageViewModel?.OnDisappearing();
+			}
 
-            base.OnDisappearing();
-        }
-    }
+			base.OnDisappearing();
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs b/TINK/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs
index 138d9df..872e5bc 100644
--- a/TINK/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs
+++ b/TINK/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs
@@ -8,92 +8,92 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.MiniSurvey
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class MiniSurveyPage : ContentPage, IViewService
-    {
-        public MiniSurveyPage()
-        {
-            var model = App.ModelRoot;
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class MiniSurveyPage : ContentPage, IViewService
+	{
+		public MiniSurveyPage()
+		{
+			var model = App.ModelRoot;
 
-            var vm = new MiniSurveyViewModel(
-                () => model.GetIsConnected(),
-                (isConnected) => model.GetConnector(isConnected),
-                this);
+			var vm = new MiniSurveyViewModel(
+				() => model.GetIsConnected(),
+				(isConnected) => model.GetConnector(isConnected),
+				this);
 
-            InitializeComponent();
+			InitializeComponent();
 
-            BindingContext = vm;
-            MiniSurveyListView.ItemsSource = vm;
-        }
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strCancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
+			BindingContext = vm;
+			MiniSurveyListView.ItemsSource = vm;
+		}
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strCancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strAccept">Text of accept button.</param>
-        /// <param name="p_strCancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strAccept">Text of accept button.</param>
+		/// <param name="p_strCancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
 
 #if USEFLYOUT
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => throw new NotImplementedException();
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushModalAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushModalAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync() => Navigation.PopModalAsync();
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync() => Navigation.PopModalAsync();
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
 
 #if USCSHARP9
         public async Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup());
 #else
-        /// <summary> Displays user feedback popup.</summary>
-        /// <param name="co2Saving"> Co2 saving information.</param>
-        /// <returns>User feedback.</returns>
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
+		/// <summary> Displays user feedback popup.</summary>
+		/// <param name="co2Saving"> Co2 saving information.</param>
+		/// <returns>User feedback.</returns>
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/MiniSurvey/Question/CheckOneViewCell.xaml.cs b/TINK/TINK/View/MiniSurvey/Question/CheckOneViewCell.xaml.cs
index d18c3dd..fd88eff 100644
--- a/TINK/TINK/View/MiniSurvey/Question/CheckOneViewCell.xaml.cs
+++ b/TINK/TINK/View/MiniSurvey/Question/CheckOneViewCell.xaml.cs
@@ -3,12 +3,12 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.MiniSurvey.Question
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class CheckOneViewCell : ViewCell
-    {
-        public CheckOneViewCell()
-        {
-            InitializeComponent();
-        }
-    }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class CheckOneViewCell : ViewCell
+	{
+		public CheckOneViewCell()
+		{
+			InitializeComponent();
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/MiniSurvey/Question/FreeTextViewCell.xaml.cs b/TINK/TINK/View/MiniSurvey/Question/FreeTextViewCell.xaml.cs
index 2f7c71e..e1304d9 100644
--- a/TINK/TINK/View/MiniSurvey/Question/FreeTextViewCell.xaml.cs
+++ b/TINK/TINK/View/MiniSurvey/Question/FreeTextViewCell.xaml.cs
@@ -4,12 +4,12 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.MiniSurvey.Question
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class FreeTextViewCell : ViewCell
-    {
-        public FreeTextViewCell()
-        {
-            InitializeComponent();
-        }
-    }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class FreeTextViewCell : ViewCell
+	{
+		public FreeTextViewCell()
+		{
+			InitializeComponent();
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/MiniSurvey/Question/QuestionViewCellTemplateSelector.cs b/TINK/TINK/View/MiniSurvey/Question/QuestionViewCellTemplateSelector.cs
index a5f70ff..0c6357c 100644
--- a/TINK/TINK/View/MiniSurvey/Question/QuestionViewCellTemplateSelector.cs
+++ b/TINK/TINK/View/MiniSurvey/Question/QuestionViewCellTemplateSelector.cs
@@ -2,25 +2,25 @@
 
 namespace TINK.View.MiniSurvey.Question
 {
-    /// <summary>
-    /// Selects different templates for different question types.
-    /// </summary>    
-    public class QuestionViewCellTemplateSelector : DataTemplateSelector
-    {
-        DataTemplate checkOneViewCell;
-        DataTemplate freeTextViewCell;
+	/// <summary>
+	/// Selects different templates for different question types.
+	/// </summary>    
+	public class QuestionViewCellTemplateSelector : DataTemplateSelector
+	{
+		DataTemplate checkOneViewCell;
+		DataTemplate freeTextViewCell;
 
-        public QuestionViewCellTemplateSelector()
-        {
-            checkOneViewCell = new DataTemplate(typeof(CheckOneViewCell));
-            freeTextViewCell = new DataTemplate(typeof(FreeTextViewCell));
-        }
+		public QuestionViewCellTemplateSelector()
+		{
+			checkOneViewCell = new DataTemplate(typeof(CheckOneViewCell));
+			freeTextViewCell = new DataTemplate(typeof(FreeTextViewCell));
+		}
 
-        protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
-        {
-            return item is ViewModel.MiniSurvey.Question.FreeTextViewModel
-                ? freeTextViewCell
-                : checkOneViewCell;
-        }
-    }
+		protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
+		{
+			return item is ViewModel.MiniSurvey.Question.FreeTextViewModel
+				? freeTextViewCell
+				: checkOneViewCell;
+		}
+	}
 }
diff --git a/TINK/TINK/View/MyBikes/MyBikesPage.xaml.cs b/TINK/TINK/View/MyBikes/MyBikesPage.xaml.cs
index 071db56..903878a 100644
--- a/TINK/TINK/View/MyBikes/MyBikesPage.xaml.cs
+++ b/TINK/TINK/View/MyBikes/MyBikesPage.xaml.cs
@@ -10,177 +10,177 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.MyBikes
 {
-    using Serilog;
-    using TINK.Model;
-    using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
-    using TINK.Model.Device;
-    using TINK.ViewModel.MyBikes;
-    using Xamarin.CommunityToolkit.Extensions;
+	using Serilog;
+	using TINK.Model;
+	using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
+	using TINK.Model.Device;
+	using TINK.ViewModel.MyBikes;
+	using Xamarin.CommunityToolkit.Extensions;
 
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class MyBikesPage : ContentPage, IViewService
-    {
-        /// <summary> Refernce to view model. </summary>
-        MyBikesPageViewModel m_oViewModel = null;
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class MyBikesPage : ContentPage, IViewService
+	{
+		/// <summary> Refernce to view model. </summary>
+		MyBikesPageViewModel m_oViewModel = null;
 
-        /// <summary> Initialization status to ensure initialization logic is not called multiple times. </summary>
-        private bool isInitializationStarted = false;
+		/// <summary> Initialization status to ensure initialization logic is not called multiple times. </summary>
+		private bool isInitializationStarted = false;
 
-        /// <summary>
-        /// Constructs a my bikes page.
-        /// </summary>
-        public MyBikesPage()
-        {
-        }
+		/// <summary>
+		/// Constructs a my bikes page.
+		/// </summary>
+		public MyBikesPage()
+		{
+		}
 
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        protected async override void OnAppearing()
-        {
-            // Don't repeat the initialization if it has been completed already.
-            if (isInitializationStarted) return;
-            isInitializationStarted = true;
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		protected async override void OnAppearing()
+		{
+			// Don't repeat the initialization if it has been completed already.
+			if (isInitializationStarted) return;
+			isInitializationStarted = true;
 
-            if (m_oViewModel != null)
-            {
-                // No need to create view model, set binding context an items source if already done.
-                // If done twice tap events are fired multiple times (when hiding page using home button).
-                await m_oViewModel.OnAppearing();
-                isInitializationStarted = false;
-                return;
-            }
+			if (m_oViewModel != null)
+			{
+				// No need to create view model, set binding context an items source if already done.
+				// If done twice tap events are fired multiple times (when hiding page using home button).
+				await m_oViewModel.OnAppearing();
+				isInitializationStarted = false;
+				return;
+			}
 
-            try
-            {
-                var model = App.ModelRoot;
+			try
+			{
+				var model = App.ModelRoot;
 
-                // Backup synchronization context when called from GUI-thread.
-                var synchronizationContext = SynchronizationContext.Current;
+				// Backup synchronization context when called from GUI-thread.
+				var synchronizationContext = SynchronizationContext.Current;
 
-                m_oViewModel = new MyBikesPageViewModel(
-                    model.ActiveUser,
-                    App.PermissionsService,
-                    App.BluetoothService,
-                    Device.RuntimePlatform,
-                    () => model.GetIsConnected(),
-                    (isConnected) => model.GetConnector(isConnected),
-                    App.LocationServicesContainer.Active,
-                    model.LocksServices.Active,
-                    model.Stations,
-                    model.Polling,
-                    (d, obj) => synchronizationContext.Post(d, obj),
-                    model.SmartDevice,
-                    this,
-                    (url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url))
-                {
-                    IsReportLevelVerbose = model.IsReportLevelVerbose
-                };
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<MyBikesPage>().Error("Displaying bikes at station page failed. {Exception}", exception);
-                await DisplayAlert("Fehler", $"Seite Räder an Station kann nicht angezeigt werden. ${exception.Message}", "OK");
-                isInitializationStarted = false;
-                return;
-            }
+				m_oViewModel = new MyBikesPageViewModel(
+					model.ActiveUser,
+					App.PermissionsService,
+					App.BluetoothService,
+					Device.RuntimePlatform,
+					() => model.GetIsConnected(),
+					(isConnected) => model.GetConnector(isConnected),
+					App.LocationServicesContainer.Active,
+					model.LocksServices.Active,
+					model.Stations,
+					model.Polling,
+					(d, obj) => synchronizationContext.Post(d, obj),
+					model.SmartDevice,
+					this,
+					(url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url))
+				{
+					IsReportLevelVerbose = model.IsReportLevelVerbose
+				};
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<MyBikesPage>().Error("Displaying bikes at station page failed. {Exception}", exception);
+				await DisplayAlert("Fehler", $"Seite Räder an Station kann nicht angezeigt werden. ${exception.Message}", "OK");
+				isInitializationStarted = false;
+				return;
+			}
 
-            InitializeComponent();
+			InitializeComponent();
 
-            BindingContext = m_oViewModel;
-            MyBikesListView.ItemsSource = m_oViewModel;
+			BindingContext = m_oViewModel;
+			MyBikesListView.ItemsSource = m_oViewModel;
 
-            await m_oViewModel.OnAppearing();
-            isInitializationStarted = false;
-        }
+			await m_oViewModel.OnAppearing();
+			isInitializationStarted = false;
+		}
 
-        /// <summary>
-        /// Invoked when pages is closed/ hidden. 
-        /// Stops update process.
-        /// </summary>
-        protected async override void OnDisappearing()
-        {
-            if (m_oViewModel == null)
-            {
-                // View model might be null (Example: Occured when page to querry for location permissions was opened)
-                return;
-            }
+		/// <summary>
+		/// Invoked when pages is closed/ hidden. 
+		/// Stops update process.
+		/// </summary>
+		protected async override void OnDisappearing()
+		{
+			if (m_oViewModel == null)
+			{
+				// View model might be null (Example: Occured when page to querry for location permissions was opened)
+				return;
+			}
 
-            await m_oViewModel.OnDisappearing();
-        }
+			await m_oViewModel.OnDisappearing();
+		}
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strCancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strCancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary>
-        /// Displays alert message.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strAccept">Text of accept button.</param>
-        /// <param name="p_strCancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
+		/// <summary>
+		/// Displays alert message.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strAccept">Text of accept button.</param>
+		/// <param name="p_strCancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
 
 #if USEFLYOUT
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => throw new NotImplementedException();
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="typeOfPage">Page to display.</param>
-        public async Task PushModalAsync(ViewTypes typeOfPage)
-            => await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="typeOfPage">Page to display.</param>
+		public async Task PushModalAsync(ViewTypes typeOfPage)
+			=> await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
 
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync() => throw new NotSupportedException();
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync() => throw new NotSupportedException();
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
 
 #if USCSHARP9
         public async Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup());
 #else
-        /// <summary> Displays user feedback popup.</summary>
-        /// <param name="co2Saving"> Co2 saving information.</param>
-        /// <returns>User feedback.</returns>
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
+		/// <summary> Displays user feedback popup.</summary>
+		/// <param name="co2Saving"> Co2 saving information.</param>
+		/// <returns>User feedback.</returns>
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/RootFlyout/RootPage.xaml.cs b/TINK/TINK/View/RootFlyout/RootPage.xaml.cs
index f3a52bb..7a0ecd0 100644
--- a/TINK/TINK/View/RootFlyout/RootPage.xaml.cs
+++ b/TINK/TINK/View/RootFlyout/RootPage.xaml.cs
@@ -8,35 +8,35 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Root
 {
-    /// <summary>
-    /// Mamages creation of detail pages if a flyout page menu entry is selected.
-    /// Exposes flyout page style navigation which is used by detail pages.
-    /// </summary>
-    /// <remarks>
-    /// Examples of use cases when detail pages do navigation:
-    // - switch to map page after succesfully logging in/ logging out
-    // - switch to login page form bikes at station page if not yet logged in
-    /// </remarks>
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	/// <summary>
+	/// Mamages creation of detail pages if a flyout page menu entry is selected.
+	/// Exposes flyout page style navigation which is used by detail pages.
+	/// </summary>
+	/// <remarks>
+	/// Examples of use cases when detail pages do navigation:
+	// - switch to map page after succesfully logging in/ logging out
+	// - switch to login page form bikes at station page if not yet logged in
+	/// </remarks>
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class RootPage : FlyoutPage, INavigationMasterDetail
 #else
-    public partial class RootPage : FlyoutPage
+	public partial class RootPage : FlyoutPage
 #endif
-    {
-        public RootPage()
-        {
-            InitializeComponent();
-            FlyoutPage.ListView.ItemSelected += OnListViewItemSelected;
+	{
+		public RootPage()
+		{
+			InitializeComponent();
+			FlyoutPage.ListView.ItemSelected += OnListViewItemSelected;
 
-            // Any type of split behaviour conflics with map shifting functionality (assuming FlyoutPage behaves same like MasterDetailPage).
-            FlyoutLayoutBehavior = FlyoutLayoutBehavior.Popover;
+			// Any type of split behaviour conflics with map shifting functionality (assuming FlyoutPage behaves same like MasterDetailPage).
+			FlyoutLayoutBehavior = FlyoutLayoutBehavior.Popover;
 
-            var navigationPage = Detail as NavigationPage;
-            if (navigationPage == null)
-            {
-                return;
-            }
+			var navigationPage = Detail as NavigationPage;
+			if (navigationPage == null)
+			{
+				return;
+			}
 
 #if USEFLYOUT
             var detailPage = navigationPage.RootPage as IDetailPage;
@@ -47,38 +47,38 @@ namespace TINK.View.Root
 
             detailPage.NavigationMasterDetail = this;
 #endif
-        }
+		}
 
-        /// <summary>
-        /// Is called if a flyout page menu entry is selected.
-        /// Creates  a new page.
-        /// </summary>
-        private void OnListViewItemSelected(object sender, SelectedItemChangedEventArgs e)
-        {
-            if (!(e.SelectedItem is RootPageFlyoutMenuItem item))
-            {
-                // Unexpected argument detected.
-                return;
-            }
+		/// <summary>
+		/// Is called if a flyout page menu entry is selected.
+		/// Creates  a new page.
+		/// </summary>
+		private void OnListViewItemSelected(object sender, SelectedItemChangedEventArgs e)
+		{
+			if (!(e.SelectedItem is RootPageFlyoutMenuItem item))
+			{
+				// Unexpected argument detected.
+				return;
+			}
 
-            // Set selected station to new 
-            App.ModelRoot.SelectedStation = new NullStation();
+			// Set selected station to new 
+			App.ModelRoot.SelectedStation = new NullStation();
 
-            ShowPage(item.TargetType, item.Title);
+			ShowPage(item.TargetType, item.Title);
 
-            IsPresented = false;
-            FlyoutPage.ListView.SelectedItem = null;
-        }
+			IsPresented = false;
+			FlyoutPage.ListView.SelectedItem = null;
+		}
 
-        /// <summary>
-        /// Shows a detail page.
-        /// </summary>
-        /// <param name="typeOfPage">Type of page to show.</param>
-        /// <param name="title">Title of page.</param>
-        public void ShowPage(Type typeOfPage, string title)
-        {
-            var page = (Page)Activator.CreateInstance(typeOfPage);
-            page.Title = title;
+		/// <summary>
+		/// Shows a detail page.
+		/// </summary>
+		/// <param name="typeOfPage">Type of page to show.</param>
+		/// <param name="title">Title of page.</param>
+		public void ShowPage(Type typeOfPage, string title)
+		{
+			var page = (Page)Activator.CreateInstance(typeOfPage);
+			page.Title = title;
 
 #if USEFLYOUT
             if (page is IDetailPage detailPage)
@@ -89,7 +89,7 @@ namespace TINK.View.Root
             }
 #endif
 
-            Detail = new NavigationPage(page);
-        }
-    }
+			Detail = new NavigationPage(page);
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/RootFlyout/RootPageFlyout.xaml.cs b/TINK/TINK/View/RootFlyout/RootPageFlyout.xaml.cs
index 5134fa0..0b6a960 100644
--- a/TINK/TINK/View/RootFlyout/RootPageFlyout.xaml.cs
+++ b/TINK/TINK/View/RootFlyout/RootPageFlyout.xaml.cs
@@ -18,19 +18,19 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.Root
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class RootPageFlyout : ContentPage
-    {
-        public ListView ListView;
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class RootPageFlyout : ContentPage
+	{
+		public ListView ListView;
 
-        public RootPageFlyout()
-        {
-            InitializeComponent();
+		public RootPageFlyout()
+		{
+			InitializeComponent();
 
-            BindingContext = new RootPageFlyoutViewModel();
+			BindingContext = new RootPageFlyoutViewModel();
 
-            ListView = MenuItemsListView;
-        }
+			ListView = MenuItemsListView;
+		}
 
-    }
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/RootFlyout/RootPageFlyoutMenuItem.cs b/TINK/TINK/View/RootFlyout/RootPageFlyoutMenuItem.cs
index 4756def..850e69f 100644
--- a/TINK/TINK/View/RootFlyout/RootPageFlyoutMenuItem.cs
+++ b/TINK/TINK/View/RootFlyout/RootPageFlyoutMenuItem.cs
@@ -3,18 +3,18 @@
 namespace TINK.View.Root
 {
 
-    public class RootPageFlyoutMenuItem
-    {
-        public RootPageFlyoutMenuItem()
-        {
-            TargetType = typeof(RootPageFlyoutMenuItem);
-        }
-        public int Id { get; set; }
+	public class RootPageFlyoutMenuItem
+	{
+		public RootPageFlyoutMenuItem()
+		{
+			TargetType = typeof(RootPageFlyoutMenuItem);
+		}
+		public int Id { get; set; }
 
-        public string GlyphCode { get; set; }
+		public string GlyphCode { get; set; }
 
-        public string Title { get; set; }
+		public string Title { get; set; }
 
-        public Type TargetType { get; set; }
-    }
+		public Type TargetType { get; set; }
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/RootMasterDetail/MainPageMenuItem.cs b/TINK/TINK/View/RootMasterDetail/MainPageMenuItem.cs
index ca04b1e..5fe31de 100644
--- a/TINK/TINK/View/RootMasterDetail/MainPageMenuItem.cs
+++ b/TINK/TINK/View/RootMasterDetail/MainPageMenuItem.cs
@@ -4,39 +4,39 @@ using TINK.ViewModel.MasterDetail;
 
 namespace TINK.View
 {
-    public class MainPageMenuItem
-    {
-        public MainPageMenuItem()
-        {
-            TargetType = typeof(MapPage);
-        }
+	public class MainPageMenuItem
+	{
+		public MainPageMenuItem()
+		{
+			TargetType = typeof(MapPage);
+		}
 
-        public MainPageMenuItem(
-            int p_iId,
-            Type p_oTypeOfPage,
-            string p_strTitle = null)
-        {
-            TargetType = p_oTypeOfPage;
-            Id = p_iId;
-            Title = p_strTitle ?? Helper.GetCaption(p_oTypeOfPage);
-        }
+		public MainPageMenuItem(
+			int p_iId,
+			Type p_oTypeOfPage,
+			string p_strTitle = null)
+		{
+			TargetType = p_oTypeOfPage;
+			Id = p_iId;
+			Title = p_strTitle ?? Helper.GetCaption(p_oTypeOfPage);
+		}
 
-        public int Id
-        {
-            get;
-            private set;
-        }
+		public int Id
+		{
+			get;
+			private set;
+		}
 
-        public string Title
-        {
-            get;
-            private set;
-        }
+		public string Title
+		{
+			get;
+			private set;
+		}
 
-        public Type TargetType
-        {
-            get;
-            private set;
-        }
-    }
+		public Type TargetType
+		{
+			get;
+			private set;
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/RootShell/AppShell.xaml b/TINK/TINK/View/RootShell/AppShell.xaml
index 3f1682a..0cd43a8 100644
--- a/TINK/TINK/View/RootShell/AppShell.xaml
+++ b/TINK/TINK/View/RootShell/AppShell.xaml
@@ -24,7 +24,7 @@
             Route="MapPage"
             ContentTemplate="{DataTemplate mappage:MapPage}">
             <ShellContent.FlyoutIcon>
-                <FontImageSource Glyph="{StaticResource IconMap}" Color="Black" FontFamily="FA-S" />
+                <FontImageSource Glyph="{StaticResource IconMap}" Color="{DynamicResource Key=primary-back-title-color}" FontFamily="FA-S" />
             </ShellContent.FlyoutIcon>
         </ShellContent>
     </FlyoutItem>
@@ -34,7 +34,7 @@
             IsVisible="{Binding IsFindBikePageVisible}"
             ContentTemplate="{DataTemplate findbike:FindBikePage}">
             <ShellContent.FlyoutIcon>
-                <FontImageSource Glyph="{StaticResource IconFindBike}" Color="Black" FontFamily="FA-S" />
+                <FontImageSource Glyph="{StaticResource IconFindBike}" Color="{DynamicResource Key=primary-back-title-color}" FontFamily="FA-S" />
             </ShellContent.FlyoutIcon>
         </ShellContent>
     </FlyoutItem>
@@ -44,7 +44,7 @@
             IsVisible="{Binding IsMyBikesPageVisible}"
             ContentTemplate="{DataTemplate mybikes:MyBikesPage}">
             <ShellContent.FlyoutIcon>
-                <FontImageSource Glyph="{StaticResource IconMyBikes}" Color="Black" FontFamily="FA-S" />
+                <FontImageSource Glyph="{StaticResource IconMyBikes}" Color="{DynamicResource Key=primary-back-title-color}" FontFamily="FA-S" />
             </ShellContent.FlyoutIcon>
         </ShellContent>
     </FlyoutItem>
@@ -54,7 +54,7 @@
             IsVisible="{Binding IsAccountPageVisible}"
             ContentTemplate="{DataTemplate account:AccountPage}">
             <ShellContent.FlyoutIcon>
-                <FontImageSource Glyph="{StaticResource IconAccount}" Color="Black" FontFamily="FA-S" />
+                <FontImageSource Glyph="{StaticResource IconAccount}" Color="{DynamicResource Key=primary-back-title-color}" FontFamily="FA-S" />
             </ShellContent.FlyoutIcon>
         </ShellContent>
     </FlyoutItem>
@@ -65,7 +65,7 @@
             IsVisible="{Binding IsLoginPageVisible}"
             ContentTemplate="{DataTemplate login:LoginPage}">
             <ShellContent.FlyoutIcon>
-                <FontImageSource Glyph="{StaticResource IconLogin}" Color="Black" FontFamily="FA-S" />
+                <FontImageSource Glyph="{StaticResource IconLogin}" Color="{DynamicResource Key=primary-back-title-color}" FontFamily="FA-S" />
             </ShellContent.FlyoutIcon>            
         </ShellContent>
     </FlyoutItem>
@@ -75,7 +75,7 @@
             IsVisible="{Binding IsSettingsPageVisible}"
             ContentTemplate="{DataTemplate settings:SettingsPage}">
             <ShellContent.FlyoutIcon>
-                <FontImageSource Glyph="{StaticResource IconSettings}" Color="Black" FontFamily="FA-S" />
+                <FontImageSource Glyph="{StaticResource IconSettings}" Color="{DynamicResource Key=primary-back-title-color}" FontFamily="FA-S" />
             </ShellContent.FlyoutIcon>
         </ShellContent>
     </FlyoutItem>
@@ -84,7 +84,7 @@
             Title="{x:Static resources:AppResources.MarkingFeesAndBikes}"
             ContentTemplate="{DataTemplate contact:FeesAndBikesPage}">
             <ShellContent.FlyoutIcon>
-                <FontImageSource Glyph="{StaticResource IconFeesAndBikes}" Color="Black" FontFamily="FA-S" />
+                <FontImageSource Glyph="{StaticResource IconFeesAndBikes}" Color="{DynamicResource Key=primary-back-title-color}" FontFamily="FA-S" />
             </ShellContent.FlyoutIcon>            
         </ShellContent>
     </FlyoutItem>
@@ -94,7 +94,7 @@
             Route="ContactPage"
             ContentTemplate="{DataTemplate contact:ContactPage}">
             <ShellContent.FlyoutIcon>
-                <FontImageSource Glyph="{StaticResource IconContact}" Color="Black" FontFamily="FA-S" />
+                <FontImageSource Glyph="{StaticResource IconContact}" Color="{DynamicResource Key=primary-back-title-color}" FontFamily="FA-S" />
             </ShellContent.FlyoutIcon>
         </ShellContent>
     </FlyoutItem>
@@ -103,7 +103,7 @@
             Title="{Binding TabbedPageIngoTitle}"
             ContentTemplate="{DataTemplate info:InfoPage}">
             <ShellContent.FlyoutIcon>
-                <FontImageSource Glyph="{StaticResource IconInfo}" Color="Black" FontFamily="FA-S" />
+                <FontImageSource Glyph="{StaticResource IconInfo}" Color="{DynamicResource Key=primary-back-title-color}" FontFamily="FA-S" />
             </ShellContent.FlyoutIcon>
         </ShellContent>
     </FlyoutItem>
diff --git a/TINK/TINK/View/RootShell/AppShell.xaml.cs b/TINK/TINK/View/RootShell/AppShell.xaml.cs
index 71f7994..b27cdc1 100644
--- a/TINK/TINK/View/RootShell/AppShell.xaml.cs
+++ b/TINK/TINK/View/RootShell/AppShell.xaml.cs
@@ -4,12 +4,12 @@ using Xamarin.Forms;
 
 namespace TINK.View.RootShell
 {
-    public partial class AppShell : Shell
-    {
-        public AppShell()
-        {
-            InitializeComponent();
-            BindingContext = new AppShellViewModel();
-        }
-    }
+	public partial class AppShell : Shell
+	{
+		public AppShell()
+		{
+			InitializeComponent();
+			BindingContext = new AppShellViewModel();
+		}
+	}
 }
diff --git a/TINK/TINK/View/RootShell/FlyoutHeader.xaml b/TINK/TINK/View/RootShell/FlyoutHeader.xaml
index 9e77d13..fe4cdbc 100644
--- a/TINK/TINK/View/RootShell/FlyoutHeader.xaml
+++ b/TINK/TINK/View/RootShell/FlyoutHeader.xaml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ContentView xmlns="http://xamarin.com/schemas/2014/forms" 
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             BackgroundColor="{DynamicResource Key=primary-back-title-color}"
-             x:Class="TINK.View.RootShell.FlyoutHeader">
-    <Grid Padding="5,10">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="30" />
-        </Grid.RowDefinitions>
-        <Image 
-                      HeightRequest="140"
-                      Aspect="AspectFit"              
-                      Source="sharee_no_background.png" />
-        <Label 
-            HorizontalOptions="CenterAndExpand"
-            FontSize="Large"
-            Grid.Row="1" 
-            Text="{Binding MasterDetailMenuTitlte}"/>    
-    </Grid>
+<ContentView xmlns="http://xamarin.com/schemas/2014/forms"
+			xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+			BackgroundColor="LightGray"
+			x:Class="TINK.View.RootShell.FlyoutHeader">
+	<StackLayout Orientation="Horizontal"
+				VerticalOptions="Center"
+				HeightRequest="100">
+		<Label HorizontalOptions="EndAndExpand"
+			VerticalOptions="CenterAndExpand"
+			FontSize="Title"
+			FontAttributes="Bold"
+			TextColor="DimGray"
+			Text="{Binding MasterDetailMenuTitlte}"/>
+		<Image HeightRequest="90"
+			WidthRequest="90"
+			Aspect="AspectFit"
+			HorizontalOptions="StartAndExpand"
+			VerticalOptions="CenterAndExpand"
+			Source="sharee_no_background.png"/>
+	</StackLayout>
 </ContentView>
\ No newline at end of file
diff --git a/TINK/TINK/View/RootShell/FlyoutHeader.xaml.cs b/TINK/TINK/View/RootShell/FlyoutHeader.xaml.cs
index 8dda9e4..67382d5 100644
--- a/TINK/TINK/View/RootShell/FlyoutHeader.xaml.cs
+++ b/TINK/TINK/View/RootShell/FlyoutHeader.xaml.cs
@@ -9,12 +9,12 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.RootShell
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class FlyoutHeader : ContentView
-    {
-        public FlyoutHeader()
-        {
-            InitializeComponent();
-        }
-    }
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class FlyoutHeader : ContentView
+	{
+		public FlyoutHeader()
+		{
+			InitializeComponent();
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/Settings/SettingsPage.xaml.cs b/TINK/TINK/View/Settings/SettingsPage.xaml.cs
index 8166aa5..00d3271 100644
--- a/TINK/TINK/View/Settings/SettingsPage.xaml.cs
+++ b/TINK/TINK/View/Settings/SettingsPage.xaml.cs
@@ -12,82 +12,82 @@ using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 
 namespace TINK.View.Settings
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
     public partial class SettingsPage : ContentPage, IViewService, IDetailPage
 #else
-    public partial class SettingsPage : ContentPage, IViewService
+	public partial class SettingsPage : ContentPage, IViewService
 #endif
-    {
-        /// <summary> Refernce to view model. </summary>
-        SettingsPageViewModel m_oViewModel = null;
+	{
+		/// <summary> Refernce to view model. </summary>
+		SettingsPageViewModel m_oViewModel = null;
 
-        /// <summary> Constructs a settings page. </summary>
-        public SettingsPage()
-        {
-            InitializeComponent();
+		/// <summary> Constructs a settings page. </summary>
+		public SettingsPage()
+		{
+			InitializeComponent();
 
-            var l_oModel = App.ModelRoot;
+			var l_oModel = App.ModelRoot;
 
-            m_oViewModel = new SettingsPageViewModel(
-                l_oModel,
-                App.LocationServicesContainer,
-                this);
+			m_oViewModel = new SettingsPageViewModel(
+				l_oModel,
+				App.LocationServicesContainer,
+				this);
 
-            BindingContext = m_oViewModel;
+			BindingContext = m_oViewModel;
 
-            Filters.ItemsSource = m_oViewModel.GroupFilter;
-        }
+			Filters.ItemsSource = m_oViewModel.GroupFilter;
+		}
 
-        /// <summary> Displays alert message. </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strCancel">Type of buttons.</param>
-        public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
+		/// <summary> Displays alert message. </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strCancel">Type of buttons.</param>
+		public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strAccept">Text of accept button.</param>
-        /// <param name="p_strCancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
-            => await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strAccept">Text of accept button.</param>
+		/// <param name="p_strCancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
+			=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
 
-        /// <summary>
-        /// Displays an action sheet.
-        /// </summary>
-        /// <param name="p_strTitle">Title of message.</param>
-        /// <param name="p_strMessage">Message to display.</param>
-        /// <param name="p_strCancel">Text of button.</param>
-        /// <param name="destruction"></param>
-        /// <param name="p_oButtons">Buttons holding options to select.</param>
-        /// <returns>Text selected</returns>
-        public new async Task<string> DisplayActionSheet(String p_strTitle, String p_strCancel, String destruction, params String[] p_oButtons)
-                => await base.DisplayActionSheet(p_strTitle, p_strCancel, destruction, p_oButtons);
+		/// <summary>
+		/// Displays an action sheet.
+		/// </summary>
+		/// <param name="p_strTitle">Title of message.</param>
+		/// <param name="p_strMessage">Message to display.</param>
+		/// <param name="p_strCancel">Text of button.</param>
+		/// <param name="destruction"></param>
+		/// <param name="p_oButtons">Buttons holding options to select.</param>
+		/// <returns>Text selected</returns>
+		public new async Task<string> DisplayActionSheet(String p_strTitle, String p_strCancel, String destruction, params String[] p_oButtons)
+				=> await base.DisplayActionSheet(p_strTitle, p_strCancel, destruction, p_oButtons);
 
 #if USEFLYOUT
         /// <summary>
@@ -97,19 +97,19 @@ namespace TINK.View.Settings
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => m_oNavigation.ShowPage(p_oType.GetViewType(), p_strTitle);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushModalAsync(ViewTypes p_oTypeOfPage)
-            => throw new NotImplementedException();
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushModalAsync(ViewTypes p_oTypeOfPage)
+			=> throw new NotImplementedException();
 
-        /// <summary> Pops a page from the modal stack. </summary>
-        public Task PopModalAsync()
-            => throw new NotSupportedException();
+		/// <summary> Pops a page from the modal stack. </summary>
+		public Task PopModalAsync()
+			=> throw new NotSupportedException();
 
 #if USEFLYOUT
         /// <summary>Delegate to perform navigation.</summary>
@@ -124,33 +124,33 @@ namespace TINK.View.Settings
         }
 
 #endif
-        /// <summary>
-        /// Invoked when pages is closed/ hidden. 
-        /// Stops update process.
-        /// </summary>
-        protected async override void OnDisappearing()
-        {
-            if (m_oViewModel == null)
-            {
-                // View model might be null.
-                return;
-            }
+		/// <summary>
+		/// Invoked when pages is closed/ hidden. 
+		/// Stops update process.
+		/// </summary>
+		protected async override void OnDisappearing()
+		{
+			if (m_oViewModel == null)
+			{
+				// View model might be null.
+				return;
+			}
 
-            await m_oViewModel?.OnDisappearing();
-        }
+			await m_oViewModel?.OnDisappearing();
+		}
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public async Task PushAsync(ViewTypes p_oTypeOfPage)
-            => await Navigation.PushAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public async Task PushAsync(ViewTypes p_oTypeOfPage)
+			=> await Navigation.PushAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
 
 #if USCSHARP9
         public async Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup());
 #else
-        /// <summary> Displays user feedback popup.</summary>
-        /// <param name="co2Saving"> Co2 saving information.</param>
-        /// <returns>User feedback.</returns>
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
+		/// <summary> Displays user feedback popup.</summary>
+		/// <param name="co2Saving"> Co2 saving information.</param>
+		/// <returns>User feedback.</returns>
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
 #endif
 
 #if USERFEEDBACKDLG_TRYOUT
@@ -164,5 +164,5 @@ namespace TINK.View.Settings
                 "OK");
         }
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/StringNotNullOrEmptyToVisibleConverter.cs b/TINK/TINK/View/StringNotNullOrEmptyToVisibleConverter.cs
index ebf2361..d4c2f32 100644
--- a/TINK/TINK/View/StringNotNullOrEmptyToVisibleConverter.cs
+++ b/TINK/TINK/View/StringNotNullOrEmptyToVisibleConverter.cs
@@ -4,20 +4,20 @@ using Xamarin.Forms;
 
 namespace TINK.View
 {
-    /// <summary> Converts a string into visible state. If string is null or empty element becomes invisible.</summary>
-    public class StringNotNullOrEmptyToVisibleConverter : IValueConverter
-    {
-        /// <summary> Converts a string into visible state.</summary>
-        /// <param name="value">Text value from view model used to derive whether object is visible or not.</param>
-        /// <returns>Boolean value indicating whether object is visible or not.</returns>
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return value != null && value is string text && !string.IsNullOrEmpty(text);
-        }
+	/// <summary> Converts a string into visible state. If string is null or empty element becomes invisible.</summary>
+	public class StringNotNullOrEmptyToVisibleConverter : IValueConverter
+	{
+		/// <summary> Converts a string into visible state.</summary>
+		/// <param name="value">Text value from view model used to derive whether object is visible or not.</param>
+		/// <returns>Boolean value indicating whether object is visible or not.</returns>
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			return value != null && value is string text && !string.IsNullOrEmpty(text);
+		}
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return "";
-        }
-    }
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			return "";
+		}
+	}
 }
diff --git a/TINK/TINK/View/ViewTypesTypeProvider.cs b/TINK/TINK/View/ViewTypesTypeProvider.cs
index d5c0c76..30d8cd7 100644
--- a/TINK/TINK/View/ViewTypesTypeProvider.cs
+++ b/TINK/TINK/View/ViewTypesTypeProvider.cs
@@ -15,63 +15,63 @@ using Xamarin.Forms;
 
 namespace TINK.View
 {
-    public static class ViewTypesTypeProvider
-    {
-        public static Type GetViewType(this ViewTypes viewType)
-        {
-            switch (viewType)
-            {
-                case ViewTypes.LoginPage:
-                    return typeof(LoginPage);
+	public static class ViewTypesTypeProvider
+	{
+		public static Type GetViewType(this ViewTypes viewType)
+		{
+			switch (viewType)
+			{
+				case ViewTypes.LoginPage:
+					return typeof(LoginPage);
 
-                case ViewTypes.MapPage:
-                    return typeof(MapPage);
+				case ViewTypes.MapPage:
+					return typeof(MapPage);
 
-                case ViewTypes.RegisterPage:
-                    return typeof(RegisterPage);
+				case ViewTypes.RegisterPage:
+					return typeof(RegisterPage);
 
-                case ViewTypes.PasswordForgottenPage:
-                    return typeof(PasswordForgottenPage);
+				case ViewTypes.PasswordForgottenPage:
+					return typeof(PasswordForgottenPage);
 
-                case ViewTypes.BikeInfoCarouselPage:
-                    return typeof(BikeInfoCarouselPage);
+				case ViewTypes.BikeInfoCarouselPage:
+					return typeof(BikeInfoCarouselPage);
 
-                case ViewTypes.MyBikesPage:
-                    return typeof(MyBikesPage);
+				case ViewTypes.MyBikesPage:
+					return typeof(MyBikesPage);
 
-                case ViewTypes.SettingsPage:
-                    return typeof(SettingsPage);
+				case ViewTypes.SettingsPage:
+					return typeof(SettingsPage);
 
-                case ViewTypes.TabbedPageInfo:
-                    return typeof(InfoPage);
+				case ViewTypes.TabbedPageInfo:
+					return typeof(InfoPage);
 
-                case ViewTypes.FeesAndBikesPage:
-                    return typeof(FeesAndBikesPage);
+				case ViewTypes.FeesAndBikesPage:
+					return typeof(FeesAndBikesPage);
 
-                case ViewTypes.ManageAccountPage:
-                    return typeof(ManageAccountPage);
+				case ViewTypes.ManageAccountPage:
+					return typeof(ManageAccountPage);
 
-                case ViewTypes.AgbPage:
-                    return typeof(AgbPage);
+				case ViewTypes.AgbPage:
+					return typeof(AgbPage);
 
-                case ViewTypes.WhatsNewPage:
-                    return typeof(WhatsNewPage);
+				case ViewTypes.WhatsNewPage:
+					return typeof(WhatsNewPage);
 
-                case ViewTypes.BikesAtStation:
-                    return typeof(BikesAtStationPage);
+				case ViewTypes.BikesAtStation:
+					return typeof(BikesAtStationPage);
 
-                case ViewTypes.ContactPage:
-                    return typeof(ContactPage);
+				case ViewTypes.ContactPage:
+					return typeof(ContactPage);
 
-                case ViewTypes.SelectStationPage:
-                    return typeof(SelectStationPage);
+				case ViewTypes.SelectStationPage:
+					return typeof(SelectStationPage);
 
-                case ViewTypes.MiniSurvey:
-                    return typeof(MiniSurveyPage);
+				case ViewTypes.MiniSurvey:
+					return typeof(MiniSurveyPage);
 
-                default:
-                    return typeof(ContentPage);
-            }
-        }
-    }
+				default:
+					return typeof(ContentPage);
+			}
+		}
+	}
 }
diff --git a/TINK/TINK/View/WhatsNew/Agb/AgbPage.xaml.cs b/TINK/TINK/View/WhatsNew/Agb/AgbPage.xaml.cs
index ccaeb0f..cb114dd 100644
--- a/TINK/TINK/View/WhatsNew/Agb/AgbPage.xaml.cs
+++ b/TINK/TINK/View/WhatsNew/Agb/AgbPage.xaml.cs
@@ -9,76 +9,76 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.WhatsNew.Agb
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class AgbPage : ContentPage, IViewService
-    {
-        public AgbPage()
-        {
-            InitializeComponent();
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class AgbPage : ContentPage, IViewService
+	{
+		public AgbPage()
+		{
+			InitializeComponent();
 
-            agbViewModel = new AgbViewModel(
-                App.ModelRoot.NextActiveUri.Host,
-                App.ModelRoot.IsSiteCachingOn,
-                CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
-                (resourceName) => ViewModelResourceHelper.GetSource(resourceName),
-                this);
+			agbViewModel = new AgbViewModel(
+				App.ModelRoot.NextActiveUri.Host,
+				App.ModelRoot.IsSiteCachingOn,
+				CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
+				(resourceName) => ViewModelResourceHelper.GetSource(resourceName),
+				this);
 
-            BindingContext = agbViewModel;
-        }
+			BindingContext = agbViewModel;
+		}
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        /// <summary> Invoked when page is shown. </summary>
-        protected async override void OnAppearing()
-            => await agbViewModel.OnAppearing();
+		/// <summary> Invoked when page is shown. </summary>
+		protected async override void OnAppearing()
+			=> await agbViewModel.OnAppearing();
 
-        /// <summary> Reference to view model.</summary>
-        AgbViewModel agbViewModel;
+		/// <summary> Reference to view model.</summary>
+		AgbViewModel agbViewModel;
 
-        public async Task PopModalAsync()
-            => await Navigation.PopModalAsync();
+		public async Task PopModalAsync()
+			=> await Navigation.PopModalAsync();
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushAsync(ViewTypes p_oTypeOfPage)
-            => throw new NotImplementedException();
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushAsync(ViewTypes p_oTypeOfPage)
+			=> throw new NotImplementedException();
 
-        public Task PushModalAsync(ViewTypes p_oTypeOfPage)
-            => throw new NotImplementedException();
+		public Task PushModalAsync(ViewTypes p_oTypeOfPage)
+			=> throw new NotImplementedException();
 
 #if USEFLYOUT
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => throw new NotImplementedException();
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
-    }
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/View/WhatsNew/WhatsNewPage.xaml.cs b/TINK/TINK/View/WhatsNew/WhatsNewPage.xaml.cs
index f519596..c1c1a2c 100644
--- a/TINK/TINK/View/WhatsNew/WhatsNewPage.xaml.cs
+++ b/TINK/TINK/View/WhatsNew/WhatsNewPage.xaml.cs
@@ -7,100 +7,100 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.View.WhatsNew
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class WhatsNewPage : ContentPage, IViewService
-    {
-        /// <summary> Holds a reference on the view model. </summary>
-        private ViewModel.WhatsNew.WhatsNewViewModel WhatsNewViewModel;
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class WhatsNewPage : ContentPage, IViewService
+	{
+		/// <summary> Holds a reference on the view model. </summary>
+		private ViewModel.WhatsNew.WhatsNewViewModel WhatsNewViewModel;
 
-        /// <summary> Constructs whats new page.</summary>
-        /// <param name="showMasterDetail">Action to invoke master detail page.</param>
-        public WhatsNewPage(Action showMasterDetail)
-        {
-            InitializeComponent();
+		/// <summary> Constructs whats new page.</summary>
+		/// <param name="showMasterDetail">Action to invoke master detail page.</param>
+		public WhatsNewPage(Action showMasterDetail)
+		{
+			InitializeComponent();
 
-            WhatsNewViewModel = new ViewModel.WhatsNew.WhatsNewViewModel(
-                DependencyService.Get<IAppInfo>().Version,
-                App.ModelRoot.WhatsNew.WhatsNewText,
-                App.ModelRoot.WhatsNew.IsShowAgbRequired,
-                showMasterDetail,
-                this);
+			WhatsNewViewModel = new ViewModel.WhatsNew.WhatsNewViewModel(
+				DependencyService.Get<IAppInfo>().Version,
+				App.ModelRoot.WhatsNew.WhatsNewText,
+				App.ModelRoot.WhatsNew.IsShowAgbRequired,
+				showMasterDetail,
+				this);
 
-            BindingContext = WhatsNewViewModel;
-        }
+			BindingContext = WhatsNewViewModel;
+		}
 
-        /// <summary> Displays alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Type of buttons.</param>
-        public async Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
+		/// <summary> Displays alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Type of buttons.</param>
+		public async Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
 
-        /// <summary> Displays detailed alert message.</summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of cancel button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
-            => await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
+		/// <summary> Displays detailed alert message.</summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of cancel button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
+			=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
 
-        public Task PopModalAsync()
-        {
-            throw new NotImplementedException(); ;
-        }
+		public Task PopModalAsync()
+		{
+			throw new NotImplementedException(); ;
+		}
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="p_oTypeOfPage">Page to display.</param>
-        public Task PushAsync(ViewTypes p_oTypeOfPage)
-        {
-            throw new NotImplementedException();
-        }
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="p_oTypeOfPage">Page to display.</param>
+		public Task PushAsync(ViewTypes p_oTypeOfPage)
+		{
+			throw new NotImplementedException();
+		}
 
-        public async Task PushModalAsync(ViewTypes p_oTypeOfPage)
-        {
-            await Navigation.PushModalAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
-        }
+		public async Task PushModalAsync(ViewTypes p_oTypeOfPage)
+		{
+			await Navigation.PushModalAsync((Page)Activator.CreateInstance(p_oTypeOfPage.GetViewType()));
+		}
 
 #if USEFLYOUT
         public void ShowPage(ViewTypes p_oType, string p_strTitle = null)
             => throw new NotImplementedException();
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
-        public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
+		public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
 #endif
 
 #if USCSHARP9
         public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
 #else
-        public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
+		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
 #endif
 
-        /// <summary>
-        /// Invoked when pages is closed/ hidden.
-        /// /// </summary>
-        protected override void OnDisappearing()
-        {
-            base.OnDisappearing();
+		/// <summary>
+		/// Invoked when pages is closed/ hidden.
+		/// /// </summary>
+		protected override void OnDisappearing()
+		{
+			base.OnDisappearing();
 
-            if (WhatsNewViewModel == null)
-            {
-                // View model might be null.
-                return;
-            }
+			if (WhatsNewViewModel == null)
+			{
+				// View model might be null.
+				return;
+			}
 
-            WhatsNewViewModel?.OnDisappearing(() =>
-            {
-                App.ModelRoot.WhatsNew.WasShownInCurrentSession = true;
-                App.ModelRoot.Save();
-            });
-        }
-    }
+			WhatsNewViewModel?.OnDisappearing(() =>
+			{
+				App.ModelRoot.WhatsNew.WasShownInCurrentSession = true;
+				App.ModelRoot.Save();
+			});
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINK/TINK/ViewModel/RootFlyout/RootPageViewModel.cs b/TINK/TINK/ViewModel/RootFlyout/RootPageViewModel.cs
index 2ed7fe8..dbf319a 100644
--- a/TINK/TINK/ViewModel/RootFlyout/RootPageViewModel.cs
+++ b/TINK/TINK/ViewModel/RootFlyout/RootPageViewModel.cs
@@ -24,175 +24,175 @@ using TINK.View.Themes;
 
 namespace TINK.ViewModel.Root
 {
-    /// <summary>
-    /// View model for flyout menu entries. Respositility
-    /// - populates entries depending on app state on showing menu
-    /// - updates menu denpending on app state change, i.e. user logs in/ out. 
-    /// </summary>
-    public class RootPageFlyoutViewModel : INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Dictionary to manage collection of menu items.
-        /// </summary>
-        private Dictionary<Type, int> m_oEntryDictionary;
+	/// <summary>
+	/// View model for flyout menu entries. Respositility
+	/// - populates entries depending on app state on showing menu
+	/// - updates menu denpending on app state change, i.e. user logs in/ out. 
+	/// </summary>
+	public class RootPageFlyoutViewModel : INotifyPropertyChanged
+	{
+		/// <summary>
+		/// Dictionary to manage collection of menu items.
+		/// </summary>
+		private Dictionary<Type, int> m_oEntryDictionary;
 
-        public event PropertyChangedEventHandler PropertyChanged;
+		public event PropertyChangedEventHandler PropertyChanged;
 
-        /// <summary> Updates menu entries depending on state. </summary>
-        private void UpdateMenuEntries()
-        {
-            for (int l_iIndex = MenuItems.Count - 1; l_iIndex >= 0; l_iIndex--)
-            {
-                MenuItems.Clear();
-                m_oEntryDictionary.Clear();
-            }
+		/// <summary> Updates menu entries depending on state. </summary>
+		private void UpdateMenuEntries()
+		{
+			for (int l_iIndex = MenuItems.Count - 1; l_iIndex >= 0; l_iIndex--)
+			{
+				MenuItems.Clear();
+				m_oEntryDictionary.Clear();
+			}
 
-            CheckAddItem(typeof(MapPage));
+			CheckAddItem(typeof(MapPage));
 
-            if (App.ModelRoot.ActiveUser.IsLoggedIn)
-            {
-                CheckAddItem(typeof(MyBikesPage));
-                CheckAddItem(typeof(FindBikePage));
-                CheckAddItem(typeof(AccountPage));
-            }
-            else
-            {
-                CheckAddItem(typeof(LoginPage));
-            }
+			if (App.ModelRoot.ActiveUser.IsLoggedIn)
+			{
+				CheckAddItem(typeof(MyBikesPage));
+				CheckAddItem(typeof(FindBikePage));
+				CheckAddItem(typeof(AccountPage));
+			}
+			else
+			{
+				CheckAddItem(typeof(LoginPage));
+			}
 
-            if (App.ModelRoot.Uris.ActiveUri.Host.GetIsCopri()
-                || App.ModelRoot.ActiveUser.IsLoggedIn)
-            {
-                CheckAddItem(typeof(SettingsPage));
-            }
+			if (App.ModelRoot.Uris.ActiveUri.Host.GetIsCopri()
+				|| App.ModelRoot.ActiveUser.IsLoggedIn)
+			{
+				CheckAddItem(typeof(SettingsPage));
+			}
 
-            CheckAddItem(typeof(FeesAndBikesPage)); // Fees and bikes
+			CheckAddItem(typeof(FeesAndBikesPage)); // Fees and bikes
 
-            CheckAddItem(typeof(ContactPage)); // Feedback and contact
+			CheckAddItem(typeof(ContactPage)); // Feedback and contact
 
-            CheckAddItem(typeof(InfoPage)); // About sharee.bike
-        }
+			CheckAddItem(typeof(InfoPage)); // About sharee.bike
+		}
 
-        /// <summary>Adds a menu item to master detail menu.</summary>
-        /// <param name="p_oType">Type decribing entry to be added.</param>
-        private void CheckAddItem(Type p_oType)
-        {
-            if (m_oEntryDictionary.ContainsKey(p_oType))
-            {
-                // Nothing to do because has already been added.
-                return;
-            }
+		/// <summary>Adds a menu item to master detail menu.</summary>
+		/// <param name="p_oType">Type decribing entry to be added.</param>
+		private void CheckAddItem(Type p_oType)
+		{
+			if (m_oEntryDictionary.ContainsKey(p_oType))
+			{
+				// Nothing to do because has already been added.
+				return;
+			}
 
-            m_oEntryDictionary.Add(
-                p_oType,
-                m_oEntryDictionary.Count);
+			m_oEntryDictionary.Add(
+				p_oType,
+				m_oEntryDictionary.Count);
 
-            MenuItems.Add(new RootPageFlyoutMenuItem
-            {
-                TargetType = p_oType,
-                GlyphCode = Helper.GetGlyphCode(p_oType),
-                Title = Helper.GetCaption(p_oType),
-                Id = m_oEntryDictionary[p_oType]
-            });
-        }
+			MenuItems.Add(new RootPageFlyoutMenuItem
+			{
+				TargetType = p_oType,
+				GlyphCode = Helper.GetGlyphCode(p_oType),
+				Title = Helper.GetCaption(p_oType),
+				Id = m_oEntryDictionary[p_oType]
+			});
+		}
 
-        /// <summary> Removes a page from menu.</summary>
-        /// <param name="p_oType"></param>
-        private void RemoveItem(Type p_oType)
-        {
-            if (!m_oEntryDictionary.ContainsKey(p_oType))
-            {
-                // Nothing to do because item was never added/ already removed.
-                return;
-            }
+		/// <summary> Removes a page from menu.</summary>
+		/// <param name="p_oType"></param>
+		private void RemoveItem(Type p_oType)
+		{
+			if (!m_oEntryDictionary.ContainsKey(p_oType))
+			{
+				// Nothing to do because item was never added/ already removed.
+				return;
+			}
 
-            MenuItems.Remove(MenuItems[m_oEntryDictionary[p_oType]]);
-            m_oEntryDictionary.Remove(p_oType);
-        }
+			MenuItems.Remove(MenuItems[m_oEntryDictionary[p_oType]]);
+			m_oEntryDictionary.Remove(p_oType);
+		}
 
-        public RootPageFlyoutViewModel()
-        {
-            MenuItems = new ObservableCollection<RootPageFlyoutMenuItem>();
-            m_oEntryDictionary = new Dictionary<Type, int>();
+		public RootPageFlyoutViewModel()
+		{
+			MenuItems = new ObservableCollection<RootPageFlyoutMenuItem>();
+			m_oEntryDictionary = new Dictionary<Type, int>();
 
-            // Update menu entries on login/ logout actions.
-            App.ModelRoot.ActiveUser.StateChanged += (sender, eventargs) => OnUpdateRequired();
+			// Update menu entries on login/ logout actions.
+			App.ModelRoot.ActiveUser.StateChanged += (sender, eventargs) => OnUpdateRequired();
 
-            // Update flyout view model whenever theme is switched.
-            App.ModelRoot.Themes.PropertyChanged += (sender, eventargs) =>
-            {
-                if (!(sender is ServicesContainerMutableT<object> themes))
-                    return;
+			// Update flyout view model whenever theme is switched.
+			App.ModelRoot.Themes.PropertyChanged += (sender, eventargs) =>
+			{
+				if (!(sender is ServicesContainerMutableT<object> themes))
+					return;
 
-                MasterDetailMenuTitlte = GetMasterDetailMenuTitle(themes.Active);
+				MasterDetailMenuTitlte = GetMasterDetailMenuTitle(themes.Active);
 
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(MasterDetailMenuTitlte)));
-            };
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(MasterDetailMenuTitlte)));
+			};
 
-            MasterDetailMenuTitlte = GetMasterDetailMenuTitle(App.ModelRoot.Themes.Active);
+			MasterDetailMenuTitlte = GetMasterDetailMenuTitle(App.ModelRoot.Themes.Active);
 
-            UpdateMenuEntries();
-        }
+			UpdateMenuEntries();
+		}
 
-        /// <summary>
-        /// Gets the flyout title from theme name
-        /// </summary>
-        /// <param name="theme">Name of theme.</param>
-        /// <returns>Flyout title.</returns>
-        private string GetMasterDetailMenuTitle(object theme)
-        {
-            if (!(theme is ITheme active))
-                return "sharee.bike";
+		/// <summary>
+		/// Gets the flyout title from theme name
+		/// </summary>
+		/// <param name="theme">Name of theme.</param>
+		/// <returns>Flyout title.</returns>
+		private string GetMasterDetailMenuTitle(object theme)
+		{
+			if (!(theme is ITheme active))
+				return "sharee.bike";
 
-            return !string.IsNullOrEmpty(active.OperatorInfo) ? $"{active.OperatorInfo}" : "sharee.bike";
-        }
+			return !string.IsNullOrEmpty(active.OperatorInfo) ? $"{active.OperatorInfo}" : "sharee.bike";
+		}
 
-        /// <summary>
-        /// Holds the title of the fylout page.
-        /// </summary>
-        public string MasterDetailMenuTitlte { get; private set; }
+		/// <summary>
+		/// Holds the title of the fylout page.
+		/// </summary>
+		public string MasterDetailMenuTitlte { get; private set; }
 
 
-        /// <summary>
-        /// Provides collection of menu items for master page.
-        /// </summary>
-        public ObservableCollection<RootPageFlyoutMenuItem> MenuItems
-        {
-            get; private set;
-        }
+		/// <summary>
+		/// Provides collection of menu items for master page.
+		/// </summary>
+		public ObservableCollection<RootPageFlyoutMenuItem> MenuItems
+		{
+			get; private set;
+		}
 
-        /// <summary>
-        /// Gets or sets the selected item.
-        /// </summary>
-        public MainPageMenuItem SelectedMenuItem
-        {
-            get;
-            set;
-        }
+		/// <summary>
+		/// Gets or sets the selected item.
+		/// </summary>
+		public MainPageMenuItem SelectedMenuItem
+		{
+			get;
+			set;
+		}
 
-        /// <summary>
-        /// Command object which is invoked from view when an item is selected.
-        /// </summary>
-        public Command MenuItemSelected
-        {
-            get
-            {
-                return new Command(OnUpdateRequired);
-            }
+		/// <summary>
+		/// Command object which is invoked from view when an item is selected.
+		/// </summary>
+		public Command MenuItemSelected
+		{
+			get
+			{
+				return new Command(OnUpdateRequired);
+			}
 
-        }
+		}
 
-        /// <summary> Manges updates required due to selection of a menu or login events.</summary>
-        public void OnUpdateRequired()
-        {
+		/// <summary> Manges updates required due to selection of a menu or login events.</summary>
+		public void OnUpdateRequired()
+		{
 
-            UpdateMenuEntries();
+			UpdateMenuEntries();
 
-            if (SelectedMenuItem == null)
-            {
-                // Nothing to do if no menu entry is selected.
-                return;
-            }
-        }
-    }
+			if (SelectedMenuItem == null)
+			{
+				// Nothing to do if no menu entry is selected.
+				return;
+			}
+		}
+	}
 }
diff --git a/TINK/TINK/ViewModel/RootMasterDetail/Helper.cs b/TINK/TINK/ViewModel/RootMasterDetail/Helper.cs
index d43f497..efa35d6 100644
--- a/TINK/TINK/ViewModel/RootMasterDetail/Helper.cs
+++ b/TINK/TINK/ViewModel/RootMasterDetail/Helper.cs
@@ -12,104 +12,104 @@ using TINK.ViewModel.Info;
 
 namespace TINK.ViewModel.MasterDetail
 {
-    public static class Helper
-    {
-        /// <summary>
-        /// Gets a description for a map page used as menu item entry and caption.
-        /// </summary>
-        /// <param name="type">Type of page to get caption for.</param>
-        /// <returns></returns>
-        public static string GetCaption(Type type)
-        {
-            if (type == typeof(MapPage)) // Bikes sites
-            {
-                return AppResources.MarkingMapPage;
-            }
-            else if (type == typeof(FindBikePage)) // Find Bike
-            {
-                return AppResources.MarkingFindBike;
-            }
-            else if (type == typeof(MyBikesPage)) // My Bikes
-            {
-                return AppResources.MarkingMyBikes;
-            }
-            else if (type == typeof(AccountPage)) // Account
-            {
-                return AppResources.MarkingAccount;
-            }
-            else if (type == typeof(LoginPage))  // Login
-            {
-                return AppResources.MarkingLogin;
-            }
-            else if (type == typeof(SettingsPage)) // Settings
-            {
-                return AppResources.MarkingSettings;
-            }
-            else if (type == typeof(FeesAndBikesPage))
-            {
-                return AppResources.MarkingFeesAndBikes;
-            }
-            else if (type == typeof(ContactPage))
-            {
-                return AppResources.MarkingFeedbackAndContact;
-            }
-            else if (type == typeof(InfoPage))
-            {
-                return AppResources.MarkingAbout;
-            }
-            else
-            {
-                return type.Name;
-            }
-        }
+	public static class Helper
+	{
+		/// <summary>
+		/// Gets a description for a map page used as menu item entry and caption.
+		/// </summary>
+		/// <param name="type">Type of page to get caption for.</param>
+		/// <returns></returns>
+		public static string GetCaption(Type type)
+		{
+			if (type == typeof(MapPage)) // Bikes sites
+			{
+				return AppResources.MarkingMapPage;
+			}
+			else if (type == typeof(FindBikePage)) // Find Bike
+			{
+				return AppResources.MarkingFindBike;
+			}
+			else if (type == typeof(MyBikesPage)) // My Bikes
+			{
+				return AppResources.MarkingMyBikes;
+			}
+			else if (type == typeof(AccountPage)) // Account
+			{
+				return AppResources.MarkingAccount;
+			}
+			else if (type == typeof(LoginPage))  // Login
+			{
+				return AppResources.MarkingLogin;
+			}
+			else if (type == typeof(SettingsPage)) // Settings
+			{
+				return AppResources.MarkingSettings;
+			}
+			else if (type == typeof(FeesAndBikesPage))
+			{
+				return AppResources.MarkingFeesAndBikes;
+			}
+			else if (type == typeof(ContactPage))
+			{
+				return AppResources.MarkingFeedbackAndContact;
+			}
+			else if (type == typeof(InfoPage))
+			{
+				return AppResources.MarkingAbout;
+			}
+			else
+			{
+				return type.Name;
+			}
+		}
 
-        /// <summary>
-        /// Gets a description for a map page used as menu item entry and caption.
-        /// </summary>
-        /// <param name="type">Type of page to get caption for.</param>
-        /// <returns></returns>
-        public static string GetGlyphCode(Type type)
-        {
-            if (type == typeof(MapPage)) // Bikes sites
-            {
-                return "\uf5a0";
-            }
-            else if (type == typeof(FindBikePage)) // My Bikes
-            {
-                return "\uf002";
-            }
-            else if (type == typeof(MyBikesPage)) // My Bikes
-            {
-                return "\uf206";
-            }
-            else if (type == typeof(AccountPage)) // Account
-            {
-                return "\uf007";
-            }
-            else if (type == typeof(LoginPage))  // Login
-            {
-                return "\uf2f6";
-            }
-            else if (type == typeof(SettingsPage)) // Settings
-            {
-                return "\uf013";
-            }
-            else if (type == typeof(FeesAndBikesPage))
-            {
-                return "\uf7d9";
-            }
-            else if (type == typeof(ContactPage))
-            {
-                return "\uf095";
-            }
-            else if (type == typeof(InfoPage))
-            {
-                return "\uf05a";
-            }
-            else
-            {
-                return type.Name;
-            }
-        }
-    }
+		/// <summary>
+		/// Gets a description for a map page used as menu item entry and caption.
+		/// </summary>
+		/// <param name="type">Type of page to get caption for.</param>
+		/// <returns></returns>
+		public static string GetGlyphCode(Type type)
+		{
+			if (type == typeof(MapPage)) // Bikes sites
+			{
+				return "\uf5a0";
+			}
+			else if (type == typeof(FindBikePage)) // My Bikes
+			{
+				return "\uf002";
+			}
+			else if (type == typeof(MyBikesPage)) // My Bikes
+			{
+				return "\uf206";
+			}
+			else if (type == typeof(AccountPage)) // Account
+			{
+				return "\uf007";
+			}
+			else if (type == typeof(LoginPage))  // Login
+			{
+				return "\uf2f6";
+			}
+			else if (type == typeof(SettingsPage)) // Settings
+			{
+				return "\uf013";
+			}
+			else if (type == typeof(FeesAndBikesPage))
+			{
+				return "\uf7d9";
+			}
+			else if (type == typeof(ContactPage))
+			{
+				return "\uf095";
+			}
+			else if (type == typeof(InfoPage))
+			{
+				return "\uf05a";
+			}
+			else
+			{
+				return type.Name;
+			}
+		}
+	}
 }
diff --git a/TINK/TINK/ViewModel/RootShell/AppShellViewModel.cs b/TINK/TINK/ViewModel/RootShell/AppShellViewModel.cs
index a827874..0aa79bf 100644
--- a/TINK/TINK/ViewModel/RootShell/AppShellViewModel.cs
+++ b/TINK/TINK/ViewModel/RootShell/AppShellViewModel.cs
@@ -7,66 +7,66 @@ using TINK.ViewModel.Info;
 
 namespace TINK.ViewModel.RootShell
 {
-    public class AppShellViewModel : INotifyPropertyChanged
-    {
-        public AppShellViewModel()
-        {
-            App.ModelRoot.ActiveUser.StateChanged += (sender, eventargs) =>
-            {
-                // Login state changed. Update related menu entries.
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsMyBikesPageVisible)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsFindBikePageVisible)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsAccountPageVisible)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLoginPageVisible)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsSettingsPageVisible)));
-            };
+	public class AppShellViewModel : INotifyPropertyChanged
+	{
+		public AppShellViewModel()
+		{
+			App.ModelRoot.ActiveUser.StateChanged += (sender, eventargs) =>
+			{
+				// Login state changed. Update related menu entries.
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsMyBikesPageVisible)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsFindBikePageVisible)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsAccountPageVisible)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLoginPageVisible)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsSettingsPageVisible)));
+			};
 
-            // Update flyout view model whenever theme is switched.
-            App.ModelRoot.Themes.PropertyChanged += (sender, eventargs) =>
-            {
-                if (!(sender is ServicesContainerMutableT<object> themes))
-                    return;
+			// Update flyout view model whenever theme is switched.
+			App.ModelRoot.Themes.PropertyChanged += (sender, eventargs) =>
+			{
+				if (!(sender is ServicesContainerMutableT<object> themes))
+					return;
 
-                MasterDetailMenuTitlte = GetMasterDetailMenuTitle(themes.Active);
+				MasterDetailMenuTitlte = GetMasterDetailMenuTitle(themes.Active);
 
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(MasterDetailMenuTitlte)));
-            };
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(MasterDetailMenuTitlte)));
+			};
 
-            MasterDetailMenuTitlte = GetMasterDetailMenuTitle(App.ModelRoot.Themes.Active);
-        }
+			MasterDetailMenuTitlte = GetMasterDetailMenuTitle(App.ModelRoot.Themes.Active);
+		}
 
-        /// <summary>
-        /// Gets the flyout title from theme name
-        /// </summary>
-        /// <param name="theme">Name of theme.</param>
-        /// <returns>Flyout title.</returns>
-        private string GetMasterDetailMenuTitle(object theme)
-        {
-            if (!(theme is ITheme active))
-                return "sharee.bike";
+		/// <summary>
+		/// Gets the flyout title from theme name
+		/// </summary>
+		/// <param name="theme">Name of theme.</param>
+		/// <returns>Flyout title.</returns>
+		private string GetMasterDetailMenuTitle(object theme)
+		{
+			if (!(theme is ITheme active))
+				return "sharee.bike";
 
-            return $"{(!string.IsNullOrEmpty(active.OperatorInfo) ? ($"{active.OperatorInfo}") : "sharee.bike")}";
-        }
+			return $"{(!string.IsNullOrEmpty(active.OperatorInfo) ? ($"{active.OperatorInfo}") : "sharee.bike")}";
+		}
 
-        /// <summary>
-        /// Holds the title of the fylout page.
-        /// </summary>
-        public string MasterDetailMenuTitlte { get; private set; }
+		/// <summary>
+		/// Holds the title of the fylout page.
+		/// </summary>
+		public string MasterDetailMenuTitlte { get; private set; }
 
-        public event PropertyChangedEventHandler PropertyChanged;
+		public event PropertyChangedEventHandler PropertyChanged;
 
-        public bool IsMyBikesPageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
+		public bool IsMyBikesPageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
 
-        public bool IsFindBikePageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
+		public bool IsFindBikePageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
 
-        public bool IsAccountPageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
+		public bool IsAccountPageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
 
-        public bool IsLoginPageVisible => !App.ModelRoot.ActiveUser.IsLoggedIn;
+		public bool IsLoginPageVisible => !App.ModelRoot.ActiveUser.IsLoggedIn;
 
-        public bool IsSettingsPageVisible => App.ModelRoot.Uris.ActiveUri.Host.GetIsCopri()
-                || App.ModelRoot.ActiveUser.IsLoggedIn;
+		public bool IsSettingsPageVisible => App.ModelRoot.Uris.ActiveUri.Host.GetIsCopri()
+				|| App.ModelRoot.ActiveUser.IsLoggedIn;
 
-        public string TabbedPageIngoTitle => AppResources.MarkingAbout;
+		public string TabbedPageIngoTitle => AppResources.MarkingAbout;
 
-    }
+	}
 }
diff --git a/TINK/TINK/ViewModel/ViewModelResourceHelper.cs b/TINK/TINK/ViewModel/ViewModelResourceHelper.cs
index 363155a..979fc70 100644
--- a/TINK/TINK/ViewModel/ViewModelResourceHelper.cs
+++ b/TINK/TINK/ViewModel/ViewModelResourceHelper.cs
@@ -5,38 +5,38 @@ using Serilog;
 
 namespace TINK.ViewModel
 {
-    public static class ViewModelResourceHelper
-    {
-        /// <summary> Get ressource prefix depending on platform.</summary>
-        public static string RessourcePrefix
-        {
-            get
-            {
+	public static class ViewModelResourceHelper
+	{
+		/// <summary> Get ressource prefix depending on platform.</summary>
+		public static string RessourcePrefix
+		{
+			get
+			{
 #if __IOS__
-                return "TINK.iOS.";
+				return "TINK.iOS.";
 #endif
 #if __ANDROID__
-                return "TINK.Droid.";
+				return "TINK.Droid.";
 #endif
 #if WINDOWS_UWP
                 return "TINK.WinPhone.";
 #endif
-            }
-        }
+			}
+		}
 
-        /// <summary> Gets an an embedded html ressource.</summary>
-        /// <param name="resrouceName">Name of resource to get.</param>
-        /// <returns></returns>
-        public static string GetSource(string resrouceName)
-        {
-            var l_oRessourceName = RessourcePrefix + resrouceName;
-            Log.Verbose($"Using this resource prefix {RessourcePrefix}.");
-            // note that the prefix includes the trailing period '.' that is required
-            var assembly = typeof(ViewModelResourceHelper).GetTypeInfo().Assembly;
-            var stream = assembly.GetManifestResourceStream(l_oRessourceName);
-            return stream != null
-                ? (new StreamReader(stream, Encoding.UTF8)).ReadToEnd()
-                 : string.Format("<!DOCTYPE html><html lang=\"de\"><body>An error occurred loading html- ressource {0}.</body>", l_oRessourceName);
-        }
-    }
+		/// <summary> Gets an an embedded html ressource.</summary>
+		/// <param name="resrouceName">Name of resource to get.</param>
+		/// <returns></returns>
+		public static string GetSource(string resrouceName)
+		{
+			var l_oRessourceName = RessourcePrefix + resrouceName;
+			Log.Verbose($"Using this resource prefix {RessourcePrefix}.");
+			// note that the prefix includes the trailing period '.' that is required
+			var assembly = typeof(ViewModelResourceHelper).GetTypeInfo().Assembly;
+			var stream = assembly.GetManifestResourceStream(l_oRessourceName);
+			return stream != null
+				? (new StreamReader(stream, Encoding.UTF8)).ReadToEnd()
+				 : string.Format("<!DOCTYPE html><html lang=\"de\"><body>An error occurred loading html- ressource {0}.</body>", l_oRessourceName);
+		}
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeCollection.cs b/TINKLib/Model/Bikes/BikeCollection.cs
index b94f48d..76882f5 100644
--- a/TINKLib/Model/Bikes/BikeCollection.cs
+++ b/TINKLib/Model/Bikes/BikeCollection.cs
@@ -8,47 +8,47 @@ using BikeInfo = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo;
 
 namespace TINK.Model.Bikes
 {
-    public class BikeCollection : IBikeDictionary<BikeInfo>
-    {
-        /// <summary> Holds the bike dictionary object.</summary>
-        private Dictionary<string, BikeInfo> BikeDictionary { get; }
+	public class BikeCollection : IBikeDictionary<BikeInfo>
+	{
+		/// <summary> Holds the bike dictionary object.</summary>
+		private Dictionary<string, BikeInfo> BikeDictionary { get; }
 
-        /// <summary>Constructs an empty bike info dictionary object.</summary>
-        public BikeCollection()
-        {
-            BikeDictionary = new Dictionary<string, BikeInfo>();
-        }
+		/// <summary>Constructs an empty bike info dictionary object.</summary>
+		public BikeCollection()
+		{
+			BikeDictionary = new Dictionary<string, BikeInfo>();
+		}
 
-        /// <summary> Constructs a bike collection object.</summary>
-        /// <param name="bikeDictionary"></param>
-        public BikeCollection(Dictionary<string, BikeInfo> bikeDictionary)
-        {
-            BikeDictionary = bikeDictionary ??
-                throw new ArgumentNullException(nameof(bikeDictionary), "Can not construct BikeCollection object.");
-        }
+		/// <summary> Constructs a bike collection object.</summary>
+		/// <param name="bikeDictionary"></param>
+		public BikeCollection(Dictionary<string, BikeInfo> bikeDictionary)
+		{
+			BikeDictionary = bikeDictionary ??
+				throw new ArgumentNullException(nameof(bikeDictionary), "Can not construct BikeCollection object.");
+		}
 
-        /// <summary> Gets a bike by its id.</summary>
-        /// <param name="id">Id of the bike to get.</param>
-        /// <returns></returns>
-        public BikeInfo GetById(string id)
-        {
-            return BikeDictionary.FirstOrDefault(x => x.Key == id).Value;
-        }
+		/// <summary> Gets a bike by its id.</summary>
+		/// <param name="id">Id of the bike to get.</param>
+		/// <returns></returns>
+		public BikeInfo GetById(string id)
+		{
+			return BikeDictionary.FirstOrDefault(x => x.Key == id).Value;
+		}
 
-        /// <summary> Gets the count of bikes. </summary>
-        public int Count => BikeDictionary.Count;
+		/// <summary> Gets the count of bikes. </summary>
+		public int Count => BikeDictionary.Count;
 
-        /// <summary> Gets if a bike with given id exists.</summary>
-        /// <param name="id">Id of bike.</param>
-        /// <returns>True if bike is contained, false otherwise.</returns>
-        public bool ContainsKey(string id) => BikeDictionary.Keys.Contains(id);
+		/// <summary> Gets if a bike with given id exists.</summary>
+		/// <param name="id">Id of bike.</param>
+		/// <returns>True if bike is contained, false otherwise.</returns>
+		public bool ContainsKey(string id) => BikeDictionary.Keys.Contains(id);
 
-        /// <summary> Gets the enumerator. </summary>
-        /// <returns>Enumerator object.</returns>
-        public IEnumerator<BikeInfo> GetEnumerator() => BikeDictionary.Values.GetEnumerator();
+		/// <summary> Gets the enumerator. </summary>
+		/// <returns>Enumerator object.</returns>
+		public IEnumerator<BikeInfo> GetEnumerator() => BikeDictionary.Values.GetEnumerator();
 
-        /// <summary> Gets the enumerator. </summary>
-        /// <returns>Enumerator object.</returns>
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-    }
+		/// <summary> Gets the enumerator. </summary>
+		/// <returns>Enumerator object.</returns>
+		IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeCollectionFilter.cs b/TINKLib/Model/Bikes/BikeCollectionFilter.cs
index f907e7c..7c282f1 100644
--- a/TINKLib/Model/Bikes/BikeCollectionFilter.cs
+++ b/TINKLib/Model/Bikes/BikeCollectionFilter.cs
@@ -6,29 +6,29 @@ using BikeInfo = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo;
 
 namespace TINK.Model
 {
-    public static class BikeCollectionFilter
-    {
-        /// <summary> Filters bikes by station. </summary>
-        /// <param name="bikesAtAnyStation">Bikes available, requested and/ or occupied bikes to filter.</param>
-        /// <param name="selectedStation">Id of station, might be null</param>
-        /// <returns>BikeCollection holding bikes at given station or empty BikeCollection, if there are no bikes.</returns>
-        public static BikeCollection GetAtStation(
-            this BikeCollection bikesAtAnyStation,
-            string selectedStation)
-        {
-            return new BikeCollection(bikesAtAnyStation?
-                .Where(bike => !string.IsNullOrEmpty(selectedStation) && bike.StationId == selectedStation)
-                .ToDictionary(bike => bike.Id) ?? new Dictionary<string, BikeInfo>());
-        }
+	public static class BikeCollectionFilter
+	{
+		/// <summary> Filters bikes by station. </summary>
+		/// <param name="bikesAtAnyStation">Bikes available, requested and/ or occupied bikes to filter.</param>
+		/// <param name="selectedStation">Id of station, might be null</param>
+		/// <returns>BikeCollection holding bikes at given station or empty BikeCollection, if there are no bikes.</returns>
+		public static BikeCollection GetAtStation(
+			this BikeCollection bikesAtAnyStation,
+			string selectedStation)
+		{
+			return new BikeCollection(bikesAtAnyStation?
+				.Where(bike => !string.IsNullOrEmpty(selectedStation) && bike.StationId == selectedStation)
+				.ToDictionary(bike => bike.Id) ?? new Dictionary<string, BikeInfo>());
+		}
 
-        /// <summary> Filters bikes by bike type. </summary>
-        /// <param name="bcAndLockItBikes">Bikes available, requested and/ or occupied bikes to filter.</param>
-        /// <returns>BikeCollection holding LockIt-bikes empty BikeCollection, if there are no LockIt-bikes.</returns>
-        public static BikeCollection GetLockIt(this BikeCollection bcAndLockItBikes)
-        {
-            return new BikeCollection(bcAndLockItBikes?
-                .Where(bike => bike is Bikes.BikeInfoNS.BluetoothLock.BikeInfo)
-                .ToDictionary(x => x.Id) ?? new Dictionary<string, BikeInfo>());
-        }
-    }
+		/// <summary> Filters bikes by bike type. </summary>
+		/// <param name="bcAndLockItBikes">Bikes available, requested and/ or occupied bikes to filter.</param>
+		/// <returns>BikeCollection holding LockIt-bikes empty BikeCollection, if there are no LockIt-bikes.</returns>
+		public static BikeCollection GetLockIt(this BikeCollection bcAndLockItBikes)
+		{
+			return new BikeCollection(bcAndLockItBikes?
+				.Where(bike => bike is Bikes.BikeInfoNS.BluetoothLock.BikeInfo)
+				.ToDictionary(x => x.Id) ?? new Dictionary<string, BikeInfo>());
+		}
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeCollectionMutable.cs b/TINKLib/Model/Bikes/BikeCollectionMutable.cs
index 2cbb87a..a814ed9 100644
--- a/TINKLib/Model/Bikes/BikeCollectionMutable.cs
+++ b/TINKLib/Model/Bikes/BikeCollectionMutable.cs
@@ -9,160 +9,160 @@ using BikeInfoMutable = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable;
 
 namespace TINK.Model.Bikes
 {
-    /// <summary> Holds entity of bikes. </summary>
-    public class BikeCollectionMutable : ObservableCollection<BikeInfoMutable>, IBikeDictionaryMutable<BikeInfoMutable>
-    {
-        /// <summary> Constructs a mutable bike collection object. </summary>
-        public BikeCollectionMutable()
-        {
-            SelectedBike = null;
-        }
+	/// <summary> Holds entity of bikes. </summary>
+	public class BikeCollectionMutable : ObservableCollection<BikeInfoMutable>, IBikeDictionaryMutable<BikeInfoMutable>
+	{
+		/// <summary> Constructs a mutable bike collection object. </summary>
+		public BikeCollectionMutable()
+		{
+			SelectedBike = null;
+		}
 
-        /// <summary>
-        /// Updates bikes dictionary from bikes response, i.e.
-        /// - removes bikes which are no more contained in bikes response
-        /// - updates state of all bikes from state contained in bikes response
-        /// </summary>
-        /// <param name="bikesAll"> Object holding bikes info from copri to update from. Holds station id but not station name.</param>
-        /// <param name="stations"> All stations to get station names from.</param>
-        /// <param name="p_oDateTimeProvider">Provices date time information.</param>
-        public void Update(IEnumerable<BikeInfo> bikesAll,
-            IEnumerable<IStation> stations)
-        {
-            // Get list of current bikes by state(s) to update. 
-            // Needed to remove bikes which switched state and have to be removed from collection.
-            var bikesToBeRemoved = this.Select(x => x.Id).ToList();
+		/// <summary>
+		/// Updates bikes dictionary from bikes response, i.e.
+		/// - removes bikes which are no more contained in bikes response
+		/// - updates state of all bikes from state contained in bikes response
+		/// </summary>
+		/// <param name="bikesAll"> Object holding bikes info from copri to update from. Holds station id but not station name.</param>
+		/// <param name="stations"> All stations to get station names from.</param>
+		/// <param name="p_oDateTimeProvider">Provices date time information.</param>
+		public void Update(IEnumerable<BikeInfo> bikesAll,
+			IEnumerable<IStation> stations)
+		{
+			// Get list of current bikes by state(s) to update. 
+			// Needed to remove bikes which switched state and have to be removed from collection.
+			var bikesToBeRemoved = this.Select(x => x.Id).ToList();
 
-            foreach (var bikeInfo in bikesAll ?? new List<BikeInfo>())
-            {
-                // Get name of station form station id.
-                var stationName = stations?.FirstOrDefault(x => x.Id == bikeInfo.StationId)?.StationName ?? string.Empty;
-                if (string.IsNullOrEmpty(stationName))
-                    Log.ForContext<BikeCollectionMutable>().Debug($"No name for station with id {bikeInfo.StationId} found.");
+			foreach (var bikeInfo in bikesAll ?? new List<BikeInfo>())
+			{
+				// Get name of station form station id.
+				var stationName = stations?.FirstOrDefault(x => x.Id == bikeInfo.StationId)?.StationName ?? string.Empty;
+				if (string.IsNullOrEmpty(stationName))
+					Log.ForContext<BikeCollectionMutable>().Debug($"No name for station with id {bikeInfo.StationId} found.");
 
-                // Check if bike has to be added to list of existing station.
-                if (ContainsKey(bikeInfo.Id) == false)
-                {
-                    var bikeInfoMutable = BikeInfoMutableFactory.Create(bikeInfo, stationName);
-                    if (bikeInfoMutable != null)
-                    {
-                        // Bike does not yet exist in list of bikes.
-                        Add(bikeInfoMutable);
-                    }
+				// Check if bike has to be added to list of existing station.
+				if (ContainsKey(bikeInfo.Id) == false)
+				{
+					var bikeInfoMutable = BikeInfoMutableFactory.Create(bikeInfo, stationName);
+					if (bikeInfoMutable != null)
+					{
+						// Bike does not yet exist in list of bikes.
+						Add(bikeInfoMutable);
+					}
 
-                    continue;
-                }
+					continue;
+				}
 
-                // Update bike.
-                GetById(bikeInfo.Id).State.Load(bikeInfo.State);
+				// Update bike.
+				GetById(bikeInfo.Id).State.Load(bikeInfo.State);
 
-                if (bikesToBeRemoved.Contains<string>(bikeInfo.Id))
-                {
-                    // Remove list from obsolete list.
-                    bikesToBeRemoved.Remove(bikeInfo.Id);
-                }
-            }
+				if (bikesToBeRemoved.Contains<string>(bikeInfo.Id))
+				{
+					// Remove list from obsolete list.
+					bikesToBeRemoved.Remove(bikeInfo.Id);
+				}
+			}
 
-            // Remove obsolete bikes.
-            foreach (var stationId in bikesToBeRemoved)
-            {
-                RemoveById(stationId);
-            }
-        }
+			// Remove obsolete bikes.
+			foreach (var stationId in bikesToBeRemoved)
+			{
+				RemoveById(stationId);
+			}
+		}
 
-        /// <summary>
-        /// Adds a new bike to collecion of bike.
-        /// </summary>
-        /// <param name="newBike">New bike to add.</param>
-        /// <exception cref="Exception">Thrown if bike is not unique.</exception>
-        public new void Add(BikeInfoMutable newBike)
-        {
-            // Ensure that bike id of new bike is is unique
-            foreach (BikeInfoMutable bike in Items)
-            {
-                if (bike.Id == newBike.Id)
-                {
-                    throw new Exception(string.Format("Can not add bike with {0} to collection ob bike. Id is not unnique.", newBike));
-                }
-            }
+		/// <summary>
+		/// Adds a new bike to collecion of bike.
+		/// </summary>
+		/// <param name="newBike">New bike to add.</param>
+		/// <exception cref="Exception">Thrown if bike is not unique.</exception>
+		public new void Add(BikeInfoMutable newBike)
+		{
+			// Ensure that bike id of new bike is is unique
+			foreach (BikeInfoMutable bike in Items)
+			{
+				if (bike.Id == newBike.Id)
+				{
+					throw new Exception(string.Format("Can not add bike with {0} to collection ob bike. Id is not unnique.", newBike));
+				}
+			}
 
-            base.Add(newBike);
-        }
+			base.Add(newBike);
+		}
 
-        /// <summary>
-        /// Bike selected by user for regerving or cancel reservation.
-        /// </summary>
-        public BikeInfoMutable SelectedBike
-        {
-            get;
-            private set;
-        }
+		/// <summary>
+		/// Bike selected by user for regerving or cancel reservation.
+		/// </summary>
+		public BikeInfoMutable SelectedBike
+		{
+			get;
+			private set;
+		}
 
-        public void SetSelectedBike(string id)
-        {
-            SelectedBike = GetById(id);
-        }
+		public void SetSelectedBike(string id)
+		{
+			SelectedBike = GetById(id);
+		}
 
-        /// <summary>
-        /// Gets a bike by its id.  
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public BikeInfoMutable GetById(string id)
-        {
-            {
-                return this.FirstOrDefault(bike => bike.Id == id);
-            }
-        }
+		/// <summary>
+		/// Gets a bike by its id.  
+		/// </summary>
+		/// <param name="id"></param>
+		/// <returns></returns>
+		public BikeInfoMutable GetById(string id)
+		{
+			{
+				return this.FirstOrDefault(bike => bike.Id == id);
+			}
+		}
 
-        /// <summary>
-        /// Deteermines whether a bike by given key exists.
-        /// </summary>
-        /// <param name="p_strKey">Key to check.</param>
-        /// <returns>True if bike exists.</returns>
-        public bool ContainsKey(string id)
-        {
-            return GetById(id) != null;
-        }
+		/// <summary>
+		/// Deteermines whether a bike by given key exists.
+		/// </summary>
+		/// <param name="p_strKey">Key to check.</param>
+		/// <returns>True if bike exists.</returns>
+		public bool ContainsKey(string id)
+		{
+			return GetById(id) != null;
+		}
 
-        /// <summary>
-        /// Removes a bike by its id.
-        /// </summary>
-        /// <param name="id">Id of bike to be removed.</param>
-        public void RemoveById(string id)
-        {
-            var l_oBike = GetById(id);
-            if (l_oBike == null)
-            {
-                // Nothing to do if bike does not exists.
-                return;
-            }
+		/// <summary>
+		/// Removes a bike by its id.
+		/// </summary>
+		/// <param name="id">Id of bike to be removed.</param>
+		public void RemoveById(string id)
+		{
+			var l_oBike = GetById(id);
+			if (l_oBike == null)
+			{
+				// Nothing to do if bike does not exists.
+				return;
+			}
 
-            Remove(l_oBike);
-        }
+			Remove(l_oBike);
+		}
 
-        /// <summary>
-        /// Create mutable objects from immutable objects.
-        /// </summary>
-        public static class BikeInfoMutableFactory
-        {
-            public static BikeInfoMutable Create(
-                BikeInfo bikeInfo,
-                string stationName)
-            {
-                if (bikeInfo is Bikes.BikeInfoNS.BluetoothLock.BikeInfo btBikeInfo)
-                {
-                    return new Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable(btBikeInfo, stationName);
-                }
-                else if (bikeInfo is BikeInfoNS.CopriLock.BikeInfo copriBikeInfo)
-                {
-                    return new BikeInfoNS.CopriLock.BikeInfoMutable(copriBikeInfo, stationName);
-                }
+		/// <summary>
+		/// Create mutable objects from immutable objects.
+		/// </summary>
+		public static class BikeInfoMutableFactory
+		{
+			public static BikeInfoMutable Create(
+				BikeInfo bikeInfo,
+				string stationName)
+			{
+				if (bikeInfo is Bikes.BikeInfoNS.BluetoothLock.BikeInfo btBikeInfo)
+				{
+					return new Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable(btBikeInfo, stationName);
+				}
+				else if (bikeInfo is BikeInfoNS.CopriLock.BikeInfo copriBikeInfo)
+				{
+					return new BikeInfoNS.CopriLock.BikeInfoMutable(copriBikeInfo, stationName);
+				}
 
-                // Unsupported type detected.
-                return null;
+				// Unsupported type detected.
+				return null;
 
-            }
-        }
-    }
+			}
+		}
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeCollectionUpdater.cs b/TINKLib/Model/Bikes/BikeCollectionUpdater.cs
index 827f2b8..0f759f1 100644
--- a/TINKLib/Model/Bikes/BikeCollectionUpdater.cs
+++ b/TINKLib/Model/Bikes/BikeCollectionUpdater.cs
@@ -3,36 +3,36 @@ using System.Linq;
 
 namespace TINK.Model.Bikes
 {
-    public static class BikeCollectionUpdater
-    {
-        /// <summary> Updates bikes lock info with the latest lock info from bluetooth service.</summary>
-        /// <param name="bikes">bikes to be updated.</param>
-        /// <param name="locksInfo">locks info to be used for updating bikes.</param>
-        /// <returns></returns>
-        public static BikeCollection UpdateLockInfo(
-            this BikeCollection bikes,
-            IEnumerable<Bikes.BikeInfoNS.BluetoothLock.LockInfo> locksInfo)
-        {
+	public static class BikeCollectionUpdater
+	{
+		/// <summary> Updates bikes lock info with the latest lock info from bluetooth service.</summary>
+		/// <param name="bikes">bikes to be updated.</param>
+		/// <param name="locksInfo">locks info to be used for updating bikes.</param>
+		/// <returns></returns>
+		public static BikeCollection UpdateLockInfo(
+			this BikeCollection bikes,
+			IEnumerable<Bikes.BikeInfoNS.BluetoothLock.LockInfo> locksInfo)
+		{
 
-            var updatedBikesCollection = new Dictionary<string, Bikes.BikeInfoNS.BC.BikeInfo>();
+			var updatedBikesCollection = new Dictionary<string, Bikes.BikeInfoNS.BC.BikeInfo>();
 
-            foreach (var bikeInfo in bikes)
-            {
-                if (!(bikeInfo is BikeInfoNS.BluetoothLock.BikeInfo bluetoothBikeInfo))
-                {
-                    // No processing needed because bike is not a bluetooth bike
-                    updatedBikesCollection.Add(bikeInfo.Id, bikeInfo);
-                    continue;
-                }
+			foreach (var bikeInfo in bikes)
+			{
+				if (!(bikeInfo is BikeInfoNS.BluetoothLock.BikeInfo bluetoothBikeInfo))
+				{
+					// No processing needed because bike is not a bluetooth bike
+					updatedBikesCollection.Add(bikeInfo.Id, bikeInfo);
+					continue;
+				}
 
-                // Check if to update current bike lock info using state from bluetooth service or not.
-                var currentLockInfo = locksInfo.FirstOrDefault(x => x.Id == bluetoothBikeInfo.LockInfo.Id) // Update bike info with latest info from bluethooth service if available
-                    ?? bluetoothBikeInfo.LockInfo; // Use lock info state object from copri which holds a lock id and a state of value unknown.
+				// Check if to update current bike lock info using state from bluetooth service or not.
+				var currentLockInfo = locksInfo.FirstOrDefault(x => x.Id == bluetoothBikeInfo.LockInfo.Id) // Update bike info with latest info from bluethooth service if available
+					?? bluetoothBikeInfo.LockInfo; // Use lock info state object from copri which holds a lock id and a state of value unknown.
 
-                updatedBikesCollection.Add(bluetoothBikeInfo.Id, new BikeInfoNS.BluetoothLock.BikeInfo(bluetoothBikeInfo, currentLockInfo));
-            }
+				updatedBikesCollection.Add(bluetoothBikeInfo.Id, new BikeInfoNS.BluetoothLock.BikeInfo(bluetoothBikeInfo, currentLockInfo));
+			}
 
-            return new BikeCollection(updatedBikesCollection);
-        }
-    }
+			return new BikeCollection(updatedBikesCollection);
+		}
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BC/BikeInfo.cs b/TINKLib/Model/Bikes/BikeInfoNS/BC/BikeInfo.cs
index 96979fb..d66ca4f 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/BC/BikeInfo.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BC/BikeInfo.cs
@@ -6,161 +6,161 @@ using TINK.Model.State;
 
 namespace TINK.Model.Bikes.BikeInfoNS.BC
 {
-    public class BikeInfo : IBikeInfo
-    {
-        /// <summary> Default value of demo property. </summary>
-        public const bool DEFAULTVALUEISDEMO = false;
+	public class BikeInfo : IBikeInfo
+	{
+		/// <summary> Default value of demo property. </summary>
+		public const bool DEFAULTVALUEISDEMO = false;
 
-        /// <summary> Holds the info about the bike state. </summary>
-        private readonly IStateInfo _StateInfo;
+		/// <summary> Holds the info about the bike state. </summary>
+		private readonly IStateInfo _StateInfo;
 
-        /// <summary>
-        /// Holds the bike object.
-        /// </summary>
-        public BikeNS.Bike Bike { get; }
+		/// <summary>
+		/// Holds the bike object.
+		/// </summary>
+		public BikeNS.Bike Bike { get; }
 
-        /// <summary>
-        /// Holds the drive object.
-        /// </summary>
-        public Drive Drive { get; }
+		/// <summary>
+		/// Holds the drive object.
+		/// </summary>
+		public Drive Drive { get; }
 
-        /// <summary> Constructs a bike object.</summary>
-        protected BikeInfo(
-            IStateInfo stateInfo,
-            BikeNS.Bike bike,
-            Drive drive,
-            bool? isDemo = DEFAULTVALUEISDEMO,
-            IEnumerable<string> group = null,
-            string stationId = null,
-            Uri operatorUri = null,
-            RentalDescription tariffDescription = null)
-        {
-            Bike = bike ?? throw new ArgumentNullException(nameof(bike));
-            Drive = drive ?? throw new ArgumentNullException(nameof(drive));
-            _StateInfo = stateInfo;
+		/// <summary> Constructs a bike object.</summary>
+		protected BikeInfo(
+			IStateInfo stateInfo,
+			BikeNS.Bike bike,
+			Drive drive,
+			bool? isDemo = DEFAULTVALUEISDEMO,
+			IEnumerable<string> group = null,
+			string stationId = null,
+			Uri operatorUri = null,
+			RentalDescription tariffDescription = null)
+		{
+			Bike = bike ?? throw new ArgumentNullException(nameof(bike));
+			Drive = drive ?? throw new ArgumentNullException(nameof(drive));
+			_StateInfo = stateInfo;
 
-            IsDemo = isDemo ?? DEFAULTVALUEISDEMO;
-            Group = group ?? new List<string>();
-            StationId = stationId;
-            OperatorUri = operatorUri;
-            TariffDescription = tariffDescription;
-        }
+			IsDemo = isDemo ?? DEFAULTVALUEISDEMO;
+			Group = group ?? new List<string>();
+			StationId = stationId;
+			OperatorUri = operatorUri;
+			TariffDescription = tariffDescription;
+		}
 
-        public BikeInfo(BikeInfo bikeInfo) : this(
-            bikeInfo != null ? bikeInfo?.State : throw new ArgumentNullException(nameof(bikeInfo)),
-            bikeInfo.Bike,
-            bikeInfo.Drive,
-            bikeInfo.IsDemo,
-            bikeInfo.Group,
-            bikeInfo.StationId,
-            bikeInfo.OperatorUri,
-            bikeInfo.TariffDescription)
-        { }
+		public BikeInfo(BikeInfo bikeInfo) : this(
+			bikeInfo != null ? bikeInfo?.State : throw new ArgumentNullException(nameof(bikeInfo)),
+			bikeInfo.Bike,
+			bikeInfo.Drive,
+			bikeInfo.IsDemo,
+			bikeInfo.Group,
+			bikeInfo.StationId,
+			bikeInfo.OperatorUri,
+			bikeInfo.TariffDescription)
+		{ }
 
-        /// <summary>
-        /// Constructs a bike info object for a available bike.
-        /// </summary>
-        /// <param name="stationId">Id of station where bike is located.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <param name="tariffDescription">Hold tariff description of bike.</param>
-        public BikeInfo(
-            BikeNS.Bike bike,
-            Drive drive,
-            string stationId,
-            Uri operatorUri = null,
-            RentalDescription tariffDescription = null,
-            bool? isDemo = DEFAULTVALUEISDEMO,
-            IEnumerable<string> group = null) : this(
-                new StateInfo(),
-                bike,
-                drive,
-                isDemo,
-                group,
-                stationId,
-                operatorUri,
-                tariffDescription)
-        {
-        }
+		/// <summary>
+		/// Constructs a bike info object for a available bike.
+		/// </summary>
+		/// <param name="stationId">Id of station where bike is located.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <param name="tariffDescription">Hold tariff description of bike.</param>
+		public BikeInfo(
+			BikeNS.Bike bike,
+			Drive drive,
+			string stationId,
+			Uri operatorUri = null,
+			RentalDescription tariffDescription = null,
+			bool? isDemo = DEFAULTVALUEISDEMO,
+			IEnumerable<string> group = null) : this(
+				new StateInfo(),
+				bike,
+				drive,
+				isDemo,
+				group,
+				stationId,
+				operatorUri,
+				tariffDescription)
+		{
+		}
 
-        /// <summary>
-        /// Constructs a bike info object for a booked bike.
-        /// </summary>
-        /// <param name="dateTimeProvider">Provider for current date time to calculate remainig time on demand for state of type reserved.</param>
-        /// <param name="currentStationId">Name of station where bike is located, null if bike is on the road.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <param name="tariffDescription">Hold tariff description of bike.</param>
-        /// <param name="bookedAt">Date time when bike was booked</param>
-        /// <param name="mailAddress">Mail address of user which booked bike.</param>
-        /// <param name="code">Booking code.</param>
-        public BikeInfo(
-            BikeNS.Bike bike,
-            Drive drive,
-            bool? isDemo,
-            IEnumerable<string> group,
-            string currentStationId,
-            Uri operatorUri,
-            RentalDescription tariffDescription,
-            DateTime bookedAt,
-            string mailAddress,
-            string code) : this(
-                new StateInfo(
-                    bookedAt,
-                    mailAddress,
-                    code),
-                bike,
-                drive,
-                isDemo,
-                group,
-                currentStationId,
-                operatorUri,
-                tariffDescription)
-        {
-        }
+		/// <summary>
+		/// Constructs a bike info object for a booked bike.
+		/// </summary>
+		/// <param name="dateTimeProvider">Provider for current date time to calculate remainig time on demand for state of type reserved.</param>
+		/// <param name="currentStationId">Name of station where bike is located, null if bike is on the road.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <param name="tariffDescription">Hold tariff description of bike.</param>
+		/// <param name="bookedAt">Date time when bike was booked</param>
+		/// <param name="mailAddress">Mail address of user which booked bike.</param>
+		/// <param name="code">Booking code.</param>
+		public BikeInfo(
+			BikeNS.Bike bike,
+			Drive drive,
+			bool? isDemo,
+			IEnumerable<string> group,
+			string currentStationId,
+			Uri operatorUri,
+			RentalDescription tariffDescription,
+			DateTime bookedAt,
+			string mailAddress,
+			string code) : this(
+				new StateInfo(
+					bookedAt,
+					mailAddress,
+					code),
+				bike,
+				drive,
+				isDemo,
+				group,
+				currentStationId,
+				operatorUri,
+				tariffDescription)
+		{
+		}
 
-        /// <summary> True if device is demo device, false otherwise. </summary>
-        public bool IsDemo { get; }
+		/// <summary> True if device is demo device, false otherwise. </summary>
+		public bool IsDemo { get; }
 
-        /// <summary> Returns the group (TINK, Konrad, ...). </summary>
-        public IEnumerable<string> Group { get; }
+		/// <summary> Returns the group (TINK, Konrad, ...). </summary>
+		public IEnumerable<string> Group { get; }
 
-        /// <summary>
-        /// Station a which bike is located, null otherwise.
-        /// </summary>
-        public string StationId { get; }
+		/// <summary>
+		/// Station a which bike is located, null otherwise.
+		/// </summary>
+		public string StationId { get; }
 
-        /// <summary> Holds description about the tarif. </summary>
-        public RentalDescription TariffDescription { get; }
+		/// <summary> Holds description about the tarif. </summary>
+		public RentalDescription TariffDescription { get; }
 
 
-        /// Holds the rent state of the bike.
-        /// </summary>
-        public IStateInfo State
-        {
-            get { return _StateInfo; }
-        }
+		/// Holds the rent state of the bike.
+		/// </summary>
+		public IStateInfo State
+		{
+			get { return _StateInfo; }
+		}
 
-        public string Id => Bike.Id;
+		public string Id => Bike.Id;
 
-        public WheelType? WheelType => Bike.WheelType;
+		public WheelType? WheelType => Bike.WheelType;
 
-        public TypeOfBike? TypeOfBike => Bike.TypeOfBike;
+		public TypeOfBike? TypeOfBike => Bike.TypeOfBike;
 
-        /// <summary> Gets the model of the lock. </summary>
-        public LockModel LockModel => Bike.LockModel;
+		/// <summary> Gets the model of the lock. </summary>
+		public LockModel LockModel => Bike.LockModel;
 
-        public string Description => Bike.Description;
+		public string Description => Bike.Description;
 
-        /// <summary>
-        /// Uri of the operator or null, in case of single operator setup.
-        /// </summary>
-        public Uri OperatorUri { get; }
+		/// <summary>
+		/// Uri of the operator or null, in case of single operator setup.
+		/// </summary>
+		public Uri OperatorUri { get; }
 
-        /// <summary>
-        /// Converts the instance to text.
-        /// </summary>
-        public new string ToString()
-        {
-            return $"Id={Bike.Id}{(Bike.WheelType != null ? $", wheel(s)={Bike.WheelType}" : string.Empty)}{(Bike.TypeOfBike != null ? $"type={Bike.TypeOfBike}" : "")}, state={State}, location={(!string.IsNullOrEmpty(StationId) ? $"Station {StationId}" : "On the road")}, is demo={IsDemo}.";
-        }
-    }
+		/// <summary>
+		/// Converts the instance to text.
+		/// </summary>
+		public new string ToString()
+		{
+			return $"Id={Bike.Id}{(Bike.WheelType != null ? $", wheel(s)={Bike.WheelType}" : string.Empty)}{(Bike.TypeOfBike != null ? $"type={Bike.TypeOfBike}" : "")}, state={State}, location={(!string.IsNullOrEmpty(StationId) ? $"Station {StationId}" : "On the road")}, is demo={IsDemo}.";
+		}
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BC/BikeInfoMutable.cs b/TINKLib/Model/Bikes/BikeInfoNS/BC/BikeInfoMutable.cs
index 7eaead5..ca3f1b6 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/BC/BikeInfoMutable.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BC/BikeInfoMutable.cs
@@ -8,125 +8,125 @@ using TINK.Model.State;
 
 namespace TINK.Model.Bikes.BikeInfoNS.BC
 {
-    [DataContract]
-    public class BikeInfoMutable : IBikeInfoMutable, INotifyPropertyChanged
-    {
-        /// <summary> Holds the bike. </summary>
-        private readonly BikeNS.Bike _Bike;
+	[DataContract]
+	public class BikeInfoMutable : IBikeInfoMutable, INotifyPropertyChanged
+	{
+		/// <summary> Holds the bike. </summary>
+		private readonly BikeNS.Bike _Bike;
 
-        /// <summary> Holds the drive of the bike. </summary>
-        private readonly Drive _Drive;
+		/// <summary> Holds the drive of the bike. </summary>
+		private readonly Drive _Drive;
 
-        /// <summary> Holds the state info of the bike. </summary>
-        private readonly StateInfoMutable _StateInfo;
+		/// <summary> Holds the state info of the bike. </summary>
+		private readonly StateInfoMutable _StateInfo;
 
-        /// <summary>
-        /// Constructs a bike.
-        /// </summary>
-        /// <param name="isDemo">True if device is demo device, false otherwise.</param>
-        /// <param name="dateTimeProvider">Provider for current date time to calculate remainig time on demand for state of type reserved.</param>
-        /// <param name="stationId">Name of station where bike is located, null if bike is on the road.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <param name="tariffDescription">Hold tariff description of bike.</param>
-        /// <param name="stateInfo">Bike state info.</param>
-        protected BikeInfoMutable(
-            BikeNS.Bike bike,
-            Drive drive,
-            bool isDemo = BikeInfo.DEFAULTVALUEISDEMO,
-            IEnumerable<string> group = null,
-            string stationId = null,
-            string stationName = null,
-            Uri operatorUri = null,
-            RentalDescription tariffDescription = null,
-            Func<DateTime> dateTimeProvider = null,
-            IStateInfo stateInfo = null)
-        {
-            IsDemo = isDemo;
-            Group = group;
-            _Bike = bike;
-            _Drive = drive;
-            _StateInfo = new StateInfoMutable(dateTimeProvider, stateInfo);
-            _StateInfo.PropertyChanged += (sender, eventargs) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(eventargs.PropertyName));
-            StationId = stationId;
-            StationName = stationName;
-            OperatorUri = operatorUri;
-            TariffDescription = tariffDescription;
-        }
+		/// <summary>
+		/// Constructs a bike.
+		/// </summary>
+		/// <param name="isDemo">True if device is demo device, false otherwise.</param>
+		/// <param name="dateTimeProvider">Provider for current date time to calculate remainig time on demand for state of type reserved.</param>
+		/// <param name="stationId">Name of station where bike is located, null if bike is on the road.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <param name="tariffDescription">Hold tariff description of bike.</param>
+		/// <param name="stateInfo">Bike state info.</param>
+		protected BikeInfoMutable(
+			BikeNS.Bike bike,
+			Drive drive,
+			bool isDemo = BikeInfo.DEFAULTVALUEISDEMO,
+			IEnumerable<string> group = null,
+			string stationId = null,
+			string stationName = null,
+			Uri operatorUri = null,
+			RentalDescription tariffDescription = null,
+			Func<DateTime> dateTimeProvider = null,
+			IStateInfo stateInfo = null)
+		{
+			IsDemo = isDemo;
+			Group = group;
+			_Bike = bike;
+			_Drive = drive;
+			_StateInfo = new StateInfoMutable(dateTimeProvider, stateInfo);
+			_StateInfo.PropertyChanged += (sender, eventargs) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(eventargs.PropertyName));
+			StationId = stationId;
+			StationName = stationName;
+			OperatorUri = operatorUri;
+			TariffDescription = tariffDescription;
+		}
 
-        /// <summary> Constructs a bike object from source. </summary>
-        public BikeInfoMutable(IBikeInfo bike, string stationName) : this(
-            bike != null
-                ? bike.Bike
-                : throw new ArgumentNullException(nameof(bike)),
-            bike.Drive,
-            bike.IsDemo,
-            bike.Group,
-            bike.StationId,
-            stationName,
-            bike.OperatorUri,
-            bike.TariffDescription,
-            null /* date time provider */,
-            bike.State)
-        {
-        }
+		/// <summary> Constructs a bike object from source. </summary>
+		public BikeInfoMutable(IBikeInfo bike, string stationName) : this(
+			bike != null
+				? bike.Bike
+				: throw new ArgumentNullException(nameof(bike)),
+			bike.Drive,
+			bike.IsDemo,
+			bike.Group,
+			bike.StationId,
+			stationName,
+			bike.OperatorUri,
+			bike.TariffDescription,
+			null /* date time provider */,
+			bike.State)
+		{
+		}
 
-        /// <summary> Id of station a which bike is located, null otherwise.</summary>
-        [DataMember]
-        public string StationId { get; }
+		/// <summary> Id of station a which bike is located, null otherwise.</summary>
+		[DataMember]
+		public string StationId { get; }
 
-        /// <summary> Name of station a which bike is located, null otherwise. </summary>
-        [DataMember]
-        public string StationName { get; }
+		/// <summary> Name of station a which bike is located, null otherwise. </summary>
+		[DataMember]
+		public string StationName { get; }
 
-        /// <summary> Holds description about the tarif. </summary>
-        [DataMember]
-        public RentalDescription TariffDescription { get; private set; }
+		/// <summary> Holds description about the tarif. </summary>
+		[DataMember]
+		public RentalDescription TariffDescription { get; private set; }
 
-        /// <summary>
-        /// Holds the rent state of the bike.
-        /// </summary>
-        [DataMember]
-        public StateInfoMutable State
-        {
-            get { return _StateInfo; }
-        }
+		/// <summary>
+		/// Holds the rent state of the bike.
+		/// </summary>
+		[DataMember]
+		public StateInfoMutable State
+		{
+			get { return _StateInfo; }
+		}
 
-        /// <summary>
-        /// Uri of the operator or null, in case of single operator setup.
-        /// </summary>
-        public Uri OperatorUri { get; }
+		/// <summary>
+		/// Uri of the operator or null, in case of single operator setup.
+		/// </summary>
+		public Uri OperatorUri { get; }
 
-        /// <summary> Unused member. </summary>
-        IStateInfoMutable IBikeInfoMutable.State => _StateInfo;
+		/// <summary> Unused member. </summary>
+		IStateInfoMutable IBikeInfoMutable.State => _StateInfo;
 
-        public string Id => _Bike.Id;
+		public string Id => _Bike.Id;
 
-        public bool IsDemo { get; }
+		public bool IsDemo { get; }
 
-        /// <summary> Returns the group (TINK, Konrad, ...). </summary>
-        public IEnumerable<string> Group { get; }
+		/// <summary> Returns the group (TINK, Konrad, ...). </summary>
+		public IEnumerable<string> Group { get; }
 
-        public WheelType? WheelType => _Bike.WheelType;
+		public WheelType? WheelType => _Bike.WheelType;
 
-        public TypeOfBike? TypeOfBike => _Bike.TypeOfBike;
+		public TypeOfBike? TypeOfBike => _Bike.TypeOfBike;
 
-        public LockModel LockModel => _Bike.LockModel;
+		public LockModel LockModel => _Bike.LockModel;
 
-        public string Description => _Bike.Description;
+		public string Description => _Bike.Description;
 
-        public Drive Drive => _Drive;
+		public Drive Drive => _Drive;
 
-        /// <summary>
-        /// Fired whenever  property of bike changes.
-        /// </summary>
-        public event PropertyChangedEventHandler PropertyChanged;
+		/// <summary>
+		/// Fired whenever  property of bike changes.
+		/// </summary>
+		public event PropertyChangedEventHandler PropertyChanged;
 
-        /// <summary>
-        /// Converts the instance to text.
-        /// </summary>
-        public new string ToString()
-        {
-            return $"Id={Id}{(WheelType != null ? $", wheel(s)={WheelType}" : string.Empty)}{(TypeOfBike != null ? $", type={TypeOfBike}" : "")}, demo={IsDemo}, state={State.ToString()}, location={(!string.IsNullOrEmpty(StationId) ? $"Station {StationId}" : "On the road")}.";
-        }
-    }
+		/// <summary>
+		/// Converts the instance to text.
+		/// </summary>
+		public new string ToString()
+		{
+			return $"Id={Id}{(WheelType != null ? $", wheel(s)={WheelType}" : string.Empty)}{(TypeOfBike != null ? $", type={TypeOfBike}" : "")}, demo={IsDemo}, state={State.ToString()}, location={(!string.IsNullOrEmpty(StationId) ? $"Station {StationId}" : "On the road")}.";
+		}
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BC/IBikeInfo.cs b/TINKLib/Model/Bikes/BikeInfoNS/BC/IBikeInfo.cs
index 50ba417..3434680 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/BC/IBikeInfo.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BC/IBikeInfo.cs
@@ -5,43 +5,43 @@ using TINK.Model.State;
 
 namespace TINK.Model.Bikes.BikeInfoNS.BC
 {
-    /// <summary>
-    /// Allows to access bike info.
-    /// </summary>
-    public interface IBikeInfo
-    {
-        /// <summary>
-        /// Holds the bike object.
-        /// </summary>
-        BikeNS.Bike Bike { get; }
+	/// <summary>
+	/// Allows to access bike info.
+	/// </summary>
+	public interface IBikeInfo
+	{
+		/// <summary>
+		/// Holds the bike object.
+		/// </summary>
+		BikeNS.Bike Bike { get; }
 
-        /// <summary>
-        /// Holds the drive.
-        /// </summary>
-        Drive Drive { get; }
+		/// <summary>
+		/// Holds the drive.
+		/// </summary>
+		Drive Drive { get; }
 
-        /// <summary> True if bike is a demo bike. </summary>
-        bool IsDemo { get; }
+		/// <summary> True if bike is a demo bike. </summary>
+		bool IsDemo { get; }
 
-        /// <summary> Returns the group (TINK, Konrad, ...). </summary>
-        IEnumerable<string> Group { get; }
+		/// <summary> Returns the group (TINK, Konrad, ...). </summary>
+		IEnumerable<string> Group { get; }
 
-        /// <summary>
-        /// Station a which bike is located, null otherwise.
-        /// </summary>
-        string StationId { get; }
+		/// <summary>
+		/// Station a which bike is located, null otherwise.
+		/// </summary>
+		string StationId { get; }
 
-        /// <summary>
-        /// Uri of the operator or null, in case of single operator setup.
-        /// </summary>
-        Uri OperatorUri { get; }
+		/// <summary>
+		/// Uri of the operator or null, in case of single operator setup.
+		/// </summary>
+		Uri OperatorUri { get; }
 
-        /// <summary> Holds description about the tarif. </summary>
-        RentalDescription TariffDescription { get; }
+		/// <summary> Holds description about the tarif. </summary>
+		RentalDescription TariffDescription { get; }
 
-        /// <summary>
-        /// Holds the rent state of the bike.
-        /// </summary>
-        IStateInfo State { get; }
-    }
+		/// <summary>
+		/// Holds the rent state of the bike.
+		/// </summary>
+		IStateInfo State { get; }
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BC/IBikeInfoMutable.cs b/TINKLib/Model/Bikes/BikeInfoNS/BC/IBikeInfoMutable.cs
index 52c900c..021272b 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/BC/IBikeInfoMutable.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BC/IBikeInfoMutable.cs
@@ -7,64 +7,64 @@ using TINK.Model.State;
 
 namespace TINK.Model.Bikes.BikeInfoNS.BC
 {
-    public interface IBikeInfoMutable
-    {
-        /// <summary>
-        /// Holds the unique id of the bike;
-        /// </summary>
-        string Id { get; }
+	public interface IBikeInfoMutable
+	{
+		/// <summary>
+		/// Holds the unique id of the bike;
+		/// </summary>
+		string Id { get; }
 
-        /// <summary> True if bike is a demo bike. </summary>
-        bool IsDemo { get; }
+		/// <summary> True if bike is a demo bike. </summary>
+		bool IsDemo { get; }
 
-        /// <summary> Returns the group (TINK, Konrad, ...). </summary>
-        IEnumerable<string> Group { get; }
+		/// <summary> Returns the group (TINK, Konrad, ...). </summary>
+		IEnumerable<string> Group { get; }
 
-        /// <summary>
-        /// Holds the count of wheels.
-        /// </summary>
-        WheelType? WheelType { get; }
+		/// <summary>
+		/// Holds the count of wheels.
+		/// </summary>
+		WheelType? WheelType { get; }
 
-        /// <summary>
-        /// Holds the type of bike.
-        /// </summary>
-        TypeOfBike? TypeOfBike { get; }
+		/// <summary>
+		/// Holds the type of bike.
+		/// </summary>
+		TypeOfBike? TypeOfBike { get; }
 
-        /// <summary> Gets the model of the lock. </summary>
-        LockModel LockModel { get; }
+		/// <summary> Gets the model of the lock. </summary>
+		LockModel LockModel { get; }
 
-        /// <summary> Holds the description of the bike. </summary>
-        string Description { get; }
+		/// <summary> Holds the description of the bike. </summary>
+		string Description { get; }
 
-        /// <summary>
-        /// Station a which bike is located, null otherwise.
-        /// </summary>
-        string StationId { get; }
+		/// <summary>
+		/// Station a which bike is located, null otherwise.
+		/// </summary>
+		string StationId { get; }
 
-        /// <summary>
-        /// Holds the rent state of the bike.
-        /// </summary>
-        IStateInfoMutable State { get; }
+		/// <summary>
+		/// Holds the rent state of the bike.
+		/// </summary>
+		IStateInfoMutable State { get; }
 
-        /// <summary>
-        /// Uri of the operator or null, in case of single operator setup.
-        /// </summary>
-        Uri OperatorUri { get; }
+		/// <summary>
+		/// Uri of the operator or null, in case of single operator setup.
+		/// </summary>
+		Uri OperatorUri { get; }
 
-        /// <summary>
-        /// Hold the drive object.
-        /// </summary>
-        Drive Drive { get; }
+		/// <summary>
+		/// Hold the drive object.
+		/// </summary>
+		Drive Drive { get; }
 
-        event PropertyChangedEventHandler PropertyChanged;
-    }
+		event PropertyChangedEventHandler PropertyChanged;
+	}
 
-    public enum NotifyPropertyChangedLevel
-    {
-        /// <summary> Notify about all property changes.</summary>
-        All,
+	public enum NotifyPropertyChangedLevel
+	{
+		/// <summary> Notify about all property changes.</summary>
+		All,
 
-        /// <summary> Notify about no property changes.</summary>
-        None
-    }
+		/// <summary> Notify about no property changes.</summary>
+		None
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BikeNS/Bike.cs b/TINKLib/Model/Bikes/BikeInfoNS/BikeNS/Bike.cs
index 74a3c0d..fa3ca78 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/BikeNS/Bike.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BikeNS/Bike.cs
@@ -3,143 +3,143 @@ using System.Collections.Generic;
 
 namespace TINK.Model.Bikes.BikeInfoNS.BikeNS
 {
-    /// <summary> Count of wheels. </summary>
-    /// <remarks> Numeric values of enum must match count of wheels</remarks>
-    public enum WheelType
-    {
-        Mono = 1,
-        Two = 2,
-        Trike = 3,
-        Quad = 4
-    }
+	/// <summary> Count of wheels. </summary>
+	/// <remarks> Numeric values of enum must match count of wheels</remarks>
+	public enum WheelType
+	{
+		Mono = 1,
+		Two = 2,
+		Trike = 3,
+		Quad = 4
+	}
 
-    /// <summary> Type of bike. </summary>
-    public enum TypeOfBike
-    {
-        Allround = 0,
-        Cargo = 1,
-        City = 2,
-    }
+	/// <summary> Type of bike. </summary>
+	public enum TypeOfBike
+	{
+		Allround = 0,
+		Cargo = 1,
+		City = 2,
+	}
 
-    /// <summary> Holds the model of lock. </summary>
-    public enum LockModel
-    {
-        ILockIt,        // haveltec GbmH Brandenburg, Germany bluetooth lock     
-        BordComputer,   // Teilrad BC
-        Sigo,           // Sigo Gmbh Darmstadt, Germany bike lock
-    }
+	/// <summary> Holds the model of lock. </summary>
+	public enum LockModel
+	{
+		ILockIt,        // haveltec GbmH Brandenburg, Germany bluetooth lock     
+		BordComputer,   // Teilrad BC
+		Sigo,           // Sigo Gmbh Darmstadt, Germany bike lock
+	}
 
-    /// <summary> Holds the type of lock. </summary>
-    public enum LockType
-    {
-        Backend,      // Backend, i.e. COPRI controls lock (open, close, ...)     
-        Bluethooth,   // Lock is controlled.
-    }
+	/// <summary> Holds the type of lock. </summary>
+	public enum LockType
+	{
+		Backend,      // Backend, i.e. COPRI controls lock (open, close, ...)     
+		Bluethooth,   // Lock is controlled.
+	}
 
-    public class Bike : IEquatable<Bike>
-    {
-        /// <summary>
-        /// Constructs a bike.
-        /// </summary>
-        /// <param name="id">Unique id of bike.</param>
-        public Bike(
-            string id,
-            LockModel lockModel,
-            WheelType? wheelType = null,
-            TypeOfBike? typeOfBike = null,
-            string description = null)
-        {
-            WheelType = wheelType;
-            TypeOfBike = typeOfBike;
-            LockModel = lockModel;
-            Id = id;
-            Description = description;
-        }
+	public class Bike : IEquatable<Bike>
+	{
+		/// <summary>
+		/// Constructs a bike.
+		/// </summary>
+		/// <param name="id">Unique id of bike.</param>
+		public Bike(
+			string id,
+			LockModel lockModel,
+			WheelType? wheelType = null,
+			TypeOfBike? typeOfBike = null,
+			string description = null)
+		{
+			WheelType = wheelType;
+			TypeOfBike = typeOfBike;
+			LockModel = lockModel;
+			Id = id;
+			Description = description;
+		}
 
-        /// <summary>
-        /// Holds the unique id of the bike;
-        /// </summary>
-        public string Id { get; }
+		/// <summary>
+		/// Holds the unique id of the bike;
+		/// </summary>
+		public string Id { get; }
 
-        /// <summary>
-        /// Holds the count of wheels.
-        /// </summary>
-        public WheelType? WheelType { get; }
+		/// <summary>
+		/// Holds the count of wheels.
+		/// </summary>
+		public WheelType? WheelType { get; }
 
-        /// <summary>
-        /// Holds the type of bike.
-        /// </summary>
-        public TypeOfBike? TypeOfBike { get; }
+		/// <summary>
+		/// Holds the type of bike.
+		/// </summary>
+		public TypeOfBike? TypeOfBike { get; }
 
-        /// <summary> Gets the model of the lock. </summary>
-        public LockModel LockModel { get; private set; }
+		/// <summary> Gets the model of the lock. </summary>
+		public LockModel LockModel { get; private set; }
 
-        /// <summary> Holds the description of the bike. </summary>
-        public string Description { get; }
+		/// <summary> Holds the description of the bike. </summary>
+		public string Description { get; }
 
 
-        /// <summary> Compares two bike object.</summary>
-        /// <param name="obj">Object to compare with.</param>
-        /// <returns>True if bikes are equal.</returns>
-        public override bool Equals(object obj)
-        {
-            var l_oBike = obj as Bike;
-            if (l_oBike == null)
-            {
-                return false;
-            }
+		/// <summary> Compares two bike object.</summary>
+		/// <param name="obj">Object to compare with.</param>
+		/// <returns>True if bikes are equal.</returns>
+		public override bool Equals(object obj)
+		{
+			var l_oBike = obj as Bike;
+			if (l_oBike == null)
+			{
+				return false;
+			}
 
-            return Equals(l_oBike);
-        }
+			return Equals(l_oBike);
+		}
 
-        /// <summary> Converts the instance to text.</summary>
-        public new string ToString()
-        {
-            return WheelType == null || TypeOfBike == null
-                ? $"Id={Id}{(!string.IsNullOrEmpty(Description) ? $", {Description}" : "")}"
-                : $"Id={Id}{(WheelType != null ? $", wheel(s)={WheelType}" : string.Empty)}{(TypeOfBike != null ? $"type={TypeOfBike}" : "")}.";
-        }
+		/// <summary> Converts the instance to text.</summary>
+		public new string ToString()
+		{
+			return WheelType == null || TypeOfBike == null
+				? $"Id={Id}{(!string.IsNullOrEmpty(Description) ? $", {Description}" : "")}"
+				: $"Id={Id}{(WheelType != null ? $", wheel(s)={WheelType}" : string.Empty)}{(TypeOfBike != null ? $"type={TypeOfBike}" : "")}.";
+		}
 
-        /// <summary> Compares two bike object.</summary>
-        /// <param name="obj">Object to compare with.</param>
-        /// <returns>True if bikes are equal.</returns>
-        public bool Equals(Bike other)
-        {
-            return other != null &&
-                   Id == other.Id &&
-                   WheelType == other.WheelType &&
-                   TypeOfBike == other.TypeOfBike
-                   && Description == other.Description;
-        }
+		/// <summary> Compares two bike object.</summary>
+		/// <param name="obj">Object to compare with.</param>
+		/// <returns>True if bikes are equal.</returns>
+		public bool Equals(Bike other)
+		{
+			return other != null &&
+				   Id == other.Id &&
+				   WheelType == other.WheelType &&
+				   TypeOfBike == other.TypeOfBike
+				   && Description == other.Description;
+		}
 
-        /// <summary> Compares two bike object.</summary>
-        /// <param name="obj">Object to compare with.</param>
-        /// <returns>True if bikes are equal.</returns>
-        public static bool operator ==(Bike bike1, Bike bike2)
-        {
-            return EqualityComparer<Bike>.Default.Equals(bike1, bike2);
-        }
+		/// <summary> Compares two bike object.</summary>
+		/// <param name="obj">Object to compare with.</param>
+		/// <returns>True if bikes are equal.</returns>
+		public static bool operator ==(Bike bike1, Bike bike2)
+		{
+			return EqualityComparer<Bike>.Default.Equals(bike1, bike2);
+		}
 
-        /// <summary> Compares two bike object.</summary>
-        /// <param name="obj">Object to compare with.</param>
-        /// <returns>True if bikes are equal.</returns>
-        public static bool operator !=(Bike bike1, Bike bike2)
-        {
-            return !(bike1 == bike2);
-        }
+		/// <summary> Compares two bike object.</summary>
+		/// <param name="obj">Object to compare with.</param>
+		/// <returns>True if bikes are equal.</returns>
+		public static bool operator !=(Bike bike1, Bike bike2)
+		{
+			return !(bike1 == bike2);
+		}
 
-        /// <summary>
-        /// Generates hash code for bike object.
-        /// </summary>
-        /// <returns></returns>
-        public override int GetHashCode()
-        {
-            var hashCode = -390870100;
-            hashCode = hashCode * -1521134295 + Id.GetHashCode();
-            hashCode = hashCode * -1521134295 + WheelType?.GetHashCode() ?? 0;
-            hashCode = hashCode * -1521134295 + TypeOfBike?.GetHashCode() ?? 0;
-            hashCode = hashCode * -1521134295 + Description?.GetHashCode() ?? 0;
-            return hashCode;
-        }
-    }
+		/// <summary>
+		/// Generates hash code for bike object.
+		/// </summary>
+		/// <returns></returns>
+		public override int GetHashCode()
+		{
+			var hashCode = -390870100;
+			hashCode = hashCode * -1521134295 + Id.GetHashCode();
+			hashCode = hashCode * -1521134295 + WheelType?.GetHashCode() ?? 0;
+			hashCode = hashCode * -1521134295 + TypeOfBike?.GetHashCode() ?? 0;
+			hashCode = hashCode * -1521134295 + Description?.GetHashCode() ?? 0;
+			return hashCode;
+		}
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BikeNS/BikeExtension.cs b/TINKLib/Model/Bikes/BikeInfoNS/BikeNS/BikeExtension.cs
index 92b337a..058fdac 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/BikeNS/BikeExtension.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BikeNS/BikeExtension.cs
@@ -2,21 +2,21 @@
 
 namespace TINK.Model.Bikes.BikeInfoNS.BikeNS
 {
-    public static class BikeExtension
-    {
-        public static LockType GetLockType(this LockModel model)
-        {
-            switch (model)
-            {
-                case LockModel.ILockIt:
-                    return LockType.Bluethooth;
+	public static class BikeExtension
+	{
+		public static LockType GetLockType(this LockModel model)
+		{
+			switch (model)
+			{
+				case LockModel.ILockIt:
+					return LockType.Bluethooth;
 
-                case LockModel.Sigo:
-                    return LockType.Backend;
+				case LockModel.Sigo:
+					return LockType.Backend;
 
-                default:
-                    throw new ArgumentException($"Unsupported lock model {model} detected.");
-            }
-        }
-    }
+				default:
+					throw new ArgumentException($"Unsupported lock model {model} detected.");
+			}
+		}
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/BikeInfo.cs b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/BikeInfo.cs
index 56ce621..d5f17aa 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/BikeInfo.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/BikeInfo.cs
@@ -7,152 +7,152 @@ using TINK.Model.State;
 
 namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 {
-    public class BikeInfo : Model.Bikes.BikeInfoNS.BC.BikeInfo, IBikeInfo
-    {
-        /// <summary>
-        /// Constructs a bike info object for a available bike.
-        /// </summary>
-        /// <param name="lockId">Id of the lock.</param>
-        /// <param name="lockGuid">GUID specifying the lock.</param>
-        /// <param name="currentStationId">Id of station where bike is located.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <param name="tariffDescription">Hold tariff description of bike.</param>
-        public BikeInfo(
-            BikeNS.Bike bike,
-            Drive drive,
-            int lockId,
-            Guid lockGuid,
-            string currentStationId,
-            Uri operatorUri = null,
-            RentalDescription tariffDescription = null,
-            bool? isDemo = DEFAULTVALUEISDEMO,
-            IEnumerable<string> group = null) : base(
-                new StateInfo(),
-                bike != null
-                    ? new BikeNS.Bike(
-                        bike.Id,
-                        LockModel.ILockIt /* Ensure consistend lock model value */,
-                        bike.WheelType,
-                        bike.TypeOfBike,
-                        bike.Description)
-                    : throw new ArgumentNullException(nameof(bike)),
-                drive,
-                isDemo,
-                group,
-                currentStationId,
-                operatorUri,
-                tariffDescription)
-        {
-            LockInfo = new Model.Bikes.BikeInfoNS.BluetoothLock.LockInfo.Builder { Id = lockId, Guid = lockGuid }.Build();
-        }
+	public class BikeInfo : Model.Bikes.BikeInfoNS.BC.BikeInfo, IBikeInfo
+	{
+		/// <summary>
+		/// Constructs a bike info object for a available bike.
+		/// </summary>
+		/// <param name="lockId">Id of the lock.</param>
+		/// <param name="lockGuid">GUID specifying the lock.</param>
+		/// <param name="currentStationId">Id of station where bike is located.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <param name="tariffDescription">Hold tariff description of bike.</param>
+		public BikeInfo(
+			BikeNS.Bike bike,
+			Drive drive,
+			int lockId,
+			Guid lockGuid,
+			string currentStationId,
+			Uri operatorUri = null,
+			RentalDescription tariffDescription = null,
+			bool? isDemo = DEFAULTVALUEISDEMO,
+			IEnumerable<string> group = null) : base(
+				new StateInfo(),
+				bike != null
+					? new BikeNS.Bike(
+						bike.Id,
+						LockModel.ILockIt /* Ensure consistend lock model value */,
+						bike.WheelType,
+						bike.TypeOfBike,
+						bike.Description)
+					: throw new ArgumentNullException(nameof(bike)),
+				drive,
+				isDemo,
+				group,
+				currentStationId,
+				operatorUri,
+				tariffDescription)
+		{
+			LockInfo = new Model.Bikes.BikeInfoNS.BluetoothLock.LockInfo.Builder { Id = lockId, Guid = lockGuid }.Build();
+		}
 
-        /// <summary>
-        /// Constructs a bike info object for a requested bike.
-        /// </summary>
-        /// <param name="dateTimeProvider">Provider for current date time to calculate remainig time on demand for state of type reserved.</param>
-        /// <param name="lockId">Id of the lock.</param>
-        /// <param name="lockGuid">GUID specifying the lock.</param>
-        /// <param name="requestedAt">Date time when bike was requested</param>
-        /// <param name="mailAddress">Mail address of user which requested bike.</param>
-        /// <param name="currentStationId">Name of station where bike is located, null if bike is on the road.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <param name="tariffDescription">Hold tariff description of bike.</param>
-        /// <param name="dateTimeProvider">Date time provider to calculate reaining time.</param>
-        public BikeInfo(
-            BikeNS.Bike bike,
-            Drive drive,
-            int lockId,
-            Guid lockGuid,
-            byte[] userKey,
-            byte[] adminKey,
-            byte[] seed,
-            DateTime requestedAt,
-            string mailAddress,
-            string currentStationId,
-            Uri operatorUri,
-            RentalDescription tariffDescription,
-            Func<DateTime> dateTimeProvider,
-            bool? isDemo = DEFAULTVALUEISDEMO,
-            IEnumerable<string> group = null) : base(
-                new StateInfo(
-                    dateTimeProvider,
-                    requestedAt,
-                    mailAddress,
-                    ""),
-                bike != null
-                    ? new BikeNS.Bike(
-                        bike.Id,
-                        LockModel.ILockIt /* Ensure consistend lock model value */,
-                        bike.WheelType,
-                        bike.TypeOfBike,
-                        bike.Description)
-                    : throw new ArgumentNullException(nameof(bike)),
-                drive,
-                isDemo,
-                group,
-                currentStationId,
-                operatorUri,
-                tariffDescription)
-        {
-            LockInfo = new Model.Bikes.BikeInfoNS.BluetoothLock.LockInfo.Builder { Id = lockId, Guid = lockGuid, UserKey = userKey, AdminKey = adminKey, Seed = seed }.Build();
-        }
+		/// <summary>
+		/// Constructs a bike info object for a requested bike.
+		/// </summary>
+		/// <param name="dateTimeProvider">Provider for current date time to calculate remainig time on demand for state of type reserved.</param>
+		/// <param name="lockId">Id of the lock.</param>
+		/// <param name="lockGuid">GUID specifying the lock.</param>
+		/// <param name="requestedAt">Date time when bike was requested</param>
+		/// <param name="mailAddress">Mail address of user which requested bike.</param>
+		/// <param name="currentStationId">Name of station where bike is located, null if bike is on the road.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <param name="tariffDescription">Hold tariff description of bike.</param>
+		/// <param name="dateTimeProvider">Date time provider to calculate reaining time.</param>
+		public BikeInfo(
+			BikeNS.Bike bike,
+			Drive drive,
+			int lockId,
+			Guid lockGuid,
+			byte[] userKey,
+			byte[] adminKey,
+			byte[] seed,
+			DateTime requestedAt,
+			string mailAddress,
+			string currentStationId,
+			Uri operatorUri,
+			RentalDescription tariffDescription,
+			Func<DateTime> dateTimeProvider,
+			bool? isDemo = DEFAULTVALUEISDEMO,
+			IEnumerable<string> group = null) : base(
+				new StateInfo(
+					dateTimeProvider,
+					requestedAt,
+					mailAddress,
+					""),
+				bike != null
+					? new BikeNS.Bike(
+						bike.Id,
+						LockModel.ILockIt /* Ensure consistend lock model value */,
+						bike.WheelType,
+						bike.TypeOfBike,
+						bike.Description)
+					: throw new ArgumentNullException(nameof(bike)),
+				drive,
+				isDemo,
+				group,
+				currentStationId,
+				operatorUri,
+				tariffDescription)
+		{
+			LockInfo = new Model.Bikes.BikeInfoNS.BluetoothLock.LockInfo.Builder { Id = lockId, Guid = lockGuid, UserKey = userKey, AdminKey = adminKey, Seed = seed }.Build();
+		}
 
-        /// <summary>
-        /// Constructs a bike info object for a booked bike.
-        /// </summary>
-        /// <param name="id">Unique id of bike.</param>
-        /// <param name="lockId">Id of the lock.</param>
-        /// <param name="lockGuid">GUID specifying the lock.</param>
-        /// <param name="bookedAt">Date time when bike was booked</param>
-        /// <param name="mailAddress">Mail address of user which booked bike.</param>
-        /// <param name="currentStationId">Name of station where bike is located, null if bike is on the road.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <param name="tariffDescription">Hold tariff description of bike.</param>
-        /// <param name="wheelType"></param>
-        public BikeInfo(
-            BikeNS.Bike bike,
-            Drive drive,
-            int lockId,
-            Guid lockGuid,
-            byte[] userKey,
-            byte[] adminKey,
-            byte[] seed,
-            DateTime bookedAt,
-            string mailAddress,
-            string currentStationId,
-            Uri operatorUri,
-            RentalDescription tariffDescription = null,
-            bool? isDemo = DEFAULTVALUEISDEMO,
-            IEnumerable<string> group = null) : base(
-                new StateInfo(
-                    bookedAt,
-                    mailAddress,
-                    ""),
-                bike != null
-                    ? new BikeNS.Bike(
-                        bike.Id,
-                        LockModel.ILockIt /* Ensure consistend lock model value */,
-                        bike.WheelType,
-                        bike.TypeOfBike,
-                        bike.Description)
-                    : throw new ArgumentNullException(),
-                drive,
-                isDemo,
-                group,
-                currentStationId,
-                operatorUri,
-                tariffDescription)
-        {
-            LockInfo = new Model.Bikes.BikeInfoNS.BluetoothLock.LockInfo.Builder { Id = lockId, Guid = lockGuid, UserKey = userKey, AdminKey = adminKey, Seed = seed }.Build();
-        }
+		/// <summary>
+		/// Constructs a bike info object for a booked bike.
+		/// </summary>
+		/// <param name="id">Unique id of bike.</param>
+		/// <param name="lockId">Id of the lock.</param>
+		/// <param name="lockGuid">GUID specifying the lock.</param>
+		/// <param name="bookedAt">Date time when bike was booked</param>
+		/// <param name="mailAddress">Mail address of user which booked bike.</param>
+		/// <param name="currentStationId">Name of station where bike is located, null if bike is on the road.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <param name="tariffDescription">Hold tariff description of bike.</param>
+		/// <param name="wheelType"></param>
+		public BikeInfo(
+			BikeNS.Bike bike,
+			Drive drive,
+			int lockId,
+			Guid lockGuid,
+			byte[] userKey,
+			byte[] adminKey,
+			byte[] seed,
+			DateTime bookedAt,
+			string mailAddress,
+			string currentStationId,
+			Uri operatorUri,
+			RentalDescription tariffDescription = null,
+			bool? isDemo = DEFAULTVALUEISDEMO,
+			IEnumerable<string> group = null) : base(
+				new StateInfo(
+					bookedAt,
+					mailAddress,
+					""),
+				bike != null
+					? new BikeNS.Bike(
+						bike.Id,
+						LockModel.ILockIt /* Ensure consistend lock model value */,
+						bike.WheelType,
+						bike.TypeOfBike,
+						bike.Description)
+					: throw new ArgumentNullException(),
+				drive,
+				isDemo,
+				group,
+				currentStationId,
+				operatorUri,
+				tariffDescription)
+		{
+			LockInfo = new Model.Bikes.BikeInfoNS.BluetoothLock.LockInfo.Builder { Id = lockId, Guid = lockGuid, UserKey = userKey, AdminKey = adminKey, Seed = seed }.Build();
+		}
 
-        public BikeInfo(Model.Bikes.BikeInfoNS.BC.BikeInfo bikeInfo, Model.Bikes.BikeInfoNS.BluetoothLock.LockInfo lockInfo) : base(
-            bikeInfo ?? throw new ArgumentException($"Can not copy-construct {typeof(BikeInfo).Name}-object. Source bike info must not be null."))
-        {
-            LockInfo = lockInfo
-                ?? throw new ArgumentException($"Can not copy-construct {typeof(BikeInfo).Name}-object. Source lock object must not be null.");
-        }
+		public BikeInfo(Model.Bikes.BikeInfoNS.BC.BikeInfo bikeInfo, Model.Bikes.BikeInfoNS.BluetoothLock.LockInfo lockInfo) : base(
+			bikeInfo ?? throw new ArgumentException($"Can not copy-construct {typeof(BikeInfo).Name}-object. Source bike info must not be null."))
+		{
+			LockInfo = lockInfo
+				?? throw new ArgumentException($"Can not copy-construct {typeof(BikeInfo).Name}-object. Source lock object must not be null.");
+		}
 
-        public Model.Bikes.BikeInfoNS.BluetoothLock.LockInfo LockInfo { get; private set; }
-    }
+		public Model.Bikes.BikeInfoNS.BluetoothLock.LockInfo LockInfo { get; private set; }
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/BikeInfoMutable.cs b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/BikeInfoMutable.cs
index e761c0a..7812c49 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/BikeInfoMutable.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/BikeInfoMutable.cs
@@ -2,34 +2,39 @@
 
 namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 {
-    public class BikeInfoMutable : Model.Bikes.BikeInfoNS.BC.BikeInfoMutable, IBikeInfoMutable
-    {
-        /// <summary> Constructs a bike object from source. </summary>
-        public BikeInfoMutable(BikeInfo bike, string stationName) : base(
-            bike != null
-                ? bike.Bike
-                : throw new ArgumentNullException(nameof(bike)),
-            bike.Drive,
-            bike.IsDemo,
-            bike.Group,
-            bike.StationId,
-            stationName,
-            bike.OperatorUri,
-            bike.TariffDescription,
-            () => DateTime.Now,
-            bike.State)
-        {
-            LockInfo = new LockInfoMutable(
-                bike.LockInfo.Id,
-                bike.LockInfo.Guid,
-                bike.LockInfo.UserKey,
-                bike.LockInfo.AdminKey,
-                bike.LockInfo.Seed,
-                bike.LockInfo.State);
-        }
+	public class BikeInfoMutable : Model.Bikes.BikeInfoNS.BC.BikeInfoMutable, IBikeInfoMutable
+	{
+		/// <summary> Constructs a bike object from source. </summary>
+		public BikeInfoMutable(BikeInfo bike, string stationName) : base(
+			bike != null
+				? bike.Bike
+				: throw new ArgumentNullException(nameof(bike)),
+			bike.Drive,
+			bike.IsDemo,
+			bike.Group,
+			bike.StationId,
+			stationName,
+			bike.OperatorUri,
+			bike.TariffDescription,
+			() => DateTime.Now,
+			bike.State)
+		{
+			LockInfo = new LockInfoMutable(
+				bike.LockInfo.Id,
+				bike.LockInfo.Guid,
+				bike.LockInfo.UserKey,
+				bike.LockInfo.AdminKey,
+				bike.LockInfo.Seed,
+				bike.LockInfo.State);
+		}
 
-        public LockInfoMutable LockInfo { get; }
+		public LockInfoMutable LockInfo { get; }
 
-        ILockInfoMutable IBikeInfoMutable.LockInfo => LockInfo;
-    }
+		ILockInfoMutable IBikeInfoMutable.LockInfo => LockInfo;
+
+		public new string ToString()
+		{
+			return $"Id={Id}{(TypeOfBike != null ? $";type={TypeOfBike}" : "")};state={State}";
+		}
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/IBikeInfo.cs b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/IBikeInfo.cs
index 0ad7325..2527b5b 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/IBikeInfo.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/IBikeInfo.cs
@@ -1,6 +1,6 @@
 namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 {
-    public interface IBikeInfo : BC.IBikeInfo
-    {
-    }
+	public interface IBikeInfo : BC.IBikeInfo
+	{
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/IBikeInfoMutable.cs b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/IBikeInfoMutable.cs
index a809616..29c3c2e 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/IBikeInfoMutable.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/IBikeInfoMutable.cs
@@ -1,7 +1,7 @@
 namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 {
-    public interface IBikeInfoMutable : BikeInfoNS.BC.IBikeInfoMutable
-    {
-        ILockInfoMutable LockInfo { get; }
-    }
+	public interface IBikeInfoMutable : BikeInfoNS.BC.IBikeInfoMutable
+	{
+		ILockInfoMutable LockInfo { get; }
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/ILockInfoMutable.cs b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/ILockInfoMutable.cs
index 00ae943..2066512 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/ILockInfoMutable.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/ILockInfoMutable.cs
@@ -2,22 +2,22 @@
 
 namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 {
-    public interface ILockInfoMutable
-    {
-        /// <summary> Identification number of bluetooth lock.</summary>
-        int Id { get; }
+	public interface ILockInfoMutable
+	{
+		/// <summary> Identification number of bluetooth lock.</summary>
+		int Id { get; }
 
-        /// <summary> Gets the user key.</summary>
-        byte[] UserKey { get; }
+		/// <summary> Gets the user key.</summary>
+		byte[] UserKey { get; }
 
-        LockingState State { get; set; }
+		LockingState State { get; set; }
 
-        /// <summary> Holds the percentage of lock battery.</summary>
-        double BatteryPercentage { get; set; }
+		/// <summary> Holds the percentage of lock battery.</summary>
+		double BatteryPercentage { get; set; }
 
-        /// <summary> Changes during runtime: Can be unknown when set from copri and chang to a valid value when set from lock.</summary>
-        Guid Guid { get; set; }
+		/// <summary> Changes during runtime: Can be unknown when set from copri and chang to a valid value when set from lock.</summary>
+		Guid Guid { get; set; }
 
-        byte[] Seed { get; }
-    }
+		byte[] Seed { get; }
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/LockInfoMutable.cs b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/LockInfoMutable.cs
index 7c6744a..4dd02c2 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/LockInfoMutable.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/LockInfoMutable.cs
@@ -2,52 +2,52 @@
 
 namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 {
-    public class LockInfoMutable : TINK.Model.Bikes.BikeInfoNS.BluetoothLock.ILockInfoMutable
-    {
-        /// <summary> Lock info object. </summary>
-        private Model.Bikes.BikeInfoNS.BluetoothLock.LockInfo LockInfo { get; set; }
+	public class LockInfoMutable : TINK.Model.Bikes.BikeInfoNS.BluetoothLock.ILockInfoMutable
+	{
+		/// <summary> Lock info object. </summary>
+		private Model.Bikes.BikeInfoNS.BluetoothLock.LockInfo LockInfo { get; set; }
 
-        /// <summary> Constructs a bluetooth lock info object. </summary>
-        /// <param name="id">Id of lock must always been known when constructing an lock info object.</param>
-        public LockInfoMutable(
-            int id,
-            Guid guid,
-            byte[] userKey,
-            byte[] adminKey,
-            byte[] seed,
-            Model.Bikes.BikeInfoNS.BluetoothLock.LockingState state)
-        {
-            LockInfo = new Model.Bikes.BikeInfoNS.BluetoothLock.LockInfo.Builder() { Id = id, Guid = guid, UserKey = userKey, AdminKey = adminKey, Seed = seed, State = state }.Build();
-        }
+		/// <summary> Constructs a bluetooth lock info object. </summary>
+		/// <param name="id">Id of lock must always been known when constructing an lock info object.</param>
+		public LockInfoMutable(
+			int id,
+			Guid guid,
+			byte[] userKey,
+			byte[] adminKey,
+			byte[] seed,
+			Model.Bikes.BikeInfoNS.BluetoothLock.LockingState state)
+		{
+			LockInfo = new Model.Bikes.BikeInfoNS.BluetoothLock.LockInfo.Builder() { Id = id, Guid = guid, UserKey = userKey, AdminKey = adminKey, Seed = seed, State = state }.Build();
+		}
 
-        public int Id => LockInfo.Id;
+		public int Id => LockInfo.Id;
 
-        /// <summary> Changes during runtime: Can be unknown when set from copri and chang to a valid value when set from lock.</summary>
-        public Guid Guid
-        {
-            get => LockInfo.Guid;
-            set => LockInfo = new Model.Bikes.BikeInfoNS.BluetoothLock.LockInfo.Builder(LockInfo) { Guid = value }.Build();
-        }
+		/// <summary> Changes during runtime: Can be unknown when set from copri and chang to a valid value when set from lock.</summary>
+		public Guid Guid
+		{
+			get => LockInfo.Guid;
+			set => LockInfo = new Model.Bikes.BikeInfoNS.BluetoothLock.LockInfo.Builder(LockInfo) { Guid = value }.Build();
+		}
 
-        public byte[] Seed => LockInfo.Seed;
+		public byte[] Seed => LockInfo.Seed;
 
-        public byte[] UserKey => LockInfo.UserKey;
+		public byte[] UserKey => LockInfo.UserKey;
 
-        public byte[] AdminKey => LockInfo.AdminKey;
+		public byte[] AdminKey => LockInfo.AdminKey;
 
-        public Model.Bikes.BikeInfoNS.BluetoothLock.LockingState State
-        {
-            get => LockInfo.State;
-            set => LockInfo = new Model.Bikes.BikeInfoNS.BluetoothLock.LockInfo.Builder(LockInfo) { State = value }.Build();
-        }
+		public Model.Bikes.BikeInfoNS.BluetoothLock.LockingState State
+		{
+			get => LockInfo.State;
+			set => LockInfo = new Model.Bikes.BikeInfoNS.BluetoothLock.LockInfo.Builder(LockInfo) { State = value }.Build();
+		}
 
-        /// <summary> Holds the percentage of lock battery.</summary>
-        public double BatteryPercentage { get; set; } = double.NaN;
+		/// <summary> Holds the percentage of lock battery.</summary>
+		public double BatteryPercentage { get; set; } = double.NaN;
 
-        /// <summary> Loads lock info object from values. </summary>
-        public void Load(int id, Guid guid, byte[] seed, byte[] userKey, byte[] adminKey)
-        {
-            LockInfo = new Model.Bikes.BikeInfoNS.BluetoothLock.LockInfo.Builder(LockInfo) { Id = id, Guid = guid, Seed = seed, UserKey = userKey, AdminKey = adminKey }.Build();
-        }
-    }
+		/// <summary> Loads lock info object from values. </summary>
+		public void Load(int id, Guid guid, byte[] seed, byte[] userKey, byte[] adminKey)
+		{
+			LockInfo = new Model.Bikes.BikeInfoNS.BluetoothLock.LockInfo.Builder(LockInfo) { Id = id, Guid = guid, Seed = seed, UserKey = userKey, AdminKey = adminKey }.Build();
+		}
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/BikeInfo.cs b/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/BikeInfo.cs
index 23ef656..378957e 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/BikeInfo.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/BikeInfo.cs
@@ -7,155 +7,155 @@ using TINK.Model.State;
 
 namespace TINK.Model.Bikes.BikeInfoNS.CopriLock
 {
-    public class BikeInfo : BC.BikeInfo
-    {
-        /// <summary>
-        /// Constructs a bike info object for a available bike or bike for which feed back is pending.
-        /// </summary>
-        /// <param name="bike">Bike object.</param>
-        /// <param name="currentStationId">Id of station where bike is located.</param>
-        /// <param name="lockInfo">Lock info.</param>
-        /// <param name="isFeedbackPending">If true user has not yet given feedback after returning bike.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <param name="tariffDescription">Hold tariff description of bike.</param>
-        public BikeInfo(
-            BikeNS.Bike bike,
-            Drive drive,
-            string currentStationId,
-            LockInfo lockInfo,
-            bool isFeedbackPending = false,
-            Uri operatorUri = null,
-            RentalDescription tariffDescription = null,
-            bool? isDemo = DEFAULTVALUEISDEMO,
-            IEnumerable<string> group = null,
-            IMiniSurveyModel miniSurvey = null,
-            string co2Saving = null) : base(
-                new StateInfo(isFeedbackPending),
-                bike != null
-                    ? new Bike(
-                        bike.Id,
-                        LockModel.Sigo,
-                        bike.WheelType /* Ensure consistend lock model value */,
-                        bike.TypeOfBike,
-                        bike.Description)
-                    : throw new ArgumentNullException(nameof(bike)),
-                drive,
-                isDemo,
-                group,
-                currentStationId,
-                operatorUri,
-                tariffDescription)
-        {
-            LockInfo = lockInfo;
-            MiniSurvey = miniSurvey;
-            Co2Saving = co2Saving;
-        }
+	public class BikeInfo : BC.BikeInfo
+	{
+		/// <summary>
+		/// Constructs a bike info object for a available bike or bike for which feed back is pending.
+		/// </summary>
+		/// <param name="bike">Bike object.</param>
+		/// <param name="currentStationId">Id of station where bike is located.</param>
+		/// <param name="lockInfo">Lock info.</param>
+		/// <param name="isFeedbackPending">If true user has not yet given feedback after returning bike.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <param name="tariffDescription">Hold tariff description of bike.</param>
+		public BikeInfo(
+			BikeNS.Bike bike,
+			Drive drive,
+			string currentStationId,
+			LockInfo lockInfo,
+			bool isFeedbackPending = false,
+			Uri operatorUri = null,
+			RentalDescription tariffDescription = null,
+			bool? isDemo = DEFAULTVALUEISDEMO,
+			IEnumerable<string> group = null,
+			IMiniSurveyModel miniSurvey = null,
+			string co2Saving = null) : base(
+				new StateInfo(isFeedbackPending),
+				bike != null
+					? new Bike(
+						bike.Id,
+						LockModel.Sigo,
+						bike.WheelType /* Ensure consistend lock model value */,
+						bike.TypeOfBike,
+						bike.Description)
+					: throw new ArgumentNullException(nameof(bike)),
+				drive,
+				isDemo,
+				group,
+				currentStationId,
+				operatorUri,
+				tariffDescription)
+		{
+			LockInfo = lockInfo;
+			MiniSurvey = miniSurvey;
+			Co2Saving = co2Saving;
+		}
 
-        /// <summary>
-        /// Constructs a bike info object for a requested bike.
-        /// </summary>
-        /// <param name="bike">Bike object.</param>
-        /// <param name="requestedAt">Date time when bike was requested</param>
-        /// <param name="mailAddress">Mail address of user which requested bike.</param>
-        /// <param name="currentStationId">Name of station where bike is located, null if bike is on the road.</param>
-        /// <param name="lockInfo">Lock info.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <param name="tariffDescription">Hold tariff description of bike.</param>
-        /// <param name="dateTimeProvider">Provider for current date time to calculate remainig time on demand for state of type reserved.</param>
-        public BikeInfo(
-            BikeNS.Bike bike,
-            Drive drive,
-            DateTime requestedAt,
-            string mailAddress,
-            string currentStationId,
-            LockInfo lockInfo,
-            Uri operatorUri,
-            RentalDescription tariffDescription,
-            Func<DateTime> dateTimeProvider,
-            bool? isDemo = DEFAULTVALUEISDEMO,
-            IEnumerable<string> group = null) : base(
-                new StateInfo(
-                    dateTimeProvider,
-                    requestedAt,
-                    mailAddress,
-                    ""),
-                bike != null
-                    ? new BikeNS.Bike(
-                        bike.Id,
-                        LockModel.Sigo /* Ensure consistend lock model value */,
-                        bike.WheelType,
-                        bike.TypeOfBike,
-                        bike.Description)
-                    : throw new ArgumentNullException(nameof(bike)),
-                drive,
-                isDemo,
-                group,
-                currentStationId,
-                operatorUri,
-                tariffDescription)
-        {
-            LockInfo = lockInfo;
-            MiniSurvey = new MiniSurveyModel();
-            Co2Saving = string.Empty;
-        }
+		/// <summary>
+		/// Constructs a bike info object for a requested bike.
+		/// </summary>
+		/// <param name="bike">Bike object.</param>
+		/// <param name="requestedAt">Date time when bike was requested</param>
+		/// <param name="mailAddress">Mail address of user which requested bike.</param>
+		/// <param name="currentStationId">Name of station where bike is located, null if bike is on the road.</param>
+		/// <param name="lockInfo">Lock info.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <param name="tariffDescription">Hold tariff description of bike.</param>
+		/// <param name="dateTimeProvider">Provider for current date time to calculate remainig time on demand for state of type reserved.</param>
+		public BikeInfo(
+			BikeNS.Bike bike,
+			Drive drive,
+			DateTime requestedAt,
+			string mailAddress,
+			string currentStationId,
+			LockInfo lockInfo,
+			Uri operatorUri,
+			RentalDescription tariffDescription,
+			Func<DateTime> dateTimeProvider,
+			bool? isDemo = DEFAULTVALUEISDEMO,
+			IEnumerable<string> group = null) : base(
+				new StateInfo(
+					dateTimeProvider,
+					requestedAt,
+					mailAddress,
+					""),
+				bike != null
+					? new BikeNS.Bike(
+						bike.Id,
+						LockModel.Sigo /* Ensure consistend lock model value */,
+						bike.WheelType,
+						bike.TypeOfBike,
+						bike.Description)
+					: throw new ArgumentNullException(nameof(bike)),
+				drive,
+				isDemo,
+				group,
+				currentStationId,
+				operatorUri,
+				tariffDescription)
+		{
+			LockInfo = lockInfo;
+			MiniSurvey = new MiniSurveyModel();
+			Co2Saving = string.Empty;
+		}
 
-        /// <summary>
-        /// Constructs a bike info object for a booked bike.
-        /// </summary>
-        /// <param name="bike">Bike object.</param>
-        /// <param name="bookedAt">Date time when bike was booked</param>
-        /// <param name="mailAddress">Mail address of user which booked bike.</param>
-        /// <param name="currentStationId">Name of station where bike is located, null if bike is on the road.</param>
-        /// <param name="lockInfo">Lock info.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <param name="tariffDescription">Hold tariff description of bike.</param>
-        public BikeInfo(
-            BikeNS.Bike bike,
-            Drive drive,
-            DateTime bookedAt,
-            string mailAddress,
-            string currentStationId,
-            LockInfo lockInfo,
-            Uri operatorUri,
-            RentalDescription tariffDescription = null,
-            bool? isDemo = DEFAULTVALUEISDEMO,
-            IEnumerable<string> group = null) : base(
-                new StateInfo(
-                    bookedAt,
-                    mailAddress,
-                    ""),
-                bike != null
-                    ? new BikeNS.Bike(
-                        bike.Id,
-                        LockModel.Sigo /* Ensure consistend lock model value */,
-                        bike.WheelType,
-                        bike.TypeOfBike,
-                        bike.Description)
-                    : throw new ArgumentNullException(nameof(bike)),
-                drive,
-                isDemo,
-                group,
-                currentStationId,
-                operatorUri,
-                tariffDescription)
-        {
-            LockInfo = lockInfo;
-            MiniSurvey = new MiniSurveyModel();
-            Co2Saving = string.Empty;
-        }
+		/// <summary>
+		/// Constructs a bike info object for a booked bike.
+		/// </summary>
+		/// <param name="bike">Bike object.</param>
+		/// <param name="bookedAt">Date time when bike was booked</param>
+		/// <param name="mailAddress">Mail address of user which booked bike.</param>
+		/// <param name="currentStationId">Name of station where bike is located, null if bike is on the road.</param>
+		/// <param name="lockInfo">Lock info.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <param name="tariffDescription">Hold tariff description of bike.</param>
+		public BikeInfo(
+			BikeNS.Bike bike,
+			Drive drive,
+			DateTime bookedAt,
+			string mailAddress,
+			string currentStationId,
+			LockInfo lockInfo,
+			Uri operatorUri,
+			RentalDescription tariffDescription = null,
+			bool? isDemo = DEFAULTVALUEISDEMO,
+			IEnumerable<string> group = null) : base(
+				new StateInfo(
+					bookedAt,
+					mailAddress,
+					""),
+				bike != null
+					? new BikeNS.Bike(
+						bike.Id,
+						LockModel.Sigo /* Ensure consistend lock model value */,
+						bike.WheelType,
+						bike.TypeOfBike,
+						bike.Description)
+					: throw new ArgumentNullException(nameof(bike)),
+				drive,
+				isDemo,
+				group,
+				currentStationId,
+				operatorUri,
+				tariffDescription)
+		{
+			LockInfo = lockInfo;
+			MiniSurvey = new MiniSurveyModel();
+			Co2Saving = string.Empty;
+		}
 
-        public BikeInfo(BC.BikeInfo bikeInfo, LockInfo lockInfo) : base(
-            bikeInfo ?? throw new ArgumentException($"Can not copy-construct {typeof(BikeInfo).Name}-object. Source bike info must not be null."))
-        {
-            LockInfo = lockInfo
-                ?? throw new ArgumentException($"Can not copy-construct {typeof(BikeInfo).Name}-object. Source lock object must not be null.");
-        }
+		public BikeInfo(BC.BikeInfo bikeInfo, LockInfo lockInfo) : base(
+			bikeInfo ?? throw new ArgumentException($"Can not copy-construct {typeof(BikeInfo).Name}-object. Source bike info must not be null."))
+		{
+			LockInfo = lockInfo
+				?? throw new ArgumentException($"Can not copy-construct {typeof(BikeInfo).Name}-object. Source lock object must not be null.");
+		}
 
-        /// <summary> Holds the lock info.</summary>
-        public LockInfo LockInfo { get; private set; }
+		/// <summary> Holds the lock info.</summary>
+		public LockInfo LockInfo { get; private set; }
 
-        public IMiniSurveyModel MiniSurvey { get; private set; }
+		public IMiniSurveyModel MiniSurvey { get; private set; }
 
-        public string Co2Saving { get; private set; }
-    }
+		public string Co2Saving { get; private set; }
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/BikeInfoMutable.cs b/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/BikeInfoMutable.cs
index dadeb84..376348f 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/BikeInfoMutable.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/BikeInfoMutable.cs
@@ -2,46 +2,46 @@
 
 namespace TINK.Model.Bikes.BikeInfoNS.CopriLock
 {
-    public class BikeInfoMutable : BC.BikeInfoMutable, IBikeInfoMutable
-    {
-        /// <summary> Constructs a bike object from source. </summary>
-        public BikeInfoMutable(BikeInfo bike, string stationName) : base(
-            bike != null
-                ? bike.Bike
-                : throw new ArgumentNullException(nameof(bike)),
-            bike.Drive,
-            bike.IsDemo,
-            bike.Group,
-            bike.StationId,
-            stationName,
-            bike.OperatorUri,
-            bike.TariffDescription,
-            () => DateTime.Now,
-            bike.State)
-        {
-            LockInfo = new LockInfoMutable(bike.LockInfo.State);
+	public class BikeInfoMutable : BC.BikeInfoMutable, IBikeInfoMutable
+	{
+		/// <summary> Constructs a bike object from source. </summary>
+		public BikeInfoMutable(BikeInfo bike, string stationName) : base(
+			bike != null
+				? bike.Bike
+				: throw new ArgumentNullException(nameof(bike)),
+			bike.Drive,
+			bike.IsDemo,
+			bike.Group,
+			bike.StationId,
+			stationName,
+			bike.OperatorUri,
+			bike.TariffDescription,
+			() => DateTime.Now,
+			bike.State)
+		{
+			LockInfo = new LockInfoMutable(bike.LockInfo.State);
 
-            BookingFinishedModel = new BookingFinishedModel
-            {
-                Co2Saving = bike.Co2Saving,
-                MiniSurvey = new MiniSurvey.MiniSurveyModel()
-            };
+			BookingFinishedModel = new BookingFinishedModel
+			{
+				Co2Saving = bike.Co2Saving,
+				MiniSurvey = new MiniSurvey.MiniSurveyModel()
+			};
 
-            if ((bike?.MiniSurvey?.Questions) == null
-                || bike.MiniSurvey.Questions.Count <= 0)
-            {
-                // No querries to add.
-                return;
-            }
+			if ((bike?.MiniSurvey?.Questions) == null
+				|| bike.MiniSurvey.Questions.Count <= 0)
+			{
+				// No querries to add.
+				return;
+			}
 
-            // Add a dummy querry. Querries are not yet read from COPRI but compiled into the app.
-            BookingFinishedModel.MiniSurvey.Questions.Add("q1", new MiniSurvey.QuestionModel());
-        }
+			// Add a dummy querry. Querries are not yet read from COPRI but compiled into the app.
+			BookingFinishedModel.MiniSurvey.Questions.Add("q1", new MiniSurvey.QuestionModel());
+		}
 
-        public LockInfoMutable LockInfo { get; }
+		public LockInfoMutable LockInfo { get; }
 
-        ILockInfoMutable IBikeInfoMutable.LockInfo => LockInfo;
+		ILockInfoMutable IBikeInfoMutable.LockInfo => LockInfo;
 
-        public IBookingFinishedModel BookingFinishedModel { get; }
-    }
+		public IBookingFinishedModel BookingFinishedModel { get; }
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/IBikeInfoMutable.cs b/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/IBikeInfoMutable.cs
index e1b4a29..7966af7 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/IBikeInfoMutable.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/IBikeInfoMutable.cs
@@ -1,9 +1,9 @@
 namespace TINK.Model.Bikes.BikeInfoNS.CopriLock
 {
-    public interface IBikeInfoMutable : BikeInfoNS.BC.IBikeInfoMutable
-    {
-        ILockInfoMutable LockInfo { get; }
+	public interface IBikeInfoMutable : BikeInfoNS.BC.IBikeInfoMutable
+	{
+		ILockInfoMutable LockInfo { get; }
 
-        IBookingFinishedModel BookingFinishedModel { get; }
-    }
+		IBookingFinishedModel BookingFinishedModel { get; }
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/ILockInfoMutable.cs b/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/ILockInfoMutable.cs
index 558a144..8bd751a 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/ILockInfoMutable.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/ILockInfoMutable.cs
@@ -1,7 +1,7 @@
 namespace TINK.Model.Bikes.BikeInfoNS.CopriLock
 {
-    public interface ILockInfoMutable
-    {
-        LockingState State { get; set; }
-    }
+	public interface ILockInfoMutable
+	{
+		LockingState State { get; set; }
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/LockInfoMutable.cs b/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/LockInfoMutable.cs
index 6097ca4..5932d57 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/LockInfoMutable.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/LockInfoMutable.cs
@@ -1,30 +1,30 @@
 namespace TINK.Model.Bikes.BikeInfoNS.CopriLock
 {
-    public class LockInfoMutable : ILockInfoMutable
-    {
-        /// <summary> Lock info object. </summary>
-        private LockInfo LockInfo { get; set; }
+	public class LockInfoMutable : ILockInfoMutable
+	{
+		/// <summary> Lock info object. </summary>
+		private LockInfo LockInfo { get; set; }
 
-        /// <summary> Constructs a bluetooth lock info object. </summary>
-        /// <param name="id">Id of lock must always been known when constructing an lock info object.</param>
-        public LockInfoMutable(LockingState state)
-        {
-            LockInfo = new LockInfo.Builder() { State = state }.Build();
-        }
+		/// <summary> Constructs a bluetooth lock info object. </summary>
+		/// <param name="id">Id of lock must always been known when constructing an lock info object.</param>
+		public LockInfoMutable(LockingState state)
+		{
+			LockInfo = new LockInfo.Builder() { State = state }.Build();
+		}
 
-        public LockingState State
-        {
-            get => LockInfo.State;
-            set => LockInfo = new LockInfo.Builder(LockInfo) { State = value }.Build();
-        }
+		public LockingState State
+		{
+			get => LockInfo.State;
+			set => LockInfo = new LockInfo.Builder(LockInfo) { State = value }.Build();
+		}
 
-        /// <summary> Holds the percentage of lock battery.</summary>
-        public double BatteryPercentage { get; set; } = double.NaN;
+		/// <summary> Holds the percentage of lock battery.</summary>
+		public double BatteryPercentage { get; set; } = double.NaN;
 
-        /// <summary> Loads lock info object from values. </summary>
-        public void Load()
-        {
-            LockInfo = new LockInfo.Builder(LockInfo) { }.Build();
-        }
-    }
+		/// <summary> Loads lock info object from values. </summary>
+		public void Load()
+		{
+			LockInfo = new LockInfo.Builder(LockInfo) { }.Build();
+		}
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/BatteryNS/Battery.cs b/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/BatteryNS/Battery.cs
index 56b4c58..dc8da99 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/BatteryNS/Battery.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/BatteryNS/Battery.cs
@@ -2,109 +2,109 @@
 
 namespace TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS
 {
-    public class Battery : IBattery
-    {
-        private Battery() { }
+	public class Battery : IBattery
+	{
+		private Battery() { }
 
-        /// <summary>
-        /// Holds the current charging level of the battery in percent, double.NaN if unknown.
-        /// </summary>
-        public double CurrentChargePercent { get; private set; } = double.NaN;
+		/// <summary>
+		/// Holds the current charging level of the battery in percent, double.NaN if unknown.
+		/// </summary>
+		public double CurrentChargePercent { get; private set; } = double.NaN;
 
-        /// <summary>
-        /// Holds the current chargeing level of the battery in bars, null if unkonwn.
-        /// </summary>
-        public int? CurrentChargeBars { get; private set; } = null;
+		/// <summary>
+		/// Holds the current chargeing level of the battery in bars, null if unkonwn.
+		/// </summary>
+		public int? CurrentChargeBars { get; private set; } = null;
 
-        /// <summary>
-        /// Holds the maximum chargeing level of the battery in bars, null if unkonwn.
-        /// </summary>
-        public int? MaxChargeBars { get; private set; } = null;
+		/// <summary>
+		/// Holds the maximum chargeing level of the battery in bars, null if unkonwn.
+		/// </summary>
+		public int? MaxChargeBars { get; private set; } = null;
 
-        /// <summary>
-        /// Holds whether backend is aware of battery charging level.
-        /// </summary>
-        public bool? IsBackendAccessible { get; private set; } = null;
+		/// <summary>
+		/// Holds whether backend is aware of battery charging level.
+		/// </summary>
+		public bool? IsBackendAccessible { get; private set; } = null;
 
-        /// <summary>
-        /// Holds whether to display battery level or not.
-        /// </summary>
-        public bool? IsHidden { get; private set; } = null;
+		/// <summary>
+		/// Holds whether to display battery level or not.
+		/// </summary>
+		public bool? IsHidden { get; private set; } = null;
 
-        public class Builder
-        {
-            /// <summary>
-            /// Holds the current chargeing level of the battery in bars.
-            /// </summary>
-            public int? CurrentChargeBars { get; set; } = null;
+		public class Builder
+		{
+			/// <summary>
+			/// Holds the current chargeing level of the battery in bars.
+			/// </summary>
+			public int? CurrentChargeBars { get; set; } = null;
 
-            /// <summary>
-            /// Holds the maximum chargeing level of the battery in bars.
-            /// </summary>
-            public int? MaxChargeBars { get; set; } = null;
+			/// <summary>
+			/// Holds the maximum chargeing level of the battery in bars.
+			/// </summary>
+			public int? MaxChargeBars { get; set; } = null;
 
-            /// <summary>
-            /// Holds the current charging level of the battery in percent.
-            /// </summary>
-            public double CurrentChargePercent { get; set; } = double.NaN;
+			/// <summary>
+			/// Holds the current charging level of the battery in percent.
+			/// </summary>
+			public double CurrentChargePercent { get; set; } = double.NaN;
 
-            /// <summary>
-            /// Holds whether backend is aware of battery charging level.
-            /// </summary>
-            public bool? IsBackendAccessible { get; set; } = null;
+			/// <summary>
+			/// Holds whether backend is aware of battery charging level.
+			/// </summary>
+			public bool? IsBackendAccessible { get; set; } = null;
 
-            /// <summary>
-            /// Holds whether to display battery level or not.
-            /// </summary>
-            public bool? IsHidden { get; set; } = null;
+			/// <summary>
+			/// Holds whether to display battery level or not.
+			/// </summary>
+			public bool? IsHidden { get; set; } = null;
 
-            public Battery Build()
-            {
-                if (!double.IsNaN(CurrentChargePercent)
-                    && (CurrentChargePercent < 0 || 100 < CurrentChargePercent))
-                {
-                    // Invalid filling level detected
-                    CurrentChargePercent = double.NaN;
-                }
+			public Battery Build()
+			{
+				if (!double.IsNaN(CurrentChargePercent)
+					&& (CurrentChargePercent < 0 || 100 < CurrentChargePercent))
+				{
+					// Invalid filling level detected
+					CurrentChargePercent = double.NaN;
+				}
 
-                if (CurrentChargeBars < 0)
-                {
-                    // Current value of bars must never be smaller zero.
-                    CurrentChargeBars = null;
-                }
+				if (CurrentChargeBars < 0)
+				{
+					// Current value of bars must never be smaller zero.
+					CurrentChargeBars = null;
+				}
 
-                if (MaxChargeBars < 0)
-                {
-                    // Max value of bars must never be smaller zero.
-                    MaxChargeBars = null;
-                }
+				if (MaxChargeBars < 0)
+				{
+					// Max value of bars must never be smaller zero.
+					MaxChargeBars = null;
+				}
 
-                if (CurrentChargeBars != null
-                    && MaxChargeBars == null)
-                {
-                    // If current charge bars is set, max charge must be set as well.
-                    Log.ForContext<Battery>().Error($"Current bars value can not be set to {CurrentChargeBars} if max bars is not se.");
-                    CurrentChargeBars = null;
-                }
+				if (CurrentChargeBars != null
+					&& MaxChargeBars == null)
+				{
+					// If current charge bars is set, max charge must be set as well.
+					Log.ForContext<Battery>().Error($"Current bars value can not be set to {CurrentChargeBars} if max bars is not se.");
+					CurrentChargeBars = null;
+				}
 
-                if (CurrentChargeBars != null
-                    && MaxChargeBars != null
-                    && CurrentChargeBars > MaxChargeBars)
-                {
-                    // If current charge bars must never be larger than max charge bars.
-                    Log.ForContext<Battery>().Error($"Invalid current bars value {CurrentChargeBars} detected. Value must never be largen than max value bars {MaxChargeBars}.");
-                    CurrentChargeBars = null;
-                }
+				if (CurrentChargeBars != null
+					&& MaxChargeBars != null
+					&& CurrentChargeBars > MaxChargeBars)
+				{
+					// If current charge bars must never be larger than max charge bars.
+					Log.ForContext<Battery>().Error($"Invalid current bars value {CurrentChargeBars} detected. Value must never be largen than max value bars {MaxChargeBars}.");
+					CurrentChargeBars = null;
+				}
 
-                return new Battery
-                {
-                    CurrentChargeBars = CurrentChargeBars,
-                    MaxChargeBars = MaxChargeBars,
-                    CurrentChargePercent = CurrentChargePercent,
-                    IsBackendAccessible = IsBackendAccessible,
-                    IsHidden = IsHidden
-                };
-            }
-        }
-    }
+				return new Battery
+				{
+					CurrentChargeBars = CurrentChargeBars,
+					MaxChargeBars = MaxChargeBars,
+					CurrentChargePercent = CurrentChargePercent,
+					IsBackendAccessible = IsBackendAccessible,
+					IsHidden = IsHidden
+				};
+			}
+		}
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/BatteryNS/IBattery.cs b/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/BatteryNS/IBattery.cs
index 5584ca7..63a62cd 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/BatteryNS/IBattery.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/BatteryNS/IBattery.cs
@@ -1,31 +1,31 @@
 
 namespace TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS
 {
-    public interface IBattery
-    {
-        /// <summary>
-        /// Holds the current charging level of the battery in percent, double.NaN if unknown.
-        /// </summary>
-        double CurrentChargePercent { get; }
+	public interface IBattery
+	{
+		/// <summary>
+		/// Holds the current charging level of the battery in percent, double.NaN if unknown.
+		/// </summary>
+		double CurrentChargePercent { get; }
 
-        /// <summary>
-        /// Holds the current chargeing level of the battery in bars. Must not be arger than MaxChargeBars, null if unkonwn.
-        /// </summary>
-        int? CurrentChargeBars { get; }
+		/// <summary>
+		/// Holds the current chargeing level of the battery in bars. Must not be arger than MaxChargeBars, null if unkonwn.
+		/// </summary>
+		int? CurrentChargeBars { get; }
 
-        /// <summary>
-        /// Holds the maximum chargeing level of the battery in bars, null if unkonwn.
-        /// </summary>
-        int? MaxChargeBars { get; }
+		/// <summary>
+		/// Holds the maximum chargeing level of the battery in bars, null if unkonwn.
+		/// </summary>
+		int? MaxChargeBars { get; }
 
-        /// <summary>
-        /// Holds whether backend is aware of battery charging level.
-        /// </summary>
-        bool? IsBackendAccessible { get; }
+		/// <summary>
+		/// Holds whether backend is aware of battery charging level.
+		/// </summary>
+		bool? IsBackendAccessible { get; }
 
-        /// <summary>
-        /// Holds whether to display battery level or not.
-        /// </summary>
-        bool? IsHidden { get; }
-    }
+		/// <summary>
+		/// Holds whether to display battery level or not.
+		/// </summary>
+		bool? IsHidden { get; }
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/Drive.cs b/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/Drive.cs
index 3893c6c..fc6962e 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/Drive.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/Drive.cs
@@ -3,60 +3,60 @@ using TINK.Model.Bikes.BikeInfoNS.DriveNS.EngineNS;
 
 namespace TINK.Model.Bikes.BikeInfoNS.DriveNS
 {
-    public enum DriveType
-    {
-        /// <summary>
-        /// Bike without pedalling aid.
-        /// </summary>
-        SoleHumanPowered,
+	public enum DriveType
+	{
+		/// <summary>
+		/// Bike without pedalling aid.
+		/// </summary>
+		SoleHumanPowered,
 
-        /// <summary>
-        /// pedal electric cycle: Pedalling is assisted by an electric engine.
-        /// </summary>
-        Pedelec
-    }
+		/// <summary>
+		/// pedal electric cycle: Pedalling is assisted by an electric engine.
+		/// </summary>
+		Pedelec
+	}
 
-    public class Drive
-    {
-        public Drive(
-            IEngine engine = null,
-            IBattery battery = null)
-        {
-            if (engine == null)
-            {
-                Engine = new Engine();
-                Battery = new Battery.Builder().Build();
-                Type = DriveType.SoleHumanPowered;
-                return;
-            }
+	public class Drive
+	{
+		public Drive(
+			IEngine engine = null,
+			IBattery battery = null)
+		{
+			if (engine == null)
+			{
+				Engine = new Engine();
+				Battery = new Battery.Builder().Build();
+				Type = DriveType.SoleHumanPowered;
+				return;
+			}
 
-            Engine = engine;
-            Battery = battery ?? new Battery.Builder().Build();
-            Type = DriveType.Pedelec;
-        }
+			Engine = engine;
+			Battery = battery ?? new Battery.Builder().Build();
+			Type = DriveType.Pedelec;
+		}
 
-        /// <summary>
-        /// Gets the type of the drive.
-        /// </summary>
-        public DriveType Type { get; private set; }
+		/// <summary>
+		/// Gets the type of the drive.
+		/// </summary>
+		public DriveType Type { get; private set; }
 
-        /// <summary>
-        /// Engine driving the bike.
-        /// </summary>
-        public IEngine Engine { get; private set; }
+		/// <summary>
+		/// Engine driving the bike.
+		/// </summary>
+		public IEngine Engine { get; private set; }
 
-        /// <summary>
-        /// Battery powering the engine.
-        /// </summary>
-        public IBattery _Battery = new Battery.Builder().Build();
+		/// <summary>
+		/// Battery powering the engine.
+		/// </summary>
+		public IBattery _Battery = new Battery.Builder().Build();
 
-        /// <summary>
-        /// Battery powering the engine.
-        /// </summary>
-        public IBattery Battery
-        {
-            get => _Battery;
-            set => _Battery = value ?? new Battery.Builder().Build();
-        }
-    }
+		/// <summary>
+		/// Battery powering the engine.
+		/// </summary>
+		public IBattery Battery
+		{
+			get => _Battery;
+			set => _Battery = value ?? new Battery.Builder().Build();
+		}
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/EngineNS/Engine.cs b/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/EngineNS/Engine.cs
index 2fad306..1e7f094 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/EngineNS/Engine.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/EngineNS/Engine.cs
@@ -1,13 +1,13 @@
 namespace TINK.Model.Bikes.BikeInfoNS.DriveNS.EngineNS
 {
-    public class Engine : IEngine
-    {
-        public Engine(string manufacturer = null)
-            => Manufacturer = !string.IsNullOrEmpty(manufacturer) ? manufacturer : null;
+	public class Engine : IEngine
+	{
+		public Engine(string manufacturer = null)
+			=> Manufacturer = !string.IsNullOrEmpty(manufacturer) ? manufacturer : null;
 
-        /// <summary>
-        /// Manufacturer of the engine.
-        /// </summary>
-        public string Manufacturer { get; private set; } = null;
-    }
+		/// <summary>
+		/// Manufacturer of the engine.
+		/// </summary>
+		public string Manufacturer { get; private set; } = null;
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/EngineNS/IEngine.cs b/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/EngineNS/IEngine.cs
index a405da1..9ef46f3 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/EngineNS/IEngine.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/EngineNS/IEngine.cs
@@ -1,10 +1,10 @@
 namespace TINK.Model.Bikes.BikeInfoNS.DriveNS.EngineNS
 {
-    public interface IEngine
-    {
-        /// <summary>
-        /// Manufacturer of the engine.
-        /// </summary>
-        string Manufacturer { get; }
-    }
+	public interface IEngine
+	{
+		/// <summary>
+		/// Manufacturer of the engine.
+		/// </summary>
+		string Manufacturer { get; }
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/IDrive.cs b/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/IDrive.cs
index 8b4eb41..bad9e10 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/IDrive.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/IDrive.cs
@@ -3,21 +3,21 @@ using TINK.Model.Bikes.BikeInfoNS.DriveNS.EngineNS;
 
 namespace TINK.Model.Bikes.BikeInfoNS
 {
-    public interface IDrive
-    {
-        /// <summary>
-        /// Gets the type of the drive.
-        /// </summary>
-        DriveNS.DriveType Type { get; }
+	public interface IDrive
+	{
+		/// <summary>
+		/// Gets the type of the drive.
+		/// </summary>
+		DriveNS.DriveType Type { get; }
 
-        /// <summary>
-        /// Engine driving the bike.
-        /// </summary>
-        IEngine Engine { get; }
+		/// <summary>
+		/// Engine driving the bike.
+		/// </summary>
+		IEngine Engine { get; }
 
-        /// <summary>
-        /// Battery powering the engine.
-        /// </summary>
-        IBattery Battery { get; }
-    }
+		/// <summary>
+		/// Battery powering the engine.
+		/// </summary>
+		IBattery Battery { get; }
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/RentalDescription.cs b/TINKLib/Model/Bikes/BikeInfoNS/RentalDescription.cs
index 9efa32c..e39731b 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/RentalDescription.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/RentalDescription.cs
@@ -2,46 +2,46 @@
 
 namespace TINK.Model.Bikes.BikeInfoNS
 {
-    /// <summary>
-    /// Successor of TarifDescription- object.
-    /// Manages tariff- and rental info.
-    /// </summary>
-    public class RentalDescription
-    {
-        /// <summary>
-        /// The different elements of a tariff (example: "Max Gebühr", )
-        /// </summary>
-        public class TariffElement
-        {
-            /// <summary>
-            /// Describes the tariff element. To be displayed to user (example of elements: "Gratis Mietzeit", "Mietgebühr", "Max Gebühr").
-            /// </summary>
-            public string Description { get; set; } = string.Empty;
+	/// <summary>
+	/// Successor of TarifDescription- object.
+	/// Manages tariff- and rental info.
+	/// </summary>
+	public class RentalDescription
+	{
+		/// <summary>
+		/// The different elements of a tariff (example: "Max Gebühr", )
+		/// </summary>
+		public class TariffElement
+		{
+			/// <summary>
+			/// Describes the tariff element. To be displayed to user (example of elements: "Gratis Mietzeit", "Mietgebühr", "Max Gebühr").
+			/// </summary>
+			public string Description { get; set; } = string.Empty;
 
-            /// <summary>
-            /// Holds the tariff element value. To be displayed to user (example: "9.00 € / Tag").
-            /// </summary>
-            public string Value { get; set; } = string.Empty;
-        }
+			/// <summary>
+			/// Holds the tariff element value. To be displayed to user (example: "9.00 € / Tag").
+			/// </summary>
+			public string Value { get; set; } = string.Empty;
+		}
 
-        public class InfoElement
-        {
-            public string Key { get; set; }
-            public string Value { get; set; }
-        }
+		public class InfoElement
+		{
+			public string Key { get; set; }
+			public string Value { get; set; }
+		}
 
-        /// <summary>
-        /// Name of the tariff.
-        /// </summary>
-        public string Name { get; set; } = string.Empty;
+		/// <summary>
+		/// Name of the tariff.
+		/// </summary>
+		public string Name { get; set; } = string.Empty;
 
-        /// <summary>
-        /// Number of the tariff.
-        /// </summary>
-        public int? Id { get; set; }
+		/// <summary>
+		/// Number of the tariff.
+		/// </summary>
+		public int? Id { get; set; }
 
-        public Dictionary<string, TariffElement> TariffEntries { get; set; } = new Dictionary<string, TariffElement>();
+		public Dictionary<string, TariffElement> TariffEntries { get; set; } = new Dictionary<string, TariffElement>();
 
-        public Dictionary<string, InfoElement> InfoEntries { get; set; } = new Dictionary<string, InfoElement>();
-    }
+		public Dictionary<string, InfoElement> InfoEntries { get; set; } = new Dictionary<string, InfoElement>();
+	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/TariffDescription.cs b/TINKLib/Model/Bikes/BikeInfoNS/TariffDescription.cs
index 7c2fbfa..d7dd80f 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/TariffDescription.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/TariffDescription.cs
@@ -2,9 +2,9 @@
 
 namespace TINK.Model.Bikes.BikeInfoNS
 {
-    /// <summary>
-    /// Holds tariff info for a single bike.
-    /// </summary>
+	/// <summary>
+	/// Holds tariff info for a single bike.
+	/// </summary>
 #if USCSHARP9
     public record TariffDescription
    {
@@ -39,44 +39,44 @@ namespace TINK.Model.Bikes.BikeInfoNS
         public double MaxFeeEuroPerDay { get; init; }
     }
 #else
-    public class TariffDescription
-    {
-        /// <summary>
-        /// Name of the tariff.
-        /// </summary>
-        public string Name { get; set; }
+	public class TariffDescription
+	{
+		/// <summary>
+		/// Name of the tariff.
+		/// </summary>
+		public string Name { get; set; }
 
-        /// <summary>
-        /// Number of the tariff.
-        /// </summary>
-        public int? Number { get; set; }
+		/// <summary>
+		/// Number of the tariff.
+		/// </summary>
+		public int? Number { get; set; }
 
-        /// <summary>
-        /// Costs per hour in euro.
-        /// </summary>
-        public double FeeEuroPerHour { get; set; }
+		/// <summary>
+		/// Costs per hour in euro.
+		/// </summary>
+		public double FeeEuroPerHour { get; set; }
 
-        /// <summary>
-        /// Costs of the abo per month.
-        /// </summary>
-        public double AboEuroPerMonth { get; set; }
+		/// <summary>
+		/// Costs of the abo per month.
+		/// </summary>
+		public double AboEuroPerMonth { get; set; }
 
-        /// <summary>
-        /// Costs per hour in euro.
-        /// </summary>
-        public TimeSpan FreeTimePerSession { get; set; }
+		/// <summary>
+		/// Costs per hour in euro.
+		/// </summary>
+		public TimeSpan FreeTimePerSession { get; set; }
 
-        /// <summary>
-        /// Max. costs per day in euro.
-        /// </summary>
-        public double MaxFeeEuroPerDay { get; set; }
+		/// <summary>
+		/// Max. costs per day in euro.
+		/// </summary>
+		public double MaxFeeEuroPerDay { get; set; }
 
-        /// <summary> Info about operator agb as HTML (i.g. text and hyperlink). </summary>
-        public string OperatorAgb { get; set; }
+		/// <summary> Info about operator agb as HTML (i.g. text and hyperlink). </summary>
+		public string OperatorAgb { get; set; }
 
-        /// <summary> Text which informs users about GPS tracking if tracking is on. </summary>
-        public string TrackingInfo { get; set; }
+		/// <summary> Text which informs users about GPS tracking if tracking is on. </summary>
+		public string TrackingInfo { get; set; }
 
-    }
+	}
 #endif
 }
diff --git a/TINKLib/Model/Bikes/IBikeCollection.cs b/TINKLib/Model/Bikes/IBikeCollection.cs
index 5dc4461..f8cf387 100644
--- a/TINKLib/Model/Bikes/IBikeCollection.cs
+++ b/TINKLib/Model/Bikes/IBikeCollection.cs
@@ -2,34 +2,34 @@
 
 namespace TINK.Model.Bikes
 {
-    public interface IBikeDictionary<T> : IReadOnlyCollection<T>
-    {
-        /// <summary>
-        /// Gets a bike by its id.  
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        T GetById(string id);
+	public interface IBikeDictionary<T> : IReadOnlyCollection<T>
+	{
+		/// <summary>
+		/// Gets a bike by its id.  
+		/// </summary>
+		/// <param name="id"></param>
+		/// <returns></returns>
+		T GetById(string id);
 
-        /// <summary>
-        /// Deteermines whether a bike by given key exists.
-        /// </summary>
-        /// <param name="p_strKey">Key to check.</param>
-        /// <returns>True if bike exists.</returns>
-        bool ContainsKey(string id);
-    }
-    public interface IBikeDictionaryMutable<T> : IBikeDictionary<T>
-    {
-        /// <summary>
-        /// Removes a bike by its id.
-        /// </summary>
-        /// <param name="id">Id of bike to be removed.</param>
-        void RemoveById(string id);
+		/// <summary>
+		/// Deteermines whether a bike by given key exists.
+		/// </summary>
+		/// <param name="p_strKey">Key to check.</param>
+		/// <returns>True if bike exists.</returns>
+		bool ContainsKey(string id);
+	}
+	public interface IBikeDictionaryMutable<T> : IBikeDictionary<T>
+	{
+		/// <summary>
+		/// Removes a bike by its id.
+		/// </summary>
+		/// <param name="id">Id of bike to be removed.</param>
+		void RemoveById(string id);
 
-        /// <summary>
-        /// Adds a new element to dictinary.
-        /// </summary>
-        /// <param name="newElement">New element to add.</param>
-        void Add(T newElement);
-    }
+		/// <summary>
+		/// Adds a new element to dictinary.
+		/// </summary>
+		/// <param name="newElement">New element to add.</param>
+		void Add(T newElement);
+	}
 }
diff --git a/TINKLib/Model/BookingFinishedModel.cs b/TINKLib/Model/BookingFinishedModel.cs
index 3d7f1b9..e8fa25e 100644
--- a/TINKLib/Model/BookingFinishedModel.cs
+++ b/TINKLib/Model/BookingFinishedModel.cs
@@ -2,16 +2,16 @@
 
 namespace TINK.Model
 {
-    /// <summary>
-    /// Holds tasks to be accoumplished/ information shown to user after booking has finished.
-    /// </summary>
-    public class BookingFinishedModel : IBookingFinishedModel
-    {
-        /// <summary> Minisurvey to query user.</summary>
-        public IMiniSurveyModel MiniSurvey { get; set; } = new MiniSurveyModel();
+	/// <summary>
+	/// Holds tasks to be accoumplished/ information shown to user after booking has finished.
+	/// </summary>
+	public class BookingFinishedModel : IBookingFinishedModel
+	{
+		/// <summary> Minisurvey to query user.</summary>
+		public IMiniSurveyModel MiniSurvey { get; set; } = new MiniSurveyModel();
 
-        /// <summary> Holds info about co2 saving accomplished by using cargo bike. </summary>
-        public string Co2Saving { get; set; }
+		/// <summary> Holds info about co2 saving accomplished by using cargo bike. </summary>
+		public string Co2Saving { get; set; }
 
-    }
+	}
 }
diff --git a/TINKLib/Model/Connector/Command/Command.cs b/TINKLib/Model/Connector/Command/Command.cs
index 8b30e7a..db9a38a 100644
--- a/TINKLib/Model/Connector/Command/Command.cs
+++ b/TINKLib/Model/Connector/Command/Command.cs
@@ -11,177 +11,177 @@ using TINK.Repository.Response;
 
 namespace TINK.Model.Connector
 {
-    public class Command : Base, ICommand
-    {
-        /// <summary> True if connector has access to copri server, false if cached values are used. </summary>
-        public bool IsConnected => CopriServer.IsConnected;
+	public class Command : Base, ICommand
+	{
+		/// <summary> True if connector has access to copri server, false if cached values are used. </summary>
+		public bool IsConnected => CopriServer.IsConnected;
 
-        /// <summary> No user is logged in.</summary>
-        public string SessionCookie => null;
+		/// <summary> No user is logged in.</summary>
+		public string SessionCookie => null;
 
-        /// <summary> Is raised whenever login state has changed.</summary>
-        public event LoginStateChangedEventHandler LoginStateChanged;
+		/// <summary> Is raised whenever login state has changed.</summary>
+		public event LoginStateChangedEventHandler LoginStateChanged;
 
-        /// <summary>Constructs a copri query object.</summary>
-        /// <param name="p_oCopriServer">Server which implements communication.</param>
-        public Command(
-            ICopriServerBase p_oCopriServer) : base(p_oCopriServer)
-        {
-        }
+		/// <summary>Constructs a copri query object.</summary>
+		/// <param name="p_oCopriServer">Server which implements communication.</param>
+		public Command(
+			ICopriServerBase p_oCopriServer) : base(p_oCopriServer)
+		{
+		}
 
-        /// <summary>
-        /// Logs user in.
-        /// If log in succeeds either and session might be updated if it was no more valid (logged in by an different device).
-        /// If log in fails (password modified) session cookie is set to empty.
-        /// If communication fails an exception is thrown.
-        /// </summary>
-        public async Task<IAccount> DoLogin(
-            string mail,
-            string password,
-            string deviceId)
-        {
-            if (string.IsNullOrEmpty(mail))
-            {
-                throw new ArgumentNullException("Can not loging user. Mail address must not be null or empty.");
-            }
+		/// <summary>
+		/// Logs user in.
+		/// If log in succeeds either and session might be updated if it was no more valid (logged in by an different device).
+		/// If log in fails (password modified) session cookie is set to empty.
+		/// If communication fails an exception is thrown.
+		/// </summary>
+		public async Task<IAccount> DoLogin(
+			string mail,
+			string password,
+			string deviceId)
+		{
+			if (string.IsNullOrEmpty(mail))
+			{
+				throw new ArgumentNullException("Can not loging user. Mail address must not be null or empty.");
+			}
 
-            if (string.IsNullOrEmpty(password))
-            {
-                throw new ArgumentNullException("Can not loging user. Password must not be null or empty.");
-            }
+			if (string.IsNullOrEmpty(password))
+			{
+				throw new ArgumentNullException("Can not loging user. Password must not be null or empty.");
+			}
 
-            if (string.IsNullOrEmpty(deviceId))
-            {
-                throw new ArgumentNullException("Can not loging user. Device not be null or empty.");
-            }
+			if (string.IsNullOrEmpty(deviceId))
+			{
+				throw new ArgumentNullException("Can not loging user. Device not be null or empty.");
+			}
 
-            AuthorizationResponse response;
-            try
-            {
-                response = (await CopriServer.DoAuthorizationAsync(mail, password, deviceId)).GetIsResponseOk(mail);
-            }
-            catch (Exception)
-            {
-                throw;
-            }
+			AuthorizationResponse response;
+			try
+			{
+				response = (await CopriServer.DoAuthorizationAsync(mail, password, deviceId)).GetIsResponseOk(mail);
+			}
+			catch (Exception)
+			{
+				throw;
+			}
 
-            var l_oAccount = response.GetAccount(MerchantId, mail, password);
+			var l_oAccount = response.GetAccount(MerchantId, mail, password);
 
-            // Log in state changes. Notify parent object to update.
-            LoginStateChanged?.Invoke(this, new LoginStateChangedEventArgs(l_oAccount.SessionCookie, l_oAccount.Mail));
+			// Log in state changes. Notify parent object to update.
+			LoginStateChanged?.Invoke(this, new LoginStateChangedEventArgs(l_oAccount.SessionCookie, l_oAccount.Mail));
 
-            return l_oAccount;
-        }
+			return l_oAccount;
+		}
 
-        /// <summary> Logs user out. </summary>
-        public async Task DoLogout()
-        {
-            Log.ForContext<Command>().Error("Unexpected log out request detected. No user logged in.");
-            await Task.CompletedTask;
-        }
+		/// <summary> Logs user out. </summary>
+		public async Task DoLogout()
+		{
+			Log.ForContext<Command>().Error("Unexpected log out request detected. No user logged in.");
+			await Task.CompletedTask;
+		}
 
-        /// <summary>
-        /// Request to reserve a bike.
-        /// </summary>
-        /// <param name="bike">Bike to book.</param>
-        public async Task DoReserve(
-           Bikes.BikeInfoNS.BC.IBikeInfoMutable bike)
-        {
-            Log.ForContext<Command>().Error("Unexpected booking request detected. No user logged in.");
-            await Task.CompletedTask;
-        }
+		/// <summary>
+		/// Request to reserve a bike.
+		/// </summary>
+		/// <param name="bike">Bike to book.</param>
+		public async Task DoReserve(
+		   Bikes.BikeInfoNS.BC.IBikeInfoMutable bike)
+		{
+			Log.ForContext<Command>().Error("Unexpected booking request detected. No user logged in.");
+			await Task.CompletedTask;
+		}
 
-        /// <summary> Request to cancel a reservation.</summary>
-        /// <param name="p_oBike">Bike to book.</param>
-        public async Task DoCancelReservation(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike)
-        {
-            Log.ForContext<Command>().Error("Unexpected cancel reservation request detected. No user logged in.");
-            await Task.CompletedTask;
-        }
+		/// <summary> Request to cancel a reservation.</summary>
+		/// <param name="p_oBike">Bike to book.</param>
+		public async Task DoCancelReservation(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike)
+		{
+			Log.ForContext<Command>().Error("Unexpected cancel reservation request detected. No user logged in.");
+			await Task.CompletedTask;
+		}
 
-        /// <summary> Get authentication keys.</summary>
-        /// <param name="bike">Bike to book.</param>
-        public async Task CalculateAuthKeys(Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMutable bike)
-        {
-            Log.ForContext<Command>().Error("Unexpected request to get authenticatin keys detected. No user logged in.");
-            await Task.CompletedTask;
-        }
+		/// <summary> Get authentication keys.</summary>
+		/// <param name="bike">Bike to book.</param>
+		public async Task CalculateAuthKeys(Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMutable bike)
+		{
+			Log.ForContext<Command>().Error("Unexpected request to get authenticatin keys detected. No user logged in.");
+			await Task.CompletedTask;
+		}
 
-        /// <summary> Updates COPRI lock state for a booked bike. </summary>
-        /// <param name="bike">Bike to update locking state for.</param>
-        /// <param name="location">Location where lock was opened/ changed.</param>
-        /// <returns>Response on updating locking state.</returns>
-        public async Task StartReturningBike(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike)
-        {
-            Log.ForContext<Command>().Error("Unexpected request to notify about start of returning bike. No user logged in.");
-            await Task.CompletedTask;
-        }
+		/// <summary> Updates COPRI lock state for a booked bike. </summary>
+		/// <param name="bike">Bike to update locking state for.</param>
+		/// <param name="location">Location where lock was opened/ changed.</param>
+		/// <returns>Response on updating locking state.</returns>
+		public async Task StartReturningBike(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike)
+		{
+			Log.ForContext<Command>().Error("Unexpected request to notify about start of returning bike. No user logged in.");
+			await Task.CompletedTask;
+		}
 
-        /// <summary> Notifies COPRI about start of returning sequence. </summary>
-        /// <remarks> Operator specific call.</remarks>
-        /// <param name="bike">Bike to return.</param>
-        /// <returns>Response on notification about start of returning sequence.</returns>
-        public async Task UpdateLockingStateAsync(Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMutable bike, LocationDto location)
-        {
-            Log.ForContext<Command>().Error("Unexpected request to update locking state detected. No user logged in.");
-            await Task.CompletedTask;
-        }
+		/// <summary> Notifies COPRI about start of returning sequence. </summary>
+		/// <remarks> Operator specific call.</remarks>
+		/// <param name="bike">Bike to return.</param>
+		/// <returns>Response on notification about start of returning sequence.</returns>
+		public async Task UpdateLockingStateAsync(Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMutable bike, LocationDto location)
+		{
+			Log.ForContext<Command>().Error("Unexpected request to update locking state detected. No user logged in.");
+			await Task.CompletedTask;
+		}
 
-        public async Task DoBook(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike)
-        {
-            Log.ForContext<Command>().Error("Unexpected booking request detected. No user logged in.");
-            await Task.CompletedTask;
-        }
+		public async Task DoBook(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike)
+		{
+			Log.ForContext<Command>().Error("Unexpected booking request detected. No user logged in.");
+			await Task.CompletedTask;
+		}
 
-        public async Task BookAndOpenAync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike)
-        {
-            Log.ForContext<Command>().Error("Unexpected request to book and open bike detected. No user logged in.");
-            await Task.CompletedTask;
-        }
+		public async Task BookAndOpenAync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike)
+		{
+			Log.ForContext<Command>().Error("Unexpected request to book and open bike detected. No user logged in.");
+			await Task.CompletedTask;
+		}
 
-        public async Task<BookingFinishedModel> DoReturn(
-            Bikes.BikeInfoNS.BC.IBikeInfoMutable bike,
-            LocationDto location,
-            ISmartDevice smartDevice)
-        {
-            Log.ForContext<Command>().Error("Unexpected returning request detected. No user logged in.");
-            return await Task.FromResult(new BookingFinishedModel());
-        }
+		public async Task<BookingFinishedModel> DoReturn(
+			Bikes.BikeInfoNS.BC.IBikeInfoMutable bike,
+			LocationDto location,
+			ISmartDevice smartDevice)
+		{
+			Log.ForContext<Command>().Error("Unexpected returning request detected. No user logged in.");
+			return await Task.FromResult(new BookingFinishedModel());
+		}
 
-        public async Task<BookingFinishedModel> ReturnAndCloseAsync(
-            Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike,
-            ISmartDevice smartDevice)
-        {
-            Log.ForContext<Command>().Error("Unexpected close lock and return request detected. No user logged in.");
-            return await Task.FromResult(new BookingFinishedModel());
-        }
+		public async Task<BookingFinishedModel> ReturnAndCloseAsync(
+			Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike,
+			ISmartDevice smartDevice)
+		{
+			Log.ForContext<Command>().Error("Unexpected close lock and return request detected. No user logged in.");
+			return await Task.FromResult(new BookingFinishedModel());
+		}
 
-        /// <summary>
-        /// Submits feedback to copri server.
-        /// </summary>
-        /// <param name="userFeedback">Feedback to submit.</param>
+		/// <summary>
+		/// Submits feedback to copri server.
+		/// </summary>
+		/// <param name="userFeedback">Feedback to submit.</param>
 #if USCSHARP9
         public async Task DoSubmitFeedback(ICommand.IUserFeedback userFeedback, Uri opertorUri)
 #else
-        public async Task DoSubmitFeedback(IUserFeedback userFeedback, Uri opertorUri)
+		public async Task DoSubmitFeedback(IUserFeedback userFeedback, Uri opertorUri)
 #endif
-        {
-            Log.ForContext<Command>().Error("Unexpected submit feedback request detected. No user logged in.");
-            await Task.CompletedTask;
-        }
+		{
+			Log.ForContext<Command>().Error("Unexpected submit feedback request detected. No user logged in.");
+			await Task.CompletedTask;
+		}
 
-        /// <summary> Submits mini survey to copri server. </summary>
-        /// <param name="answers">Collection of answers.</param>
-        public async Task DoSubmitMiniSurvey(IDictionary<string, string> answers)
-        {
-            Log.ForContext<Command>().Error("Unexpected submit mini survey request detected. No user logged in.");
-            await Task.CompletedTask;
-        }
+		/// <summary> Submits mini survey to copri server. </summary>
+		/// <param name="answers">Collection of answers.</param>
+		public async Task DoSubmitMiniSurvey(IDictionary<string, string> answers)
+		{
+			Log.ForContext<Command>().Error("Unexpected submit mini survey request detected. No user logged in.");
+			await Task.CompletedTask;
+		}
 
-        public Task OpenLockAsync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike)
-            => throw new NotImplementedException();
+		public Task OpenLockAsync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike)
+			=> throw new NotImplementedException();
 
-        public Task CloseLockAsync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike)
-            => throw new NotImplementedException();
-    }
+		public Task CloseLockAsync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike)
+			=> throw new NotImplementedException();
+	}
 }
\ No newline at end of file
diff --git a/TINKLib/Model/Connector/Command/CommandLoggedIn.cs b/TINKLib/Model/Connector/Command/CommandLoggedIn.cs
index 91ffa1b..4b83fae 100644
--- a/TINKLib/Model/Connector/Command/CommandLoggedIn.cs
+++ b/TINKLib/Model/Connector/Command/CommandLoggedIn.cs
@@ -13,311 +13,311 @@ using TINK.Services.CopriApi;
 
 namespace TINK.Model.Connector
 {
-    public class CommandLoggedIn : BaseLoggedIn, ICommand
-    {
-        /// <summary> True if connector has access to copri server, false if cached values are used. </summary>
-        public bool IsConnected => CopriServer.IsConnected;
+	public class CommandLoggedIn : BaseLoggedIn, ICommand
+	{
+		/// <summary> True if connector has access to copri server, false if cached values are used. </summary>
+		public bool IsConnected => CopriServer.IsConnected;
 
-        /// <summary> Is raised whenever login state has changed.</summary>
-        public event LoginStateChangedEventHandler LoginStateChanged;
+		/// <summary> Is raised whenever login state has changed.</summary>
+		public event LoginStateChangedEventHandler LoginStateChanged;
 
-        /// <summary>Constructs a copri query object.</summary>
-        /// <param name="p_oCopriServer">Server which implements communication.</param>
-        public CommandLoggedIn(ICopriServerBase p_oCopriServer,
-            string sessionCookie,
-            string mail,
-            Func<DateTime> dateTimeProvider) : base(p_oCopriServer, sessionCookie, mail, dateTimeProvider)
-        {
-        }
+		/// <summary>Constructs a copri query object.</summary>
+		/// <param name="p_oCopriServer">Server which implements communication.</param>
+		public CommandLoggedIn(ICopriServerBase p_oCopriServer,
+			string sessionCookie,
+			string mail,
+			Func<DateTime> dateTimeProvider) : base(p_oCopriServer, sessionCookie, mail, dateTimeProvider)
+		{
+		}
 
-        /// <summary>
-        /// Logs user in.
-        /// If log in succeeds either and session might be updated if it was no more valid (logged in by an different device).
-        /// If log in fails (password modified) session cookie is set to empty.
-        /// If communication fails an TINK.Repository.Exception is thrown.
-        /// </summary>
-        /// <param name="p_oAccount">Account to use for login.</param>
-        public Task<IAccount> DoLogin(string mail, string password, string deviceId)
-        {
-            if (string.IsNullOrEmpty(mail))
-            {
-                throw new ArgumentNullException("Can not loging user. Mail address must not be null or empty.");
-            }
+		/// <summary>
+		/// Logs user in.
+		/// If log in succeeds either and session might be updated if it was no more valid (logged in by an different device).
+		/// If log in fails (password modified) session cookie is set to empty.
+		/// If communication fails an TINK.Repository.Exception is thrown.
+		/// </summary>
+		/// <param name="p_oAccount">Account to use for login.</param>
+		public Task<IAccount> DoLogin(string mail, string password, string deviceId)
+		{
+			if (string.IsNullOrEmpty(mail))
+			{
+				throw new ArgumentNullException("Can not loging user. Mail address must not be null or empty.");
+			}
 
-            throw new Exception($"Fehler beim Anmelden von unter {mail}. Benutzer {Mail} ist bereits angemeldet.");
-        }
+			throw new Exception($"Fehler beim Anmelden von unter {mail}. Benutzer {Mail} ist bereits angemeldet.");
+		}
 
-        /// <summary> Logs user out. </summary>
-        public async Task DoLogout()
-        {
-            AuthorizationoutResponse l_oResponse = null;
-            try
-            {
-                l_oResponse = (await CopriServer.DoAuthoutAsync()).GetIsResponseOk();
-            }
-            catch (AuthcookieNotDefinedException)
-            {
-                // Cookie is no more defined, i.e. no need to logout user at copri because user is already logged out.
-                // Just ignore this error.
-                // User logged out, log in state changed. Notify parent object to update.
-                LoginStateChanged?.Invoke(this, new LoginStateChangedEventArgs());
-                return;
-            }
-            catch (Exception)
-            {
-                throw;
-            }
+		/// <summary> Logs user out. </summary>
+		public async Task DoLogout()
+		{
+			AuthorizationoutResponse l_oResponse = null;
+			try
+			{
+				l_oResponse = (await CopriServer.DoAuthoutAsync()).GetIsResponseOk();
+			}
+			catch (AuthcookieNotDefinedException)
+			{
+				// Cookie is no more defined, i.e. no need to logout user at copri because user is already logged out.
+				// Just ignore this error.
+				// User logged out, log in state changed. Notify parent object to update.
+				LoginStateChanged?.Invoke(this, new LoginStateChangedEventArgs());
+				return;
+			}
+			catch (Exception)
+			{
+				throw;
+			}
 
-            // User logged out, log in state changed. Notify parent object to update.
-            LoginStateChanged?.Invoke(this, new LoginStateChangedEventArgs());
-        }
+			// User logged out, log in state changed. Notify parent object to update.
+			LoginStateChanged?.Invoke(this, new LoginStateChangedEventArgs());
+		}
 
-        /// <summary>
-        /// Request to reserve a bike.
-        /// </summary>
-        /// <param name="bike">Bike to book.</param>
-        public async Task DoReserve(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike)
-        {
-            if (bike == null)
-            {
-                throw new ArgumentNullException("Can not reserve bike. No bike object available.");
-            }
+		/// <summary>
+		/// Request to reserve a bike.
+		/// </summary>
+		/// <param name="bike">Bike to book.</param>
+		public async Task DoReserve(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike)
+		{
+			if (bike == null)
+			{
+				throw new ArgumentNullException("Can not reserve bike. No bike object available.");
+			}
 
-            BikeInfoReservedOrBooked response;
-            try
-            {
-                response = (await CopriServer.DoReserveAsync(bike.Id, bike.OperatorUri)).GetIsReserveResponseOk(bike.Id);
-            }
-            catch (Exception)
-            {
-                // Exception was not expected or too many subsequent excepitons detected.
-                throw;
-            }
+			BikeInfoReservedOrBooked response;
+			try
+			{
+				response = (await CopriServer.DoReserveAsync(bike.Id, bike.OperatorUri)).GetIsReserveResponseOk(bike.Id);
+			}
+			catch (Exception)
+			{
+				// Exception was not expected or too many subsequent excepitons detected.
+				throw;
+			}
 
-            bike.Load(response, Mail, Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.None);
-        }
+			bike.Load(response, Mail, Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.None);
+		}
 
-        /// <summary> Request to cancel a reservation.</summary>
-        /// <param name="bike">Bike to cancel reservation.</param>
-        public async Task DoCancelReservation(
-            Bikes.BikeInfoNS.BC.IBikeInfoMutable bike)
-        {
-            if (bike == null)
-            {
-                throw new ArgumentNullException("Can not cancel reservation of bike. No bike object available.");
-            }
+		/// <summary> Request to cancel a reservation.</summary>
+		/// <param name="bike">Bike to cancel reservation.</param>
+		public async Task DoCancelReservation(
+			Bikes.BikeInfoNS.BC.IBikeInfoMutable bike)
+		{
+			if (bike == null)
+			{
+				throw new ArgumentNullException("Can not cancel reservation of bike. No bike object available.");
+			}
 
-            ReservationCancelReturnResponse response;
-            try
-            {
-                response = (await CopriServer.DoCancelReservationAsync(bike.Id, bike.OperatorUri)).GetIsCancelReservationResponseOk(bike.Id);
-            }
-            catch (Exception)
-            {
-                // Exception was not expected or too many subsequent excepitons detected.
-                throw;
-            }
+			ReservationCancelReturnResponse response;
+			try
+			{
+				response = (await CopriServer.DoCancelReservationAsync(bike.Id, bike.OperatorUri)).GetIsCancelReservationResponseOk(bike.Id);
+			}
+			catch (Exception)
+			{
+				// Exception was not expected or too many subsequent excepitons detected.
+				throw;
+			}
 
-            bike.Load(Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.None);
-        }
+			bike.Load(Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.None);
+		}
 
-        /// <summary> Get authentication keys.</summary>
-        /// <param name="bike">Bike to get new keys for.</param>
-        public async Task CalculateAuthKeys(Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMutable bike)
-        {
-            if (bike == null)
-            {
-                throw new ArgumentNullException("Can not calculate auth keys. No bike object available.");
-            }
+		/// <summary> Get authentication keys.</summary>
+		/// <param name="bike">Bike to get new keys for.</param>
+		public async Task CalculateAuthKeys(Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMutable bike)
+		{
+			if (bike == null)
+			{
+				throw new ArgumentNullException("Can not calculate auth keys. No bike object available.");
+			}
 
-            switch (bike.State.Value)
-            {
-                case State.InUseStateEnum.Reserved:
-                case State.InUseStateEnum.Booked:
-                    break;
+			switch (bike.State.Value)
+			{
+				case State.InUseStateEnum.Reserved:
+				case State.InUseStateEnum.Booked:
+					break;
 
-                default:
-                    throw new ArgumentNullException($"Can not calculate auth keys. Unexpected bike state {bike.State.Value} detected.");
-            }
+				default:
+					throw new ArgumentNullException($"Can not calculate auth keys. Unexpected bike state {bike.State.Value} detected.");
+			}
 
-            BikeInfoReservedOrBooked response;
-            Guid guid = (bike is BikeInfoMutable btBike) ? btBike.LockInfo.Guid : new Guid();
-            try
-            {
-                response = (await CopriServer.CalculateAuthKeysAsync(bike.Id, bike.OperatorUri)).GetIsBookingResponseOk(bike.Id);
-            }
-            catch (Exception)
-            {
-                // Exception was not expected or too many subsequent excepitons detected.
-                throw;
-            }
+			BikeInfoReservedOrBooked response;
+			Guid guid = (bike is BikeInfoMutable btBike) ? btBike.LockInfo.Guid : new Guid();
+			try
+			{
+				response = (await CopriServer.CalculateAuthKeysAsync(bike.Id, bike.OperatorUri)).GetIsBookingResponseOk(bike.Id);
+			}
+			catch (Exception)
+			{
+				// Exception was not expected or too many subsequent excepitons detected.
+				throw;
+			}
 
-            UpdaterJSON.Load(
-                bike,
-                response,
-                Mail,
-                Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.None);
-        }
+			UpdaterJSON.Load(
+				bike,
+				response,
+				Mail,
+				Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.None);
+		}
 
-        /// <summary> Notifies COPRI about start of returning sequence. </summary>
-        /// <remarks> Operator specific call.</remarks>
-        /// <param name="bike">Bike to return.</param>
-        /// <returns>Response on notification about start of returning sequence.</returns>
-        public async Task StartReturningBike(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike)
-        {
-            if (bike == null)
-            {
-                throw new ArgumentNullException("Can not notify about start returning bike. No bike object available.");
-            }
+		/// <summary> Notifies COPRI about start of returning sequence. </summary>
+		/// <remarks> Operator specific call.</remarks>
+		/// <param name="bike">Bike to return.</param>
+		/// <returns>Response on notification about start of returning sequence.</returns>
+		public async Task StartReturningBike(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike)
+		{
+			if (bike == null)
+			{
+				throw new ArgumentNullException("Can not notify about start returning bike. No bike object available.");
+			}
 
-            try
-            {
-                (await CopriServer.StartReturningBike(
-                    bike.Id,
-                    bike.OperatorUri)).GetIsResponseOk("Start returning bike");
-            }
-            catch (Exception)
-            {
-                // Exception was not expected or too many subsequent excepitons detected.
-                throw;
-            }
+			try
+			{
+				(await CopriServer.StartReturningBike(
+					bike.Id,
+					bike.OperatorUri)).GetIsResponseOk("Start returning bike");
+			}
+			catch (Exception)
+			{
+				// Exception was not expected or too many subsequent excepitons detected.
+				throw;
+			}
 
-        }
+		}
 
-        /// <summary> Updates COPRI lock state for a booked bike. </summary>
-        /// <param name="bike">Bike to update locking state for.</param>
-        /// <param name="location">Location of the bike.</param>
-        /// <returns>Response on updating locking state.</returns>
-        public async Task UpdateLockingStateAsync(
-            IBikeInfoMutable bike,
-            LocationDto location)
-        {
-            if (bike == null)
-            {
-                throw new ArgumentNullException("Can not update locking state of bike. No bike object available.");
-            }
+		/// <summary> Updates COPRI lock state for a booked bike. </summary>
+		/// <param name="bike">Bike to update locking state for.</param>
+		/// <param name="location">Location of the bike.</param>
+		/// <returns>Response on updating locking state.</returns>
+		public async Task UpdateLockingStateAsync(
+			IBikeInfoMutable bike,
+			LocationDto location)
+		{
+			if (bike == null)
+			{
+				throw new ArgumentNullException("Can not update locking state of bike. No bike object available.");
+			}
 
-            if (bike.State.Value != State.InUseStateEnum.Booked)
-            {
-                throw new ArgumentNullException($"Can not update locking state of bike. Unexpected booking state {bike.State} detected.");
-            }
+			if (bike.State.Value != State.InUseStateEnum.Booked)
+			{
+				throw new ArgumentNullException($"Can not update locking state of bike. Unexpected booking state {bike.State} detected.");
+			}
 
-            lock_state? state = null;
-            switch (bike.LockInfo.State)
-            {
-                case LockingState.Open:
-                    state = lock_state.unlocked;
-                    break;
+			lock_state? state = null;
+			switch (bike.LockInfo.State)
+			{
+				case LockingState.Open:
+					state = lock_state.unlocked;
+					break;
 
-                case LockingState.Closed:
-                    state = lock_state.locked;
-                    break;
-            }
+				case LockingState.Closed:
+					state = lock_state.locked;
+					break;
+			}
 
-            if (!state.HasValue)
-            {
-                throw new ArgumentNullException($"Can not update locking state of bike. Unexpected locking state {bike.LockInfo.State} detected.");
-            }
+			if (!state.HasValue)
+			{
+				throw new ArgumentNullException($"Can not update locking state of bike. Unexpected locking state {bike.LockInfo.State} detected.");
+			}
 
-            try
-            {
-                (await CopriServer.UpdateLockingStateAsync(
-                    bike.Id,
-                    state.Value,
-                    bike.OperatorUri,
-                    location,
-                    bike.LockInfo.BatteryPercentage)).GetIsBookingResponseOk(bike.Id);
-            }
-            catch (Exception)
-            {
-                // Exception was not expected or too many subsequent excepitons detected.
-                throw;
-            }
-        }
+			try
+			{
+				(await CopriServer.UpdateLockingStateAsync(
+					bike.Id,
+					state.Value,
+					bike.OperatorUri,
+					location,
+					bike.LockInfo.BatteryPercentage)).GetIsBookingResponseOk(bike.Id);
+			}
+			catch (Exception)
+			{
+				// Exception was not expected or too many subsequent excepitons detected.
+				throw;
+			}
+		}
 
-        /// <summary> Request to book a bike. </summary>
-        /// <param name="bike">Bike to book.</param>
-        public async Task DoBook(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike)
-        {
-            if (bike == null)
-            {
-                throw new ArgumentNullException(nameof(bike), "Can not book bike. No bike object available.");
-            }
+		/// <summary> Request to book a bike. </summary>
+		/// <param name="bike">Bike to book.</param>
+		public async Task DoBook(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike)
+		{
+			if (bike == null)
+			{
+				throw new ArgumentNullException(nameof(bike), "Can not book bike. No bike object available.");
+			}
 
-            BikeInfoReservedOrBooked response;
-            var btBike = bike as BikeInfoMutable;
-            Guid guid = btBike != null ? btBike.LockInfo.Guid : new Guid();
-            double batteryPercentage = btBike != null ? btBike.LockInfo.BatteryPercentage : double.NaN;
+			BikeInfoReservedOrBooked response;
+			var btBike = bike as BikeInfoMutable;
+			Guid guid = btBike != null ? btBike.LockInfo.Guid : new Guid();
+			double batteryPercentage = btBike != null ? btBike.LockInfo.BatteryPercentage : double.NaN;
 
-            response = (await CopriServer.DoBookAsync(
-                bike.Id,
-                guid,
-                batteryPercentage,
-                bike.OperatorUri)).GetIsBookingResponseOk(bike.Id);
+			response = (await CopriServer.DoBookAsync(
+				bike.Id,
+				guid,
+				batteryPercentage,
+				bike.OperatorUri)).GetIsBookingResponseOk(bike.Id);
 
-            bike.Load(
-                response,
-                Mail,
-                Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.None);
-        }
+			bike.Load(
+				response,
+				Mail,
+				Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.None);
+		}
 
-        /// <summary>
-        /// Books a bike and opens the lock.
-        /// </summary>
-        /// <param name="bike">Bike to book and open.</param>
-        public async Task BookAndOpenAync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike)
-            => await Polling.BookAndOpenAync(CopriServer, bike, Mail);
+		/// <summary>
+		/// Books a bike and opens the lock.
+		/// </summary>
+		/// <param name="bike">Bike to book and open.</param>
+		public async Task BookAndOpenAync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike)
+			=> await Polling.BookAndOpenAync(CopriServer, bike, Mail);
 
-        /// <summary> Request to return a bike.</summary>
-        /// <param name="bike">Bike to return.</param>
-        /// <param name="locaton">Position of the bike for bluetooth locks.</param>
-        /// <param name="smartDevice">Provides info about hard and software.</param>
-        public async Task<BookingFinishedModel> DoReturn(
-            Bikes.BikeInfoNS.BC.IBikeInfoMutable bike,
-            LocationDto location = null,
-            ISmartDevice smartDevice = null)
-        {
-            if (bike == null)
-            {
-                throw new ArgumentNullException("Can not return bike. No bike object available.");
-            }
+		/// <summary> Request to return a bike.</summary>
+		/// <param name="bike">Bike to return.</param>
+		/// <param name="locaton">Position of the bike for bluetooth locks.</param>
+		/// <param name="smartDevice">Provides info about hard and software.</param>
+		public async Task<BookingFinishedModel> DoReturn(
+			Bikes.BikeInfoNS.BC.IBikeInfoMutable bike,
+			LocationDto location = null,
+			ISmartDevice smartDevice = null)
+		{
+			if (bike == null)
+			{
+				throw new ArgumentNullException("Can not return bike. No bike object available.");
+			}
 
-            DoReturnResponse response
-                = (await CopriServer.DoReturn(bike.Id, location, smartDevice, bike.OperatorUri)).GetIsReturnBikeResponseOk(bike.Id);
+			DoReturnResponse response
+				= (await CopriServer.DoReturn(bike.Id, location, smartDevice, bike.OperatorUri)).GetIsReturnBikeResponseOk(bike.Id);
 
-            bike.Load(Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.None);
-            return response?.Create() ?? new BookingFinishedModel();
-        }
+			bike.Load(Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.None);
+			return response?.Create() ?? new BookingFinishedModel();
+		}
 
-        /// <summary> Request to return bike and close the lock.</summary>
-        /// <param name="bike">Bike to return.</param>
-        /// <param name="smartDevice">Provides info about hard and software.</param>
-        public async Task<BookingFinishedModel> ReturnAndCloseAsync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike, ISmartDevice smartDevice = null)
-            => await Polling.ReturnAndCloseAync(CopriServer, smartDevice, bike);
+		/// <summary> Request to return bike and close the lock.</summary>
+		/// <param name="bike">Bike to return.</param>
+		/// <param name="smartDevice">Provides info about hard and software.</param>
+		public async Task<BookingFinishedModel> ReturnAndCloseAsync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike, ISmartDevice smartDevice = null)
+			=> await Polling.ReturnAndCloseAync(CopriServer, smartDevice, bike);
 
-        /// <summary>
-        /// Submits feedback to copri server.
-        /// </summary>
-        /// <param name="userFeedback">Feedback to submit.</param>
+		/// <summary>
+		/// Submits feedback to copri server.
+		/// </summary>
+		/// <param name="userFeedback">Feedback to submit.</param>
 #if USCSHARP9
         public async Task DoSubmitFeedback(ICommand.IUserFeedback userFeedback, Uri opertorUri)
             => await CopriServer.DoSubmitFeedback(userFeedback.BikeId, userFeedback.Message, userFeedback.IsBikeBroken, opertorUri);
 #else
-        /// <summary> Submits feedback for a renting operation.</summary>
-        public async Task DoSubmitFeedback(
-            IUserFeedback userFeedback,
-            Uri opertorUri)
-            => await CopriServer.DoSubmitFeedback(userFeedback.BikeId, userFeedback.CurrentChargeBars, userFeedback.Message, userFeedback.IsBikeBroken, opertorUri);
+		/// <summary> Submits feedback for a renting operation.</summary>
+		public async Task DoSubmitFeedback(
+			IUserFeedback userFeedback,
+			Uri opertorUri)
+			=> await CopriServer.DoSubmitFeedback(userFeedback.BikeId, userFeedback.CurrentChargeBars, userFeedback.Message, userFeedback.IsBikeBroken, opertorUri);
 #endif
 
-        /// <summary> Submits mini survey to copri server. </summary>
-        /// <param name="answers">Collection of answers.</param>
-        public async Task DoSubmitMiniSurvey(IDictionary<string, string> answers)
-            => await CopriServer.DoSubmitMiniSurvey(answers);
+		/// <summary> Submits mini survey to copri server. </summary>
+		/// <param name="answers">Collection of answers.</param>
+		public async Task DoSubmitMiniSurvey(IDictionary<string, string> answers)
+			=> await CopriServer.DoSubmitMiniSurvey(answers);
 
-        public async Task OpenLockAsync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike)
-            => await CopriServer.OpenAync(bike);
-        public async Task CloseLockAsync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike)
-            => await CopriServer.CloseAync(bike);
-    }
+		public async Task OpenLockAsync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike)
+			=> await CopriServer.OpenAync(bike);
+		public async Task CloseLockAsync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike)
+			=> await CopriServer.CloseAync(bike);
+	}
 }
\ No newline at end of file
diff --git a/TINKLib/Model/Connector/Command/ICommand.cs b/TINKLib/Model/Connector/Command/ICommand.cs
index f3aeade..a005f35 100644
--- a/TINKLib/Model/Connector/Command/ICommand.cs
+++ b/TINKLib/Model/Connector/Command/ICommand.cs
@@ -7,87 +7,87 @@ using TINK.Repository.Request;
 
 namespace TINK.Model.Connector
 {
-    public interface ICommand
-    {
-        /// <summary> Is raised whenever login state has changed.</summary>
-        event LoginStateChangedEventHandler LoginStateChanged;
+	public interface ICommand
+	{
+		/// <summary> Is raised whenever login state has changed.</summary>
+		event LoginStateChangedEventHandler LoginStateChanged;
 
-        /// <summary>
-        /// Logs user in.
-        /// If log in succeeds either and session might be updated if it was no more valid (logged in by an different device).
-        /// If log in fails (password modified) session cookie is set to empty.
-        /// If communication fails an exception is thrown.
-        /// </summary>
-        Task<IAccount> DoLogin(string p_strMail, string p_strPassword, string p_strDeviceId);
+		/// <summary>
+		/// Logs user in.
+		/// If log in succeeds either and session might be updated if it was no more valid (logged in by an different device).
+		/// If log in fails (password modified) session cookie is set to empty.
+		/// If communication fails an exception is thrown.
+		/// </summary>
+		Task<IAccount> DoLogin(string p_strMail, string p_strPassword, string p_strDeviceId);
 
-        /// <summary> Logs user out. </summary>
-        Task DoLogout();
+		/// <summary> Logs user out. </summary>
+		Task DoLogout();
 
-        /// <summary> Request to reserve a bike.</summary>
-        /// <param name="bike">Bike to book.</param>
-        Task DoReserve(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike);
+		/// <summary> Request to reserve a bike.</summary>
+		/// <param name="bike">Bike to book.</param>
+		Task DoReserve(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike);
 
-        /// <summary> Request to cancel a reservation.</summary>
-        /// <param name="bike">Bike to book.</param>
-        Task DoCancelReservation(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike);
+		/// <summary> Request to cancel a reservation.</summary>
+		/// <param name="bike">Bike to book.</param>
+		Task DoCancelReservation(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike);
 
-        /// <summary> Get authentication keys to connect to lock.</summary>
-        /// <param name="bike">Bike to book.</param>
-        Task CalculateAuthKeys(Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMutable bike);
+		/// <summary> Get authentication keys to connect to lock.</summary>
+		/// <param name="bike">Bike to book.</param>
+		Task CalculateAuthKeys(Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMutable bike);
 
-        /// <summary> Notifies COPRI about start of returning sequence. </summary>
-        /// <remarks> Operator specific call.</remarks>
-        /// <param name="bike">Bike to return.</param>
-        /// <returns>Response on notification about start of returning sequence.</returns>
-        Task StartReturningBike(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike);
+		/// <summary> Notifies COPRI about start of returning sequence. </summary>
+		/// <remarks> Operator specific call.</remarks>
+		/// <param name="bike">Bike to return.</param>
+		/// <returns>Response on notification about start of returning sequence.</returns>
+		Task StartReturningBike(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike);
 
-        /// <summary> Updates COPRI lock state for a booked bike. </summary>
-        /// <param name="bike">Bike to update locking state for.</param>
-        /// <param name="location">Geolocation of lock when returning bike.</param>
-        /// <returns>Response on updating locking state.</returns>
-        Task UpdateLockingStateAsync(Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMutable bike, LocationDto location = null);
+		/// <summary> Updates COPRI lock state for a booked bike. </summary>
+		/// <param name="bike">Bike to update locking state for.</param>
+		/// <param name="location">Geolocation of lock when returning bike.</param>
+		/// <returns>Response on updating locking state.</returns>
+		Task UpdateLockingStateAsync(Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMutable bike, LocationDto location = null);
 
-        /// <summary> Request to book a bike.</summary>
-        /// <param name="bike">Bike to book.</param>
-        Task DoBook(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike);
+		/// <summary> Request to book a bike.</summary>
+		/// <param name="bike">Bike to book.</param>
+		Task DoBook(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike);
 
-        /// <summary> Request to book a bike and open its lock.</summary>
-        /// <param name="bike">Bike to book and to open lock for.</param>
-        Task BookAndOpenAync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike);
+		/// <summary> Request to book a bike and open its lock.</summary>
+		/// <param name="bike">Bike to book and to open lock for.</param>
+		Task BookAndOpenAync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike);
 
-        /// <summary> Request to open lock.</summary>
-        /// <param name="bike">Bike for which lock has to be opened.</param>
-        Task OpenLockAsync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike);
+		/// <summary> Request to open lock.</summary>
+		/// <param name="bike">Bike for which lock has to be opened.</param>
+		Task OpenLockAsync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike);
 
-        /// <summary> Request to close lock.</summary>
-        /// <param name="bike">Bike for which lock has to be closed.</param>
-        Task CloseLockAsync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike);
+		/// <summary> Request to close lock.</summary>
+		/// <param name="bike">Bike for which lock has to be closed.</param>
+		Task CloseLockAsync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike);
 
-        /// <summary> Request to return a bike.</summary>
-        /// <param name="bike">Bike to return.</param>
-        /// <param name="location">Geolocation of lock when returning bike.</param>
-        /// <param name="smartDevice">Provides info about hard and software.</param>
-        Task<BookingFinishedModel> DoReturn(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike, LocationDto geolocation = null, ISmartDevice smartDevice = null);
+		/// <summary> Request to return a bike.</summary>
+		/// <param name="bike">Bike to return.</param>
+		/// <param name="location">Geolocation of lock when returning bike.</param>
+		/// <param name="smartDevice">Provides info about hard and software.</param>
+		Task<BookingFinishedModel> DoReturn(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike, LocationDto geolocation = null, ISmartDevice smartDevice = null);
 
-        /// <summary> Request to return bike and close the lock.</summary>
-        /// <param name="bike">Bike to return.</param>
-        /// <param name="smartDevice">Provides info about hard and software.</param>
-        Task<BookingFinishedModel> ReturnAndCloseAsync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike, ISmartDevice smartDevice = null);
+		/// <summary> Request to return bike and close the lock.</summary>
+		/// <param name="bike">Bike to return.</param>
+		/// <param name="smartDevice">Provides info about hard and software.</param>
+		Task<BookingFinishedModel> ReturnAndCloseAsync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike, ISmartDevice smartDevice = null);
 
-        /// <summary> True if connector has access to copri server, false if cached values are used. </summary>
-        bool IsConnected { get; }
+		/// <summary> True if connector has access to copri server, false if cached values are used. </summary>
+		bool IsConnected { get; }
 
-        /// <summary> True if user is logged in false if not. </summary>
-        string SessionCookie { get; }
+		/// <summary> True if user is logged in false if not. </summary>
+		string SessionCookie { get; }
 
-        /// <summary> Submits feedback for a renting operation.</summary>
-        Task DoSubmitFeedback(
-            IUserFeedback userFeedback,
-            Uri opertorUri);
+		/// <summary> Submits feedback for a renting operation.</summary>
+		Task DoSubmitFeedback(
+			IUserFeedback userFeedback,
+			Uri opertorUri);
 
-        /// <summary> Submits mini survey to copri server. </summary>
-        /// <param name="answers">Collection of answers.</param>
-        Task DoSubmitMiniSurvey(IDictionary<string, string> answers);
+		/// <summary> Submits mini survey to copri server. </summary>
+		/// <param name="answers">Collection of answers.</param>
+		Task DoSubmitMiniSurvey(IDictionary<string, string> answers);
 
 #if USCSHARP9
         /// <summary>
@@ -112,55 +112,55 @@ namespace TINK.Model.Connector
             string Message { get;  }
         }
 #endif
-    }
+	}
 
-    /// <summary>Defines delegate to be raised whenever login state changes.</summary>
-    /// <param name="eventArgs">Holds session cookie and mail address if user logged in successfully.</param>
-    public delegate void LoginStateChangedEventHandler(object sender, LoginStateChangedEventArgs eventArgs);
+	/// <summary>Defines delegate to be raised whenever login state changes.</summary>
+	/// <param name="eventArgs">Holds session cookie and mail address if user logged in successfully.</param>
+	public delegate void LoginStateChangedEventHandler(object sender, LoginStateChangedEventArgs eventArgs);
 
 #if !USCSHARP9
-    /// <summary>
-    /// Feedback given by user when returning bike.
-    /// </summary>
-    public interface IUserFeedback
-    {
-        /// <summary> Id of the bike to which the feedback is related to.</summary>
-        string BikeId { get; }
+	/// <summary>
+	/// Feedback given by user when returning bike.
+	/// </summary>
+	public interface IUserFeedback
+	{
+		/// <summary> Id of the bike to which the feedback is related to.</summary>
+		string BikeId { get; }
 
-        /// <summary>
-        /// Holds the current chargeing level of the battery in bars, null if unkonwn.
-        /// </summary>
-        int? CurrentChargeBars { get; set; }
+		/// <summary>
+		/// Holds the current chargeing level of the battery in bars, null if unkonwn.
+		/// </summary>
+		int? CurrentChargeBars { get; set; }
 
-        /// <summary>
-        /// Holds whether bike is broken or not.
-        /// </summary>
-        bool IsBikeBroken { get; }
+		/// <summary>
+		/// Holds whether bike is broken or not.
+		/// </summary>
+		bool IsBikeBroken { get; }
 
-        /// <summary>
-        /// Holds either 
-        /// - general feedback
-        /// - error description of broken bike 
-        /// or both.
-        /// </summary>
-        string Message { get; }
-    }
+		/// <summary>
+		/// Holds either 
+		/// - general feedback
+		/// - error description of broken bike 
+		/// or both.
+		/// </summary>
+		string Message { get; }
+	}
 #endif
 
-    /// <summary> Event arguments to notify about changes of logged in state.</summary>
-    public class LoginStateChangedEventArgs : EventArgs
-    {
-        public LoginStateChangedEventArgs() : this(string.Empty, string.Empty)
-        { }
+	/// <summary> Event arguments to notify about changes of logged in state.</summary>
+	public class LoginStateChangedEventArgs : EventArgs
+	{
+		public LoginStateChangedEventArgs() : this(string.Empty, string.Empty)
+		{ }
 
-        public LoginStateChangedEventArgs(string sessionCookie, string mail)
-        {
-            SessionCookie = sessionCookie;
-            Mail = mail;
-        }
+		public LoginStateChangedEventArgs(string sessionCookie, string mail)
+		{
+			SessionCookie = sessionCookie;
+			Mail = mail;
+		}
 
-        public string SessionCookie { get; }
+		public string SessionCookie { get; }
 
-        public string Mail { get; }
-    }
+		public string Mail { get; }
+	}
 }
diff --git a/TINKLib/Model/Connector/Command/UserFeedbackDto.cs b/TINKLib/Model/Connector/Command/UserFeedbackDto.cs
index 1fb0e91..0b28c78 100644
--- a/TINKLib/Model/Connector/Command/UserFeedbackDto.cs
+++ b/TINKLib/Model/Connector/Command/UserFeedbackDto.cs
@@ -12,21 +12,21 @@ namespace TINK.Model.Connector
 #if USCSHARP9
     public class UserFeedbackDto : ICommand.IUserFeedback    
 #else
-    public class UserFeedbackDto : IUserFeedback
+	public class UserFeedbackDto : IUserFeedback
 #endif
-    {
-        public string BikeId { get; set; }
+	{
+		public string BikeId { get; set; }
 
-        /// <summary>
-        /// Holds the current chargeing level of the battery in bars, null if unkonwn.
-        /// </summary>
-        public int? CurrentChargeBars { get; set; }
+		/// <summary>
+		/// Holds the current chargeing level of the battery in bars, null if unkonwn.
+		/// </summary>
+		public int? CurrentChargeBars { get; set; }
 
-        public bool IsBikeBroken { get; set; }
+		public bool IsBikeBroken { get; set; }
 
-        public string Message { get; set; }
+		public string Message { get; set; }
 
 
-    }
+	}
 #endif
 }
diff --git a/TINKLib/Model/Connector/Connector.cs b/TINKLib/Model/Connector/Connector.cs
index f505a6a..560d222 100644
--- a/TINKLib/Model/Connector/Connector.cs
+++ b/TINKLib/Model/Connector/Connector.cs
@@ -4,67 +4,67 @@ using TINK.Repository;
 
 namespace TINK.Model.Connector
 {
-    /// <summary>
-    /// Connects app to copri data by getting data from copri.
-    /// </summary>
-    public class Connector : IConnector
-    {
-        /// <summary>Constructs a copri connector object.</summary>
-        /// <param name="activeUri"> Uri to connect to.</param>
-        /// <param name="appContextInfo">Provides app related info (app name and version, merchantid) to pass to COPRI.</param>
-        /// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
-        /// <param name="sessionCookie"> Holds the session cookie.</param>
-        /// <param name="mail">Mail of user.</param>
-        /// <param name="expiresAfter">Timespan which holds value after which cache expires.</param>
-        /// <param name="server"> Is null in production and migh be a mock in testing context.</param>
-        public Connector(
-            Uri activeUri,
-            AppContextInfo appContextInfo,
-            string uiIsoLangugageName,
-            string sessionCookie,
-            string mail,
-            TimeSpan? expiresAfter = null,
-            ICachedCopriServer server = null)
-        {
-            Command = GetCommand(
-                server ?? new CopriProviderHttps(
-                    activeUri,
-                    appContextInfo.MerchantId,
-                    appContextInfo,
-                    uiIsoLangugageName,
-                    sessionCookie),
-                sessionCookie,
-                mail);
+	/// <summary>
+	/// Connects app to copri data by getting data from copri.
+	/// </summary>
+	public class Connector : IConnector
+	{
+		/// <summary>Constructs a copri connector object.</summary>
+		/// <param name="activeUri"> Uri to connect to.</param>
+		/// <param name="appContextInfo">Provides app related info (app name and version, merchantid) to pass to COPRI.</param>
+		/// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
+		/// <param name="sessionCookie"> Holds the session cookie.</param>
+		/// <param name="mail">Mail of user.</param>
+		/// <param name="expiresAfter">Timespan which holds value after which cache expires.</param>
+		/// <param name="server"> Is null in production and migh be a mock in testing context.</param>
+		public Connector(
+			Uri activeUri,
+			AppContextInfo appContextInfo,
+			string uiIsoLangugageName,
+			string sessionCookie,
+			string mail,
+			TimeSpan? expiresAfter = null,
+			ICachedCopriServer server = null)
+		{
+			Command = GetCommand(
+				server ?? new CopriProviderHttps(
+					activeUri,
+					appContextInfo.MerchantId,
+					appContextInfo,
+					uiIsoLangugageName,
+					sessionCookie),
+				sessionCookie,
+				mail);
 
-            Query = GetQuery(
-                server ?? new CopriProviderHttps(
-                    activeUri,
-                    appContextInfo.MerchantId,
-                    appContextInfo,
-                    uiIsoLangugageName,
-                    sessionCookie,
-                    expiresAfter),
-                sessionCookie,
-                mail);
-        }
+			Query = GetQuery(
+				server ?? new CopriProviderHttps(
+					activeUri,
+					appContextInfo.MerchantId,
+					appContextInfo,
+					uiIsoLangugageName,
+					sessionCookie,
+					expiresAfter),
+				sessionCookie,
+				mail);
+		}
 
-        /// <summary> Object for queriying stations and bikes.</summary>
-        public ICommand Command { get; private set; }
+		/// <summary> Object for queriying stations and bikes.</summary>
+		public ICommand Command { get; private set; }
 
-        /// <summary> Object for queriying stations and bikes.</summary>
-        public IQuery Query { get; private set; }
+		/// <summary> Object for queriying stations and bikes.</summary>
+		public IQuery Query { get; private set; }
 
-        /// <summary> True if connector has access to copri server, false if cached values are used. </summary>
-        public bool IsConnected => Command.IsConnected;
+		/// <summary> True if connector has access to copri server, false if cached values are used. </summary>
+		public bool IsConnected => Command.IsConnected;
 
-        /// <summary> Gets a command object to perform copri commands. </summary>
-        public static ICommand GetCommand(ICopriServerBase copri, string sessioncookie, string mail) => string.IsNullOrEmpty(sessioncookie)
-                            ? new Command(copri)
-                            : new CommandLoggedIn(copri, sessioncookie, mail, () => DateTime.Now) as ICommand;
+		/// <summary> Gets a command object to perform copri commands. </summary>
+		public static ICommand GetCommand(ICopriServerBase copri, string sessioncookie, string mail) => string.IsNullOrEmpty(sessioncookie)
+							? new Command(copri)
+							: new CommandLoggedIn(copri, sessioncookie, mail, () => DateTime.Now) as ICommand;
 
-        /// <summary> Gets a command object to perform copri queries. </summary>
-        private static IQuery GetQuery(ICachedCopriServer copri, string sessioncookie, string mail) => string.IsNullOrEmpty(sessioncookie)
-                            ? new CachedQuery(copri) as IQuery
-                            : new CachedQueryLoggedIn(copri, sessioncookie, mail, () => DateTime.Now);
-    }
+		/// <summary> Gets a command object to perform copri queries. </summary>
+		private static IQuery GetQuery(ICachedCopriServer copri, string sessioncookie, string mail) => string.IsNullOrEmpty(sessioncookie)
+							? new CachedQuery(copri) as IQuery
+							: new CachedQueryLoggedIn(copri, sessioncookie, mail, () => DateTime.Now);
+	}
 }
diff --git a/TINKLib/Model/Connector/ConnectorCache.cs b/TINKLib/Model/Connector/ConnectorCache.cs
index 485c021..7ecf525 100644
--- a/TINKLib/Model/Connector/ConnectorCache.cs
+++ b/TINKLib/Model/Connector/ConnectorCache.cs
@@ -4,47 +4,47 @@ using TINK.Repository;
 
 namespace TINK.Model.Connector
 {
-    /// <summary>
-    /// Connects app to copri data by getting data from cache.
-    /// </summary>
-    public class ConnectorCache : IConnector
-    {
-        /// <summary>Constructs a copri connector object.</summary>
-        /// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
-        /// <param name="sessionCookie"> Holds the session cookie.</param>
-        /// <param name="mail">Mail of user.</param>
-        /// <param name="server"> Is null in production and migh be a mock in testing context.</param>
-        public ConnectorCache(
-            AppContextInfo appContextInfo,
-            string uiIsoLangugageName,
-            string sessionCookie,
-            string mail,
-            ICopriServer server = null)
-        {
+	/// <summary>
+	/// Connects app to copri data by getting data from cache.
+	/// </summary>
+	public class ConnectorCache : IConnector
+	{
+		/// <summary>Constructs a copri connector object.</summary>
+		/// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
+		/// <param name="sessionCookie"> Holds the session cookie.</param>
+		/// <param name="mail">Mail of user.</param>
+		/// <param name="server"> Is null in production and migh be a mock in testing context.</param>
+		public ConnectorCache(
+			AppContextInfo appContextInfo,
+			string uiIsoLangugageName,
+			string sessionCookie,
+			string mail,
+			ICopriServer server = null)
+		{
 
-            Command = Connector.GetCommand(
-                server ?? new CopriProviderMonkeyStore(appContextInfo.MerchantId, uiIsoLangugageName, sessionCookie),
-                sessionCookie,
-                mail);
+			Command = Connector.GetCommand(
+				server ?? new CopriProviderMonkeyStore(appContextInfo.MerchantId, uiIsoLangugageName, sessionCookie),
+				sessionCookie,
+				mail);
 
-            Query = GetQuery(
-                server ?? new CopriProviderMonkeyStore(appContextInfo.MerchantId, uiIsoLangugageName, sessionCookie),
-                sessionCookie,
-                mail);
-        }
+			Query = GetQuery(
+				server ?? new CopriProviderMonkeyStore(appContextInfo.MerchantId, uiIsoLangugageName, sessionCookie),
+				sessionCookie,
+				mail);
+		}
 
-        /// <summary> Object for queriying stations and bikes.</summary>
-        public ICommand Command { get; private set; }
+		/// <summary> Object for queriying stations and bikes.</summary>
+		public ICommand Command { get; private set; }
 
-        /// <summary> Object for queriying stations and bikes.</summary>
-        public IQuery Query { get; private set; }
+		/// <summary> Object for queriying stations and bikes.</summary>
+		public IQuery Query { get; private set; }
 
-        /// <summary> True if connector has access to copri server, false if cached values are used. </summary>
-        public bool IsConnected => Command.IsConnected;
+		/// <summary> True if connector has access to copri server, false if cached values are used. </summary>
+		public bool IsConnected => Command.IsConnected;
 
-        /// <summary> Gets a command object to perform copri queries. </summary>
-        private static IQuery GetQuery(ICopriServer copri, string sessioncookie, string mail) => string.IsNullOrEmpty(sessioncookie)
-                            ? new Query(copri) as IQuery
-                            : new QueryLoggedIn(copri, sessioncookie, mail, () => DateTime.Now);
-    }
+		/// <summary> Gets a command object to perform copri queries. </summary>
+		private static IQuery GetQuery(ICopriServer copri, string sessioncookie, string mail) => string.IsNullOrEmpty(sessioncookie)
+							? new Query(copri) as IQuery
+							: new QueryLoggedIn(copri, sessioncookie, mail, () => DateTime.Now);
+	}
 }
diff --git a/TINKLib/Model/Connector/ConnectorFactory.cs b/TINKLib/Model/Connector/ConnectorFactory.cs
index 6c47269..a010e98 100644
--- a/TINKLib/Model/Connector/ConnectorFactory.cs
+++ b/TINKLib/Model/Connector/ConnectorFactory.cs
@@ -3,27 +3,27 @@ using TINK.Repository;
 
 namespace TINK.Model.Connector
 {
-    public class ConnectorFactory
-    {
-        /// <summary>
-        /// Gets a connector object depending on whether beein onlin or offline.
-        /// </summary>
-        /// <param name="isConnected">True if online, false if offline. If offline cache connector is returned.</param>
-        /// <param name="appContextInfo">Provides app related info (app name and version, merchantid) to pass to COPRI.</param>
-        /// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
-        /// <returns></returns>
-        public static IConnector Create(
-            bool isConnected,
-            Uri activeUri,
-            AppContextInfo appContextInfo,
-            string uiIsoLangugageName,
-            string sessionCookie,
-            string mail,
-            TimeSpan? expiresAfter = null)
-        {
-            return isConnected
-                ? new Connector(activeUri, appContextInfo, uiIsoLangugageName, sessionCookie, mail, expiresAfter: expiresAfter) as IConnector
-                : new ConnectorCache(appContextInfo, uiIsoLangugageName, sessionCookie, mail);
-        }
-    }
+	public class ConnectorFactory
+	{
+		/// <summary>
+		/// Gets a connector object depending on whether beein onlin or offline.
+		/// </summary>
+		/// <param name="isConnected">True if online, false if offline. If offline cache connector is returned.</param>
+		/// <param name="appContextInfo">Provides app related info (app name and version, merchantid) to pass to COPRI.</param>
+		/// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
+		/// <returns></returns>
+		public static IConnector Create(
+			bool isConnected,
+			Uri activeUri,
+			AppContextInfo appContextInfo,
+			string uiIsoLangugageName,
+			string sessionCookie,
+			string mail,
+			TimeSpan? expiresAfter = null)
+		{
+			return isConnected
+				? new Connector(activeUri, appContextInfo, uiIsoLangugageName, sessionCookie, mail, expiresAfter: expiresAfter) as IConnector
+				: new ConnectorCache(appContextInfo, uiIsoLangugageName, sessionCookie, mail);
+		}
+	}
 }
diff --git a/TINKLib/Model/Connector/Filter/GroupFilterFactory.cs b/TINKLib/Model/Connector/Filter/GroupFilterFactory.cs
index 8b0649d..5fe1029 100644
--- a/TINKLib/Model/Connector/Filter/GroupFilterFactory.cs
+++ b/TINKLib/Model/Connector/Filter/GroupFilterFactory.cs
@@ -3,23 +3,23 @@ using System.Linq;
 
 namespace TINK.Model.Connector.Filter
 {
-    public static class GroupFilterFactory
-    {
-        /// <summary>
-        /// Creates filter object.
-        /// </summary>
-        /// <param name="group">if value consists
-        /// - list of strings entries are used to filter (intersect) with or if value is
-        /// - null or an empty list null filter is applied, i.e. filtering is off.</param>
-        /// <returns>Filtering object.</returns>
-        /// <remarks>
-        /// Tread group values of null and empty lists as marker to turn filtering off to handle COPRI responses maximal flexible.
-        /// </remarks>
-        public static IGroupFilter Create(IEnumerable<string> group)
-        {
-            return group != null && group.Count() > 0
-                ? (IGroupFilter)new IntersectGroupFilter(group) :
-                new NullGroupFilter();
-        }
-    }
+	public static class GroupFilterFactory
+	{
+		/// <summary>
+		/// Creates filter object.
+		/// </summary>
+		/// <param name="group">if value consists
+		/// - list of strings entries are used to filter (intersect) with or if value is
+		/// - null or an empty list null filter is applied, i.e. filtering is off.</param>
+		/// <returns>Filtering object.</returns>
+		/// <remarks>
+		/// Tread group values of null and empty lists as marker to turn filtering off to handle COPRI responses maximal flexible.
+		/// </remarks>
+		public static IGroupFilter Create(IEnumerable<string> group)
+		{
+			return group != null && group.Count() > 0
+				? (IGroupFilter)new IntersectGroupFilter(group) :
+				new NullGroupFilter();
+		}
+	}
 }
diff --git a/TINKLib/Model/Connector/Filter/IGroupFilter.cs b/TINKLib/Model/Connector/Filter/IGroupFilter.cs
index f32e4ca..eafea6b 100644
--- a/TINKLib/Model/Connector/Filter/IGroupFilter.cs
+++ b/TINKLib/Model/Connector/Filter/IGroupFilter.cs
@@ -2,8 +2,8 @@
 
 namespace TINK.Model.Connector.Filter
 {
-    public interface IGroupFilter
-    {
-        IEnumerable<string> DoFilter(IEnumerable<string> filter);
-    }
+	public interface IGroupFilter
+	{
+		IEnumerable<string> DoFilter(IEnumerable<string> filter);
+	}
 }
diff --git a/TINKLib/Model/Connector/Filter/IntersectGroupFilter.cs b/TINKLib/Model/Connector/Filter/IntersectGroupFilter.cs
index fc1a806..56c722c 100644
--- a/TINKLib/Model/Connector/Filter/IntersectGroupFilter.cs
+++ b/TINKLib/Model/Connector/Filter/IntersectGroupFilter.cs
@@ -2,18 +2,18 @@
 
 namespace TINK.Model.Connector.Filter
 {
-    /// <summary> Filters to enumerations of string by intersecting.</summary>
-    public class IntersectGroupFilter : IGroupFilter
-    {
-        private IEnumerable<string> Group { get; set; }
+	/// <summary> Filters to enumerations of string by intersecting.</summary>
+	public class IntersectGroupFilter : IGroupFilter
+	{
+		private IEnumerable<string> Group { get; set; }
 
-        public IntersectGroupFilter(IEnumerable<string> group) => Group = group ?? new List<string>();
+		public IntersectGroupFilter(IEnumerable<string> group) => Group = group ?? new List<string>();
 
-        /// <summary> Applies filtering. </summary>
-        /// <param name="filter">Enumeration of filter values to filter with or null if no filtering has to be applied.</param>
-        /// <returns></returns>
-        public IEnumerable<string> DoFilter(IEnumerable<string> filter) => filter != null
-            ? Group.IntersectByGoupId(filter)
-            : Group;
-    }
+		/// <summary> Applies filtering. </summary>
+		/// <param name="filter">Enumeration of filter values to filter with or null if no filtering has to be applied.</param>
+		/// <returns></returns>
+		public IEnumerable<string> DoFilter(IEnumerable<string> filter) => filter != null
+			? Group.IntersectByGoupId(filter)
+			: Group;
+	}
 }
diff --git a/TINKLib/Model/Connector/Filter/IntersectGroupFilterHelper.cs b/TINKLib/Model/Connector/Filter/IntersectGroupFilterHelper.cs
index ef2e3dc..3713809 100644
--- a/TINKLib/Model/Connector/Filter/IntersectGroupFilterHelper.cs
+++ b/TINKLib/Model/Connector/Filter/IntersectGroupFilterHelper.cs
@@ -4,40 +4,40 @@ using System.Text.RegularExpressions;
 
 namespace TINK.Model.Connector.Filter
 {
-    public static class IntersectGroupFilterHelper
-    {
-        /// <summary>
-        /// Transforms a group (each element consists of an operator prefix and a numeric bike category) to bike category enumeration (numeric elements).
-        /// </summary>
-        /// <param name="group">Group to transform.</param>
-        /// <returns>Enumeration of numeric bike categories.</returns>
-        public static IEnumerable<string> ToBikeCategory(this IEnumerable<string> group)
-            => group?.Select(x => x.GetBikeCategory())?.Where(x => !string.IsNullOrEmpty(x))
-                ?? new List<string>();
+	public static class IntersectGroupFilterHelper
+	{
+		/// <summary>
+		/// Transforms a group (each element consists of an operator prefix and a numeric bike category) to bike category enumeration (numeric elements).
+		/// </summary>
+		/// <param name="group">Group to transform.</param>
+		/// <returns>Enumeration of numeric bike categories.</returns>
+		public static IEnumerable<string> ToBikeCategory(this IEnumerable<string> group)
+			=> group?.Select(x => x.GetBikeCategory())?.Where(x => !string.IsNullOrEmpty(x))
+				?? new List<string>();
 
-        /// <summary>
-        /// Extracts bike group category umber from a group string.
-        /// </summary>
-        /// <param name="group">Group to transform. Example KN_300101 (Stadtrad located in Konstanz), FR_300102 (Lastenrad located in Freiburg).</param>
-        /// <returns>Enumeration of numeric bike categories.</returns>
-        public static string GetBikeCategory(this string group)
-            => Regex.Match(group, "[0-9]+")?.Value ?? string.Empty;
+		/// <summary>
+		/// Extracts bike group category umber from a group string.
+		/// </summary>
+		/// <param name="group">Group to transform. Example KN_300101 (Stadtrad located in Konstanz), FR_300102 (Lastenrad located in Freiburg).</param>
+		/// <returns>Enumeration of numeric bike categories.</returns>
+		public static string GetBikeCategory(this string group)
+			=> Regex.Match(group, "[0-9]+")?.Value ?? string.Empty;
 
-        /// <summary>
-        /// Intersects two goups only taking into accout the numeric bike group category part.
-        /// </summary>
-        /// <param name="group">Group to filter.</param>
-        /// <param name="filter">Filter to apply</param>
-        public static IEnumerable<string> IntersectByGoupId(this IEnumerable<string> group, IEnumerable<string> filter)
-            => group.Where(x => filter.ContainsGroupId(x));
+		/// <summary>
+		/// Intersects two goups only taking into accout the numeric bike group category part.
+		/// </summary>
+		/// <param name="group">Group to filter.</param>
+		/// <param name="filter">Filter to apply</param>
+		public static IEnumerable<string> IntersectByGoupId(this IEnumerable<string> group, IEnumerable<string> filter)
+			=> group.Where(x => filter.ContainsGroupId(x));
 
-        /// <summary>
-        /// Gets if group contains a filter element.
-        /// </summary>
-        /// <param name="group"></param>
-        /// <param name="filterElement"></param>
-        /// <returns></returns>
-        public static bool ContainsGroupId(this IEnumerable<string> group, string filterElement)
-            => group.ToBikeCategory().Contains(filterElement.GetBikeCategory());
-    }
+		/// <summary>
+		/// Gets if group contains a filter element.
+		/// </summary>
+		/// <param name="group"></param>
+		/// <param name="filterElement"></param>
+		/// <returns></returns>
+		public static bool ContainsGroupId(this IEnumerable<string> group, string filterElement)
+			=> group.ToBikeCategory().Contains(filterElement.GetBikeCategory());
+	}
 }
diff --git a/TINKLib/Model/Connector/Filter/NullGroupFilter.cs b/TINKLib/Model/Connector/Filter/NullGroupFilter.cs
index e7ddb36..60546f4 100644
--- a/TINKLib/Model/Connector/Filter/NullGroupFilter.cs
+++ b/TINKLib/Model/Connector/Filter/NullGroupFilter.cs
@@ -2,8 +2,8 @@
 
 namespace TINK.Model.Connector.Filter
 {
-    public class NullGroupFilter : IGroupFilter
-    {
-        public IEnumerable<string> DoFilter(IEnumerable<string> filter) => filter;
-    }
+	public class NullGroupFilter : IGroupFilter
+	{
+		public IEnumerable<string> DoFilter(IEnumerable<string> filter) => filter;
+	}
 }
diff --git a/TINKLib/Model/Connector/FilterHelper.cs b/TINKLib/Model/Connector/FilterHelper.cs
index 658890e..f8e69ef 100644
--- a/TINKLib/Model/Connector/FilterHelper.cs
+++ b/TINKLib/Model/Connector/FilterHelper.cs
@@ -1,19 +1,19 @@
 namespace TINK.Model.Connector
 {
-    public static class FilterHelper
-    {
-        /// <summary> Holds the Konrad group (city bikes).</summary>
-        /// <remarks>
-        /// Was "Konrad" up to version 3.0.258.
-        /// Specified first: "KN300001" (RG).
-        /// </remarks>
-        public const string CITYBIKE = "300103";
+	public static class FilterHelper
+	{
+		/// <summary> Holds the Konrad group (city bikes).</summary>
+		/// <remarks>
+		/// Was "Konrad" up to version 3.0.258.
+		/// Specified first: "KN300001" (RG).
+		/// </remarks>
+		public const string CITYBIKE = "300103";
 
-        /// <summary> Holds the tink group (Lastenräder).</summary>
-        /// <remarks>
-        /// Was "TINK" up to version 3.0.258.
-        /// Specified first: "KN300029" (RG).
-        /// </remarks>
-        public const string CARGOBIKE = "300101";
-    }
+		/// <summary> Holds the tink group (Lastenräder).</summary>
+		/// <remarks>
+		/// Was "TINK" up to version 3.0.258.
+		/// Specified first: "KN300029" (RG).
+		/// </remarks>
+		public const string CARGOBIKE = "300101";
+	}
 }
diff --git a/TINKLib/Model/Connector/FilteredConnector.cs b/TINKLib/Model/Connector/FilteredConnector.cs
index 24bc452..e9d3a59 100644
--- a/TINKLib/Model/Connector/FilteredConnector.cs
+++ b/TINKLib/Model/Connector/FilteredConnector.cs
@@ -11,112 +11,112 @@ using BikeInfo = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo;
 
 namespace TINK.Model.Connector
 {
-    /// <summary> Filters connector respones.</summary>
-    /// <remarks>Former name: Filter</remarks>
-    public class FilteredConnector : IFilteredConnector
-    {
-        /// <summary> Constructs a filter object. </summary>
-        /// <param name="group">Filter group.</param>
-        /// <param name="connector">Connector object.</param>
-        public FilteredConnector(
-            IEnumerable<string> group,
-            IConnector connector)
-        {
-            Connector = connector;
+	/// <summary> Filters connector respones.</summary>
+	/// <remarks>Former name: Filter</remarks>
+	public class FilteredConnector : IFilteredConnector
+	{
+		/// <summary> Constructs a filter object. </summary>
+		/// <param name="group">Filter group.</param>
+		/// <param name="connector">Connector object.</param>
+		public FilteredConnector(
+			IEnumerable<string> group,
+			IConnector connector)
+		{
+			Connector = connector;
 
-            if (Connector == null)
-            {
-                throw new ArgumentException("Can not construct filter object. Connector- and command objects must not be null.");
-            }
+			if (Connector == null)
+			{
+				throw new ArgumentException("Can not construct filter object. Connector- and command objects must not be null.");
+			}
 
-            Query = new QueryProvider(Connector.Query, GroupFilterFactory.Create(group));
-        }
+			Query = new QueryProvider(Connector.Query, GroupFilterFactory.Create(group));
+		}
 
-        /// <summary> Inner connector object.</summary>
-        public IConnector Connector { get; }
+		/// <summary> Inner connector object.</summary>
+		public IConnector Connector { get; }
 
-        /// <summary> Command object. </summary>
-        public ICommand Command => Connector.Command;
+		/// <summary> Command object. </summary>
+		public ICommand Command => Connector.Command;
 
-        /// <summary> Object to query information. </summary>
-        public IQuery Query { get; }
+		/// <summary> Object to query information. </summary>
+		public IQuery Query { get; }
 
-        /// <summary> True if connector has access to copri server, false if cached values are used. </summary>
-        public bool IsConnected => Connector.IsConnected;
+		/// <summary> True if connector has access to copri server, false if cached values are used. </summary>
+		public bool IsConnected => Connector.IsConnected;
 
-        /// <summary> Object to perform filtered queries.</summary>
-        private class QueryProvider : IQuery
-        {
-            /// <summary> Holds the filter. </summary>
-            private IGroupFilter Filter { get; }
+		/// <summary> Object to perform filtered queries.</summary>
+		private class QueryProvider : IQuery
+		{
+			/// <summary> Holds the filter. </summary>
+			private IGroupFilter Filter { get; }
 
-            /// <summary> Holds the reference to object which performs copry queries.</summary>
-            private IQuery m_oInnerQuery;
+			/// <summary> Holds the reference to object which performs copry queries.</summary>
+			private IQuery m_oInnerQuery;
 
-            /// <summary> Constructs a query object.</summary>
-            /// <param name="innerQuerry"></param>
-            /// <param name="filter"></param>
-            public QueryProvider(IQuery innerQuerry, IGroupFilter filter)
-            {
-                m_oInnerQuery = innerQuerry;
-                Filter = filter;
-            }
+			/// <summary> Constructs a query object.</summary>
+			/// <param name="innerQuerry"></param>
+			/// <param name="filter"></param>
+			public QueryProvider(IQuery innerQuerry, IGroupFilter filter)
+			{
+				m_oInnerQuery = innerQuerry;
+				Filter = filter;
+			}
 
-            /// <summary> Gets bikes either bikes available if no user is logged in or bikes available and bikes occupied if a user is logged in. </summary>
-            public async Task<Result<BikeCollection>> GetBikesAsync()
-            {
-                var result = await m_oInnerQuery.GetBikesAsync();
-                return new Result<BikeCollection>(
-                    result.Source,
-                    new BikeCollection(DoFilter(result.Response, Filter)),
-                    result.GeneralData,
-                    result.Exception);
-            }
+			/// <summary> Gets bikes either bikes available if no user is logged in or bikes available and bikes occupied if a user is logged in. </summary>
+			public async Task<Result<BikeCollection>> GetBikesAsync()
+			{
+				var result = await m_oInnerQuery.GetBikesAsync();
+				return new Result<BikeCollection>(
+					result.Source,
+					new BikeCollection(DoFilter(result.Response, Filter)),
+					result.GeneralData,
+					result.Exception);
+			}
 
-            /// <summary> Gets bikes occupied if a user is logged in. </summary>
-            public async Task<Result<BikeCollection>> GetBikesOccupiedAsync()
-            {
-                var result = await m_oInnerQuery.GetBikesOccupiedAsync();
-                return new Result<BikeCollection>(
-                    result.Source,
-                    new BikeCollection(result.Response.ToDictionary(x => x.Id)),
-                    result.GeneralData,
-                    result.Exception);
-            }
+			/// <summary> Gets bikes occupied if a user is logged in. </summary>
+			public async Task<Result<BikeCollection>> GetBikesOccupiedAsync()
+			{
+				var result = await m_oInnerQuery.GetBikesOccupiedAsync();
+				return new Result<BikeCollection>(
+					result.Source,
+					new BikeCollection(result.Response.ToDictionary(x => x.Id)),
+					result.GeneralData,
+					result.Exception);
+			}
 
-            /// <summary> Gets all station applying filter rules. </summary>
-            /// <returns></returns>
-            public async Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync()
-            {
-                // Bikes and stations from COPRI or cache
-                var providerBikesAndStations = await m_oInnerQuery.GetBikesAndStationsAsync();
+			/// <summary> Gets all station applying filter rules. </summary>
+			/// <returns></returns>
+			public async Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync()
+			{
+				// Bikes and stations from COPRI or cache
+				var providerBikesAndStations = await m_oInnerQuery.GetBikesAndStationsAsync();
 
-                // Do filtering.
-                var filteredStationsDictionary = new StationDictionary(providerBikesAndStations.Response.StationsAll.CopriVersion, DoFilter(providerBikesAndStations.Response.StationsAll, Filter));
-                var filteredBikesDictionary = new BikeCollection(DoFilter(providerBikesAndStations.Response.Bikes, Filter));
-                var filteredBikesAndStations = new Result<StationsAndBikesContainer>(
-                    providerBikesAndStations.Source,
-                    new StationsAndBikesContainer(filteredStationsDictionary, filteredBikesDictionary),
-                    providerBikesAndStations.GeneralData,
-                    providerBikesAndStations.Exception);
+				// Do filtering.
+				var filteredStationsDictionary = new StationDictionary(providerBikesAndStations.Response.StationsAll.CopriVersion, DoFilter(providerBikesAndStations.Response.StationsAll, Filter));
+				var filteredBikesDictionary = new BikeCollection(DoFilter(providerBikesAndStations.Response.Bikes, Filter));
+				var filteredBikesAndStations = new Result<StationsAndBikesContainer>(
+					providerBikesAndStations.Source,
+					new StationsAndBikesContainer(filteredStationsDictionary, filteredBikesDictionary),
+					providerBikesAndStations.GeneralData,
+					providerBikesAndStations.Exception);
 
-                return filteredBikesAndStations;
-            }
+				return filteredBikesAndStations;
+			}
 
-            /// <summary> Filter bikes by group. </summary>
-            /// <param name="bikes">Bikes to filter.</param>
-            /// <returns>Filtered bikes.</returns>
-            private static Dictionary<string, BikeInfo> DoFilter(BikeCollection bikes, IGroupFilter filter)
-            {
-                return bikes.Where(x => filter.DoFilter(x.Group).Count() > 0).ToDictionary(x => x.Id);
-            }
+			/// <summary> Filter bikes by group. </summary>
+			/// <param name="bikes">Bikes to filter.</param>
+			/// <returns>Filtered bikes.</returns>
+			private static Dictionary<string, BikeInfo> DoFilter(BikeCollection bikes, IGroupFilter filter)
+			{
+				return bikes.Where(x => filter.DoFilter(x.Group).Count() > 0).ToDictionary(x => x.Id);
+			}
 
-            /// <summary> Filter stations by broup. </summary>
-            /// <returns></returns>
-            private static Dictionary<string, IStation> DoFilter(StationDictionary stations, IGroupFilter filter)
-            {
-                return stations.Where(x => filter.DoFilter(x.Group).Count() > 0).ToDictionary(x => x.Id);
-            }
-        }
-    }
+			/// <summary> Filter stations by broup. </summary>
+			/// <returns></returns>
+			private static Dictionary<string, IStation> DoFilter(StationDictionary stations, IGroupFilter filter)
+			{
+				return stations.Where(x => filter.DoFilter(x.Group).Count() > 0).ToDictionary(x => x.Id);
+			}
+		}
+	}
 }
diff --git a/TINKLib/Model/Connector/FilteredConnectorFactory.cs b/TINKLib/Model/Connector/FilteredConnectorFactory.cs
index 1d8df08..f61e96d 100644
--- a/TINKLib/Model/Connector/FilteredConnectorFactory.cs
+++ b/TINKLib/Model/Connector/FilteredConnectorFactory.cs
@@ -2,16 +2,16 @@
 
 namespace TINK.Model.Connector
 {
-    public static class FilteredConnectorFactory
-    {
-        /// <summary> Creates a filter object. </summary>
-        /// <param name="group">Filter to apply on stations and bikes.</param>
-        /// <param name="connector">Connector to connect to COPRI.</param>
-        public static IFilteredConnector Create(IEnumerable<string> group, IConnector connector)
-        {
-            return group != null
-                ? (IFilteredConnector)new FilteredConnector(group, connector)
-                : new NullFilterConnector(connector); // Do not apply filtering.
-        }
-    }
+	public static class FilteredConnectorFactory
+	{
+		/// <summary> Creates a filter object. </summary>
+		/// <param name="group">Filter to apply on stations and bikes.</param>
+		/// <param name="connector">Connector to connect to COPRI.</param>
+		public static IFilteredConnector Create(IEnumerable<string> group, IConnector connector)
+		{
+			return group != null
+				? (IFilteredConnector)new FilteredConnector(group, connector)
+				: new NullFilterConnector(connector); // Do not apply filtering.
+		}
+	}
 }
diff --git a/TINKLib/Model/Connector/IConnector.cs b/TINKLib/Model/Connector/IConnector.cs
index 7cebd34..4db7918 100644
--- a/TINKLib/Model/Connector/IConnector.cs
+++ b/TINKLib/Model/Connector/IConnector.cs
@@ -1,14 +1,14 @@
 namespace TINK.Model.Connector
 {
-    public interface IConnector
-    {
-        /// <summary> Object for queriying stations and bikes.</summary>
-        ICommand Command { get; }
+	public interface IConnector
+	{
+		/// <summary> Object for queriying stations and bikes.</summary>
+		ICommand Command { get; }
 
-        /// <summary> Object for queriying stations and bikes.</summary>
-        IQuery Query { get; }
+		/// <summary> Object for queriying stations and bikes.</summary>
+		IQuery Query { get; }
 
-        /// <summary> True if connector has access to copri server, false if cached values are used. </summary>
-        bool IsConnected { get; }
-    }
+		/// <summary> True if connector has access to copri server, false if cached values are used. </summary>
+		bool IsConnected { get; }
+	}
 }
diff --git a/TINKLib/Model/Connector/IFilteredConnector.cs b/TINKLib/Model/Connector/IFilteredConnector.cs
index d58149d..6a6489d 100644
--- a/TINKLib/Model/Connector/IFilteredConnector.cs
+++ b/TINKLib/Model/Connector/IFilteredConnector.cs
@@ -1,7 +1,7 @@
 namespace TINK.Model.Connector
 {
-    public interface IFilteredConnector : IConnector
-    {
-        IConnector Connector { get; }
-    }
+	public interface IFilteredConnector : IConnector
+	{
+		IConnector Connector { get; }
+	}
 }
diff --git a/TINKLib/Model/Connector/NullFilterConnector.cs b/TINKLib/Model/Connector/NullFilterConnector.cs
index 19040fe..96fca26 100644
--- a/TINKLib/Model/Connector/NullFilterConnector.cs
+++ b/TINKLib/Model/Connector/NullFilterConnector.cs
@@ -10,102 +10,102 @@ using BikeInfo = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo;
 
 namespace TINK.Model.Connector
 {
-    /// <summary> Filters connector respones.</summary>
-    public class NullFilterConnector : IFilteredConnector
-    {
-        /// <summary> Constructs a filter object. </summary>
-        /// <param name="p_oGroup">Filter group.</param>
-        /// <param name="connector">Connector object.</param>
-        public NullFilterConnector(
-            IConnector connector)
-        {
-            Connector = connector;
+	/// <summary> Filters connector respones.</summary>
+	public class NullFilterConnector : IFilteredConnector
+	{
+		/// <summary> Constructs a filter object. </summary>
+		/// <param name="p_oGroup">Filter group.</param>
+		/// <param name="connector">Connector object.</param>
+		public NullFilterConnector(
+			IConnector connector)
+		{
+			Connector = connector;
 
-            if (Connector == null)
-            {
-                throw new ArgumentException("Can not construct filter object. Connector- and command objects must not be null.");
-            }
+			if (Connector == null)
+			{
+				throw new ArgumentException("Can not construct filter object. Connector- and command objects must not be null.");
+			}
 
-            Query = new QueryProvider(Connector.Query);
-        }
+			Query = new QueryProvider(Connector.Query);
+		}
 
-        /// <summary> Inner connector object.</summary>
-        public IConnector Connector { get; }
+		/// <summary> Inner connector object.</summary>
+		public IConnector Connector { get; }
 
-        /// <summary> Command object. </summary>
-        public ICommand Command => Connector.Command;
+		/// <summary> Command object. </summary>
+		public ICommand Command => Connector.Command;
 
-        /// <summary> Object to query information. </summary>
-        public IQuery Query { get; }
+		/// <summary> Object to query information. </summary>
+		public IQuery Query { get; }
 
-        /// <summary> True if connector has access to copri server, false if cached values are used. </summary>
-        public bool IsConnected => Connector.IsConnected;
+		/// <summary> True if connector has access to copri server, false if cached values are used. </summary>
+		public bool IsConnected => Connector.IsConnected;
 
-        /// <summary> Object to perform filtered queries.</summary>
-        private class QueryProvider : IQuery
-        {
-            /// <summary> Holds the reference to object which performs copry queries.</summary>
-            private IQuery m_oInnerQuery;
+		/// <summary> Object to perform filtered queries.</summary>
+		private class QueryProvider : IQuery
+		{
+			/// <summary> Holds the reference to object which performs copry queries.</summary>
+			private IQuery m_oInnerQuery;
 
-            /// <summary> Constructs a query object.</summary>
-            /// <param name="p_oInnerQuery"></param>
-            /// <param name="p_oFilter"></param>
-            public QueryProvider(IQuery p_oInnerQuery)
-            {
-                m_oInnerQuery = p_oInnerQuery;
-            }
+			/// <summary> Constructs a query object.</summary>
+			/// <param name="p_oInnerQuery"></param>
+			/// <param name="p_oFilter"></param>
+			public QueryProvider(IQuery p_oInnerQuery)
+			{
+				m_oInnerQuery = p_oInnerQuery;
+			}
 
-            /// <summary> Gets bikes either bikes available if no user is logged in or bikes available and bikes occupied if a user is logged in. </summary>
-            public async Task<Result<BikeCollection>> GetBikesAsync()
-            {
-                var result = await m_oInnerQuery.GetBikesAsync();
-                return new Result<BikeCollection>(
-                    result.Source,
-                    new BikeCollection(result.Response.ToDictionary(x => x.Id)),
-                    result.GeneralData,
-                    result.Exception);
-            }
+			/// <summary> Gets bikes either bikes available if no user is logged in or bikes available and bikes occupied if a user is logged in. </summary>
+			public async Task<Result<BikeCollection>> GetBikesAsync()
+			{
+				var result = await m_oInnerQuery.GetBikesAsync();
+				return new Result<BikeCollection>(
+					result.Source,
+					new BikeCollection(result.Response.ToDictionary(x => x.Id)),
+					result.GeneralData,
+					result.Exception);
+			}
 
-            /// <summary> Gets bikes occupied if a user is logged in. </summary>
-            public async Task<Result<BikeCollection>> GetBikesOccupiedAsync()
-            {
-                var result = await m_oInnerQuery.GetBikesOccupiedAsync();
-                return new Result<BikeCollection>(
-                    result.Source,
-                    new BikeCollection(result.Response.ToDictionary(x => x.Id)),
-                    result.GeneralData,
-                    result.Exception);
-            }
+			/// <summary> Gets bikes occupied if a user is logged in. </summary>
+			public async Task<Result<BikeCollection>> GetBikesOccupiedAsync()
+			{
+				var result = await m_oInnerQuery.GetBikesOccupiedAsync();
+				return new Result<BikeCollection>(
+					result.Source,
+					new BikeCollection(result.Response.ToDictionary(x => x.Id)),
+					result.GeneralData,
+					result.Exception);
+			}
 
-            /// <summary> Gets all station applying filter rules. </summary>
-            /// <returns></returns>
-            public async Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync()
-            {
-                var result = await m_oInnerQuery.GetBikesAndStationsAsync();
+			/// <summary> Gets all station applying filter rules. </summary>
+			/// <returns></returns>
+			public async Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync()
+			{
+				var result = await m_oInnerQuery.GetBikesAndStationsAsync();
 
-                return new Result<StationsAndBikesContainer>(
-                    result.Source,
-                    new StationsAndBikesContainer(
-                        new StationDictionary(result.Response.StationsAll.CopriVersion, result.Response.StationsAll.ToDictionary(x => x.Id)),
-                        new BikeCollection(result.Response.Bikes.ToDictionary(x => x.Id))),
-                    result.GeneralData,
-                    result.Exception);
-            }
+				return new Result<StationsAndBikesContainer>(
+					result.Source,
+					new StationsAndBikesContainer(
+						new StationDictionary(result.Response.StationsAll.CopriVersion, result.Response.StationsAll.ToDictionary(x => x.Id)),
+						new BikeCollection(result.Response.Bikes.ToDictionary(x => x.Id))),
+					result.GeneralData,
+					result.Exception);
+			}
 
-            /// <summary> Filter bikes by group. </summary>
-            /// <param name="bikes">Bikes to filter.</param>
-            /// <returns>Filtered bikes.</returns>
-            public static Dictionary<string, BikeInfo> DoFilter(BikeCollection bikes, IEnumerable<string> filter)
-            {
-                return bikes.Where(x => x.Group.Intersect(filter).Count() > 0).ToDictionary(x => x.Id);
-            }
+			/// <summary> Filter bikes by group. </summary>
+			/// <param name="bikes">Bikes to filter.</param>
+			/// <returns>Filtered bikes.</returns>
+			public static Dictionary<string, BikeInfo> DoFilter(BikeCollection bikes, IEnumerable<string> filter)
+			{
+				return bikes.Where(x => x.Group.Intersect(filter).Count() > 0).ToDictionary(x => x.Id);
+			}
 
-            /// <summary> Filter stations by broup. </summary>
-            /// <returns></returns>
-            public static Dictionary<string, IStation> DoFilter(StationDictionary stations, IEnumerable<string> p_oFilter)
-            {
-                return stations.Where(x => x.Group.Intersect(p_oFilter).Count() > 0).ToDictionary(x => x.Id);
-            }
-        }
-    }
+			/// <summary> Filter stations by broup. </summary>
+			/// <returns></returns>
+			public static Dictionary<string, IStation> DoFilter(StationDictionary stations, IEnumerable<string> p_oFilter)
+			{
+				return stations.Where(x => x.Group.Intersect(p_oFilter).Count() > 0).ToDictionary(x => x.Id);
+			}
+		}
+	}
 }
diff --git a/TINKLib/Model/Connector/Query/Base.cs b/TINKLib/Model/Connector/Query/Base.cs
index 76979ee..a0c8b0e 100644
--- a/TINKLib/Model/Connector/Query/Base.cs
+++ b/TINKLib/Model/Connector/Query/Base.cs
@@ -3,25 +3,25 @@ using TINK.Repository;
 
 namespace TINK.Model.Connector
 {
-    /// <summary>
-    /// Provides information required for copri commands/ query operations.
-    /// </summary>
-    public class Base
-    {
-        /// <summary> Reference to object which provides access to copri server. </summary>
-        protected ICopriServerBase CopriServer { get; }
+	/// <summary>
+	/// Provides information required for copri commands/ query operations.
+	/// </summary>
+	public class Base
+	{
+		/// <summary> Reference to object which provides access to copri server. </summary>
+		protected ICopriServerBase CopriServer { get; }
 
-        /// <summary> Gets the merchant id.</summary>
-        protected string MerchantId => CopriServer.MerchantId;
+		/// <summary> Gets the merchant id.</summary>
+		protected string MerchantId => CopriServer.MerchantId;
 
-        /// <summary> Constructs a query base object.</summary>
-        /// <param name="p_oCopriServer">Server which implements communication.</param>
-        /// <param name="p_oErrorStack">Object which hold communication objects.</param>
-        protected Base(
-            ICopriServerBase p_oCopriServer)
-        {
-            CopriServer = p_oCopriServer
-                ?? throw new ArgumentException("Can not instantiate command/ query base- object. Copri server object must never be null or emtpy.");
-        }
-    }
+		/// <summary> Constructs a query base object.</summary>
+		/// <param name="p_oCopriServer">Server which implements communication.</param>
+		/// <param name="p_oErrorStack">Object which hold communication objects.</param>
+		protected Base(
+			ICopriServerBase p_oCopriServer)
+		{
+			CopriServer = p_oCopriServer
+				?? throw new ArgumentException("Can not instantiate command/ query base- object. Copri server object must never be null or emtpy.");
+		}
+	}
 }
diff --git a/TINKLib/Model/Connector/Query/BaseLoggedIn.cs b/TINKLib/Model/Connector/Query/BaseLoggedIn.cs
index adb2ee2..55d8cf6 100644
--- a/TINKLib/Model/Connector/Query/BaseLoggedIn.cs
+++ b/TINKLib/Model/Connector/Query/BaseLoggedIn.cs
@@ -3,37 +3,37 @@ using TINK.Repository;
 
 namespace TINK.Model.Connector
 {
-    /// <summary>Holds user infromation required for copri related commands/ query operations. </summary>
-    public class BaseLoggedIn : Base
-    {
-        /// <summary>Session cookie used to sign in to copri.</summary>
-        public string SessionCookie { get; }
+	/// <summary>Holds user infromation required for copri related commands/ query operations. </summary>
+	public class BaseLoggedIn : Base
+	{
+		/// <summary>Session cookie used to sign in to copri.</summary>
+		public string SessionCookie { get; }
 
-        /// <summary> Mail address of the user. </summary>
-        protected string Mail { get; }
+		/// <summary> Mail address of the user. </summary>
+		protected string Mail { get; }
 
-        /// <summary> Object which provides date time info. </summary>
-        protected readonly Func<DateTime> DateTimeProvider;
+		/// <summary> Object which provides date time info. </summary>
+		protected readonly Func<DateTime> DateTimeProvider;
 
-        /// <summary>Constructs a copri query object.</summary>
-        /// <param name="copriServer">Server which implements communication.</param>
-        public BaseLoggedIn(ICopriServerBase copriServer,
-            string sessionCookie,
-            string mail,
-            Func<DateTime> p_oDateTimeProvider) : base(copriServer)
-        {
-            if (string.IsNullOrEmpty(sessionCookie))
-                throw new ArgumentException("Can not instantiate query object- object. Session cookie must never be null or emtpy.");
+		/// <summary>Constructs a copri query object.</summary>
+		/// <param name="copriServer">Server which implements communication.</param>
+		public BaseLoggedIn(ICopriServerBase copriServer,
+			string sessionCookie,
+			string mail,
+			Func<DateTime> p_oDateTimeProvider) : base(copriServer)
+		{
+			if (string.IsNullOrEmpty(sessionCookie))
+				throw new ArgumentException("Can not instantiate query object- object. Session cookie must never be null or emtpy.");
 
-            if (string.IsNullOrEmpty(mail))
-                throw new ArgumentException("Can not instantiate query object- object. Mail address must never be null or emtpy.");
+			if (string.IsNullOrEmpty(mail))
+				throw new ArgumentException("Can not instantiate query object- object. Mail address must never be null or emtpy.");
 
-            DateTimeProvider = p_oDateTimeProvider
-                ?? throw new ArgumentException("Can not instantiate connector- object. No date time provider object available.");
+			DateTimeProvider = p_oDateTimeProvider
+				?? throw new ArgumentException("Can not instantiate connector- object. No date time provider object available.");
 
-            SessionCookie = sessionCookie;
+			SessionCookie = sessionCookie;
 
-            Mail = mail;
-        }
-    }
+			Mail = mail;
+		}
+	}
 }
diff --git a/TINKLib/Model/Connector/Query/CachedQuery.cs b/TINKLib/Model/Connector/Query/CachedQuery.cs
index 9f196df..2ff69c8 100644
--- a/TINKLib/Model/Connector/Query/CachedQuery.cs
+++ b/TINKLib/Model/Connector/Query/CachedQuery.cs
@@ -11,82 +11,82 @@ using BikeInfo = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo;
 
 namespace TINK.Model.Connector
 {
-    public class CachedQuery : Base, IQuery
-    {
-        /// <summary> Cached copri server. </summary>
-        private readonly ICachedCopriServer server;
+	public class CachedQuery : Base, IQuery
+	{
+		/// <summary> Cached copri server. </summary>
+		private readonly ICachedCopriServer server;
 
-        /// <summary>Constructs a copri query object.</summary>
-        /// <param name="copriServer">Server which implements communication.</param>
-        public CachedQuery(
-            ICopriServerBase copriServer) : base(copriServer)
-        {
-            server = copriServer as ICachedCopriServer;
-            if (server == null)
-            {
-                throw new ArgumentException($"Copri server is not of expected typ. Type detected is {copriServer.GetType()}.");
-            }
-        }
+		/// <summary>Constructs a copri query object.</summary>
+		/// <param name="copriServer">Server which implements communication.</param>
+		public CachedQuery(
+			ICopriServerBase copriServer) : base(copriServer)
+		{
+			server = copriServer as ICachedCopriServer;
+			if (server == null)
+			{
+				throw new ArgumentException($"Copri server is not of expected typ. Type detected is {copriServer.GetType()}.");
+			}
+		}
 
-        /// <summary> Gets all stations including postions and bikes.</summary>
-        public async Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync()
-        {
-            var resultStations = await server.GetStations();
+		/// <summary> Gets all stations including postions and bikes.</summary>
+		public async Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync()
+		{
+			var resultStations = await server.GetStations();
 
-            if (resultStations.Source == typeof(CopriCallsMonkeyStore))
-            {
-                // Communication with copri in order to get stations failed.
-                return new Result<StationsAndBikesContainer>(
-                    resultStations.Source,
-                    new StationsAndBikesContainer(
-                        resultStations.Response.GetStationsAllMutable(),
-                        (await server.GetBikesAvailable(true)).Response.GetBikesAvailable()),
-                    resultStations.GeneralData,
-                    resultStations.Exception);
-            }
+			if (resultStations.Source == typeof(CopriCallsMonkeyStore))
+			{
+				// Communication with copri in order to get stations failed.
+				return new Result<StationsAndBikesContainer>(
+					resultStations.Source,
+					new StationsAndBikesContainer(
+						resultStations.Response.GetStationsAllMutable(),
+						(await server.GetBikesAvailable(true)).Response.GetBikesAvailable()),
+					resultStations.GeneralData,
+					resultStations.Exception);
+			}
 
-            var resultBikes = await server.GetBikesAvailable();
-            if (resultBikes.Source == typeof(CopriCallsMonkeyStore))
-            {
-                // Communication with copri in order to get bikes failed.
-                return new Result<StationsAndBikesContainer>(
-                    resultBikes.Source,
-                    new StationsAndBikesContainer(
-                        (await server.GetStations(true)).Response.GetStationsAllMutable(),
-                        resultBikes.Response.GetBikesAvailable()),
-                    resultBikes.GeneralData,
-                    resultBikes.Exception);
-            }
+			var resultBikes = await server.GetBikesAvailable();
+			if (resultBikes.Source == typeof(CopriCallsMonkeyStore))
+			{
+				// Communication with copri in order to get bikes failed.
+				return new Result<StationsAndBikesContainer>(
+					resultBikes.Source,
+					new StationsAndBikesContainer(
+						(await server.GetStations(true)).Response.GetStationsAllMutable(),
+						resultBikes.Response.GetBikesAvailable()),
+					resultBikes.GeneralData,
+					resultBikes.Exception);
+			}
 
-            // Communicatin with copri succeeded.
-            server.AddToCache(resultStations);
-            server.AddToCache(resultBikes);
+			// Communicatin with copri succeeded.
+			server.AddToCache(resultStations);
+			server.AddToCache(resultBikes);
 
-            return new Result<StationsAndBikesContainer>(
-                resultStations.Source,
-                new StationsAndBikesContainer(resultStations.Response.GetStationsAllMutable(), resultBikes.Response.GetBikesAvailable()),
-                resultStations.GeneralData);
-        }
+			return new Result<StationsAndBikesContainer>(
+				resultStations.Source,
+				new StationsAndBikesContainer(resultStations.Response.GetStationsAllMutable(), resultBikes.Response.GetBikesAvailable()),
+				resultStations.GeneralData);
+		}
 
-        /// <summary> Gets bikes occupied. </summary>
-        /// <returns>Collection of bikes.</returns>
-        public async Task<Result<BikeCollection>> GetBikesOccupiedAsync()
-        {
-            Log.ForContext<CachedQuery>().Error("Unexpected call to get be bikes occpied detected. No user is logged in.");
-            return new Result<BikeCollection>(
-                typeof(CopriCallsMonkeyStore),
-                await Task.FromResult(new BikeCollection(new Dictionary<string, BikeInfo>())),
-                new GeneralData(),
-                new Exception("Abfrage der reservierten/ gebuchten Räder nicht möglich. Kein Benutzer angemeldet."));
-        }
+		/// <summary> Gets bikes occupied. </summary>
+		/// <returns>Collection of bikes.</returns>
+		public async Task<Result<BikeCollection>> GetBikesOccupiedAsync()
+		{
+			Log.ForContext<CachedQuery>().Error("Unexpected call to get be bikes occpied detected. No user is logged in.");
+			return new Result<BikeCollection>(
+				typeof(CopriCallsMonkeyStore),
+				await Task.FromResult(new BikeCollection(new Dictionary<string, BikeInfo>())),
+				new GeneralData(),
+				new Exception("Abfrage der reservierten/ gebuchten Räder nicht möglich. Kein Benutzer angemeldet."));
+		}
 
-        /// <summary> Gets bikes available. </summary>
-        /// <returns>Collection of bikes.</returns>
-        public async Task<Result<BikeCollection>> GetBikesAsync()
-        {
-            var result = await server.GetBikesAvailable();
-            server.AddToCache(result);
-            return new Result<BikeCollection>(result.Source, result.Response.GetBikesAvailable(), result.GeneralData, result.Exception);
-        }
-    }
+		/// <summary> Gets bikes available. </summary>
+		/// <returns>Collection of bikes.</returns>
+		public async Task<Result<BikeCollection>> GetBikesAsync()
+		{
+			var result = await server.GetBikesAvailable();
+			server.AddToCache(result);
+			return new Result<BikeCollection>(result.Source, result.Response.GetBikesAvailable(), result.GeneralData, result.Exception);
+		}
+	}
 }
diff --git a/TINKLib/Model/Connector/Query/CachedQueryLoggedIn.cs b/TINKLib/Model/Connector/Query/CachedQueryLoggedIn.cs
index c32accc..8a204ef 100644
--- a/TINKLib/Model/Connector/Query/CachedQueryLoggedIn.cs
+++ b/TINKLib/Model/Connector/Query/CachedQueryLoggedIn.cs
@@ -9,210 +9,210 @@ using TINK.Repository;
 
 namespace TINK.Model.Connector
 {
-    /// <summary> Provides query functionality for a logged in user. </summary>
-    public class CachedQueryLoggedIn : BaseLoggedIn, IQuery
-    {
-        /// <summary> Cached copri server. </summary>
-        private ICachedCopriServer Server { get; }
+	/// <summary> Provides query functionality for a logged in user. </summary>
+	public class CachedQueryLoggedIn : BaseLoggedIn, IQuery
+	{
+		/// <summary> Cached copri server. </summary>
+		private ICachedCopriServer Server { get; }
 
-        /// <summary>Constructs a copri query object.</summary>
-        /// <param name="copriServer">Server which implements communication.</param>
-        public CachedQueryLoggedIn(ICopriServerBase copriServer,
-            string sessionCookie,
-            string mail,
-            Func<DateTime> dateTimeProvider) : base(copriServer, sessionCookie, mail, dateTimeProvider)
-        {
-            Server = copriServer as ICachedCopriServer;
-            if (Server == null)
-            {
-                throw new ArgumentException($"Copri server is not of expected typ. Type detected is {copriServer.GetType()}.");
-            }
-        }
+		/// <summary>Constructs a copri query object.</summary>
+		/// <param name="copriServer">Server which implements communication.</param>
+		public CachedQueryLoggedIn(ICopriServerBase copriServer,
+			string sessionCookie,
+			string mail,
+			Func<DateTime> dateTimeProvider) : base(copriServer, sessionCookie, mail, dateTimeProvider)
+		{
+			Server = copriServer as ICachedCopriServer;
+			if (Server == null)
+			{
+				throw new ArgumentException($"Copri server is not of expected typ. Type detected is {copriServer.GetType()}.");
+			}
+		}
 
-        /// <summary> Gets all stations including postions.</summary>
-        public async Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync()
-        {
-            var stationsResponse = await Server.GetStations();
+		/// <summary> Gets all stations including postions.</summary>
+		public async Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync()
+		{
+			var stationsResponse = await Server.GetStations();
 
-            if (stationsResponse.Source == typeof(CopriCallsMonkeyStore)
-                || stationsResponse.Exception != null)
-            {
-                // Stations were read from cache ==> get bikes availbalbe and occupied from cache as well to avoid inconsistencies
-                return new Result<StationsAndBikesContainer>(
-                    stationsResponse.Source,
-                    new StationsAndBikesContainer(
-                        stationsResponse.Response.GetStationsAllMutable(),
-                        UpdaterJSON.GetBikesAll(
-                            (await Server.GetBikesAvailable(true)).Response?.bikes?.Values,
-                            (await Server.GetBikesOccupied(true)).Response?.bikes_occupied?.Values,
-                            Mail,
-                            DateTimeProvider)),
-                    stationsResponse.GeneralData,
-                    stationsResponse.Exception);
-            }
+			if (stationsResponse.Source == typeof(CopriCallsMonkeyStore)
+				|| stationsResponse.Exception != null)
+			{
+				// Stations were read from cache ==> get bikes availbalbe and occupied from cache as well to avoid inconsistencies
+				return new Result<StationsAndBikesContainer>(
+					stationsResponse.Source,
+					new StationsAndBikesContainer(
+						stationsResponse.Response.GetStationsAllMutable(),
+						UpdaterJSON.GetBikesAll(
+							(await Server.GetBikesAvailable(true)).Response?.bikes?.Values,
+							(await Server.GetBikesOccupied(true)).Response?.bikes_occupied?.Values,
+							Mail,
+							DateTimeProvider)),
+					stationsResponse.GeneralData,
+					stationsResponse.Exception);
+			}
 
-            var bikesAvailableResponse = await Server.GetBikesAvailable();
-            if (bikesAvailableResponse.Source == typeof(CopriCallsMonkeyStore)
-                || bikesAvailableResponse.Exception != null)
-            {
-                // Bikes avilable were read from cache ==> get bikes occupied from cache as well to avoid inconsistencies
-                return new Result<StationsAndBikesContainer>(
-                    bikesAvailableResponse.Source,
-                    new StationsAndBikesContainer(
-                        (await Server.GetStations(true)).Response.GetStationsAllMutable(),
-                        UpdaterJSON.GetBikesAll(bikesAvailableResponse.Response?.bikes?.Values,
-                        (await Server.GetBikesOccupied(true)).Response?.bikes_occupied?.Values,
-                        Mail,
-                        DateTimeProvider)),
-                    bikesAvailableResponse.GeneralData,
-                    bikesAvailableResponse.Exception);
-            }
+			var bikesAvailableResponse = await Server.GetBikesAvailable();
+			if (bikesAvailableResponse.Source == typeof(CopriCallsMonkeyStore)
+				|| bikesAvailableResponse.Exception != null)
+			{
+				// Bikes avilable were read from cache ==> get bikes occupied from cache as well to avoid inconsistencies
+				return new Result<StationsAndBikesContainer>(
+					bikesAvailableResponse.Source,
+					new StationsAndBikesContainer(
+						(await Server.GetStations(true)).Response.GetStationsAllMutable(),
+						UpdaterJSON.GetBikesAll(bikesAvailableResponse.Response?.bikes?.Values,
+						(await Server.GetBikesOccupied(true)).Response?.bikes_occupied?.Values,
+						Mail,
+						DateTimeProvider)),
+					bikesAvailableResponse.GeneralData,
+					bikesAvailableResponse.Exception);
+			}
 
-            var bikesOccupiedResponse = await Server.GetBikesOccupied();
-            if (bikesOccupiedResponse.Source == typeof(CopriCallsMonkeyStore)
-                || bikesOccupiedResponse.Exception != null)
-            {
-                // Bikes occupied were read from cache ==> get bikes available from cache as well to avoid inconsistencies
-                return new Result<StationsAndBikesContainer>(
-                    bikesOccupiedResponse.Source,
-                    new StationsAndBikesContainer(
-                        (await Server.GetStations(true)).Response.GetStationsAllMutable(),
-                        UpdaterJSON.GetBikesAll(
-                            (await Server.GetBikesAvailable(true)).Response?.bikes?.Values,
-                            bikesOccupiedResponse.Response?.bikes_occupied?.Values,
-                            Mail,
-                            DateTimeProvider)),
-                    bikesOccupiedResponse.GeneralData,
-                    bikesOccupiedResponse.Exception);
-            }
+			var bikesOccupiedResponse = await Server.GetBikesOccupied();
+			if (bikesOccupiedResponse.Source == typeof(CopriCallsMonkeyStore)
+				|| bikesOccupiedResponse.Exception != null)
+			{
+				// Bikes occupied were read from cache ==> get bikes available from cache as well to avoid inconsistencies
+				return new Result<StationsAndBikesContainer>(
+					bikesOccupiedResponse.Source,
+					new StationsAndBikesContainer(
+						(await Server.GetStations(true)).Response.GetStationsAllMutable(),
+						UpdaterJSON.GetBikesAll(
+							(await Server.GetBikesAvailable(true)).Response?.bikes?.Values,
+							bikesOccupiedResponse.Response?.bikes_occupied?.Values,
+							Mail,
+							DateTimeProvider)),
+					bikesOccupiedResponse.GeneralData,
+					bikesOccupiedResponse.Exception);
+			}
 
-            // Both types bikes could read from copri =>  update cache
-            Server.AddToCache(stationsResponse);
-            Server.AddToCache(bikesAvailableResponse);
-            Server.AddToCache(bikesOccupiedResponse);
+			// Both types bikes could read from copri =>  update cache
+			Server.AddToCache(stationsResponse);
+			Server.AddToCache(bikesAvailableResponse);
+			Server.AddToCache(bikesOccupiedResponse);
 
-            var exceptions = new[] { stationsResponse?.Exception, bikesAvailableResponse?.Exception, bikesOccupiedResponse?.Exception }.Where(x => x != null).ToArray();
+			var exceptions = new[] { stationsResponse?.Exception, bikesAvailableResponse?.Exception, bikesOccupiedResponse?.Exception }.Where(x => x != null).ToArray();
 
-            var stationsMutable = stationsResponse.Response.GetStationsAllMutable();
-            var bikesMutable = UpdaterJSON.GetBikesAll(
-                        bikesAvailableResponse.Response?.bikes?.Values,
-                        bikesOccupiedResponse.Response?.bikes_occupied?.Values,
-                        Mail,
-                        DateTimeProvider);
+			var stationsMutable = stationsResponse.Response.GetStationsAllMutable();
+			var bikesMutable = UpdaterJSON.GetBikesAll(
+						bikesAvailableResponse.Response?.bikes?.Values,
+						bikesOccupiedResponse.Response?.bikes_occupied?.Values,
+						Mail,
+						DateTimeProvider);
 
-            return new Result<StationsAndBikesContainer>(
-                stationsResponse.Source,
-                new StationsAndBikesContainer(stationsMutable, bikesMutable),
-                stationsResponse.GeneralData,
-                exceptions.Length > 0 ? new AggregateException(exceptions) : null);
-        }
+			return new Result<StationsAndBikesContainer>(
+				stationsResponse.Source,
+				new StationsAndBikesContainer(stationsMutable, bikesMutable),
+				stationsResponse.GeneralData,
+				exceptions.Length > 0 ? new AggregateException(exceptions) : null);
+		}
 
-        /// <summary> Gets bikes occupied. </summary>
-        /// <returns>Collection of bikes.</returns>
-        public async Task<Result<BikeCollection>> GetBikesOccupiedAsync()
-        {
-            var bikesAvailableResponse = await Server.GetBikesAvailable(false);
-            if (bikesAvailableResponse.Source == typeof(CopriCallsMonkeyStore)
-                || bikesAvailableResponse.Exception != null)
-            {
-                // Bikes available were read from cache ==> get bikes occupied from cache as well to avoid inconsistencies.
-                Log.ForContext<CachedQueryLoggedIn>().Debug("Bikes available read from cache. Reading bikes occupied from cache as well.");
-                return new Result<BikeCollection>(
-                    bikesAvailableResponse.Source,
-                    UpdaterJSON.GetBikesAll(
-                        bikesAvailableResponse.Response?.bikes?.Values?.Where(bike => bike.GetState() == State.InUseStateEnum.FeedbackPending),
-                        (await Server.GetBikesOccupied(true))?.Response?.bikes_occupied?.Values,
-                        Mail,
-                        DateTimeProvider),
-                    bikesAvailableResponse.GeneralData,
-                    bikesAvailableResponse.Exception);
-            }
+		/// <summary> Gets bikes occupied. </summary>
+		/// <returns>Collection of bikes.</returns>
+		public async Task<Result<BikeCollection>> GetBikesOccupiedAsync()
+		{
+			var bikesAvailableResponse = await Server.GetBikesAvailable(false);
+			if (bikesAvailableResponse.Source == typeof(CopriCallsMonkeyStore)
+				|| bikesAvailableResponse.Exception != null)
+			{
+				// Bikes available were read from cache ==> get bikes occupied from cache as well to avoid inconsistencies.
+				Log.ForContext<CachedQueryLoggedIn>().Debug("Bikes available read from cache. Reading bikes occupied from cache as well.");
+				return new Result<BikeCollection>(
+					bikesAvailableResponse.Source,
+					UpdaterJSON.GetBikesAll(
+						bikesAvailableResponse.Response?.bikes?.Values?.Where(bike => bike.GetState() == State.InUseStateEnum.FeedbackPending),
+						(await Server.GetBikesOccupied(true))?.Response?.bikes_occupied?.Values,
+						Mail,
+						DateTimeProvider),
+					bikesAvailableResponse.GeneralData,
+					bikesAvailableResponse.Exception);
+			}
 
-            var bikesOccupiedResponse = await Server.GetBikesOccupied(false);
-            if (bikesOccupiedResponse.Source == typeof(CopriCallsMonkeyStore)
-                || bikesOccupiedResponse.Exception != null)
-            {
-                // Bikes occupied were read from cache ==> get bikes available from cache as well to avoid inconsistencies
-                Log.ForContext<CachedQueryLoggedIn>().Debug("Bikes occupied read from cache. Reread bikes available from cache as well.");
-                return new Result<BikeCollection>(
-                    bikesOccupiedResponse.Source,
-                    UpdaterJSON.GetBikesAll(
-                        (await Server.GetBikesAvailable(true)).Response?.bikes?.Values?.Where(bike => bike.GetState() == State.InUseStateEnum.FeedbackPending),
-                        bikesOccupiedResponse.Response?.bikes_occupied?.Values,
-                        Mail,
-                        DateTimeProvider),
-                    bikesOccupiedResponse.GeneralData,
-                    bikesOccupiedResponse.Exception);
-            }
+			var bikesOccupiedResponse = await Server.GetBikesOccupied(false);
+			if (bikesOccupiedResponse.Source == typeof(CopriCallsMonkeyStore)
+				|| bikesOccupiedResponse.Exception != null)
+			{
+				// Bikes occupied were read from cache ==> get bikes available from cache as well to avoid inconsistencies
+				Log.ForContext<CachedQueryLoggedIn>().Debug("Bikes occupied read from cache. Reread bikes available from cache as well.");
+				return new Result<BikeCollection>(
+					bikesOccupiedResponse.Source,
+					UpdaterJSON.GetBikesAll(
+						(await Server.GetBikesAvailable(true)).Response?.bikes?.Values?.Where(bike => bike.GetState() == State.InUseStateEnum.FeedbackPending),
+						bikesOccupiedResponse.Response?.bikes_occupied?.Values,
+						Mail,
+						DateTimeProvider),
+					bikesOccupiedResponse.GeneralData,
+					bikesOccupiedResponse.Exception);
+			}
 
-            // Both types bikes could read from copri =>  update bikes occupied cache.
-            // // Do not add bikes available to cache because this might lead to conflicts calls GetBikesAsync() and bikes with FeedbackPending state are of no use offline. 
-            Server.AddToCache(bikesOccupiedResponse);
+			// Both types bikes could read from copri =>  update bikes occupied cache.
+			// // Do not add bikes available to cache because this might lead to conflicts calls GetBikesAsync() and bikes with FeedbackPending state are of no use offline. 
+			Server.AddToCache(bikesOccupiedResponse);
 
-            return new Result<BikeCollection>(
-                bikesOccupiedResponse.Source,
-               UpdaterJSON.GetBikesAll(
-                    bikesAvailableResponse?.Response.bikes?.Values?.Select(bike => bike)?.Where(bike => bike.GetState() == State.InUseStateEnum.FeedbackPending),
-                    bikesOccupiedResponse?.Response?.bikes_occupied?.Values,
-                    Mail,
-                    DateTimeProvider),
-                bikesOccupiedResponse.GeneralData,
-                bikesOccupiedResponse.Exception);
-        }
+			return new Result<BikeCollection>(
+				bikesOccupiedResponse.Source,
+			   UpdaterJSON.GetBikesAll(
+					bikesAvailableResponse?.Response.bikes?.Values?.Select(bike => bike)?.Where(bike => bike.GetState() == State.InUseStateEnum.FeedbackPending),
+					bikesOccupiedResponse?.Response?.bikes_occupied?.Values,
+					Mail,
+					DateTimeProvider),
+				bikesOccupiedResponse.GeneralData,
+				bikesOccupiedResponse.Exception);
+		}
 
-        /// <summary> Gets bikes available and bikes occupied. </summary>
-        /// <returns>Collection of bikes.</returns>
-        public async Task<Result<BikeCollection>> GetBikesAsync()
-        {
-            var bikesAvailableResponse = await Server.GetBikesAvailable();
+		/// <summary> Gets bikes available and bikes occupied. </summary>
+		/// <returns>Collection of bikes.</returns>
+		public async Task<Result<BikeCollection>> GetBikesAsync()
+		{
+			var bikesAvailableResponse = await Server.GetBikesAvailable();
 
-            if (bikesAvailableResponse.Source == typeof(CopriCallsMonkeyStore)
-                || bikesAvailableResponse.Exception != null)
-            {
-                // Bikes available were read from cache ==> get bikes occupied from cache as well to avoid inconsistencies.
-                Log.ForContext<CachedQueryLoggedIn>().Debug("Bikes available read from cache. Reading bikes occupied from cache as well.");
-                return new Result<BikeCollection>(
-                    bikesAvailableResponse.Source,
-                    UpdaterJSON.GetBikesAll(
-                        bikesAvailableResponse.Response?.bikes?.Values,
-                        (await Server.GetBikesOccupied(true)).Response?.bikes_occupied?.Values,
-                        Mail,
-                        DateTimeProvider),
-                    bikesAvailableResponse.GeneralData,
-                    bikesAvailableResponse.Exception);
-            }
+			if (bikesAvailableResponse.Source == typeof(CopriCallsMonkeyStore)
+				|| bikesAvailableResponse.Exception != null)
+			{
+				// Bikes available were read from cache ==> get bikes occupied from cache as well to avoid inconsistencies.
+				Log.ForContext<CachedQueryLoggedIn>().Debug("Bikes available read from cache. Reading bikes occupied from cache as well.");
+				return new Result<BikeCollection>(
+					bikesAvailableResponse.Source,
+					UpdaterJSON.GetBikesAll(
+						bikesAvailableResponse.Response?.bikes?.Values,
+						(await Server.GetBikesOccupied(true)).Response?.bikes_occupied?.Values,
+						Mail,
+						DateTimeProvider),
+					bikesAvailableResponse.GeneralData,
+					bikesAvailableResponse.Exception);
+			}
 
-            var bikesOccupiedResponse = await Server.GetBikesOccupied();
-            if (bikesOccupiedResponse.Source == typeof(CopriCallsMonkeyStore)
-                || bikesOccupiedResponse.Exception != null)
-            {
-                // Bikes occupied were read from cache ==> get bikes available from cache as well to avoid inconsistencies
-                Log.ForContext<CachedQueryLoggedIn>().Debug("Bikes occupied read from cache. Reread bikes available from cache as well.");
-                return new Result<BikeCollection>(
-                    bikesOccupiedResponse.Source,
-                    UpdaterJSON.GetBikesAll(
-                        (await Server.GetBikesAvailable(true)).Response?.bikes?.Values,
-                        bikesOccupiedResponse.Response?.bikes_occupied?.Values,
-                        Mail,
-                        DateTimeProvider),
-                    bikesOccupiedResponse.GeneralData,
-                    bikesOccupiedResponse.Exception);
-            }
+			var bikesOccupiedResponse = await Server.GetBikesOccupied();
+			if (bikesOccupiedResponse.Source == typeof(CopriCallsMonkeyStore)
+				|| bikesOccupiedResponse.Exception != null)
+			{
+				// Bikes occupied were read from cache ==> get bikes available from cache as well to avoid inconsistencies
+				Log.ForContext<CachedQueryLoggedIn>().Debug("Bikes occupied read from cache. Reread bikes available from cache as well.");
+				return new Result<BikeCollection>(
+					bikesOccupiedResponse.Source,
+					UpdaterJSON.GetBikesAll(
+						(await Server.GetBikesAvailable(true)).Response?.bikes?.Values,
+						bikesOccupiedResponse.Response?.bikes_occupied?.Values,
+						Mail,
+						DateTimeProvider),
+					bikesOccupiedResponse.GeneralData,
+					bikesOccupiedResponse.Exception);
+			}
 
-            // Both types bikes could read from copri =>  update cache
-            Server.AddToCache(bikesAvailableResponse);
-            Server.AddToCache(bikesOccupiedResponse);
+			// Both types bikes could read from copri =>  update cache
+			Server.AddToCache(bikesAvailableResponse);
+			Server.AddToCache(bikesOccupiedResponse);
 
-            Log.ForContext<CachedQueryLoggedIn>().Debug("Bikes available and occupied read successfully from server.");
-            return new Result<BikeCollection>(
-                bikesAvailableResponse.Source,
-                UpdaterJSON.GetBikesAll(
-                    bikesAvailableResponse.Response?.bikes?.Values,
-                    bikesOccupiedResponse.Response?.bikes_occupied?.Values,
-                    Mail,
-                    DateTimeProvider),
-                bikesAvailableResponse.GeneralData,
-                bikesAvailableResponse.Exception != null || bikesOccupiedResponse.Exception != null ? new AggregateException(new[] { bikesAvailableResponse.Exception, bikesOccupiedResponse.Exception }) : null);
-        }
-    }
+			Log.ForContext<CachedQueryLoggedIn>().Debug("Bikes available and occupied read successfully from server.");
+			return new Result<BikeCollection>(
+				bikesAvailableResponse.Source,
+				UpdaterJSON.GetBikesAll(
+					bikesAvailableResponse.Response?.bikes?.Values,
+					bikesOccupiedResponse.Response?.bikes_occupied?.Values,
+					Mail,
+					DateTimeProvider),
+				bikesAvailableResponse.GeneralData,
+				bikesAvailableResponse.Exception != null || bikesOccupiedResponse.Exception != null ? new AggregateException(new[] { bikesAvailableResponse.Exception, bikesOccupiedResponse.Exception }) : null);
+		}
+	}
 }
diff --git a/TINKLib/Model/Connector/Query/IQuery.cs b/TINKLib/Model/Connector/Query/IQuery.cs
index 40e2b76..6ca9013 100644
--- a/TINKLib/Model/Connector/Query/IQuery.cs
+++ b/TINKLib/Model/Connector/Query/IQuery.cs
@@ -4,17 +4,17 @@ using TINK.Model.Services.CopriApi;
 
 namespace TINK.Model.Connector
 {
-    public interface IQuery
-    {
-        /// <summary> Gets all stations including postions.</summary>
-        Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync();
+	public interface IQuery
+	{
+		/// <summary> Gets all stations including postions.</summary>
+		Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync();
 
-        /// <summary> Gets bikes occupied is a user is logged in. </summary>
-        /// <returns>Collection of bikes.</returns>
-        Task<Result<BikeCollection>> GetBikesOccupiedAsync();
+		/// <summary> Gets bikes occupied is a user is logged in. </summary>
+		/// <returns>Collection of bikes.</returns>
+		Task<Result<BikeCollection>> GetBikesOccupiedAsync();
 
-        /// <summary> Gets bikes either bikes available if no user is logged in or bikes available and bikes occupied if a user is logged in. </summary>
-        /// <returns>Collection of bikes.</returns>
-        Task<Result<BikeCollection>> GetBikesAsync();
-    }
+		/// <summary> Gets bikes either bikes available if no user is logged in or bikes available and bikes occupied if a user is logged in. </summary>
+		/// <returns>Collection of bikes.</returns>
+		Task<Result<BikeCollection>> GetBikesAsync();
+	}
 }
diff --git a/TINKLib/Model/Connector/Query/Query.cs b/TINKLib/Model/Connector/Query/Query.cs
index 4d69ef1..f1dd960 100644
--- a/TINKLib/Model/Connector/Query/Query.cs
+++ b/TINKLib/Model/Connector/Query/Query.cs
@@ -11,56 +11,56 @@ using BikeInfo = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo;
 
 namespace TINK.Model.Connector
 {
-    /// <summary> Provides query functionality without login. </summary>
-    public class Query : Base, IQuery
-    {
-        /// <summary> Cached copri server. </summary>
-        private readonly ICopriServer server;
+	/// <summary> Provides query functionality without login. </summary>
+	public class Query : Base, IQuery
+	{
+		/// <summary> Cached copri server. </summary>
+		private readonly ICopriServer server;
 
-        /// <summary>Constructs a copri query object.</summary>
-        /// <param name="p_oCopriServer">Server which implements communication.</param>
-        public Query(ICopriServerBase p_oCopriServer) : base(p_oCopriServer)
-        {
-            server = p_oCopriServer as ICopriServer;
-            if (server == null)
-            {
-                throw new ArgumentException($"Copri server is not of expected typ. Type detected is {p_oCopriServer.GetType()}.");
-            }
-        }
+		/// <summary>Constructs a copri query object.</summary>
+		/// <param name="p_oCopriServer">Server which implements communication.</param>
+		public Query(ICopriServerBase p_oCopriServer) : base(p_oCopriServer)
+		{
+			server = p_oCopriServer as ICopriServer;
+			if (server == null)
+			{
+				throw new ArgumentException($"Copri server is not of expected typ. Type detected is {p_oCopriServer.GetType()}.");
+			}
+		}
 
-        /// <summary> Gets all stations including postions.</summary>
-        public async Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync()
-        {
-            var stationsAllResponse = await server.GetStationsAsync();
-            var bikesAvailableResponse = await server.GetBikesAvailableAsync();
+		/// <summary> Gets all stations including postions.</summary>
+		public async Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync()
+		{
+			var stationsAllResponse = await server.GetStationsAsync();
+			var bikesAvailableResponse = await server.GetBikesAvailableAsync();
 
-            return new Result<StationsAndBikesContainer>(
-                typeof(CopriCallsMonkeyStore),
-                new StationsAndBikesContainer(stationsAllResponse.GetStationsAllMutable(), bikesAvailableResponse.GetBikesAvailable()),
-                stationsAllResponse.GetGeneralData());
-        }
+			return new Result<StationsAndBikesContainer>(
+				typeof(CopriCallsMonkeyStore),
+				new StationsAndBikesContainer(stationsAllResponse.GetStationsAllMutable(), bikesAvailableResponse.GetBikesAvailable()),
+				stationsAllResponse.GetGeneralData());
+		}
 
-        /// <summary> Gets bikes occupied. </summary>
-        /// <returns>Collection of bikes.</returns>
-        public async Task<Result<BikeCollection>> GetBikesOccupiedAsync()
-        {
-            Log.ForContext<Query>().Error("Unexpected call to get be bikes occpied detected. No user is logged in.");
-            return new Result<BikeCollection>(
-                typeof(CopriCallsMonkeyStore),
-                await Task.FromResult(new BikeCollection(new Dictionary<string, BikeInfo>())),
-                new GeneralData(),
-                new Exception("Abfrage der reservierten/ gebuchten Räder fehlgeschlagen. Kein Benutzer angemeldet."));
-        }
+		/// <summary> Gets bikes occupied. </summary>
+		/// <returns>Collection of bikes.</returns>
+		public async Task<Result<BikeCollection>> GetBikesOccupiedAsync()
+		{
+			Log.ForContext<Query>().Error("Unexpected call to get be bikes occpied detected. No user is logged in.");
+			return new Result<BikeCollection>(
+				typeof(CopriCallsMonkeyStore),
+				await Task.FromResult(new BikeCollection(new Dictionary<string, BikeInfo>())),
+				new GeneralData(),
+				new Exception("Abfrage der reservierten/ gebuchten Räder fehlgeschlagen. Kein Benutzer angemeldet."));
+		}
 
-        /// <summary> Gets bikes occupied. </summary>
-        /// <returns> Collection of bikes. </returns>
-        public async Task<Result<BikeCollection>> GetBikesAsync()
-        {
-            var bikesAvailableResponse = await server.GetBikesAvailableAsync();
-            return new Result<BikeCollection>(
-                typeof(CopriCallsMonkeyStore),
-                bikesAvailableResponse.GetBikesAvailable(),
-                bikesAvailableResponse.GetGeneralData());
-        }
-    }
+		/// <summary> Gets bikes occupied. </summary>
+		/// <returns> Collection of bikes. </returns>
+		public async Task<Result<BikeCollection>> GetBikesAsync()
+		{
+			var bikesAvailableResponse = await server.GetBikesAvailableAsync();
+			return new Result<BikeCollection>(
+				typeof(CopriCallsMonkeyStore),
+				bikesAvailableResponse.GetBikesAvailable(),
+				bikesAvailableResponse.GetGeneralData());
+		}
+	}
 }
diff --git a/TINKLib/Model/Connector/Query/QueryLoggedIn.cs b/TINKLib/Model/Connector/Query/QueryLoggedIn.cs
index 5a9f24b..24f2ed6 100644
--- a/TINKLib/Model/Connector/Query/QueryLoggedIn.cs
+++ b/TINKLib/Model/Connector/Query/QueryLoggedIn.cs
@@ -8,79 +8,79 @@ using TINK.Repository;
 
 namespace TINK.Model.Connector
 {
-    /// <summary> Provides query functionality for a logged in user. </summary>
-    public class QueryLoggedIn : BaseLoggedIn, IQuery
-    {
-        /// <summary> Copri server. </summary>
-        private readonly ICopriServer server;
+	/// <summary> Provides query functionality for a logged in user. </summary>
+	public class QueryLoggedIn : BaseLoggedIn, IQuery
+	{
+		/// <summary> Copri server. </summary>
+		private readonly ICopriServer server;
 
-        /// <summary>Constructs a copri query object.</summary>
-        /// <param name="copriServer">Server which implements communication.</param>
-        public QueryLoggedIn(ICopriServerBase copriServer,
-            string sessionCookie,
-            string mail,
-            Func<DateTime> dateTimeProvider) : base(copriServer, sessionCookie, mail, dateTimeProvider)
-        {
-            server = copriServer as ICopriServer;
-            if (server == null)
-            {
-                throw new ArgumentException($"Copri server is not of expected typ. Type detected is {copriServer.GetType()}.");
-            }
+		/// <summary>Constructs a copri query object.</summary>
+		/// <param name="copriServer">Server which implements communication.</param>
+		public QueryLoggedIn(ICopriServerBase copriServer,
+			string sessionCookie,
+			string mail,
+			Func<DateTime> dateTimeProvider) : base(copriServer, sessionCookie, mail, dateTimeProvider)
+		{
+			server = copriServer as ICopriServer;
+			if (server == null)
+			{
+				throw new ArgumentException($"Copri server is not of expected typ. Type detected is {copriServer.GetType()}.");
+			}
 
-            server = copriServer as ICopriServer;
-        }
+			server = copriServer as ICopriServer;
+		}
 
-        /// <summary> Gets all stations including postions.</summary>
-        public async Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync()
-        {
-            var stationResponse = await server.GetStationsAsync();
-            var bikesAvailableResponse = await server.GetBikesAvailableAsync();
-            var bikesOccupiedResponse = await server.GetBikesOccupiedAsync();
+		/// <summary> Gets all stations including postions.</summary>
+		public async Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync()
+		{
+			var stationResponse = await server.GetStationsAsync();
+			var bikesAvailableResponse = await server.GetBikesAvailableAsync();
+			var bikesOccupiedResponse = await server.GetBikesOccupiedAsync();
 
-            return new Result<StationsAndBikesContainer>(
-                typeof(CopriCallsMonkeyStore),
-                new StationsAndBikesContainer(
-                    stationResponse.GetStationsAllMutable(),
-                    UpdaterJSON.GetBikesAll(
-                        bikesAvailableResponse?.bikes?.Values,
-                        bikesOccupiedResponse?.bikes_occupied?.Values,
-                        Mail,
-                        DateTimeProvider)),
-                stationResponse.GetGeneralData());
-        }
+			return new Result<StationsAndBikesContainer>(
+				typeof(CopriCallsMonkeyStore),
+				new StationsAndBikesContainer(
+					stationResponse.GetStationsAllMutable(),
+					UpdaterJSON.GetBikesAll(
+						bikesAvailableResponse?.bikes?.Values,
+						bikesOccupiedResponse?.bikes_occupied?.Values,
+						Mail,
+						DateTimeProvider)),
+				stationResponse.GetGeneralData());
+		}
 
-        /// <summary> Gets bikes occupied and bikes for which feedback is required. </summary>
-        /// <returns>Collection of bikes.</returns>
-        public async Task<Result<BikeCollection>> GetBikesOccupiedAsync()
-        {
-            var bikesFeedbackRequired = await server.GetBikesAvailableAsync();
-            var bikesOccupiedResponse = await server.GetBikesOccupiedAsync();
+		/// <summary> Gets bikes occupied and bikes for which feedback is required. </summary>
+		/// <returns>Collection of bikes.</returns>
+		public async Task<Result<BikeCollection>> GetBikesOccupiedAsync()
+		{
+			var bikesFeedbackRequired = await server.GetBikesAvailableAsync();
+			var bikesOccupiedResponse = await server.GetBikesOccupiedAsync();
 
-            return new Result<BikeCollection>(
-                typeof(CopriCallsMonkeyStore),
-                UpdaterJSON.GetBikesAll(
-                    bikesFeedbackRequired.bikes?.Values?.Select(bike => bike)?.Where(bike => bike.GetState() == State.InUseStateEnum.FeedbackPending),
-                    bikesOccupiedResponse?.bikes_occupied?.Values,
-                    Mail,
-                    DateTimeProvider),
-                bikesOccupiedResponse.GetGeneralData());
-        }
+			return new Result<BikeCollection>(
+				typeof(CopriCallsMonkeyStore),
+				UpdaterJSON.GetBikesAll(
+					bikesFeedbackRequired.bikes?.Values?.Select(bike => bike)?.Where(bike => bike.GetState() == State.InUseStateEnum.FeedbackPending),
+					bikesOccupiedResponse?.bikes_occupied?.Values,
+					Mail,
+					DateTimeProvider),
+				bikesOccupiedResponse.GetGeneralData());
+		}
 
-        /// <summary> Gets bikes available and bikes occupied. </summary>
-        /// <returns>Collection of bikes.</returns>
-        public async Task<Result<BikeCollection>> GetBikesAsync()
-        {
-            var bikesAvailableResponse = await server.GetBikesAvailableAsync();
-            var bikesOccupiedResponse = await server.GetBikesOccupiedAsync();
+		/// <summary> Gets bikes available and bikes occupied. </summary>
+		/// <returns>Collection of bikes.</returns>
+		public async Task<Result<BikeCollection>> GetBikesAsync()
+		{
+			var bikesAvailableResponse = await server.GetBikesAvailableAsync();
+			var bikesOccupiedResponse = await server.GetBikesOccupiedAsync();
 
-            return new Result<BikeCollection>(
-                typeof(CopriCallsMonkeyStore),
-                UpdaterJSON.GetBikesAll(
-                    bikesAvailableResponse?.bikes?.Values,
-                    bikesOccupiedResponse?.bikes_occupied?.Values,
-                    Mail,
-                    DateTimeProvider),
-                bikesAvailableResponse.GetGeneralData());
-        }
-    }
+			return new Result<BikeCollection>(
+				typeof(CopriCallsMonkeyStore),
+				UpdaterJSON.GetBikesAll(
+					bikesAvailableResponse?.bikes?.Values,
+					bikesOccupiedResponse?.bikes_occupied?.Values,
+					Mail,
+					DateTimeProvider),
+				bikesAvailableResponse.GetGeneralData());
+		}
+	}
 }
diff --git a/TINKLib/Model/Connector/TextToTypeHelper.cs b/TINKLib/Model/Connector/TextToTypeHelper.cs
index 0ed987b..e577e59 100644
--- a/TINKLib/Model/Connector/TextToTypeHelper.cs
+++ b/TINKLib/Model/Connector/TextToTypeHelper.cs
@@ -12,369 +12,369 @@ using TINK.Repository.Response;
 
 namespace TINK.Model.Connector
 {
-    /// <summary>
-    /// Converts weak typed JSON data (mostly string) to strong typed c# data (base types, enumerations, objects, ...).
-    /// JSON is received from COPRI and deserialized using Json.NET.
-    /// </summary>
-    public static class TextToTypeHelper
-    {
-        /// <summary> Holds the text for demo bikes. </summary>
-        private const string DEMOBIKEMARKER = "DEMO";
+	/// <summary>
+	/// Converts weak typed JSON data (mostly string) to strong typed c# data (base types, enumerations, objects, ...).
+	/// JSON is received from COPRI and deserialized using Json.NET.
+	/// </summary>
+	public static class TextToTypeHelper
+	{
+		/// <summary> Holds the text for demo bikes. </summary>
+		private const string DEMOBIKEMARKER = "DEMO";
 
-        /// <summary>
-        /// Gets the position from StationInfo object.
-        /// </summary>
-        /// <param name="stationInfo">Object to get information from.</param>
-        /// <returns>Position information.</returns>
-        public static IPosition GetPosition(this StationsAvailableResponse.StationInfo stationInfo)
-            => GetPosition(stationInfo.gps);
+		/// <summary>
+		/// Gets the position from StationInfo object.
+		/// </summary>
+		/// <param name="stationInfo">Object to get information from.</param>
+		/// <returns>Position information.</returns>
+		public static IPosition GetPosition(this StationsAvailableResponse.StationInfo stationInfo)
+			=> GetPosition(stationInfo.gps);
 
-        /// <summary> Gets the position from StationInfo object. </summary>
-        /// <param name="authorizationResponse">Object to get information from.</param>
-        /// <returns>Position information.</returns>
-        public static IEnumerable<string> GetGroup(this AuthorizationResponse authorizationResponse)
-        {
-            try
-            {
-                return authorizationResponse.user_group.GetGroup();
-            }
-            catch (Exception l_oException)
-            {
-                throw new Exception($"Can not get group of user from text \"{authorizationResponse.user_group}\".", l_oException);
-            }
-        }
+		/// <summary> Gets the position from StationInfo object. </summary>
+		/// <param name="authorizationResponse">Object to get information from.</param>
+		/// <returns>Position information.</returns>
+		public static IEnumerable<string> GetGroup(this AuthorizationResponse authorizationResponse)
+		{
+			try
+			{
+				return authorizationResponse.user_group.GetGroup();
+			}
+			catch (Exception l_oException)
+			{
+				throw new Exception($"Can not get group of user from text \"{authorizationResponse.user_group}\".", l_oException);
+			}
+		}
 
-        /// <summary> Gets the position from StationInfo object. </summary>
-        /// <param name="group">Object to get information from.</param>
-        /// <returns>Position information.</returns>
-        public static IEnumerable<string> GetGroup(this string[] group)
-        {
-            if (group == null || group.Length == 0)
-            {
-                // If not logged in stations groups are empty form COPRI version v4.1.
-                Log.Debug("Can not get goup form string. Group text can not be null.");
-                return new List<string>();
-            }
+		/// <summary> Gets the position from StationInfo object. </summary>
+		/// <param name="group">Object to get information from.</param>
+		/// <returns>Position information.</returns>
+		public static IEnumerable<string> GetGroup(this string[] group)
+		{
+			if (group == null || group.Length == 0)
+			{
+				// If not logged in stations groups are empty form COPRI version v4.1.
+				Log.Debug("Can not get goup form string. Group text can not be null.");
+				return new List<string>();
+			}
 
-            return new HashSet<string>(group).ToList();
-        }
+			return new HashSet<string>(group).ToList();
+		}
 
-        /// <summary> Gets if user acknowldged ags or not. </summary>
-        /// <param name="authorizationResponse">Object to get information from.</param>
-        /// <returns>Position information.</returns>
-        public static bool GetIsAgbAcknowledged(this AuthorizationResponse authorizationResponse)
-            => int.TryParse(authorizationResponse?.agb_checked, out int result)
-                && result != 0;
+		/// <summary> Gets if user acknowldged ags or not. </summary>
+		/// <param name="authorizationResponse">Object to get information from.</param>
+		/// <returns>Position information.</returns>
+		public static bool GetIsAgbAcknowledged(this AuthorizationResponse authorizationResponse)
+			=> int.TryParse(authorizationResponse?.agb_checked, out int result)
+				&& result != 0;
 
-        /// <summary> Gets the position from StationInfo object. </summary>
-        /// <param name="group">Object to get information from.</param>
-        /// <returns>Position information.</returns>
-        public static string GetGroup(this IEnumerable<string> group)
-        {
-            return string.Join(",", group);
-        }
+		/// <summary> Gets the position from StationInfo object. </summary>
+		/// <param name="group">Object to get information from.</param>
+		/// <returns>Position information.</returns>
+		public static string GetGroup(this IEnumerable<string> group)
+		{
+			return string.Join(",", group);
+		}
 
-        /// <summary> Gets the position from StationInfo object. </summary>
-        /// <param name="stationInfo">Object to get information from.</param>
-        /// <returns>Position information.</returns>
-        public static IEnumerable<string> GetGroup(this StationsAvailableResponse.StationInfo stationInfo)
-        {
-            try
-            {
-                return stationInfo.station_group.GetGroup();
-            }
-            catch (Exception l_oException)
-            {
-                throw new Exception($"Can not get group of stations from text \"{stationInfo.station_group}\".", l_oException);
-            }
-        }
+		/// <summary> Gets the position from StationInfo object. </summary>
+		/// <param name="stationInfo">Object to get information from.</param>
+		/// <returns>Position information.</returns>
+		public static IEnumerable<string> GetGroup(this StationsAvailableResponse.StationInfo stationInfo)
+		{
+			try
+			{
+				return stationInfo.station_group.GetGroup();
+			}
+			catch (Exception l_oException)
+			{
+				throw new Exception($"Can not get group of stations from text \"{stationInfo.station_group}\".", l_oException);
+			}
+		}
 
-        /// <summary>
-        /// Gets the position from BikeInfoBase object.
-        /// </summary>
-        /// <param name="bikeInfo">Object to get information from.</param>
-        /// <returns>Rental state.</returns>
-        public static InUseStateEnum GetState(this BikeInfoBase bikeInfo)
-        {
-            var stateText = bikeInfo.state?.ToLower()?.Trim();
+		/// <summary>
+		/// Gets the position from BikeInfoBase object.
+		/// </summary>
+		/// <param name="bikeInfo">Object to get information from.</param>
+		/// <returns>Rental state.</returns>
+		public static InUseStateEnum GetState(this BikeInfoBase bikeInfo)
+		{
+			var stateText = bikeInfo.state?.ToLower()?.Trim();
 
-            if (string.IsNullOrEmpty(stateText))
-            {
-                throw new InvalidResponseException<BikeInfoBase>(
-                    "Bike state must not be empty.",
-                    bikeInfo);
-            }
+			if (string.IsNullOrEmpty(stateText))
+			{
+				throw new InvalidResponseException<BikeInfoBase>(
+					"Bike state must not be empty.",
+					bikeInfo);
+			}
 
-            if (Enum.TryParse(stateText, out InUseStateEnum state))
-                return state;
+			if (Enum.TryParse(stateText, out InUseStateEnum state))
+				return state;
 
-            if (stateText == "available")
-            {
-                return InUseStateEnum.Disposable;
-            }
-            else if (stateText == "reserved" ||
-                stateText == "requested")
-            {
-                return InUseStateEnum.Reserved;
-            }
-            else if (stateText == "booked" ||
-                stateText == "occupied")
-            {
-                return InUseStateEnum.Booked;
-            }
+			if (stateText == "available")
+			{
+				return InUseStateEnum.Disposable;
+			}
+			else if (stateText == "reserved" ||
+				stateText == "requested")
+			{
+				return InUseStateEnum.Reserved;
+			}
+			else if (stateText == "booked" ||
+				stateText == "occupied")
+			{
+				return InUseStateEnum.Booked;
+			}
 
-            throw new CommunicationException(string.Format("Unknown bike state detected. State is {0}.", stateText));
-        }
+			throw new CommunicationException(string.Format("Unknown bike state detected. State is {0}.", stateText));
+		}
 
-        /// <summary>
-        /// Gets the position from BikeInfoAvailable object.
-        /// </summary>
-        /// <param name="bikeInfo">Object to get information from.</param>
-        /// <returns>Rental state.</returns>
-        public static InUseStateEnum GetState(this BikeInfoAvailable bikeInfo)
-        {
-            var state = GetState((BikeInfoBase)bikeInfo);
+		/// <summary>
+		/// Gets the position from BikeInfoAvailable object.
+		/// </summary>
+		/// <param name="bikeInfo">Object to get information from.</param>
+		/// <returns>Rental state.</returns>
+		public static InUseStateEnum GetState(this BikeInfoAvailable bikeInfo)
+		{
+			var state = GetState((BikeInfoBase)bikeInfo);
 
-            if (state != InUseStateEnum.Disposable)
-                return state;
+			if (state != InUseStateEnum.Disposable)
+				return state;
 
-            return bikeInfo.GetIsFeedbackPending()
-                ? InUseStateEnum.FeedbackPending
-                : InUseStateEnum.Disposable;
+			return bikeInfo.GetIsFeedbackPending()
+				? InUseStateEnum.FeedbackPending
+				: InUseStateEnum.Disposable;
 
-        }
+		}
 
-        /// <summary>
-        /// Gets the from date information from JSON.
-        /// </summary>
-        /// <param name="bikeInfo">JSON to get information from..</param>
-        /// <returns>From information if bike hold this information 0001-01-01 (DateTime.MinValue) otherwise.</returns>
-        public static DateTime GetFrom(this BikeInfoReservedOrBooked bikeInfo)
-            => DateTime.TryParse(bikeInfo?.start_time, out DateTime dateFrom) ? dateFrom : DateTime.MinValue;
+		/// <summary>
+		/// Gets the from date information from JSON.
+		/// </summary>
+		/// <param name="bikeInfo">JSON to get information from..</param>
+		/// <returns>From information if bike hold this information 0001-01-01 (DateTime.MinValue) otherwise.</returns>
+		public static DateTime GetFrom(this BikeInfoReservedOrBooked bikeInfo)
+			=> DateTime.TryParse(bikeInfo?.start_time, out DateTime dateFrom) ? dateFrom : DateTime.MinValue;
 
-        /// <summary>
-        /// Gets whether the bike is a trike or not.
-        /// </summary>
-        /// <param name="bikeInfo">JSON to get information from..</param>
-        /// <returns>From information.</returns>
-        public static bool? GetIsDemo(this BikeInfoBase bikeInfo)
-        {
-            return bikeInfo?.description != null
-                ? bikeInfo.description.ToUpper().Contains(DEMOBIKEMARKER)
-                : (bool?)null;
-        }
+		/// <summary>
+		/// Gets whether the bike is a trike or not.
+		/// </summary>
+		/// <param name="bikeInfo">JSON to get information from..</param>
+		/// <returns>From information.</returns>
+		public static bool? GetIsDemo(this BikeInfoBase bikeInfo)
+		{
+			return bikeInfo?.description != null
+				? bikeInfo.description.ToUpper().Contains(DEMOBIKEMARKER)
+				: (bool?)null;
+		}
 
-        /// <summary>
-        /// Gets whether the bike is a trike or not.
-        /// </summary>
-        /// <param name="bikeInfo">JSON to get information from.</param>
-        /// <returns>From information.</returns>
-        public static IEnumerable<string> GetGroup(this BikeInfoBase bikeInfo)
-        {
-            try
-            {
-                return bikeInfo?.bike_group?.GetGroup()?.ToList() ?? new List<string>();
-            }
-            catch (Exception l_oException)
-            {
-                throw new Exception($"Can not get group of user from text \"{bikeInfo.bike_group}\".", l_oException);
-            }
-        }
+		/// <summary>
+		/// Gets whether the bike is a trike or not.
+		/// </summary>
+		/// <param name="bikeInfo">JSON to get information from.</param>
+		/// <returns>From information.</returns>
+		public static IEnumerable<string> GetGroup(this BikeInfoBase bikeInfo)
+		{
+			try
+			{
+				return bikeInfo?.bike_group?.GetGroup()?.ToList() ?? new List<string>();
+			}
+			catch (Exception l_oException)
+			{
+				throw new Exception($"Can not get group of user from text \"{bikeInfo.bike_group}\".", l_oException);
+			}
+		}
 
-        /// <summary> Gets whether the bike has a bord computer or not. </summary>
-        /// <param name="bikeInfo">JSON to get information from.</param>
-        /// <returns>From information.</returns>
-        public static bool GetIsManualLockBike(this BikeInfoBase bikeInfo)
-        {
-            return !string.IsNullOrEmpty(bikeInfo.system)
-                && bikeInfo.system.ToUpper().StartsWith("LOCK");
-        }
+		/// <summary> Gets whether the bike has a bord computer or not. </summary>
+		/// <param name="bikeInfo">JSON to get information from.</param>
+		/// <returns>From information.</returns>
+		public static bool GetIsManualLockBike(this BikeInfoBase bikeInfo)
+		{
+			return !string.IsNullOrEmpty(bikeInfo.system)
+				&& bikeInfo.system.ToUpper().StartsWith("LOCK");
+		}
 
-        /// <summary> Gets whether the bike has a bord computer or not. </summary>
-        /// <param name="bikeInfo">JSON to get information from..</param>
-        /// <returns>From information.</returns>
-        public static bool GetIsBluetoothLockBike(this BikeInfoBase bikeInfo)
-        {
-            return !string.IsNullOrEmpty(bikeInfo.system)
-                && bikeInfo.system.ToUpper().StartsWith("ILOCKIT");
-        }
+		/// <summary> Gets whether the bike has a bord computer or not. </summary>
+		/// <param name="bikeInfo">JSON to get information from..</param>
+		/// <returns>From information.</returns>
+		public static bool GetIsBluetoothLockBike(this BikeInfoBase bikeInfo)
+		{
+			return !string.IsNullOrEmpty(bikeInfo.system)
+				&& bikeInfo.system.ToUpper().StartsWith("ILOCKIT");
+		}
 
-        /// <summary> Gets whether the bike Is a Sigo bike or not. </summary>
-        /// <param name="bikeInfo">JSON to get information from..</param>
-        /// <returns>True if bike is a Sigo.</returns>
-        public static bool GetIsSigoBike(this BikeInfoBase bikeInfo)
-        {
-            return !string.IsNullOrEmpty(bikeInfo.system)
-                && bikeInfo.system.ToUpper().StartsWith("SIGO");
-        }
+		/// <summary> Gets whether the bike Is a Sigo bike or not. </summary>
+		/// <param name="bikeInfo">JSON to get information from..</param>
+		/// <returns>True if bike is a Sigo.</returns>
+		public static bool GetIsSigoBike(this BikeInfoBase bikeInfo)
+		{
+			return !string.IsNullOrEmpty(bikeInfo.system)
+				&& bikeInfo.system.ToUpper().StartsWith("SIGO");
+		}
 
-        public static LockModel? GetLockModel(this BikeInfoBase bikeInfo)
-        {
-            if (GetIsBluetoothLockBike(bikeInfo))
-                return LockModel.ILockIt;
+		public static LockModel? GetLockModel(this BikeInfoBase bikeInfo)
+		{
+			if (GetIsBluetoothLockBike(bikeInfo))
+				return LockModel.ILockIt;
 
-            if (GetIsManualLockBike(bikeInfo))
-                return LockModel.BordComputer;
+			if (GetIsManualLockBike(bikeInfo))
+				return LockModel.BordComputer;
 
-            if (GetIsSigoBike(bikeInfo))
-                return LockModel.Sigo;
+			if (GetIsSigoBike(bikeInfo))
+				return LockModel.Sigo;
 
-            return null;
-        }
+			return null;
+		}
 
-        /// <summary> Gets whether the bike has a bord computer or not. </summary>
-        /// <param name="bikeInfo">JSON to get information from..</param>
-        /// <returns>From information.</returns>
-        public static int GetBluetoothLockId(this BikeInfoBase bikeInfo)
-        {
-            return TextToLockItTypeHelper.GetBluetoothLockId(bikeInfo?.Ilockit_ID);
-        }
+		/// <summary> Gets whether the bike has a bord computer or not. </summary>
+		/// <param name="bikeInfo">JSON to get information from..</param>
+		/// <returns>From information.</returns>
+		public static int GetBluetoothLockId(this BikeInfoBase bikeInfo)
+		{
+			return TextToLockItTypeHelper.GetBluetoothLockId(bikeInfo?.Ilockit_ID);
+		}
 
-        /// <summary> Gets whether the bike has a bord computer or not. </summary>
-        /// <param name="bikeInfo">JSON to get information from..</param>
-        /// <returns>From information.</returns>
-        public static Guid GetBluetoothLockGuid(this BikeInfoBase bikeInfo)
-        {
-            // return new Guid("00000000-0000-0000-0000-e57e6b9aee16");
-            return Guid.TryParse(bikeInfo?.Ilockit_GUID, out Guid lockGuid)
-                ? lockGuid
-                : TextToLockItTypeHelper.INVALIDLOCKGUID;
-        }
+		/// <summary> Gets whether the bike has a bord computer or not. </summary>
+		/// <param name="bikeInfo">JSON to get information from..</param>
+		/// <returns>From information.</returns>
+		public static Guid GetBluetoothLockGuid(this BikeInfoBase bikeInfo)
+		{
+			// return new Guid("00000000-0000-0000-0000-e57e6b9aee16");
+			return Guid.TryParse(bikeInfo?.Ilockit_GUID, out Guid lockGuid)
+				? lockGuid
+				: TextToLockItTypeHelper.INVALIDLOCKGUID;
+		}
 
-        public static byte[] GetUserKey(this BikeInfoReservedOrBooked bikeInfo)
-        {
-            return GetKey(bikeInfo.K_u);
-        }
+		public static byte[] GetUserKey(this BikeInfoReservedOrBooked bikeInfo)
+		{
+			return GetKey(bikeInfo.K_u);
+		}
 
-        public static byte[] GetAdminKey(this BikeInfoReservedOrBooked bikeInfo)
-        {
-            return GetKey(bikeInfo.K_a);
-        }
+		public static byte[] GetAdminKey(this BikeInfoReservedOrBooked bikeInfo)
+		{
+			return GetKey(bikeInfo.K_a);
+		}
 
-        public static byte[] GetSeed(this BikeInfoReservedOrBooked bikeInfo)
-        {
-            return GetKey(bikeInfo.K_seed);
-        }
+		public static byte[] GetSeed(this BikeInfoReservedOrBooked bikeInfo)
+		{
+			return GetKey(bikeInfo.K_seed);
+		}
 
-        /// <summary>
-        /// Get array of keys from string of format "[12, -9, 5]"
-        /// </summary>
-        /// <param name="keyArrayText"></param>
-        /// <returns></returns>
-        private static byte[] GetKey(string keyArrayText)
-        {
-            try
-            {
-                if (string.IsNullOrEmpty(keyArrayText))
-                    return new byte[0];
+		/// <summary>
+		/// Get array of keys from string of format "[12, -9, 5]"
+		/// </summary>
+		/// <param name="keyArrayText"></param>
+		/// <returns></returns>
+		private static byte[] GetKey(string keyArrayText)
+		{
+			try
+			{
+				if (string.IsNullOrEmpty(keyArrayText))
+					return new byte[0];
 
-                return Regex.Replace(keyArrayText, @"\[(.*)\]", "$1").Split(',').Select(x => (byte)sbyte.Parse(x)).ToArray();
-            }
-            catch (Exception exception)
-            {
-                Log.Error("Can not extract K_u/ K_a/ or K_seed. Key {ArrayText} does not is not of expected format. {Exception}", keyArrayText, exception);
-                return new byte[0];
-            }
-        }
+				return Regex.Replace(keyArrayText, @"\[(.*)\]", "$1").Split(',').Select(x => (byte)sbyte.Parse(x)).ToArray();
+			}
+			catch (Exception exception)
+			{
+				Log.Error("Can not extract K_u/ K_a/ or K_seed. Key {ArrayText} does not is not of expected format. {Exception}", keyArrayText, exception);
+				return new byte[0];
+			}
+		}
 
-        /// <summary>
-        /// Gets whether the bike is a trike or not.
-        /// </summary>
-        /// <param name="bikeInfo">JSON to get information from..</param>
-        /// <returns>From information.</returns>
-        public static WheelType? GetWheelType(this BikeInfoBase bikeInfo)
-            => Enum.TryParse(bikeInfo?.bike_type?.wheels, true, out WheelType wheelType)
-                ? wheelType
-                : (WheelType?)null;
+		/// <summary>
+		/// Gets whether the bike is a trike or not.
+		/// </summary>
+		/// <param name="bikeInfo">JSON to get information from..</param>
+		/// <returns>From information.</returns>
+		public static WheelType? GetWheelType(this BikeInfoBase bikeInfo)
+			=> Enum.TryParse(bikeInfo?.bike_type?.wheels, true, out WheelType wheelType)
+				? wheelType
+				: (WheelType?)null;
 
-        /// <summary>
-        /// Gets the type of bike.
-        /// </summary>
-        /// <param name="bikeInfo">Object to get bike type from.</param>
-        /// <returns>Type of bike.</returns>
-        public static TypeOfBike? GetTypeOfBike(this BikeInfoBase bikeInfo)
-            => Enum.TryParse(bikeInfo?.bike_type?.category, true, out TypeOfBike typeOfBike)
-                ? typeOfBike
-                : (TypeOfBike?)null;
+		/// <summary>
+		/// Gets the type of bike.
+		/// </summary>
+		/// <param name="bikeInfo">Object to get bike type from.</param>
+		/// <returns>Type of bike.</returns>
+		public static TypeOfBike? GetTypeOfBike(this BikeInfoBase bikeInfo)
+			=> Enum.TryParse(bikeInfo?.bike_type?.category, true, out TypeOfBike typeOfBike)
+				? typeOfBike
+				: (TypeOfBike?)null;
 
-        /// <summary> Get position from a ,- separated string. </summary>
-        /// <param name="gps">Text to extract positon from.</param>
-        /// <returns>Position object.</returns>
-        public static IPosition GetPosition(Repository.Response.Position gps)
-            => PositionFactory.Create(
-                double.TryParse(gps?.latitude, NumberStyles.Float, CultureInfo.InvariantCulture, out double latitude) ? latitude : double.NaN,
-                double.TryParse(gps?.longitude, NumberStyles.Float, CultureInfo.InvariantCulture, out double longitude) ? longitude : double.NaN);
+		/// <summary> Get position from a ,- separated string. </summary>
+		/// <param name="gps">Text to extract positon from.</param>
+		/// <returns>Position object.</returns>
+		public static IPosition GetPosition(Repository.Response.Position gps)
+			=> PositionFactory.Create(
+				double.TryParse(gps?.latitude, NumberStyles.Float, CultureInfo.InvariantCulture, out double latitude) ? latitude : double.NaN,
+				double.TryParse(gps?.longitude, NumberStyles.Float, CultureInfo.InvariantCulture, out double longitude) ? longitude : double.NaN);
 
-        /// <summary> Get position from a ,- separated string. </summary>
-        /// <param name="gps">Text to extract positon from.</param>
-        /// <returns>Position object.</returns>
-        public static Map.IMapSpan GetMapSpan(this MapSpan mapSpan)
-            => Map.MapSpanFactory.Create(
-                GetPosition(mapSpan?.center),
-                double.TryParse(mapSpan?.radius, NumberStyles.Float, CultureInfo.InvariantCulture, out double radius) ? radius : double.NaN);
+		/// <summary> Get position from a ,- separated string. </summary>
+		/// <param name="gps">Text to extract positon from.</param>
+		/// <returns>Position object.</returns>
+		public static Map.IMapSpan GetMapSpan(this MapSpan mapSpan)
+			=> Map.MapSpanFactory.Create(
+				GetPosition(mapSpan?.center),
+				double.TryParse(mapSpan?.radius, NumberStyles.Float, CultureInfo.InvariantCulture, out double radius) ? radius : double.NaN);
 
 
-        /// <summary>
-        /// Gets the locking state from response.
-        /// </summary>
-        /// <param name="bikeInfo"> Response locking state from.</param>
-        /// <returns>Locking state</returns>
-        public static Bikes.BikeInfoNS.CopriLock.LockingState GetCopriLockingState(this BikeInfoBase bikeInfo)
-        {
-            if (string.IsNullOrEmpty(bikeInfo?.lock_state))
-                return Bikes.BikeInfoNS.CopriLock.LockingState.UnknownDisconnected;
+		/// <summary>
+		/// Gets the locking state from response.
+		/// </summary>
+		/// <param name="bikeInfo"> Response locking state from.</param>
+		/// <returns>Locking state</returns>
+		public static Bikes.BikeInfoNS.CopriLock.LockingState GetCopriLockingState(this BikeInfoBase bikeInfo)
+		{
+			if (string.IsNullOrEmpty(bikeInfo?.lock_state))
+				return Bikes.BikeInfoNS.CopriLock.LockingState.UnknownDisconnected;
 
-            if (bikeInfo.lock_state.ToUpper().Trim() == "locked".ToUpper())
-                return Bikes.BikeInfoNS.CopriLock.LockingState.Closed;
+			if (bikeInfo.lock_state.ToUpper().Trim() == "locked".ToUpper())
+				return Bikes.BikeInfoNS.CopriLock.LockingState.Closed;
 
-            if (bikeInfo.lock_state.ToUpper().Trim() == "locking".ToUpper())
-                return Bikes.BikeInfoNS.CopriLock.LockingState.Closing;
+			if (bikeInfo.lock_state.ToUpper().Trim() == "locking".ToUpper())
+				return Bikes.BikeInfoNS.CopriLock.LockingState.Closing;
 
-            if (bikeInfo.lock_state.ToUpper().Trim() == "unlocked".ToUpper())
-                return Bikes.BikeInfoNS.CopriLock.LockingState.Open;
+			if (bikeInfo.lock_state.ToUpper().Trim() == "unlocked".ToUpper())
+				return Bikes.BikeInfoNS.CopriLock.LockingState.Open;
 
-            if (bikeInfo.lock_state.ToUpper().Trim() == "unlocking".ToUpper())
-                return Bikes.BikeInfoNS.CopriLock.LockingState.Opening;
+			if (bikeInfo.lock_state.ToUpper().Trim() == "unlocking".ToUpper())
+				return Bikes.BikeInfoNS.CopriLock.LockingState.Opening;
 
-            return Bikes.BikeInfoNS.CopriLock.LockingState.UnknownDisconnected;
-        }
+			return Bikes.BikeInfoNS.CopriLock.LockingState.UnknownDisconnected;
+		}
 
-        /// <summary>
-        /// Gets the operator Uri from response.
-        /// </summary>
-        /// <param name="bikeInfo"> Response to get uri from.</param>
-        /// <returns>Operatore Uri</returns>
-        public static Uri GetOperatorUri(this BikeInfoBase bikeInfo)
-        {
-            return bikeInfo?.uri_operator != null && !string.IsNullOrEmpty(bikeInfo?.uri_operator)
-                ? new Uri($"{bikeInfo.uri_operator}/{CopriServerUriList.REST_RESOURCE_ROOT}")
-                : null;
-        }
+		/// <summary>
+		/// Gets the operator Uri from response.
+		/// </summary>
+		/// <param name="bikeInfo"> Response to get uri from.</param>
+		/// <returns>Operatore Uri</returns>
+		public static Uri GetOperatorUri(this BikeInfoBase bikeInfo)
+		{
+			return bikeInfo?.uri_operator != null && !string.IsNullOrEmpty(bikeInfo?.uri_operator)
+				? new Uri($"{bikeInfo.uri_operator}/{CopriServerUriList.REST_RESOURCE_ROOT}")
+				: null;
+		}
 
-        /// <summary> Tries to get the copriversion from response.</summary>
-        /// <param name="response">Response to get version info from.</param>
-        /// <returns>COPRI version</returns>
-        public static bool TryGetCopriVersion(this CopriVersion response, out Version copriVersion)
-        {
-            copriVersion = new Version(0, 0);
-            return response != null
-                && !string.IsNullOrEmpty(response.copri_version)
-                && Version.TryParse(response.copri_version, out copriVersion);
-        }
+		/// <summary> Tries to get the copriversion from response.</summary>
+		/// <param name="response">Response to get version info from.</param>
+		/// <returns>COPRI version</returns>
+		public static bool TryGetCopriVersion(this CopriVersion response, out Version copriVersion)
+		{
+			copriVersion = new Version(0, 0);
+			return response != null
+				&& !string.IsNullOrEmpty(response.copri_version)
+				&& Version.TryParse(response.copri_version, out copriVersion);
+		}
 
-        /// <summary> Gets the copriversion from.</summary>
-        /// <param name="response">Response to get version info from.</param>
-        /// <returns>COPRI version</returns>
-        public static Version GetCopriVersion(this CopriVersion response)
-            => response.TryGetCopriVersion(out Version copriVersion)
-                ? copriVersion
-                : throw new InvalidResponseException($"Can not get version info from copri response {response?.copri_version}.");
+		/// <summary> Gets the copriversion from.</summary>
+		/// <param name="response">Response to get version info from.</param>
+		/// <returns>COPRI version</returns>
+		public static Version GetCopriVersion(this CopriVersion response)
+			=> response.TryGetCopriVersion(out Version copriVersion)
+				? copriVersion
+				: throw new InvalidResponseException($"Can not get version info from copri response {response?.copri_version}.");
 
-        /// <summary>
-        /// Gets bike advanced bike state. If entry Co2Saving exists feedback is required.
-        /// </summary>
-        /// <param name="bike">Bike get to state from.</param>
-        public static bool GetIsFeedbackPending(this BikeInfoAvailable bike)
-            => bike.co2saving != null;
-    }
+		/// <summary>
+		/// Gets bike advanced bike state. If entry Co2Saving exists feedback is required.
+		/// </summary>
+		/// <param name="bike">Bike get to state from.</param>
+		public static bool GetIsFeedbackPending(this BikeInfoAvailable bike)
+			=> bike.co2saving != null;
+	}
 }
diff --git a/TINKLib/Model/Connector/Updater/BikeInfoFactory.cs b/TINKLib/Model/Connector/Updater/BikeInfoFactory.cs
index 22c0317..8828c97 100644
--- a/TINKLib/Model/Connector/Updater/BikeInfoFactory.cs
+++ b/TINKLib/Model/Connector/Updater/BikeInfoFactory.cs
@@ -10,321 +10,321 @@ using BikeInfo = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo;
 
 namespace TINK.Model.Connector.Updater
 {
-    /// <summary>
-    /// Constructs bike info instances/ bike info derived instances.
-    /// </summary>
-    public static class BikeInfoFactory
-    {
-        /// <summary> Set default lock type to . </summary>
-        public static LockModel DEFAULTLOCKMODEL = LockModel.Sigo;
+	/// <summary>
+	/// Constructs bike info instances/ bike info derived instances.
+	/// </summary>
+	public static class BikeInfoFactory
+	{
+		/// <summary> Set default lock type to . </summary>
+		public static LockModel DEFAULTLOCKMODEL = LockModel.Sigo;
 
-        /// <summary> Creates a bike info object from copri response. </summary>
-        /// <param name="bikeInfo">Copri response for a disposable bike. </param>
-        public static BikeInfo Create(BikeInfoAvailable bikeInfo)
-        {
-            if (bikeInfo == null) throw new ArgumentNullException(nameof(bikeInfo));
+		/// <summary> Creates a bike info object from copri response. </summary>
+		/// <param name="bikeInfo">Copri response for a disposable bike. </param>
+		public static BikeInfo Create(BikeInfoAvailable bikeInfo)
+		{
+			if (bikeInfo == null) throw new ArgumentNullException(nameof(bikeInfo));
 
-            var lockModel = bikeInfo.GetLockModel();
+			var lockModel = bikeInfo.GetLockModel();
 
-            if (lockModel.HasValue
-                && lockModel.Value == LockModel.BordComputer)
-            {
-                // Manual lock bikes are no more supported.
-                Log.Error(
-                    $"Can not create new {nameof(BikeInfo)}-object from {nameof(BikeInfoAvailable)} argument. " +
-                    "Manual lock bikes are no more supported." +
-                    $"Bike number: {bikeInfo.bike}{(bikeInfo.station != null ? $"station number {bikeInfo.station}" : string.Empty)}."
-                    );
+			if (lockModel.HasValue
+				&& lockModel.Value == LockModel.BordComputer)
+			{
+				// Manual lock bikes are no more supported.
+				Log.Error(
+					$"Can not create new {nameof(BikeInfo)}-object from {nameof(BikeInfoAvailable)} argument. " +
+					"Manual lock bikes are no more supported." +
+					$"Bike number: {bikeInfo.bike}{(bikeInfo.station != null ? $"station number {bikeInfo.station}" : string.Empty)}."
+					);
 
-                return null;
-            }
+				return null;
+			}
 
-            switch (bikeInfo.GetState())
-            {
-                case InUseStateEnum.Disposable:
-                case InUseStateEnum.FeedbackPending:
-                    break;
+			switch (bikeInfo.GetState())
+			{
+				case InUseStateEnum.Disposable:
+				case InUseStateEnum.FeedbackPending:
+					break;
 
-                default:
-                    Log.Error($"Can not create new {nameof(BikeInfo)}-object from {nameof(BikeInfoAvailable)} argument. Unexpected state {bikeInfo.GetState()} detected.");
-                    return null;
-            }
+				default:
+					Log.Error($"Can not create new {nameof(BikeInfo)}-object from {nameof(BikeInfoAvailable)} argument. Unexpected state {bikeInfo.GetState()} detected.");
+					return null;
+			}
 
-            if (string.IsNullOrEmpty(bikeInfo.station))
-            {
-                // Bike available must always have a station id because bikes can only be returned at a station.
-                Log.Error($"Can not create new {nameof(BikeInfo)}-object from {nameof(BikeInfoAvailable)} argument. No station info set.");
-                return null;
-            }
+			if (string.IsNullOrEmpty(bikeInfo.station))
+			{
+				// Bike available must always have a station id because bikes can only be returned at a station.
+				Log.Error($"Can not create new {nameof(BikeInfo)}-object from {nameof(BikeInfoAvailable)} argument. No station info set.");
+				return null;
+			}
 
-            var lockType = lockModel.HasValue
-                ? BikeExtension.GetLockType(lockModel.Value)
-                : BikeExtension.GetLockType(DEFAULTLOCKMODEL); // Map bikes without "system"- entry in response to backend- locks.  
+			var lockType = lockModel.HasValue
+				? BikeExtension.GetLockType(lockModel.Value)
+				: BikeExtension.GetLockType(DEFAULTLOCKMODEL); // Map bikes without "system"- entry in response to backend- locks.  
 
-            try
-            {
-                switch (lockType)
-                {
-                    case LockType.Backend:
-                        return new Bikes.BikeInfoNS.CopriLock.BikeInfo(
-                              new Bike(
-                                  bikeInfo.bike,
-                                  LockModel.Sigo,
-                                  bikeInfo.GetWheelType(),
-                                  bikeInfo.GetTypeOfBike(),
-                                  bikeInfo.description),
-                              DriveFactory.Create(bikeInfo?.bike_type),
-                              bikeInfo.station,
-                              new Bikes.BikeInfoNS.CopriLock.LockInfo.Builder { State = bikeInfo.GetCopriLockingState() }.Build(),
-                              bikeInfo.GetState() == InUseStateEnum.FeedbackPending,
-                              bikeInfo.GetOperatorUri(),
+			try
+			{
+				switch (lockType)
+				{
+					case LockType.Backend:
+						return new Bikes.BikeInfoNS.CopriLock.BikeInfo(
+							  new Bike(
+								  bikeInfo.bike,
+								  LockModel.Sigo,
+								  bikeInfo.GetWheelType(),
+								  bikeInfo.GetTypeOfBike(),
+								  bikeInfo.description),
+							  DriveFactory.Create(bikeInfo?.bike_type),
+							  bikeInfo.station,
+							  new Bikes.BikeInfoNS.CopriLock.LockInfo.Builder { State = bikeInfo.GetCopriLockingState() }.Build(),
+							  bikeInfo.GetState() == InUseStateEnum.FeedbackPending,
+							  bikeInfo.GetOperatorUri(),
 #if !NOTARIFFDESCRIPTION
-                              bikeInfo.rental_description != null
-                                ? RentalDescriptionFactory.Create(bikeInfo.rental_description)
-                                : TariffDescriptionFactory.Create(bikeInfo.tariff_description),
+							  bikeInfo.rental_description != null
+								? RentalDescriptionFactory.Create(bikeInfo.rental_description)
+								: TariffDescriptionFactory.Create(bikeInfo.tariff_description),
 #else
                               Create((TINK.Repository.Response.TariffDescription) null),
 #endif
-                              bikeInfo.GetIsDemo(),
-                              bikeInfo.GetGroup(),
-                              miniSurvey: bikeInfo.user_miniquery != null
-                                ? new MiniSurveyModel(new Dictionary<string, IQuestionModel> {
-                                    { "q1", new QuestionModel()} // Add a dummy querry. Querries are not yet read from COPRI but compiled into the app.
+							  bikeInfo.GetIsDemo(),
+							  bikeInfo.GetGroup(),
+							  miniSurvey: bikeInfo.user_miniquery != null
+								? new MiniSurveyModel(new Dictionary<string, IQuestionModel> {
+									{ "q1", new QuestionModel()} // Add a dummy querry. Querries are not yet read from COPRI but compiled into the app.
                                 })
-                                : new MiniSurveyModel(),
-                              co2Saving: bikeInfo.co2saving);
+								: new MiniSurveyModel(),
+							  co2Saving: bikeInfo.co2saving);
 
-                    case LockType.Bluethooth:
-                        return new Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
-                                new Bike(
-                                    bikeInfo.bike,
-                                    LockModel.ILockIt,
-                                    bikeInfo.GetWheelType(),
-                                    bikeInfo.GetTypeOfBike(),
-                                    bikeInfo.description),
-                                DriveFactory.Create(bikeInfo?.bike_type),
-                                bikeInfo.GetBluetoothLockId(),
-                                bikeInfo.GetBluetoothLockGuid(),
-                                bikeInfo.station,
-                                bikeInfo.GetOperatorUri(),
+					case LockType.Bluethooth:
+						return new Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
+								new Bike(
+									bikeInfo.bike,
+									LockModel.ILockIt,
+									bikeInfo.GetWheelType(),
+									bikeInfo.GetTypeOfBike(),
+									bikeInfo.description),
+								DriveFactory.Create(bikeInfo?.bike_type),
+								bikeInfo.GetBluetoothLockId(),
+								bikeInfo.GetBluetoothLockGuid(),
+								bikeInfo.station,
+								bikeInfo.GetOperatorUri(),
 #if !NOTARIFFDESCRIPTION
-                                bikeInfo.rental_description != null
-                                    ? RentalDescriptionFactory.Create(bikeInfo.rental_description)
-                                    : TariffDescriptionFactory.Create(bikeInfo.tariff_description),
+								bikeInfo.rental_description != null
+									? RentalDescriptionFactory.Create(bikeInfo.rental_description)
+									: TariffDescriptionFactory.Create(bikeInfo.tariff_description),
 #else
                                 Create((TINK.Repository.Response.TariffDescription)null),
 #endif
-                                bikeInfo.GetIsDemo(),
-                                bikeInfo.GetGroup());
+								bikeInfo.GetIsDemo(),
+								bikeInfo.GetGroup());
 
-                    default:
-                        throw new ArgumentException($"Unsupported lock type {lockType} detected.");
-                }
-            }
-            catch (ArgumentException ex)
-            {
-                // Contructor reported invalid arguemts (missing lock id, ....).
-                Log.Error($"Can not create new {nameof(BikeInfo)}-object from {nameof(BikeInfoAvailable)} argument. Invalid response detected. Available bike with id {bikeInfo.bike} skipped. {ex.Message}");
-                return null;
-            }
-        }
+					default:
+						throw new ArgumentException($"Unsupported lock type {lockType} detected.");
+				}
+			}
+			catch (ArgumentException ex)
+			{
+				// Contructor reported invalid arguemts (missing lock id, ....).
+				Log.Error($"Can not create new {nameof(BikeInfo)}-object from {nameof(BikeInfoAvailable)} argument. Invalid response detected. Available bike with id {bikeInfo.bike} skipped. {ex.Message}");
+				return null;
+			}
+		}
 
-        /// <summary> Creates a bike info object from copri response. </summary>
-        /// <param name="bikeInfo">Copri response. </param>
-        /// <param name="mailAddress">Mail address of user.</param>
-        /// <param name="dateTimeProvider">Date and time provider function.</param>
-        public static BikeInfo Create(
-            BikeInfoReservedOrBooked bikeInfo,
-            string mailAddress,
-            Func<DateTime> dateTimeProvider)
-        {
-            if (bikeInfo == null) throw new ArgumentNullException(nameof(bikeInfo));
+		/// <summary> Creates a bike info object from copri response. </summary>
+		/// <param name="bikeInfo">Copri response. </param>
+		/// <param name="mailAddress">Mail address of user.</param>
+		/// <param name="dateTimeProvider">Date and time provider function.</param>
+		public static BikeInfo Create(
+			BikeInfoReservedOrBooked bikeInfo,
+			string mailAddress,
+			Func<DateTime> dateTimeProvider)
+		{
+			if (bikeInfo == null) throw new ArgumentNullException(nameof(bikeInfo));
 
-            var lockModel = bikeInfo.GetLockModel();
+			var lockModel = bikeInfo.GetLockModel();
 
-            if (lockModel.HasValue
-                && lockModel.Value == LockModel.BordComputer)
-            {
-                // Manual lock bikes are no more supported.
-                Log.Error(
-                    $"Can not create new {nameof(BikeInfo)}-object from {nameof(BikeInfoAvailable)} argument. " +
-                    "Manual lock bikes are no more supported." +
-                    $"Bike number: {bikeInfo.bike}{(bikeInfo.station != null ? $", station number {bikeInfo.station}" : string.Empty)}."
-                    );
-                return null;
-            }
+			if (lockModel.HasValue
+				&& lockModel.Value == LockModel.BordComputer)
+			{
+				// Manual lock bikes are no more supported.
+				Log.Error(
+					$"Can not create new {nameof(BikeInfo)}-object from {nameof(BikeInfoAvailable)} argument. " +
+					"Manual lock bikes are no more supported." +
+					$"Bike number: {bikeInfo.bike}{(bikeInfo.station != null ? $", station number {bikeInfo.station}" : string.Empty)}."
+					);
+				return null;
+			}
 
-            var lockType = lockModel.HasValue
-                ? BikeExtension.GetLockType(lockModel.Value)
-                : BikeExtension.GetLockType(DEFAULTLOCKMODEL); // Map bikes without "system"- entry in response to backend- locks.  
+			var lockType = lockModel.HasValue
+				? BikeExtension.GetLockType(lockModel.Value)
+				: BikeExtension.GetLockType(DEFAULTLOCKMODEL); // Map bikes without "system"- entry in response to backend- locks.  
 
-            // Check if bike is a bluetooth lock bike.
-            int lockSerial = bikeInfo.GetBluetoothLockId();
-            Guid lockGuid = bikeInfo.GetBluetoothLockGuid();
+			// Check if bike is a bluetooth lock bike.
+			int lockSerial = bikeInfo.GetBluetoothLockId();
+			Guid lockGuid = bikeInfo.GetBluetoothLockGuid();
 
-            switch (bikeInfo.GetState())
-            {
-                case InUseStateEnum.Reserved:
-                    try
-                    {
-                        switch (lockType)
-                        {
-                            case LockType.Bluethooth:
-                                return new Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
-                                    new Bike(
-                                        bikeInfo.bike,
-                                        LockModel.ILockIt,
-                                        bikeInfo.GetWheelType(),
-                                        bikeInfo.GetTypeOfBike(),
-                                        bikeInfo.description),
-                                    DriveFactory.Create(bikeInfo?.bike_type),
-                                    lockSerial,
-                                    lockGuid,
-                                    bikeInfo.GetUserKey(),
-                                    bikeInfo.GetAdminKey(),
-                                    bikeInfo.GetSeed(),
-                                    bikeInfo.GetFrom(),
-                                    mailAddress,
-                                    bikeInfo.station,
-                                    bikeInfo.GetOperatorUri(),
+			switch (bikeInfo.GetState())
+			{
+				case InUseStateEnum.Reserved:
+					try
+					{
+						switch (lockType)
+						{
+							case LockType.Bluethooth:
+								return new Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
+									new Bike(
+										bikeInfo.bike,
+										LockModel.ILockIt,
+										bikeInfo.GetWheelType(),
+										bikeInfo.GetTypeOfBike(),
+										bikeInfo.description),
+									DriveFactory.Create(bikeInfo?.bike_type),
+									lockSerial,
+									lockGuid,
+									bikeInfo.GetUserKey(),
+									bikeInfo.GetAdminKey(),
+									bikeInfo.GetSeed(),
+									bikeInfo.GetFrom(),
+									mailAddress,
+									bikeInfo.station,
+									bikeInfo.GetOperatorUri(),
 #if !NOTARIFFDESCRIPTION
-                                    bikeInfo.rental_description != null
-                                        ? RentalDescriptionFactory.Create(bikeInfo.rental_description)
-                                        : TariffDescriptionFactory.Create(bikeInfo.tariff_description),
+									bikeInfo.rental_description != null
+										? RentalDescriptionFactory.Create(bikeInfo.rental_description)
+										: TariffDescriptionFactory.Create(bikeInfo.tariff_description),
 #else
                                     Create((TINK.Repository.Response.TariffDescription)null),
 #endif
-                                    dateTimeProvider,
-                                    bikeInfo.GetIsDemo(),
-                                    bikeInfo.GetGroup());
+									dateTimeProvider,
+									bikeInfo.GetIsDemo(),
+									bikeInfo.GetGroup());
 
-                            case LockType.Backend:
-                                return new Bikes.BikeInfoNS.CopriLock.BikeInfo(
-                                    new Bike(
-                                        bikeInfo.bike,
-                                        LockModel.Sigo,
-                                        bikeInfo.GetWheelType(),
-                                        bikeInfo.GetTypeOfBike(),
-                                        bikeInfo.description),
-                                    DriveFactory.Create(bikeInfo?.bike_type),
-                                    bikeInfo.GetFrom(),
-                                    mailAddress,
-                                    bikeInfo.station,
-                                    new Bikes.BikeInfoNS.CopriLock.LockInfo.Builder { State = bikeInfo.GetCopriLockingState() }.Build(),
-                                    bikeInfo.GetOperatorUri(),
+							case LockType.Backend:
+								return new Bikes.BikeInfoNS.CopriLock.BikeInfo(
+									new Bike(
+										bikeInfo.bike,
+										LockModel.Sigo,
+										bikeInfo.GetWheelType(),
+										bikeInfo.GetTypeOfBike(),
+										bikeInfo.description),
+									DriveFactory.Create(bikeInfo?.bike_type),
+									bikeInfo.GetFrom(),
+									mailAddress,
+									bikeInfo.station,
+									new Bikes.BikeInfoNS.CopriLock.LockInfo.Builder { State = bikeInfo.GetCopriLockingState() }.Build(),
+									bikeInfo.GetOperatorUri(),
 #if !NOTARIFFDESCRIPTION
-                                    bikeInfo.rental_description != null
-                                        ? RentalDescriptionFactory.Create(bikeInfo.rental_description)
-                                        : TariffDescriptionFactory.Create(bikeInfo.tariff_description),
+									bikeInfo.rental_description != null
+										? RentalDescriptionFactory.Create(bikeInfo.rental_description)
+										: TariffDescriptionFactory.Create(bikeInfo.tariff_description),
 #else
                                     Create((TINK.Repository.Response.TariffDescription)null),
 #endif
-                                    dateTimeProvider,
-                                    bikeInfo.GetIsDemo(),
-                                    bikeInfo.GetGroup());
-                            default:
-                                throw new ArgumentException($"Unsupported lock type {lockType} detected.");
-                        }
-                    }
-                    catch (ArgumentException ex)
-                    {
-                        // Contructor reported invalid arguemts (missing lock id, ....).
-                        Log.Error($"Can not create new {nameof(BikeInfo)}-object from {nameof(BikeInfoReservedOrBooked)} argument. Invalid response detected. Reserved bike with id {bikeInfo.bike} skipped. {ex.Message}");
-                        return null;
-                    }
+									dateTimeProvider,
+									bikeInfo.GetIsDemo(),
+									bikeInfo.GetGroup());
+							default:
+								throw new ArgumentException($"Unsupported lock type {lockType} detected.");
+						}
+					}
+					catch (ArgumentException ex)
+					{
+						// Contructor reported invalid arguemts (missing lock id, ....).
+						Log.Error($"Can not create new {nameof(BikeInfo)}-object from {nameof(BikeInfoReservedOrBooked)} argument. Invalid response detected. Reserved bike with id {bikeInfo.bike} skipped. {ex.Message}");
+						return null;
+					}
 
-                case InUseStateEnum.Booked:
-                    try
-                    {
-                        switch (lockModel)
-                        {
-                            case LockModel.ILockIt:
-                                return new Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
-                                    new Bike(
-                                        bikeInfo.bike,
-                                        LockModel.ILockIt,
-                                        bikeInfo.GetWheelType(),
-                                        bikeInfo.GetTypeOfBike(),
-                                        bikeInfo.description),
-                                    DriveFactory.Create(bikeInfo?.bike_type),
-                                    lockSerial,
-                                    bikeInfo.GetBluetoothLockGuid(),
-                                    bikeInfo.GetUserKey(),
-                                    bikeInfo.GetAdminKey(),
-                                    bikeInfo.GetSeed(),
-                                    bikeInfo.GetFrom(),
-                                    mailAddress,
-                                    bikeInfo.station,
-                                    bikeInfo.GetOperatorUri(),
+				case InUseStateEnum.Booked:
+					try
+					{
+						switch (lockModel)
+						{
+							case LockModel.ILockIt:
+								return new Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
+									new Bike(
+										bikeInfo.bike,
+										LockModel.ILockIt,
+										bikeInfo.GetWheelType(),
+										bikeInfo.GetTypeOfBike(),
+										bikeInfo.description),
+									DriveFactory.Create(bikeInfo?.bike_type),
+									lockSerial,
+									bikeInfo.GetBluetoothLockGuid(),
+									bikeInfo.GetUserKey(),
+									bikeInfo.GetAdminKey(),
+									bikeInfo.GetSeed(),
+									bikeInfo.GetFrom(),
+									mailAddress,
+									bikeInfo.station,
+									bikeInfo.GetOperatorUri(),
 #if !NOTARIFFDESCRIPTION
-                                    bikeInfo.rental_description != null
-                                        ? RentalDescriptionFactory.Create(bikeInfo.rental_description)
-                                        : TariffDescriptionFactory.Create(bikeInfo.tariff_description),
+									bikeInfo.rental_description != null
+										? RentalDescriptionFactory.Create(bikeInfo.rental_description)
+										: TariffDescriptionFactory.Create(bikeInfo.tariff_description),
 #else
                                     Create((TINK.Repository.Response.TariffDescription)null),
 #endif
-                                    bikeInfo.GetIsDemo(),
-                                    bikeInfo.GetGroup());
+									bikeInfo.GetIsDemo(),
+									bikeInfo.GetGroup());
 
-                            case LockModel.BordComputer:
-                                return new BikeInfo(
-                                    new Bike(
-                                        bikeInfo.bike,
-                                        LockModel.BordComputer,
-                                        bikeInfo.GetWheelType(),
-                                        bikeInfo.GetTypeOfBike(),
-                                        bikeInfo.description),
-                                    DriveFactory.Create(bikeInfo?.bike_type),
-                                    bikeInfo.GetIsDemo(),
-                                    bikeInfo.GetGroup(),
-                                    bikeInfo.station,
-                                    bikeInfo.GetOperatorUri(),
+							case LockModel.BordComputer:
+								return new BikeInfo(
+									new Bike(
+										bikeInfo.bike,
+										LockModel.BordComputer,
+										bikeInfo.GetWheelType(),
+										bikeInfo.GetTypeOfBike(),
+										bikeInfo.description),
+									DriveFactory.Create(bikeInfo?.bike_type),
+									bikeInfo.GetIsDemo(),
+									bikeInfo.GetGroup(),
+									bikeInfo.station,
+									bikeInfo.GetOperatorUri(),
 #if !NOTARIFFDESCRIPTION
-                                    bikeInfo.rental_description != null
-                                        ? RentalDescriptionFactory.Create(bikeInfo.rental_description)
-                                        : TariffDescriptionFactory.Create(bikeInfo.tariff_description),
+									bikeInfo.rental_description != null
+										? RentalDescriptionFactory.Create(bikeInfo.rental_description)
+										: TariffDescriptionFactory.Create(bikeInfo.tariff_description),
 #else
                                     Create((TINK.Repository.Response.TariffDescription)null),
 #endif
-                                    bikeInfo.GetFrom(),
-                                    mailAddress,
-                                    bikeInfo.timeCode);
-                            default:
-                                return new Bikes.BikeInfoNS.CopriLock.BikeInfo(
-                                        new Bike(
-                                            bikeInfo.bike,
-                                            LockModel.Sigo,
-                                            bikeInfo.GetWheelType(),
-                                            bikeInfo.GetTypeOfBike(),
-                                            bikeInfo.description),
-                                        DriveFactory.Create(bikeInfo?.bike_type),
-                                        bikeInfo.GetFrom(),
-                                        mailAddress,
-                                        bikeInfo.station,
-                                        new Bikes.BikeInfoNS.CopriLock.LockInfo.Builder { State = bikeInfo.GetCopriLockingState() }.Build(),
-                                        bikeInfo.GetOperatorUri(),
+									bikeInfo.GetFrom(),
+									mailAddress,
+									bikeInfo.timeCode);
+							default:
+								return new Bikes.BikeInfoNS.CopriLock.BikeInfo(
+										new Bike(
+											bikeInfo.bike,
+											LockModel.Sigo,
+											bikeInfo.GetWheelType(),
+											bikeInfo.GetTypeOfBike(),
+											bikeInfo.description),
+										DriveFactory.Create(bikeInfo?.bike_type),
+										bikeInfo.GetFrom(),
+										mailAddress,
+										bikeInfo.station,
+										new Bikes.BikeInfoNS.CopriLock.LockInfo.Builder { State = bikeInfo.GetCopriLockingState() }.Build(),
+										bikeInfo.GetOperatorUri(),
 #if !NOTARIFFDESCRIPTION
-                                        bikeInfo.rental_description != null
-                                            ? RentalDescriptionFactory.Create(bikeInfo.rental_description)
-                                            : TariffDescriptionFactory.Create(bikeInfo.tariff_description),
+										bikeInfo.rental_description != null
+											? RentalDescriptionFactory.Create(bikeInfo.rental_description)
+											: TariffDescriptionFactory.Create(bikeInfo.tariff_description),
 #else
                                         Create((TINK.Repository.Response.TariffDescription)null),
 #endif
-                                        bikeInfo.GetIsDemo(),
-                                        bikeInfo.GetGroup());
-                        }
-                    }
-                    catch (ArgumentException ex)
-                    {
-                        // Contructor reported invalid arguemts (missing lock id, ....).
-                        Log.Error($"Can not create new {nameof(BikeInfo)}-object from {nameof(BikeInfoReservedOrBooked)} argument. Invalid response detected. Booked bike with id {bikeInfo.bike} skipped. {ex.Message}");
-                        return null;
-                    }
+										bikeInfo.GetIsDemo(),
+										bikeInfo.GetGroup());
+						}
+					}
+					catch (ArgumentException ex)
+					{
+						// Contructor reported invalid arguemts (missing lock id, ....).
+						Log.Error($"Can not create new {nameof(BikeInfo)}-object from {nameof(BikeInfoReservedOrBooked)} argument. Invalid response detected. Booked bike with id {bikeInfo.bike} skipped. {ex.Message}");
+						return null;
+					}
 
-                default:
-                    Log.Error($"Can not create new {nameof(BikeInfo)}-object from {nameof(BikeInfoAvailable)} argument. Unexpected state {bikeInfo.GetState()} detected.");
-                    return null;
-            }
-        }
-    }
+				default:
+					Log.Error($"Can not create new {nameof(BikeInfo)}-object from {nameof(BikeInfoAvailable)} argument. Unexpected state {bikeInfo.GetState()} detected.");
+					return null;
+			}
+		}
+	}
 }
diff --git a/TINKLib/Model/Connector/Updater/BookingFinishedModelFactory.cs b/TINKLib/Model/Connector/Updater/BookingFinishedModelFactory.cs
index 2a8bcd1..4a57cc4 100644
--- a/TINKLib/Model/Connector/Updater/BookingFinishedModelFactory.cs
+++ b/TINKLib/Model/Connector/Updater/BookingFinishedModelFactory.cs
@@ -5,46 +5,46 @@ using TINK.Repository.Response;
 
 namespace TINK.Model.Connector.Updater
 {
-    public static class BookingFinishedModelFactory
-    {
-        /// <summary> Creates a booking finished object from response.</summary>
-        /// <param name="response">Response to create survey object from.</param>
-        public static BookingFinishedModel Create(this DoReturnResponse response)
-        {
-            var bookingFinished = new BookingFinishedModel
-            {
-                Co2Saving = response?.co2saving
-            };
+	public static class BookingFinishedModelFactory
+	{
+		/// <summary> Creates a booking finished object from response.</summary>
+		/// <param name="response">Response to create survey object from.</param>
+		public static BookingFinishedModel Create(this DoReturnResponse response)
+		{
+			var bookingFinished = new BookingFinishedModel
+			{
+				Co2Saving = response?.co2saving
+			};
 
-            if (response?.user_miniquery == null)
+			if (response?.user_miniquery == null)
 
-            {
-                return bookingFinished;
-            }
+			{
+				return bookingFinished;
+			}
 
-            var miniquery = response.user_miniquery;
-            bookingFinished.MiniSurvey = new MiniSurveyModel
-            {
-                Title = miniquery.title,
-                Subtitle = miniquery.subtitle,
-                Footer = miniquery.footer
-            };
+			var miniquery = response.user_miniquery;
+			bookingFinished.MiniSurvey = new MiniSurveyModel
+			{
+				Title = miniquery.title,
+				Subtitle = miniquery.subtitle,
+				Footer = miniquery.footer
+			};
 
-            foreach (var question in miniquery?.questions?.OrderBy(x => x.Key) ?? new Dictionary<string, MiniSurveyResponse.Question>().OrderBy(x => x.Key))
-            {
-                if (string.IsNullOrEmpty(question.Key.Trim())
-                    || question.Value.query == null)
-                {
-                    // Skip invalid entries.
-                    continue;
-                }
+			foreach (var question in miniquery?.questions?.OrderBy(x => x.Key) ?? new Dictionary<string, MiniSurveyResponse.Question>().OrderBy(x => x.Key))
+			{
+				if (string.IsNullOrEmpty(question.Key.Trim())
+					|| question.Value.query == null)
+				{
+					// Skip invalid entries.
+					continue;
+				}
 
-                bookingFinished.MiniSurvey.Questions.Add(
-                    question.Key,
-                    new QuestionModel());
-            }
+				bookingFinished.MiniSurvey.Questions.Add(
+					question.Key,
+					new QuestionModel());
+			}
 
-            return bookingFinished;
-        }
-    }
+			return bookingFinished;
+		}
+	}
 }
diff --git a/TINKLib/Model/Connector/Updater/DriveFactory.cs b/TINKLib/Model/Connector/Updater/DriveFactory.cs
index f145b0c..0d5b900 100644
--- a/TINKLib/Model/Connector/Updater/DriveFactory.cs
+++ b/TINKLib/Model/Connector/Updater/DriveFactory.cs
@@ -5,41 +5,41 @@ using TINK.Repository.Response;
 
 namespace TINK.Model.Connector.Updater
 {
-    public static class DriveFactory
-    {
-        public static Drive Create(this BikeType bikeType)
-        {
-            if (string.IsNullOrEmpty(bikeType?.engine?.manufacturer))
-            {
-                // Bike is has no engine
-                return new Drive();
-            }
+	public static class DriveFactory
+	{
+		public static Drive Create(this BikeType bikeType)
+		{
+			if (string.IsNullOrEmpty(bikeType?.engine?.manufacturer))
+			{
+				// Bike is has no engine
+				return new Drive();
+			}
 
-            // Bike is a pedelec.
-            return new Drive(
-                new Engine(bikeType?.engine?.manufacturer),
-                new Battery.Builder
-                {
-                    CurrentChargePercent = double.TryParse(bikeType?.battery?.charge_current_percent, out double currentChargePercent)
-                        ? currentChargePercent
-                        : double.NaN,
+			// Bike is a pedelec.
+			return new Drive(
+				new Engine(bikeType?.engine?.manufacturer),
+				new Battery.Builder
+				{
+					CurrentChargePercent = double.TryParse(bikeType?.battery?.charge_current_percent, out double currentChargePercent)
+						? currentChargePercent
+						: double.NaN,
 
-                    CurrentChargeBars = int.TryParse(bikeType?.battery?.charge_current_bars, out int currentChargeBars)
-                        ? (int?)currentChargeBars
-                        : null,
+					CurrentChargeBars = int.TryParse(bikeType?.battery?.charge_current_bars, out int currentChargeBars)
+						? (int?)currentChargeBars
+						: null,
 
-                    MaxChargeBars = int.TryParse(bikeType?.battery?.charge_max_bars, out int maxChargeBars)
-                        ? (int?)maxChargeBars
-                        : null,
+					MaxChargeBars = int.TryParse(bikeType?.battery?.charge_max_bars, out int maxChargeBars)
+						? (int?)maxChargeBars
+						: null,
 
-                    IsBackendAccessible = bikeType?.battery?.backend_accessible != null && int.TryParse(bikeType.battery.backend_accessible, out int accessible)
-                        ? (bool?)(accessible > 0)
-                        : null,
+					IsBackendAccessible = bikeType?.battery?.backend_accessible != null && int.TryParse(bikeType.battery.backend_accessible, out int accessible)
+						? (bool?)(accessible > 0)
+						: null,
 
-                    IsHidden = bikeType?.battery?.hidden != null && int.TryParse(bikeType.battery.hidden, out int hidden)
-                        ? (bool?)(hidden > 0)
-                        : null
-                }.Build());
-        }
-    }
+					IsHidden = bikeType?.battery?.hidden != null && int.TryParse(bikeType.battery.hidden, out int hidden)
+						? (bool?)(hidden > 0)
+						: null
+				}.Build());
+		}
+	}
 }
diff --git a/TINKLib/Model/Connector/Updater/RentalDescriptionFactory.cs b/TINKLib/Model/Connector/Updater/RentalDescriptionFactory.cs
index f220a57..bbde656 100644
--- a/TINKLib/Model/Connector/Updater/RentalDescriptionFactory.cs
+++ b/TINKLib/Model/Connector/Updater/RentalDescriptionFactory.cs
@@ -3,61 +3,61 @@ using System.Linq;
 
 namespace TINK.Model.Connector.Updater
 {
-    public static class RentalDescriptionFactory
-    {
-        /// <summary>
-        /// Creates rental description object from JSON- tarif description object.
-        /// </summary>
-        /// <param name="rentalDesciption">Source JSON object.</param>
-        /// <returns>Tariff description object.</returns>
+	public static class RentalDescriptionFactory
+	{
+		/// <summary>
+		/// Creates rental description object from JSON- tarif description object.
+		/// </summary>
+		/// <param name="rentalDesciption">Source JSON object.</param>
+		/// <returns>Tariff description object.</returns>
 
-        public static Bikes.BikeInfoNS.RentalDescription Create(this Repository.Response.RentalDescription rentalDesciption)
-        {
-            Bikes.BikeInfoNS.RentalDescription.TariffElement CreateTarifEntry(string[] elementValue)
-            {
-                return new Bikes.BikeInfoNS.RentalDescription.TariffElement
-                {
-                    Description = elementValue != null && elementValue.Length > 0 ? elementValue[0] : string.Empty,
-                    Value = elementValue != null && elementValue.Length > 1 ? elementValue[1] : string.Empty,
-                };
-            }
+		public static Bikes.BikeInfoNS.RentalDescription Create(this Repository.Response.RentalDescription rentalDesciption)
+		{
+			Bikes.BikeInfoNS.RentalDescription.TariffElement CreateTarifEntry(string[] elementValue)
+			{
+				return new Bikes.BikeInfoNS.RentalDescription.TariffElement
+				{
+					Description = elementValue != null && elementValue.Length > 0 ? elementValue[0] : string.Empty,
+					Value = elementValue != null && elementValue.Length > 1 ? elementValue[1] : string.Empty,
+				};
+			}
 
-            Bikes.BikeInfoNS.RentalDescription.InfoElement CreateInfoElement(string[] elementValue)
-            {
-                return new Bikes.BikeInfoNS.RentalDescription.InfoElement
-                {
-                    Key = elementValue != null && elementValue.Length > 0 ? elementValue[0] : string.Empty,
-                    Value = elementValue != null && elementValue.Length > 1 ? elementValue[1] : string.Empty,
-                };
-            }
+			Bikes.BikeInfoNS.RentalDescription.InfoElement CreateInfoElement(string[] elementValue)
+			{
+				return new Bikes.BikeInfoNS.RentalDescription.InfoElement
+				{
+					Key = elementValue != null && elementValue.Length > 0 ? elementValue[0] : string.Empty,
+					Value = elementValue != null && elementValue.Length > 1 ? elementValue[1] : string.Empty,
+				};
+			}
 
-            // Read tariff elements.
-            var tarifEntries = rentalDesciption?.tarif_elements != null
-                    ? rentalDesciption.tarif_elements.Select(x => new
-                    {
-                        Key = x.Key,
-                        Value = CreateTarifEntry(x.Value)
-                    }).ToLookup(x => x.Key, x => x.Value).ToDictionary(x => x.Key, x => x.First())
-                    : new Dictionary<string, Bikes.BikeInfoNS.RentalDescription.TariffElement>();
+			// Read tariff elements.
+			var tarifEntries = rentalDesciption?.tarif_elements != null
+					? rentalDesciption.tarif_elements.Select(x => new
+					{
+						Key = x.Key,
+						Value = CreateTarifEntry(x.Value)
+					}).ToLookup(x => x.Key, x => x.Value).ToDictionary(x => x.Key, x => x.First())
+					: new Dictionary<string, Bikes.BikeInfoNS.RentalDescription.TariffElement>();
 
-            // Read info elements.
-            var InfoEntries = rentalDesciption?.rental_info != null
-                ? rentalDesciption.rental_info.Select(x => new
-                {
-                    Key = x.Key,
-                    Value = CreateInfoElement(x.Value)
-                }).ToLookup(x => x.Key, x => x.Value).ToDictionary(x => x.Key, x => x.First())
-                : new Dictionary<string, Bikes.BikeInfoNS.RentalDescription.InfoElement>();
+			// Read info elements.
+			var InfoEntries = rentalDesciption?.rental_info != null
+				? rentalDesciption.rental_info.Select(x => new
+				{
+					Key = x.Key,
+					Value = CreateInfoElement(x.Value)
+				}).ToLookup(x => x.Key, x => x.Value).ToDictionary(x => x.Key, x => x.First())
+				: new Dictionary<string, Bikes.BikeInfoNS.RentalDescription.InfoElement>();
 
-            var bike = new Bikes.BikeInfoNS.RentalDescription
-            {
-                Name = rentalDesciption?.name ?? string.Empty,
-                Id = int.TryParse(rentalDesciption?.id ?? string.Empty, out int number) ? number : (int?)null,
-                TariffEntries = tarifEntries,
-                InfoEntries = InfoEntries
-            };
+			var bike = new Bikes.BikeInfoNS.RentalDescription
+			{
+				Name = rentalDesciption?.name ?? string.Empty,
+				Id = int.TryParse(rentalDesciption?.id ?? string.Empty, out int number) ? number : (int?)null,
+				TariffEntries = tarifEntries,
+				InfoEntries = InfoEntries
+			};
 
-            return bike;
-        }
-    }
+			return bike;
+		}
+	}
 }
diff --git a/TINKLib/Model/Connector/Updater/TariffDescriptionFactory.cs b/TINKLib/Model/Connector/Updater/TariffDescriptionFactory.cs
index 4312e46..b53b5bd 100644
--- a/TINKLib/Model/Connector/Updater/TariffDescriptionFactory.cs
+++ b/TINKLib/Model/Connector/Updater/TariffDescriptionFactory.cs
@@ -4,77 +4,77 @@ using TINK.Repository.Response;
 
 namespace TINK.Model.Connector.Updater
 {
-    public static class TariffDescriptionFactory
-    {
-        /// <summary>
-        /// Creates rental description object from JSON- tarif description object.
-        /// </summary>
-        /// <param name="tariffDesciption">Source JSON object.</param>
-        /// <returns>Tariff description object.</returns>
-        public static Bikes.BikeInfoNS.RentalDescription Create(this TariffDescription tariffDesciption)
-        {
-            var bike = new Bikes.BikeInfoNS.RentalDescription
-            {
-                Name = tariffDesciption?.name,
+	public static class TariffDescriptionFactory
+	{
+		/// <summary>
+		/// Creates rental description object from JSON- tarif description object.
+		/// </summary>
+		/// <param name="tariffDesciption">Source JSON object.</param>
+		/// <returns>Tariff description object.</returns>
+		public static Bikes.BikeInfoNS.RentalDescription Create(this TariffDescription tariffDesciption)
+		{
+			var bike = new Bikes.BikeInfoNS.RentalDescription
+			{
+				Name = tariffDesciption?.name,
 #if USCSHARP9
                 Number = int.TryParse(tariffDesciption?.number, out int number) ? number : null,
 #else
-                Id = int.TryParse(tariffDesciption?.number, out int number) ? number : (int?)null,
+				Id = int.TryParse(tariffDesciption?.number, out int number) ? number : (int?)null,
 #endif
-            };
+			};
 
-            if (!string.IsNullOrEmpty(tariffDesciption?.free_hours)
-                && double.TryParse(tariffDesciption?.free_hours, NumberStyles.Any, CultureInfo.InvariantCulture, out double freeHours))
-            {
-                // Free time. Unit hours,format floating point number.
-                bike.TariffEntries.Add("1", new Bikes.BikeInfoNS.RentalDescription.TariffElement
-                {
-                    Description = AppResources.MessageBikesManagementTariffDescriptionFreeTimePerSession,
-                    Value = string.Format("{0} {1}", freeHours.ToString("0.00"), AppResources.MessageBikesManagementTariffDescriptionHour)
-                });
-            }
+			if (!string.IsNullOrEmpty(tariffDesciption?.free_hours)
+				&& double.TryParse(tariffDesciption?.free_hours, NumberStyles.Any, CultureInfo.InvariantCulture, out double freeHours))
+			{
+				// Free time. Unit hours,format floating point number.
+				bike.TariffEntries.Add("1", new Bikes.BikeInfoNS.RentalDescription.TariffElement
+				{
+					Description = AppResources.MessageBikesManagementTariffDescriptionFreeTimePerSession,
+					Value = string.Format("{0} {1}", freeHours.ToString("0.00"), AppResources.MessageBikesManagementTariffDescriptionHour)
+				});
+			}
 
-            if (!string.IsNullOrEmpty(tariffDesciption?.eur_per_hour)
-                && double.TryParse(tariffDesciption?.eur_per_hour, NumberStyles.Any, CultureInfo.InvariantCulture, out double euroPerHour))
-            {
-                // Euro per hour. Format floating point.
-                bike.TariffEntries.Add("2", new Bikes.BikeInfoNS.RentalDescription.TariffElement
-                {
-                    Description = AppResources.MessageBikesManagementTariffDescriptionFeeEuroPerHour,
-                    Value = string.Format("{0} {1}", euroPerHour.ToString("0.00"), AppResources.MessageBikesManagementTariffDescriptionEuroPerHour)
-                });
-            }
+			if (!string.IsNullOrEmpty(tariffDesciption?.eur_per_hour)
+				&& double.TryParse(tariffDesciption?.eur_per_hour, NumberStyles.Any, CultureInfo.InvariantCulture, out double euroPerHour))
+			{
+				// Euro per hour. Format floating point.
+				bike.TariffEntries.Add("2", new Bikes.BikeInfoNS.RentalDescription.TariffElement
+				{
+					Description = AppResources.MessageBikesManagementTariffDescriptionFeeEuroPerHour,
+					Value = string.Format("{0} {1}", euroPerHour.ToString("0.00"), AppResources.MessageBikesManagementTariffDescriptionEuroPerHour)
+				});
+			}
 
-            if (!string.IsNullOrEmpty(tariffDesciption?.max_eur_per_day)
-                && double.TryParse(tariffDesciption.max_eur_per_day, NumberStyles.Any, CultureInfo.InvariantCulture, out double maxEuroPerDay))
-            {
-                // Max euro per day. Format floating point.
-                bike.TariffEntries.Add("3", new Bikes.BikeInfoNS.RentalDescription.TariffElement
-                {
-                    Description = AppResources.MessageBikesManagementTariffDescriptionMaxFeeEuroPerDay,
-                    Value = string.Format("{0} {1}", maxEuroPerDay.ToString("0.00"), AppResources.MessageBikesManagementMaxFeeEuroPerDay)
-                });
-            }
+			if (!string.IsNullOrEmpty(tariffDesciption?.max_eur_per_day)
+				&& double.TryParse(tariffDesciption.max_eur_per_day, NumberStyles.Any, CultureInfo.InvariantCulture, out double maxEuroPerDay))
+			{
+				// Max euro per day. Format floating point.
+				bike.TariffEntries.Add("3", new Bikes.BikeInfoNS.RentalDescription.TariffElement
+				{
+					Description = AppResources.MessageBikesManagementTariffDescriptionMaxFeeEuroPerDay,
+					Value = string.Format("{0} {1}", maxEuroPerDay.ToString("0.00"), AppResources.MessageBikesManagementMaxFeeEuroPerDay)
+				});
+			}
 
-            if (!string.IsNullOrEmpty(tariffDesciption?.abo_eur_per_month)
-                && double.TryParse(tariffDesciption.abo_eur_per_month, NumberStyles.Any, CultureInfo.InvariantCulture, out double aboEuroPerMonth))
-            {
-                // Abo per month
-                bike.TariffEntries.Add("4", new Bikes.BikeInfoNS.RentalDescription.TariffElement
-                {
-                    Description = AppResources.MessageBikesManagementTariffDescriptionAboEuroPerMonth,
-                    Value = string.Format("{0} {1}", aboEuroPerMonth.ToString("0.00"), AppResources.MessageBikesManagementTariffDescriptionEuroPerMonth)
-                });
-            }
+			if (!string.IsNullOrEmpty(tariffDesciption?.abo_eur_per_month)
+				&& double.TryParse(tariffDesciption.abo_eur_per_month, NumberStyles.Any, CultureInfo.InvariantCulture, out double aboEuroPerMonth))
+			{
+				// Abo per month
+				bike.TariffEntries.Add("4", new Bikes.BikeInfoNS.RentalDescription.TariffElement
+				{
+					Description = AppResources.MessageBikesManagementTariffDescriptionAboEuroPerMonth,
+					Value = string.Format("{0} {1}", aboEuroPerMonth.ToString("0.00"), AppResources.MessageBikesManagementTariffDescriptionEuroPerMonth)
+				});
+			}
 
 
-            if (!string.IsNullOrEmpty(tariffDesciption?.operator_agb ?? string.Empty))
-            {
-                bike.InfoEntries.Add("1", new Bikes.BikeInfoNS.RentalDescription.InfoElement { Key = "AGB", Value = tariffDesciption.operator_agb });
-            }
+			if (!string.IsNullOrEmpty(tariffDesciption?.operator_agb ?? string.Empty))
+			{
+				bike.InfoEntries.Add("1", new Bikes.BikeInfoNS.RentalDescription.InfoElement { Key = "AGB", Value = tariffDesciption.operator_agb });
+			}
 
-            return bike;
-        }
+			return bike;
+		}
 
-    }
+	}
 }
diff --git a/TINKLib/Model/Connector/Updater/UpdaterJSON.cs b/TINKLib/Model/Connector/Updater/UpdaterJSON.cs
index 42ad672..a30f85c 100644
--- a/TINKLib/Model/Connector/Updater/UpdaterJSON.cs
+++ b/TINKLib/Model/Connector/Updater/UpdaterJSON.cs
@@ -15,268 +15,268 @@ using IBikeInfoMutable = TINK.Model.Bikes.BikeInfoNS.BC.IBikeInfoMutable;
 
 namespace TINK.Model.Connector.Updater
 {
-    /// <summary>
-    /// Connects TINK app to copri using JSON as input data format.
-    /// </summary>
-    /// <todo>Rename to UpdateFromCopri.</todo>
-    public static class UpdaterJSON
-    {
-        /// <summary> Loads a bike object from copri server cancel reservation/ booking update request.</summary>
-        /// <param name="bike">Bike object to load response into.</param>
-        /// <param name="notifyLevel">Controls whether notify property changed events are fired or not.</param>
-        public static void Load(
-            this IBikeInfoMutable bike,
-            Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel notifyLevel)
-        {
+	/// <summary>
+	/// Connects TINK app to copri using JSON as input data format.
+	/// </summary>
+	/// <todo>Rename to UpdateFromCopri.</todo>
+	public static class UpdaterJSON
+	{
+		/// <summary> Loads a bike object from copri server cancel reservation/ booking update request.</summary>
+		/// <param name="bike">Bike object to load response into.</param>
+		/// <param name="notifyLevel">Controls whether notify property changed events are fired or not.</param>
+		public static void Load(
+			this IBikeInfoMutable bike,
+			Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel notifyLevel)
+		{
 
-            bike.State.Load(InUseStateEnum.Disposable, notifyLevel: notifyLevel);
-        }
+			bike.State.Load(InUseStateEnum.Disposable, notifyLevel: notifyLevel);
+		}
 
-        /// <summary>
-        /// Gets all statsion for station provider and add them into station list.
-        /// </summary>
-        /// <param name="p_oStationList">List of stations to update.</param>
-        public static StationDictionary GetStationsAllMutable(this StationsAvailableResponse stationsAllResponse)
-        {
-            // Get stations from Copri/ file/ memory, ....
-            if (stationsAllResponse == null
-                || stationsAllResponse.stations == null)
-            {
-                // Latest list of stations could not be retrieved from provider.
-                return new StationDictionary();
-            }
+		/// <summary>
+		/// Gets all statsion for station provider and add them into station list.
+		/// </summary>
+		/// <param name="p_oStationList">List of stations to update.</param>
+		public static StationDictionary GetStationsAllMutable(this StationsAvailableResponse stationsAllResponse)
+		{
+			// Get stations from Copri/ file/ memory, ....
+			if (stationsAllResponse == null
+				|| stationsAllResponse.stations == null)
+			{
+				// Latest list of stations could not be retrieved from provider.
+				return new StationDictionary();
+			}
 
-            Version.TryParse(stationsAllResponse.copri_version, out Version copriVersion);
+			Version.TryParse(stationsAllResponse.copri_version, out Version copriVersion);
 
-            var stations = new StationDictionary(p_oVersion: copriVersion);
+			var stations = new StationDictionary(p_oVersion: copriVersion);
 
-            foreach (var station in stationsAllResponse.stations)
-            {
-                if (stations.GetById(station.Value.station) != null)
-                {
-                    // Can not add station to list of station. Id is not unique.
-                    throw new InvalidResponseException<StationsAvailableResponse>(
-                        string.Format("Station id {0} is not unique.", station.Value.station), stationsAllResponse);
-                }
+			foreach (var station in stationsAllResponse.stations)
+			{
+				if (stations.GetById(station.Value.station) != null)
+				{
+					// Can not add station to list of station. Id is not unique.
+					throw new InvalidResponseException<StationsAvailableResponse>(
+						string.Format("Station id {0} is not unique.", station.Value.station), stationsAllResponse);
+				}
 
-                stations.Add(new Station.Station(
-                    station.Value.station,
-                    station.Value.GetGroup(),
-                    station.Value.GetPosition(),
-                    station.Value.description,
-                    new Data(station.Value.operator_data?.operator_name,
-                        station.Value.operator_data?.operator_phone,
-                        station.Value.operator_data?.operator_hours,
-                        station.Value.operator_data?.operator_email,
-                        !string.IsNullOrEmpty(station.Value.operator_data?.operator_color)
-                            ? Color.FromHex(station.Value.operator_data?.operator_color)
-                            : (Color?)null)));
-            }
+				stations.Add(new Station.Station(
+					station.Value.station,
+					station.Value.GetGroup(),
+					station.Value.GetPosition(),
+					station.Value.description,
+					new Data(station.Value.operator_data?.operator_name,
+						station.Value.operator_data?.operator_phone,
+						station.Value.operator_data?.operator_hours,
+						station.Value.operator_data?.operator_email,
+						!string.IsNullOrEmpty(station.Value.operator_data?.operator_color)
+							? Color.FromHex(station.Value.operator_data?.operator_color)
+							: (Color?)null)));
+			}
 
-            return stations;
-        }
+			return stations;
+		}
 
-        /// <summary>
-        /// Gets general data from COPRI response.
-        /// </summary>
-        /// <param name="response">Response to get data from.</param>
-        /// <returns>General data object initialized form COPRI response.</returns>
-        public static GeneralData GetGeneralData(this ResponseBase response)
-             => new GeneralData(
-                 response.init_map.GetMapSpan(),
-                 response.merchant_message,
-                 response.TryGetCopriVersion(out Version copriVersion)
-                    ? new Version(0, 0)
-                    : copriVersion,
-                 new ResourceUrls(response.tariff_info_html, response.bike_info_html, response.agb_html, response.privacy_html, response.impress_html));
+		/// <summary>
+		/// Gets general data from COPRI response.
+		/// </summary>
+		/// <param name="response">Response to get data from.</param>
+		/// <returns>General data object initialized form COPRI response.</returns>
+		public static GeneralData GetGeneralData(this ResponseBase response)
+			 => new GeneralData(
+				 response.init_map.GetMapSpan(),
+				 response.merchant_message,
+				 response.TryGetCopriVersion(out Version copriVersion)
+					? new Version(0, 0)
+					: copriVersion,
+				 new ResourceUrls(response.tariff_info_html, response.bike_info_html, response.agb_html, response.privacy_html, response.impress_html));
 
-        /// <summary> Gets account object from login response.</summary>
-        /// <param name="merchantId">Needed to extract cookie from autorization response.</param>
-        /// <param name="loginResponse">Response to get session cookie and debug level from.</param>
-        /// <param name="mail">Mail address needed to construct a complete account object (is not part of response).</param>
-        /// <param name="password">Password needed to construct a complete account object (is not part of response).</param>
-        public static IAccount GetAccount(
-            this AuthorizationResponse loginResponse,
-            string merchantId,
-            string mail,
-            string password)
-        {
-            if (loginResponse == null)
-            {
-                throw new ArgumentNullException(nameof(loginResponse));
-            }
+		/// <summary> Gets account object from login response.</summary>
+		/// <param name="merchantId">Needed to extract cookie from autorization response.</param>
+		/// <param name="loginResponse">Response to get session cookie and debug level from.</param>
+		/// <param name="mail">Mail address needed to construct a complete account object (is not part of response).</param>
+		/// <param name="password">Password needed to construct a complete account object (is not part of response).</param>
+		public static IAccount GetAccount(
+			this AuthorizationResponse loginResponse,
+			string merchantId,
+			string mail,
+			string password)
+		{
+			if (loginResponse == null)
+			{
+				throw new ArgumentNullException(nameof(loginResponse));
+			}
 
-            return new Account(
-                mail,
-                password,
-                loginResponse.GetIsAgbAcknowledged(),
-                loginResponse.authcookie?.Replace(merchantId, ""),
-                loginResponse.GetGroup(),
-                loginResponse.debuglevel == 1
-                    ? Permissions.All :
-                    (Permissions)loginResponse.debuglevel);
-        }
+			return new Account(
+				mail,
+				password,
+				loginResponse.GetIsAgbAcknowledged(),
+				loginResponse.authcookie?.Replace(merchantId, ""),
+				loginResponse.GetGroup(),
+				loginResponse.debuglevel == 1
+					? Permissions.All :
+					(Permissions)loginResponse.debuglevel);
+		}
 
-        /// <summary> Load bike object from booking response. </summary>
-        /// <param name="bike">Bike object to load from response.</param>
-        /// <param name="bikeInfo">Booking response.</param>
-        /// <param name="mailAddress">Mail address of user which books bike.</param>
-        /// <param name="notifyLevel">Controls whether notify property changed events are fired or not.</param>
-        public static void Load(
-            this IBikeInfoMutable bike,
-            BikeInfoReservedOrBooked bikeInfo,
-            string mailAddress,
-            Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel notifyLevel = Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.All)
-        {
-            if (bike is Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable btBikeInfo)
-            {
-                btBikeInfo.LockInfo.Load(
-                    bikeInfo.GetBluetoothLockId(),
-                    bikeInfo.GetBluetoothLockGuid(),
-                    bikeInfo.GetSeed(),
-                    bikeInfo.GetUserKey(),
-                    bikeInfo.GetAdminKey());
-            }
+		/// <summary> Load bike object from booking response. </summary>
+		/// <param name="bike">Bike object to load from response.</param>
+		/// <param name="bikeInfo">Booking response.</param>
+		/// <param name="mailAddress">Mail address of user which books bike.</param>
+		/// <param name="notifyLevel">Controls whether notify property changed events are fired or not.</param>
+		public static void Load(
+			this IBikeInfoMutable bike,
+			BikeInfoReservedOrBooked bikeInfo,
+			string mailAddress,
+			Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel notifyLevel = Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.All)
+		{
+			if (bike is Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable btBikeInfo)
+			{
+				btBikeInfo.LockInfo.Load(
+					bikeInfo.GetBluetoothLockId(),
+					bikeInfo.GetBluetoothLockGuid(),
+					bikeInfo.GetSeed(),
+					bikeInfo.GetUserKey(),
+					bikeInfo.GetAdminKey());
+			}
 
-            var l_oState = bikeInfo.GetState();
-            switch (l_oState)
-            {
-                case InUseStateEnum.Disposable:
-                    bike.State.Load(
-                        InUseStateEnum.Disposable,
-                        notifyLevel: notifyLevel);
-                    break;
+			var l_oState = bikeInfo.GetState();
+			switch (l_oState)
+			{
+				case InUseStateEnum.Disposable:
+					bike.State.Load(
+						InUseStateEnum.Disposable,
+						notifyLevel: notifyLevel);
+					break;
 
-                case InUseStateEnum.Reserved:
-                    bike.State.Load(
-                        InUseStateEnum.Reserved,
-                        bikeInfo.GetFrom(),
-                        mailAddress,
-                        bikeInfo.timeCode,
-                        notifyLevel);
-                    break;
+				case InUseStateEnum.Reserved:
+					bike.State.Load(
+						InUseStateEnum.Reserved,
+						bikeInfo.GetFrom(),
+						mailAddress,
+						bikeInfo.timeCode,
+						notifyLevel);
+					break;
 
-                case InUseStateEnum.Booked:
-                    bike.State.Load(
-                        InUseStateEnum.Booked,
-                        bikeInfo.GetFrom(),
-                        mailAddress,
-                        bikeInfo.timeCode,
-                        notifyLevel);
-                    break;
+				case InUseStateEnum.Booked:
+					bike.State.Load(
+						InUseStateEnum.Booked,
+						bikeInfo.GetFrom(),
+						mailAddress,
+						bikeInfo.timeCode,
+						notifyLevel);
+					break;
 
-                default:
-                    throw new Exception(string.Format("Unexpected bike state detected. state is {0}.", l_oState));
-            }
-        }
+				default:
+					throw new Exception(string.Format("Unexpected bike state detected. state is {0}.", l_oState));
+			}
+		}
 
-        /// <summary> Gets bikes available from copri server response.</summary>
-        /// <param name="bikesAvailableResponse">Response to create collection from.</param>
-        /// <returns>New collection of available bikes.</returns>
-        public static BikeCollection GetBikesAvailable(
-            this BikesAvailableResponse bikesAvailableResponse)
-            => GetBikesAll(
-                bikesAvailableResponse?.bikes?.Values,
-                new BikesReservedOccupiedResponse()?.bikes_occupied?.Values,    // There are no occupied bikes.
-                string.Empty,
-                () => DateTime.Now);
+		/// <summary> Gets bikes available from copri server response.</summary>
+		/// <param name="bikesAvailableResponse">Response to create collection from.</param>
+		/// <returns>New collection of available bikes.</returns>
+		public static BikeCollection GetBikesAvailable(
+			this BikesAvailableResponse bikesAvailableResponse)
+			=> GetBikesAll(
+				bikesAvailableResponse?.bikes?.Values,
+				new BikesReservedOccupiedResponse()?.bikes_occupied?.Values,    // There are no occupied bikes.
+				string.Empty,
+				() => DateTime.Now);
 
-        /// <summary> Gets bikes occupied from copri server response. </summary>
-        /// <param name="p_oBikesAvailable">Response to create bikes from.</param>
-        /// <returns>New collection of occupied bikes.</returns>
-        public static BikeCollection GetBikesOccupied(
-            this BikesReservedOccupiedResponse bikesOccupiedResponse,
-            string mail,
-            Func<DateTime> dateTimeProvider)
-        {
-            return GetBikesAll(
-                new BikesAvailableResponse()?.bikes?.Values,
-                bikesOccupiedResponse?.bikes_occupied?.Values,
-                mail,
-                dateTimeProvider);
-        }
+		/// <summary> Gets bikes occupied from copri server response. </summary>
+		/// <param name="p_oBikesAvailable">Response to create bikes from.</param>
+		/// <returns>New collection of occupied bikes.</returns>
+		public static BikeCollection GetBikesOccupied(
+			this BikesReservedOccupiedResponse bikesOccupiedResponse,
+			string mail,
+			Func<DateTime> dateTimeProvider)
+		{
+			return GetBikesAll(
+				new BikesAvailableResponse()?.bikes?.Values,
+				bikesOccupiedResponse?.bikes_occupied?.Values,
+				mail,
+				dateTimeProvider);
+		}
 
-        /// <summary> Gets bikes occupied from copri server response. </summary>
-        /// <param name="bikesAvailable">Response to create bikes available from.</param>
-        /// <param name="bikesOccupied">Response to create bikes occupied from.</param>
-        /// <returns>New collection of occupied bikes.</returns>
-        public static BikeCollection GetBikesAll(
-            IEnumerable<BikeInfoAvailable> bikesAvailable,
-            IEnumerable<BikeInfoReservedOrBooked> bikesOccupied,
-            string mail,
-            Func<DateTime> dateTimeProvider)
-        {
-            var bikesDictionary = new Dictionary<string, BikeInfo>();
-            var duplicates = new Dictionary<string, BikeInfo>();
+		/// <summary> Gets bikes occupied from copri server response. </summary>
+		/// <param name="bikesAvailable">Response to create bikes available from.</param>
+		/// <param name="bikesOccupied">Response to create bikes occupied from.</param>
+		/// <returns>New collection of occupied bikes.</returns>
+		public static BikeCollection GetBikesAll(
+			IEnumerable<BikeInfoAvailable> bikesAvailable,
+			IEnumerable<BikeInfoReservedOrBooked> bikesOccupied,
+			string mail,
+			Func<DateTime> dateTimeProvider)
+		{
+			var bikesDictionary = new Dictionary<string, BikeInfo>();
+			var duplicates = new Dictionary<string, BikeInfo>();
 
-            // Get bikes from Copri/ file/ memory, ....
-            if (bikesAvailable != null)
-            {
-                foreach (var bikeInfoResponse in bikesAvailable)
-                {
-                    var bikeInfo = BikeInfoFactory.Create(bikeInfoResponse);
-                    if (bikeInfo == null)
-                    {
-                        // Response is not valid.
-                        continue;
-                    }
+			// Get bikes from Copri/ file/ memory, ....
+			if (bikesAvailable != null)
+			{
+				foreach (var bikeInfoResponse in bikesAvailable)
+				{
+					var bikeInfo = BikeInfoFactory.Create(bikeInfoResponse);
+					if (bikeInfo == null)
+					{
+						// Response is not valid.
+						continue;
+					}
 
-                    if (bikesDictionary.ContainsKey(bikeInfo.Id))
-                    {
-                        // Duplicates are not allowed.
-                        Log.Error($"Duplicate bike with id {bikeInfo.Id} detected evaluating bikes available. Bike status is {bikeInfo.State.Value}.");
+					if (bikesDictionary.ContainsKey(bikeInfo.Id))
+					{
+						// Duplicates are not allowed.
+						Log.Error($"Duplicate bike with id {bikeInfo.Id} detected evaluating bikes available. Bike status is {bikeInfo.State.Value}.");
 
-                        if (!duplicates.ContainsKey(bikeInfo.Id))
-                        {
-                            duplicates.Add(bikeInfo.Id, bikeInfo);
-                        }
+						if (!duplicates.ContainsKey(bikeInfo.Id))
+						{
+							duplicates.Add(bikeInfo.Id, bikeInfo);
+						}
 
-                        continue;
-                    }
+						continue;
+					}
 
-                    bikesDictionary.Add(bikeInfo.Id, bikeInfo);
-                }
-            }
+					bikesDictionary.Add(bikeInfo.Id, bikeInfo);
+				}
+			}
 
-            // Get bikes from Copri/ file/ memory, ....
-            if (bikesOccupied != null)
-            {
-                foreach (var bikeInfoResponse in bikesOccupied)
-                {
-                    BikeInfo bikeInfo = BikeInfoFactory.Create(
-                        bikeInfoResponse,
-                        mail,
-                        dateTimeProvider);
+			// Get bikes from Copri/ file/ memory, ....
+			if (bikesOccupied != null)
+			{
+				foreach (var bikeInfoResponse in bikesOccupied)
+				{
+					BikeInfo bikeInfo = BikeInfoFactory.Create(
+						bikeInfoResponse,
+						mail,
+						dateTimeProvider);
 
-                    if (bikeInfo == null)
-                    {
-                        continue;
-                    }
+					if (bikeInfo == null)
+					{
+						continue;
+					}
 
-                    if (bikesDictionary.ContainsKey(bikeInfo.Id))
-                    {
-                        // Duplicates are not allowed.
-                        Log.Error($"Duplicate bike with id {bikeInfo.Id} detected evaluating bikes occupied. Bike status is {bikeInfo.State.Value}.");
-                        if (!duplicates.ContainsKey(bikeInfo.Id))
-                        {
-                            duplicates.Add(bikeInfo.Id, bikeInfo);
-                        }
+					if (bikesDictionary.ContainsKey(bikeInfo.Id))
+					{
+						// Duplicates are not allowed.
+						Log.Error($"Duplicate bike with id {bikeInfo.Id} detected evaluating bikes occupied. Bike status is {bikeInfo.State.Value}.");
+						if (!duplicates.ContainsKey(bikeInfo.Id))
+						{
+							duplicates.Add(bikeInfo.Id, bikeInfo);
+						}
 
-                        continue;
-                    }
+						continue;
+					}
 
 
-                    bikesDictionary.Add(bikeInfo.Id, bikeInfo);
-                }
-            }
+					bikesDictionary.Add(bikeInfo.Id, bikeInfo);
+				}
+			}
 
-            // Remove entries which are not unique.
-            foreach (var l_oDuplicate in duplicates)
-            {
-                bikesDictionary.Remove(l_oDuplicate.Key);
-            }
+			// Remove entries which are not unique.
+			foreach (var l_oDuplicate in duplicates)
+			{
+				bikesDictionary.Remove(l_oDuplicate.Key);
+			}
 
-            return new BikeCollection(bikesDictionary);
-        }
-    }
+			return new BikeCollection(bikesDictionary);
+		}
+	}
 }
diff --git a/TINKLib/Model/Device/IAppInfo.cs b/TINKLib/Model/Device/IAppInfo.cs
index 77b0759..ce90270 100644
--- a/TINKLib/Model/Device/IAppInfo.cs
+++ b/TINKLib/Model/Device/IAppInfo.cs
@@ -1,14 +1,14 @@
 using System;
 namespace TINK.Model.Device
 {
-    /// <summary> Interface to get version info. </summary>
-    public interface IAppInfo
-    {
-        /// <summary> Gets the app version to display to user.</summary>
-        Version Version { get; }
+	/// <summary> Interface to get version info. </summary>
+	public interface IAppInfo
+	{
+		/// <summary> Gets the app version to display to user.</summary>
+		Version Version { get; }
 
-        /// <summary> Gets the URL to the app store. </summary>
-        /// <value>The store URL.</value>
+		/// <summary> Gets the URL to the app store. </summary>
+		/// <value>The store URL.</value>
 		string StoreUrl { get; }
-    }
+	}
 }
diff --git a/TINKLib/Model/Device/IDevice.cs b/TINKLib/Model/Device/IDevice.cs
index 787dce5..c45bbe7 100644
--- a/TINKLib/Model/Device/IDevice.cs
+++ b/TINKLib/Model/Device/IDevice.cs
@@ -1,9 +1,9 @@
 namespace TINK.Model.Device
 {
-    public interface IDevice
-    {
-        /// <summary> Gets unitque device identifier. </summary>
-        /// <returns>Gets the identifies specifying device.</returns>
-        string GetIdentifier();
-    }
+	public interface IDevice
+	{
+		/// <summary> Gets unitque device identifier. </summary>
+		/// <returns>Gets the identifies specifying device.</returns>
+		string GetIdentifier();
+	}
 }
diff --git a/TINKLib/Model/Device/IExternalBrowserService.cs b/TINKLib/Model/Device/IExternalBrowserService.cs
index 4a7a9ae..3942300 100644
--- a/TINKLib/Model/Device/IExternalBrowserService.cs
+++ b/TINKLib/Model/Device/IExternalBrowserService.cs
@@ -1,9 +1,9 @@
 namespace TINK.Model.Device
 {
-    public interface IExternalBrowserService
-    {
-        /// <summary> Opens an external browser. </summary>
-        /// <param name="url">Url to open.</param>
-        void OpenUrl(string url);
-    }
+	public interface IExternalBrowserService
+	{
+		/// <summary> Opens an external browser. </summary>
+		/// <param name="url">Url to open.</param>
+		void OpenUrl(string url);
+	}
 }
diff --git a/TINKLib/Model/Device/IGeolodationDependent.cs b/TINKLib/Model/Device/IGeolodationDependent.cs
index 736b437..3b01ce2 100644
--- a/TINKLib/Model/Device/IGeolodationDependent.cs
+++ b/TINKLib/Model/Device/IGeolodationDependent.cs
@@ -1,7 +1,7 @@
 namespace TINK.Model.Device
 {
-    public interface IGeolodationDependent
-    {
-        bool IsGeolcationEnabled { get; }
-    }
+	public interface IGeolodationDependent
+	{
+		bool IsGeolcationEnabled { get; }
+	}
 }
diff --git a/TINKLib/Model/Device/ISmartDevice.cs b/TINKLib/Model/Device/ISmartDevice.cs
index 332d237..7c1e13f 100644
--- a/TINKLib/Model/Device/ISmartDevice.cs
+++ b/TINKLib/Model/Device/ISmartDevice.cs
@@ -2,21 +2,21 @@
 
 namespace TINK.Model.Device
 {
-    public interface ISmartDevice
-    {
-        /// <summary> Gets unitque device identifier. </summary>
-        /// <returns>Gets the identifies specifying device.</returns>
-        string Identifier { get; }
+	public interface ISmartDevice
+	{
+		/// <summary> Gets unitque device identifier. </summary>
+		/// <returns>Gets the identifies specifying device.</returns>
+		string Identifier { get; }
 
-        /// <summary> Manufacturer (Samsung). </summary>
-        string Manufacturer { get; }
+		/// <summary> Manufacturer (Samsung). </summary>
+		string Manufacturer { get; }
 
-        /// <summary> Device Model (SMG-950U, iPhone10,6). </summary>
-        string Model { get; }
+		/// <summary> Device Model (SMG-950U, iPhone10,6). </summary>
+		string Model { get; }
 
-        DevicePlatform Platform { get; }
+		DevicePlatform Platform { get; }
 
-        /// <summary> Operating System Version Number (7.0) as text</summary>
-        string VersionText { get; }
-    }
+		/// <summary> Operating System Version Number (7.0) as text</summary>
+		string VersionText { get; }
+	}
 }
diff --git a/TINKLib/Model/Device/ISpecialFolder.cs b/TINKLib/Model/Device/ISpecialFolder.cs
index ed6ac85..fd46049 100644
--- a/TINKLib/Model/Device/ISpecialFolder.cs
+++ b/TINKLib/Model/Device/ISpecialFolder.cs
@@ -1,15 +1,15 @@
 namespace TINK.Model.Device
 {
-    public interface ISpecialFolder
-    {
-        /// <summary>
-        /// Get the folder name of external folder to write to.
-        /// </summary>
-        /// <returns>External directory.</returns>
-        string GetExternalFilesDir();
+	public interface ISpecialFolder
+	{
+		/// <summary>
+		/// Get the folder name of external folder to write to.
+		/// </summary>
+		/// <returns>External directory.</returns>
+		string GetExternalFilesDir();
 
-        /// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
-        /// <returns>Directory name.</returns>
-        string GetInternalPersonalDir();
-    }
+		/// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
+		/// <returns>Directory name.</returns>
+		string GetInternalPersonalDir();
+	}
 }
diff --git a/TINKLib/Model/Device/IWebView.cs b/TINKLib/Model/Device/IWebView.cs
index bda2202..116255d 100644
--- a/TINKLib/Model/Device/IWebView.cs
+++ b/TINKLib/Model/Device/IWebView.cs
@@ -1,8 +1,8 @@
 namespace TINK.Model.Device
 {
-    public interface IWebView
-    {
-        /// <summary> Clears the cookie cache for all web views. </summary>
-        void ClearCookies();
-    }
+	public interface IWebView
+	{
+		/// <summary> Clears the cookie cache for all web views. </summary>
+		void ClearCookies();
+	}
 }
diff --git a/TINKLib/Model/EnumExtensions.cs b/TINKLib/Model/EnumExtensions.cs
index 56a54fd..cd03380 100644
--- a/TINKLib/Model/EnumExtensions.cs
+++ b/TINKLib/Model/EnumExtensions.cs
@@ -4,31 +4,31 @@ using System.Reflection;
 
 namespace TINK.Model
 {
-    public static class EnumExtensions
-    {
-        public static string GetDisplayName(this Enum enu)
-        {
-            var attr = GetDisplayAttribute(enu);
-            return attr != null ? attr.Name : enu.ToString();
-        }
+	public static class EnumExtensions
+	{
+		public static string GetDisplayName(this Enum enu)
+		{
+			var attr = GetDisplayAttribute(enu);
+			return attr != null ? attr.Name : enu.ToString();
+		}
 
-        public static string GetDescription(this Enum enu)
-        {
-            var attr = GetDisplayAttribute(enu);
-            return attr != null ? attr.Description : enu.ToString();
-        }
+		public static string GetDescription(this Enum enu)
+		{
+			var attr = GetDisplayAttribute(enu);
+			return attr != null ? attr.Description : enu.ToString();
+		}
 
-        private static DisplayAttribute GetDisplayAttribute(object value)
-        {
-            Type type = value?.GetType() ?? typeof(object);
-            if (!type.IsEnum)
-            {
-                throw new ArgumentException(string.Format("Type {0} is not an enum", type));
-            }
+		private static DisplayAttribute GetDisplayAttribute(object value)
+		{
+			Type type = value?.GetType() ?? typeof(object);
+			if (!type.IsEnum)
+			{
+				throw new ArgumentException(string.Format("Type {0} is not an enum", type));
+			}
 
-            // Get the enum field.
-            var field = type.GetField(value.ToString());
-            return field == null ? null : field.GetCustomAttribute<DisplayAttribute>();
-        }
-    }
+			// Get the enum field.
+			var field = type.GetField(value.ToString());
+			return field == null ? null : field.GetCustomAttribute<DisplayAttribute>();
+		}
+	}
 }
diff --git a/TINKLib/Model/FileOperationException.cs b/TINKLib/Model/FileOperationException.cs
index 909c8ac..1dbd14a 100644
--- a/TINKLib/Model/FileOperationException.cs
+++ b/TINKLib/Model/FileOperationException.cs
@@ -2,10 +2,10 @@
 
 namespace TINK.Model
 {
-    /// <summary> Operation fired when a file operation fails.</summary>
-    public class FileOperationException : Exception
-    {
-        public FileOperationException(string message, Exception innerException) : base(message, innerException)
-        { }
-    }
+	/// <summary> Operation fired when a file operation fails.</summary>
+	public class FileOperationException : Exception
+	{
+		public FileOperationException(string message, Exception innerException) : base(message, innerException)
+		{ }
+	}
 }
diff --git a/TINKLib/Model/FilterCollectionStore.cs b/TINKLib/Model/FilterCollectionStore.cs
index b36af22..3188793 100644
--- a/TINKLib/Model/FilterCollectionStore.cs
+++ b/TINKLib/Model/FilterCollectionStore.cs
@@ -3,11 +3,11 @@ using System.Linq;
 
 namespace TINK.Model
 {
-    public static class FilterCollectionStore
-    {
-        /// <summary> Writes filter collection state to string. </summary>
-        /// <returns> Filter collection to write to string.</returns>
-        /// <param name="p_oDictionary">P  o dictionary.</param>
+	public static class FilterCollectionStore
+	{
+		/// <summary> Writes filter collection state to string. </summary>
+		/// <returns> Filter collection to write to string.</returns>
+		/// <param name="p_oDictionary">P  o dictionary.</param>
 		public static string ToString(this IDictionary<string, FilterState> p_oDictionary) => "{" + string.Join(", ", p_oDictionary.Select(x => "(" + x.Key + "= " + x.Value + ")")) + "}";
-    }
+	}
 }
diff --git a/TINKLib/Model/GroupFilterHelper.cs b/TINKLib/Model/GroupFilterHelper.cs
index c949edf..caad842 100644
--- a/TINKLib/Model/GroupFilterHelper.cs
+++ b/TINKLib/Model/GroupFilterHelper.cs
@@ -5,41 +5,41 @@ using TINK.ViewModel.Settings;
 
 namespace TINK.Model
 {
-    /// <summary> Holds collecion of filters to filter options (TINK, Konrad, ....).     </summary>
-    /// <remarks> Former name: FilterCollection.</remarks>
-    public static class GroupFilterHelper
-    {
-        /// <summary> Gets default filter set.</summary>
-        public static IGroupFilterSettings GetSettingsFilterDefaults
-        {
-            get
-            {
-                return new GroupFilterSettings(new Dictionary<string, FilterState> {
-                    { FilterHelper.CARGOBIKE, FilterState.On },
-                    {FilterHelper.CITYBIKE, FilterState.On }
-                });
-            }
-        }
+	/// <summary> Holds collecion of filters to filter options (TINK, Konrad, ....).     </summary>
+	/// <remarks> Former name: FilterCollection.</remarks>
+	public static class GroupFilterHelper
+	{
+		/// <summary> Gets default filter set.</summary>
+		public static IGroupFilterSettings GetSettingsFilterDefaults
+		{
+			get
+			{
+				return new GroupFilterSettings(new Dictionary<string, FilterState> {
+					{ FilterHelper.CARGOBIKE, FilterState.On },
+					{FilterHelper.CITYBIKE, FilterState.On }
+				});
+			}
+		}
 
-        /// <summary> Gets default filter set.</summary>
-        public static IGroupFilterMapPage GetMapPageFilterDefaults
-        {
-            get
-            {
-                return new GroupFilterMapPage(new Dictionary<string, FilterState> {
-                    { FilterHelper.CARGOBIKE, FilterState.On },
-                    {FilterHelper.CITYBIKE, FilterState.Off }
-                });
-            }
-        }
-    }
+		/// <summary> Gets default filter set.</summary>
+		public static IGroupFilterMapPage GetMapPageFilterDefaults
+		{
+			get
+			{
+				return new GroupFilterMapPage(new Dictionary<string, FilterState> {
+					{ FilterHelper.CARGOBIKE, FilterState.On },
+					{FilterHelper.CITYBIKE, FilterState.Off }
+				});
+			}
+		}
+	}
 
-    /// <summary> Holds value whether filter (on TINK, Konrad, ....) is on or off. </summary>
-    public enum FilterState
-    {
-        /// <summary> Option (TINK, Konrad, ....) is available.</summary>
-        On,
-        /// <summary> Option is off</summary>
-        Off,
-    }
+	/// <summary> Holds value whether filter (on TINK, Konrad, ....) is on or off. </summary>
+	public enum FilterState
+	{
+		/// <summary> Option (TINK, Konrad, ....) is available.</summary>
+		On,
+		/// <summary> Option is off</summary>
+		Off,
+	}
 }
diff --git a/TINKLib/Model/IBookingFinishedModel.cs b/TINKLib/Model/IBookingFinishedModel.cs
index 9adcb24..d46e38a 100644
--- a/TINKLib/Model/IBookingFinishedModel.cs
+++ b/TINKLib/Model/IBookingFinishedModel.cs
@@ -2,12 +2,12 @@
 
 namespace TINK.Model
 {
-    public interface IBookingFinishedModel
-    {
-        /// <summary> Minisurvey to query user.</summary>
-        IMiniSurveyModel MiniSurvey { get; set; }
+	public interface IBookingFinishedModel
+	{
+		/// <summary> Minisurvey to query user.</summary>
+		IMiniSurveyModel MiniSurvey { get; set; }
 
-        /// <summary> Holds info about co2 saving accomplished by using cargo bike. </summary>
-        string Co2Saving { get; set; }
-    }
+		/// <summary> Holds info about co2 saving accomplished by using cargo bike. </summary>
+		string Co2Saving { get; set; }
+	}
 }
diff --git a/TINKLib/Model/IPosition.cs b/TINKLib/Model/IPosition.cs
index 57387aa..a7049b2 100644
--- a/TINKLib/Model/IPosition.cs
+++ b/TINKLib/Model/IPosition.cs
@@ -2,12 +2,12 @@
 
 namespace TINK.Model
 {
-    public interface IPosition : IEquatable<IPosition>
-    {
-        double Latitude { get; }
+	public interface IPosition : IEquatable<IPosition>
+	{
+		double Latitude { get; }
 
-        double Longitude { get; }
+		double Longitude { get; }
 
-        bool IsValid { get; }
-    }
+		bool IsValid { get; }
+	}
 }
diff --git a/TINKLib/Model/ITinkApp.cs b/TINKLib/Model/ITinkApp.cs
index 862fbe8..4c559d2 100644
--- a/TINKLib/Model/ITinkApp.cs
+++ b/TINKLib/Model/ITinkApp.cs
@@ -15,115 +15,118 @@ using TINK.ViewModel.Settings;
 
 namespace TINK.Model
 {
-    public enum AppFlavor
-    {
-        [Display(Name = "sharee.bike")]
-        ShareeBike,
-        [Display(Name = "Lastenrad Bayern")]
-        LastenradBayern,
-        [Display(Name = "Mein konrad")]
-        MeinKonrad,
-    }
+	public enum AppFlavor
+	{
+		[Display(Name = "sharee.bike")]
+		ShareeBike,
+		[Display(Name = "Lastenrad Bayern")]
+		LastenradBayern,
+		[Display(Name = "Mein konrad")]
+		MeinKonrad,
+	}
 
-    public interface ITinkApp
-    {
-        /// <summary> Update connector from depending on whether user is logged in or not.</summary>
-        void UpdateConnector();
+	public interface ITinkApp
+	{
+		/// <summary> Update connector from depending on whether user is logged in or not.</summary>
+		void UpdateConnector();
 
-        /// <summary> Saves object to file. </summary>
-        void Save();
+		/// <summary> Saves object to file. </summary>
+		void Save();
 
-        /// <summary> Holds the filter which is applied on the map view. Either TINK or Konrad stations are displayed. </summary>
-        IGroupFilterMapPage GroupFilterMapPage { get; set; }
+		/// <summary> Holds the filter which is applied on the map view. Either TINK or Konrad stations are displayed. </summary>
+		IGroupFilterMapPage GroupFilterMapPage { get; set; }
 
-        /// <summary> Holds the user of the app. </summary>
-        User.User ActiveUser { get; }
+		/// <summary> Holds the user of the app. </summary>
+		User.User ActiveUser { get; }
 
-        /// <summary> Holds the system to copri.</summary>
-        IFilteredConnector GetConnector(bool isConnected);
+		/// <summary> Holds the system to copri.</summary>
+		IFilteredConnector GetConnector(bool isConnected);
 
-        /// <summary> Name of the station which is selected. </summary>
-        IStation SelectedStation { get; set; }
+		/// <summary> Name of the station which is selected. </summary>
+		IStation SelectedStation { get; set; }
 
-        /// <summary>Polling periode.</summary>
-        PollingParameters Polling { get; set; }
+		/// <summary>Polling periode.</summary>
+		PollingParameters Polling { get; set; }
 
-        TimeSpan ExpiresAfter { get; set; }
+		TimeSpan ExpiresAfter { get; set; }
 
-        /// <summary> Holds status about whants new page. </summary>
-        WhatsNew WhatsNew { get; }
+		/// <summary> Holds status about whants new page. </summary>
+		WhatsNew WhatsNew { get; }
 
-        /// <summary> Gets whether device is connected to internet or not. </summary>
-        bool GetIsConnected();
+		/// <summary> Gets whether device is connected to internet or not. </summary>
+		bool GetIsConnected();
 
-        /// <summary> Action to post to GUI thread.</summary>
-        Action<SendOrPostCallback, object> PostAction { get; }
+		/// <summary> Action to post to GUI thread.</summary>
+		Action<SendOrPostCallback, object> PostAction { get; }
 
-        /// <summary> Holds the uri which is applied after restart. </summary>
-        Uri NextActiveUri { get; set; }
+		/// <summary> Holds the uri which is applied after restart. </summary>
+		Uri NextActiveUri { get; set; }
 
-        /// <summary> Holds the filters loaded from settings. </summary>
-        IGroupFilterSettings FilterGroupSetting { get; set; }
+		/// <summary> Holds the filters loaded from settings. </summary>
+		IGroupFilterSettings FilterGroupSetting { get; set; }
 
-        /// <summary> Value indicating whether map is centerted to current position or not. </summary>
-        bool CenterMapToCurrentLocation { get; set; }
+		/// <summary> Value indicating whether map is centerted to current position or not. </summary>
+		bool CenterMapToCurrentLocation { get; set; }
 
-        /// <summary> Holds the map area where user is or was located or null if position is unknown. </summary>
-        Xamarin.Forms.GoogleMaps.MapSpan UserMapSpan { get; set; }
+		/// <summary> Holds the map area where user is or was located or null if position is unknown. </summary>
+		Xamarin.Forms.GoogleMaps.MapSpan UserMapSpan { get; set; }
 
-        /// <summary> Holds the map span to display either default span or span centered to current position depending on option <see cref="CenterMapToCurrentLocation"/>.</summary>
-        Xamarin.Forms.GoogleMaps.MapSpan ActiveMapSpan { get; }
+		/// <summary> Holds the map span to display either default span or span centered to current position depending on option <see cref="CenterMapToCurrentLocation"/>.</summary>
+		Xamarin.Forms.GoogleMaps.MapSpan ActiveMapSpan { get; }
 
-        bool LogToExternalFolder { get; set; }
+		bool LogToExternalFolder { get; set; }
 
-        bool IsSiteCachingOn { get; set; }
+		bool IsSiteCachingOn { get; set; }
 
-        /// <summary> Gets the minimum logging level. </summary>
-        LogEventLevel MinimumLogEventLevel { get; set; }
+		/// <summary> Gets the minimum logging level. </summary>
+		LogEventLevel MinimumLogEventLevel { get; set; }
 
-        /// <summary> Gets a value indicating whether reporting level is verbose or not.</summary>
-        bool IsReportLevelVerbose { get; set; }
+		/// <summary> Gets a value indicating whether reporting level is verbose or not.</summary>
+		bool IsReportLevelVerbose { get; set; }
 
 
-        /// <summary> Updates logging level. </summary>
-        /// <param name="p_oNewLevel">New level to set.</param>
-        void UpdateLoggingLevel(LogEventLevel p_oNewLevel);
+		/// <summary> Updates logging level. </summary>
+		/// <param name="p_oNewLevel">New level to set.</param>
+		void UpdateLoggingLevel(LogEventLevel p_oNewLevel);
 
-        /// <summary>Holds uris of copri servers. </summary>
-        CopriServerUriList Uris { get; }
+		/// <summary>Holds uris of copri servers. </summary>
+		CopriServerUriList Uris { get; }
 
-        /// <summary> Holds the different lock service implementations.</summary>
-        LocksServicesContainerMutable LocksServices { get; }
+		/// <summary> Holds the different lock service implementations.</summary>
+		LocksServicesContainerMutable LocksServices { get; }
 
-        /// <summary> Holds available app themes.</summary>
-        ServicesContainerMutable Themes { get; }
+		/// <summary> Holds the flavor of the app, i.e. specifies if app is sharee.bike, Mein konrad or Lastenrad Bayern.</summary>
+		AppFlavor Flavor { get; }
 
-        /// <summary> Reference of object which provides device information. </summary>
-        ISmartDevice SmartDevice { get; }
+		/// <summary> Holds available app themes.</summary>
+		ServicesContainerMutable Themes { get; }
 
-        /// <summary> Holds the folder where settings files are stored. </summary>
-        string SettingsFileFolder { get; }
+		/// <summary> Reference of object which provides device information. </summary>
+		ISmartDevice SmartDevice { get; }
 
-        /// <summary> Holds the external path. </summary>
-        string ExternalFolder { get; }
+		/// <summary> Holds the folder where settings files are stored. </summary>
+		string SettingsFileFolder { get; }
 
-        /// <summary> Holds the stations availalbe. </summary>
-        IEnumerable<IStation> Stations { get; set; }
+		/// <summary> Holds the external path. </summary>
+		string ExternalFolder { get; }
+
+		/// <summary> Holds the stations availalbe. </summary>
+		IEnumerable<IStation> Stations { get; set; }
 
 
-        IResourceUrls ResourceUrls { get; set; }
-    }
+		IResourceUrls ResourceUrls { get; set; }
+	}
 
-    public interface IResourceUrls
-    {
-        string FeesResourcePath { get; }
+	public interface IResourceUrls
+	{
+		string FeesResourcePath { get; }
 
-        string BikesResourcePath { get; }
+		string BikesResourcePath { get; }
 
-        string AgbResourcePath { get; }
+		string AgbResourcePath { get; }
 
-        string PrivacyResourcePath { get; }
+		string PrivacyResourcePath { get; }
 
-        string ImpressResourcePath { get; }
-    }
+		string ImpressResourcePath { get; }
+	}
 }
diff --git a/TINKLib/Model/Logging/EmptyDirectoryLoggingManger.cs b/TINKLib/Model/Logging/EmptyDirectoryLoggingManger.cs
index 29bae3b..726844e 100644
--- a/TINKLib/Model/Logging/EmptyDirectoryLoggingManger.cs
+++ b/TINKLib/Model/Logging/EmptyDirectoryLoggingManger.cs
@@ -2,19 +2,19 @@
 
 namespace TINK.Model.Logging
 {
-    public class EmptyDirectoryLoggingManger : ILoggingDirectoryManager
-    {
-        public void DeleteObsoleteLogs() { }
+	public class EmptyDirectoryLoggingManger : ILoggingDirectoryManager
+	{
+		public void DeleteObsoleteLogs() { }
 
-        /// <summary> Gets the log file name. </summary>
-        public string LogFileName { get { return string.Empty; } }
+		/// <summary> Gets the log file name. </summary>
+		public string LogFileName { get { return string.Empty; } }
 
-        /// <summary> Gets all log files in logging directory. </summary>
-        /// <returns>List of log files.</returns>
-        public IList<string> GetLogFiles() { return new List<string>(); }
+		/// <summary> Gets all log files in logging directory. </summary>
+		/// <returns>List of log files.</returns>
+		public IList<string> GetLogFiles() { return new List<string>(); }
 
-        /// <summary> Gets path where log files are located. </summary>
-        /// <returns>Path to log files.</returns>
-        public string LogFilePath { get { return string.Empty; } }
-    }
+		/// <summary> Gets path where log files are located. </summary>
+		/// <returns>Path to log files.</returns>
+		public string LogFilePath { get { return string.Empty; } }
+	}
 }
diff --git a/TINKLib/Model/Logging/ILoggingDirectoryManager.cs b/TINKLib/Model/Logging/ILoggingDirectoryManager.cs
index ea1188a..b76616f 100644
--- a/TINKLib/Model/Logging/ILoggingDirectoryManager.cs
+++ b/TINKLib/Model/Logging/ILoggingDirectoryManager.cs
@@ -2,20 +2,20 @@
 
 namespace TINK.Model.Logging
 {
-    public interface ILoggingDirectoryManager
-    {
-        /// <summary> Deletes files which are out of retainment scope. </summary>
-        void DeleteObsoleteLogs();
+	public interface ILoggingDirectoryManager
+	{
+		/// <summary> Deletes files which are out of retainment scope. </summary>
+		void DeleteObsoleteLogs();
 
-        /// <summary> Gets the log file name. </summary>
-        string LogFileName { get; }
+		/// <summary> Gets the log file name. </summary>
+		string LogFileName { get; }
 
-        /// <summary> Gets all log files in logging directory. </summary>
-        /// <returns>List of log files.</returns>
-        IList<string> GetLogFiles();
+		/// <summary> Gets all log files in logging directory. </summary>
+		/// <returns>List of log files.</returns>
+		IList<string> GetLogFiles();
 
-        /// <summary> Gets path where log files are located. </summary>
-        /// <returns>Path to log files.</returns>
-        string LogFilePath { get; }
-    }
+		/// <summary> Gets path where log files are located. </summary>
+		/// <returns>Path to log files.</returns>
+		string LogFilePath { get; }
+	}
 }
diff --git a/TINKLib/Model/Logging/LogEntryClassifyHelper.cs b/TINKLib/Model/Logging/LogEntryClassifyHelper.cs
index e40be86..6223f86 100644
--- a/TINKLib/Model/Logging/LogEntryClassifyHelper.cs
+++ b/TINKLib/Model/Logging/LogEntryClassifyHelper.cs
@@ -4,32 +4,32 @@ using TINK.Repository.Exception;
 
 namespace TINK.Model.Logging
 {
-    public static class LogEntryClassifyHelper
-    {
-        /// <summary> Classifies exception and logs information or error depending on result of classification. </summary>
-        /// <typeparam name="T0">Type of first message parameter.</typeparam>
-        /// <typeparam name="T1">Type of second message parameter.</typeparam>
-        /// <param name="p_oLogger">Object to use for logging.</param>
-        /// <param name="messageTemplate">Templated used to output message.</param>
-        /// <param name="propertyValue0">First message parameter.</param>
-        /// <param name="propertyValue1">Second message parameter.</param>
-        /// <param name="p_oException">Exception to classify.</param>
-        public static void InformationOrError<T0, T1>(this ILogger p_oLogger, string messageTemplate, T0 propertyValue0, T1 propertyValue1, Exception p_oException)
-        {
-            if (p_oException == null)
-            {
-                p_oLogger.Error(messageTemplate, propertyValue0, propertyValue1, string.Empty);
-                return;
-            }
+	public static class LogEntryClassifyHelper
+	{
+		/// <summary> Classifies exception and logs information or error depending on result of classification. </summary>
+		/// <typeparam name="T0">Type of first message parameter.</typeparam>
+		/// <typeparam name="T1">Type of second message parameter.</typeparam>
+		/// <param name="p_oLogger">Object to use for logging.</param>
+		/// <param name="messageTemplate">Templated used to output message.</param>
+		/// <param name="propertyValue0">First message parameter.</param>
+		/// <param name="propertyValue1">Second message parameter.</param>
+		/// <param name="p_oException">Exception to classify.</param>
+		public static void InformationOrError<T0, T1>(this ILogger p_oLogger, string messageTemplate, T0 propertyValue0, T1 propertyValue1, Exception p_oException)
+		{
+			if (p_oException == null)
+			{
+				p_oLogger.Error(messageTemplate, propertyValue0, propertyValue1, string.Empty);
+				return;
+			}
 
-            if (p_oException.GetIsConnectFailureException())
-            {
-                // Expected exception (LAN or mobile data off/ not reachable, proxy, ...)
-                p_oLogger.Information(messageTemplate, propertyValue0, propertyValue1, p_oException);
-                return;
-            }
+			if (p_oException.GetIsConnectFailureException())
+			{
+				// Expected exception (LAN or mobile data off/ not reachable, proxy, ...)
+				p_oLogger.Information(messageTemplate, propertyValue0, propertyValue1, p_oException);
+				return;
+			}
 
-            p_oLogger.Error(messageTemplate, propertyValue0, propertyValue1, p_oException);
-        }
-    }
+			p_oLogger.Error(messageTemplate, propertyValue0, propertyValue1, p_oException);
+		}
+	}
 }
diff --git a/TINKLib/Model/Logging/LoggerConfigurationHelper.cs b/TINKLib/Model/Logging/LoggerConfigurationHelper.cs
index 241d29c..01e4438 100644
--- a/TINKLib/Model/Logging/LoggerConfigurationHelper.cs
+++ b/TINKLib/Model/Logging/LoggerConfigurationHelper.cs
@@ -7,104 +7,104 @@ using Serilog.Formatting.Json;
 
 namespace TINK.Model.Logging
 {
-    /// <summary> Holds new logging levels. </summary>
-    public enum RollingInterval
-    {
-        /// <summary> Create a new log file for each session (start of app).</summary>
-        Session,
-    }
+	/// <summary> Holds new logging levels. </summary>
+	public enum RollingInterval
+	{
+		/// <summary> Create a new log file for each session (start of app).</summary>
+		Session,
+	}
 
-    /// <summary> Provides logging file name helper functionality.</summary>
-    public static class LoggerConfigurationHelper
-    {
-        // Max count of retained logs count.
-        private const int RETAINEDFILECOUNT = 10;
+	/// <summary> Provides logging file name helper functionality.</summary>
+	public static class LoggerConfigurationHelper
+	{
+		// Max count of retained logs count.
+		private const int RETAINEDFILECOUNT = 10;
 
-        // Max size of logging file.
-        private const int MAXLOGFILESSIZEBYTESBYTES = 1024 * 1024 * 8; // 8MB
+		// Max size of logging file.
+		private const int MAXLOGFILESSIZEBYTESBYTES = 1024 * 1024 * 8; // 8MB
 
-        /// <summary> Holds the log file name. </summary>
-        private static ILoggingDirectoryManager DirectoryManager { get; set; } = new EmptyDirectoryLoggingManger();
+		/// <summary> Holds the log file name. </summary>
+		private static ILoggingDirectoryManager DirectoryManager { get; set; } = new EmptyDirectoryLoggingManger();
 
-        /// <summary> Sets up logging to file.</summary>
-        /// <param name="loggerConfiguration">Object to set up logging with.</param>
-        /// <param name="p_oDevice">Object to get file informaton from.</param>
-        /// <param name="rollingInterval">Specifies rolling type.</param>
-        /// <param name="retainedFilesCountLimit">Count of file being retained.</param>
-        /// <returns>Logger object.</returns>
-        public static LoggerConfiguration File(
-            this LoggerSinkConfiguration loggerConfiguration,
-            string logFileFolder,
-            RollingInterval rollingInterval = RollingInterval.Session,
-            int retainedFilesCountLimit = RETAINEDFILECOUNT)
-        {
-            if (DirectoryManager is EmptyDirectoryLoggingManger)
-            {
-                // Roll file only once per app session.
-                try
-                {
-                    DirectoryManager = new LoggingDirectoryManager(
-                        Directory.GetFiles,
-                        Directory.Exists,
-                        (path) => Directory.CreateDirectory(path),
-                        System.IO.File.Delete,
-                        logFileFolder,
-                        Path.DirectorySeparatorChar,
-                        retainedFilesCountLimit);
-                }
-                catch (Exception l_oException)
-                {
-                    Log.Error("Log directory manager could not be instanciated successfully. {@l_oException}", l_oException);
-                    DirectoryManager = new EmptyDirectoryLoggingManger();
-                }
-            }
+		/// <summary> Sets up logging to file.</summary>
+		/// <param name="loggerConfiguration">Object to set up logging with.</param>
+		/// <param name="p_oDevice">Object to get file informaton from.</param>
+		/// <param name="rollingInterval">Specifies rolling type.</param>
+		/// <param name="retainedFilesCountLimit">Count of file being retained.</param>
+		/// <returns>Logger object.</returns>
+		public static LoggerConfiguration File(
+			this LoggerSinkConfiguration loggerConfiguration,
+			string logFileFolder,
+			RollingInterval rollingInterval = RollingInterval.Session,
+			int retainedFilesCountLimit = RETAINEDFILECOUNT)
+		{
+			if (DirectoryManager is EmptyDirectoryLoggingManger)
+			{
+				// Roll file only once per app session.
+				try
+				{
+					DirectoryManager = new LoggingDirectoryManager(
+						Directory.GetFiles,
+						Directory.Exists,
+						(path) => Directory.CreateDirectory(path),
+						System.IO.File.Delete,
+						logFileFolder,
+						Path.DirectorySeparatorChar,
+						retainedFilesCountLimit);
+				}
+				catch (Exception l_oException)
+				{
+					Log.Error("Log directory manager could not be instanciated successfully. {@l_oException}", l_oException);
+					DirectoryManager = new EmptyDirectoryLoggingManger();
+				}
+			}
 
-            try
-            {
-                DirectoryManager.DeleteObsoleteLogs();
-            }
-            catch (Exception l_oException)
-            {
-                Log.Error("Not all obsolte log files could be deleted successfully. {@l_oException}", l_oException);
-            }
+			try
+			{
+				DirectoryManager.DeleteObsoleteLogs();
+			}
+			catch (Exception l_oException)
+			{
+				Log.Error("Not all obsolte log files could be deleted successfully. {@l_oException}", l_oException);
+			}
 
-            if (loggerConfiguration == null)
-            {
-                return null;
-            }
+			if (loggerConfiguration == null)
+			{
+				return null;
+			}
 
-            return loggerConfiguration.File(
-                new JsonFormatter(),
-                DirectoryManager.LogFileName,
-                fileSizeLimitBytes: MAXLOGFILESSIZEBYTESBYTES / RETAINEDFILECOUNT,
-                /*shared: true, // Leads to exception if activated.*/
-                rollingInterval: Serilog.RollingInterval.Infinite,
-                retainedFileCountLimit: retainedFilesCountLimit);
-        }
+			return loggerConfiguration.File(
+				new JsonFormatter(),
+				DirectoryManager.LogFileName,
+				fileSizeLimitBytes: MAXLOGFILESSIZEBYTESBYTES / RETAINEDFILECOUNT,
+				/*shared: true, // Leads to exception if activated.*/
+				rollingInterval: Serilog.RollingInterval.Infinite,
+				retainedFileCountLimit: retainedFilesCountLimit);
+		}
 
-        /// <summary> Gets all log files in logging directory. </summary>
-        /// <param name="p_oLogger"></param>
-        /// <returns>List of log files.</returns>
-        public static IList<string> GetLogFiles(this ILogger p_oLogger)
-        {
-            try
-            {
-                return DirectoryManager.GetLogFiles();
-            }
-            catch (Exception l_oException)
-            {
-                Log.Error("Getting list of log files failed. Empty list is returned instead. {@l_oException}", l_oException);
-                return new List<string>();
-            }
-        }
+		/// <summary> Gets all log files in logging directory. </summary>
+		/// <param name="p_oLogger"></param>
+		/// <returns>List of log files.</returns>
+		public static IList<string> GetLogFiles(this ILogger p_oLogger)
+		{
+			try
+			{
+				return DirectoryManager.GetLogFiles();
+			}
+			catch (Exception l_oException)
+			{
+				Log.Error("Getting list of log files failed. Empty list is returned instead. {@l_oException}", l_oException);
+				return new List<string>();
+			}
+		}
 
-        /// <summary> Gets path where log files are located. </summary>
-        /// <param name="p_oLogger"></param>
-        /// <returns>List of log files.</returns>
-        public static string GetLogFilePath(
-            this ILogger p_oLogger)
-        {
-            return DirectoryManager.LogFilePath;
-        }
-    }
+		/// <summary> Gets path where log files are located. </summary>
+		/// <param name="p_oLogger"></param>
+		/// <returns>List of log files.</returns>
+		public static string GetLogFilePath(
+			this ILogger p_oLogger)
+		{
+			return DirectoryManager.LogFilePath;
+		}
+	}
 }
diff --git a/TINKLib/Model/Logging/LoggingDirectoryManager.cs b/TINKLib/Model/Logging/LoggingDirectoryManager.cs
index 1baa41d..b6bf227 100644
--- a/TINKLib/Model/Logging/LoggingDirectoryManager.cs
+++ b/TINKLib/Model/Logging/LoggingDirectoryManager.cs
@@ -4,143 +4,143 @@ using System.Linq;
 
 namespace TINK.Model.Logging
 {
-    public class LoggingDirectoryManager : ILoggingDirectoryManager
-    {
-        /// <summary> Name of logging subdirectory.</summary>
-        private const string LOGDIRECTORYTITLE = "Log";
+	public class LoggingDirectoryManager : ILoggingDirectoryManager
+	{
+		/// <summary> Name of logging subdirectory.</summary>
+		private const string LOGDIRECTORYTITLE = "Log";
 
-        /// <summary> Prevents an invalid instance to be created. </summary>
-        private LoggingDirectoryManager() { }
+		/// <summary> Prevents an invalid instance to be created. </summary>
+		private LoggingDirectoryManager() { }
 
-        public LoggingDirectoryManager(
-            Func<string, IList<string>> fileListProvider,
-            Func<string, bool> directoryExistsChecker,
-            Action<string> directoryCreator,
-            Action<string> fileEraser,
-            string logFilePath,
-            char directorySeparatorChar,
-            int p_iRetainedFilesCountLimit)
-        {
-            m_oFileListProvider = fileListProvider ?? throw new ArgumentException($"Can not instantiate {nameof(LoggingDirectoryManager)}- object. File list provider delegate can not be null.");
+		public LoggingDirectoryManager(
+			Func<string, IList<string>> fileListProvider,
+			Func<string, bool> directoryExistsChecker,
+			Action<string> directoryCreator,
+			Action<string> fileEraser,
+			string logFilePath,
+			char directorySeparatorChar,
+			int p_iRetainedFilesCountLimit)
+		{
+			m_oFileListProvider = fileListProvider ?? throw new ArgumentException($"Can not instantiate {nameof(LoggingDirectoryManager)}- object. File list provider delegate can not be null.");
 
-            if (directoryExistsChecker == null)
-            {
-                throw new ArgumentException($"Can not instantiate {nameof(LoggingDirectoryManager)}- object. Directory existance checker delegate can not be null.");
-            }
+			if (directoryExistsChecker == null)
+			{
+				throw new ArgumentException($"Can not instantiate {nameof(LoggingDirectoryManager)}- object. Directory existance checker delegate can not be null.");
+			}
 
-            if (directoryCreator == null)
-            {
-                throw new ArgumentException($"Can not instantiate {nameof(LoggingDirectoryManager)}- object. Directory creator delegate can not be null.");
-            }
+			if (directoryCreator == null)
+			{
+				throw new ArgumentException($"Can not instantiate {nameof(LoggingDirectoryManager)}- object. Directory creator delegate can not be null.");
+			}
 
-            m_oFileEraser = fileEraser ?? throw new ArgumentException($"Can not instantiate {nameof(LoggingDirectoryManager)}- object. File eraser delegate can not be null.");
+			m_oFileEraser = fileEraser ?? throw new ArgumentException($"Can not instantiate {nameof(LoggingDirectoryManager)}- object. File eraser delegate can not be null.");
 
-            if (string.IsNullOrEmpty(logFilePath))
-            {
-                throw new ArgumentException($"Can not instantiate {nameof(LoggingDirectoryManager)}- object. Log file path can not be null or empty.");
-            }
+			if (string.IsNullOrEmpty(logFilePath))
+			{
+				throw new ArgumentException($"Can not instantiate {nameof(LoggingDirectoryManager)}- object. Log file path can not be null or empty.");
+			}
 
-            if (string.IsNullOrEmpty(directorySeparatorChar.ToString()))
-            {
-                throw new ArgumentException($"Can not instantiate {nameof(LoggingDirectoryManager)}- object. Directory separtor character can not be null or empty.");
-            }
+			if (string.IsNullOrEmpty(directorySeparatorChar.ToString()))
+			{
+				throw new ArgumentException($"Can not instantiate {nameof(LoggingDirectoryManager)}- object. Directory separtor character can not be null or empty.");
+			}
 
-            if (p_iRetainedFilesCountLimit < 1)
-            {
-                throw new ArgumentException($"Can not instantiate {nameof(LoggingDirectoryManager)}- object. Count of retained log files is {p_iRetainedFilesCountLimit} but must be equal or larger one.");
-            }
+			if (p_iRetainedFilesCountLimit < 1)
+			{
+				throw new ArgumentException($"Can not instantiate {nameof(LoggingDirectoryManager)}- object. Count of retained log files is {p_iRetainedFilesCountLimit} but must be equal or larger one.");
+			}
 
-            DirectorySeparatorChar = directorySeparatorChar.ToString();
+			DirectorySeparatorChar = directorySeparatorChar.ToString();
 
-            LogFilePath = $"{logFilePath}{DirectorySeparatorChar}{LOGDIRECTORYTITLE}";
+			LogFilePath = $"{logFilePath}{DirectorySeparatorChar}{LOGDIRECTORYTITLE}";
 
 
-            m_iRetainedFilesCountLimit = p_iRetainedFilesCountLimit;
+			m_iRetainedFilesCountLimit = p_iRetainedFilesCountLimit;
 
-            if (string.IsNullOrEmpty(LogFileTitle))
-            {
-                LogFileTitle = $"{DateTime.Now:yyyy_MM_dd_HH_mm_ss}.jsnl";
-            }
+			if (string.IsNullOrEmpty(LogFileTitle))
+			{
+				LogFileTitle = $"{DateTime.Now:yyyy_MM_dd_HH_mm_ss}.jsnl";
+			}
 
-            // Create directory if direcotry does not exist.
-            if (directoryExistsChecker(LogFilePath) == false)
-            {
-                try
-                {
-                    directoryCreator(LogFilePath);
-                }
-                catch (Exception l_oException)
-                {
+			// Create directory if direcotry does not exist.
+			if (directoryExistsChecker(LogFilePath) == false)
+			{
+				try
+				{
+					directoryCreator(LogFilePath);
+				}
+				catch (Exception l_oException)
+				{
 
-                    throw new FileOperationException($"Logging directory {LogFilePath} could not be created successfully.", l_oException);
-                }
-            }
-        }
+					throw new FileOperationException($"Logging directory {LogFilePath} could not be created successfully.", l_oException);
+				}
+			}
+		}
 
-        /// <summary> Deletes files which are out of retainment scope. </summary>
-        public void DeleteObsoleteLogs()
-        {
-            var l_oExceptions = new List<Exception>();
-            var l_oSortedFileArray = m_oFileListProvider(LogFilePath).OrderByDescending(x => x).ToArray();
+		/// <summary> Deletes files which are out of retainment scope. </summary>
+		public void DeleteObsoleteLogs()
+		{
+			var l_oExceptions = new List<Exception>();
+			var l_oSortedFileArray = m_oFileListProvider(LogFilePath).OrderByDescending(x => x).ToArray();
 
-            for (int l_iIndex = l_oSortedFileArray.Length - 1;
-                l_iIndex >= m_iRetainedFilesCountLimit - 1; /* files remaining count must be  m_iRetainedFilesCountLimit - 1 because new log file will be added afterwards */
-                l_iIndex--)
-            {
-                try
-                {
-                    m_oFileEraser(l_oSortedFileArray[l_iIndex]);
-                }
-                catch (Exception l_oExpetion)
-                {
-                    // Getting list of log files found.
-                    l_oExceptions.Add(l_oExpetion);
-                }
-            }
+			for (int l_iIndex = l_oSortedFileArray.Length - 1;
+				l_iIndex >= m_iRetainedFilesCountLimit - 1; /* files remaining count must be  m_iRetainedFilesCountLimit - 1 because new log file will be added afterwards */
+				l_iIndex--)
+			{
+				try
+				{
+					m_oFileEraser(l_oSortedFileArray[l_iIndex]);
+				}
+				catch (Exception l_oExpetion)
+				{
+					// Getting list of log files found.
+					l_oExceptions.Add(l_oExpetion);
+				}
+			}
 
-            if (l_oExceptions.Count <= 0)
-            {
-                return;
-            }
+			if (l_oExceptions.Count <= 0)
+			{
+				return;
+			}
 
-            throw new AggregateException("Deleting obsolete log files failed.", l_oExceptions.ToArray());
-        }
+			throw new AggregateException("Deleting obsolete log files failed.", l_oExceptions.ToArray());
+		}
 
-        /// <summary> Gets all log files in logging directory. </summary>
-        /// <param name="p_oLogger"></param>
-        /// <returns>List of log files.</returns>
-        public IList<string> GetLogFiles()
-        {
-            try
-            {
-                return m_oFileListProvider(LogFilePath).OrderBy(x => x).ToList();
-            }
-            catch (Exception l_oExpetion)
-            {
-                // Getting list of log files found.
-                throw new FileOperationException("Getting list of log files failed.", l_oExpetion);
-            }
-        }
+		/// <summary> Gets all log files in logging directory. </summary>
+		/// <param name="p_oLogger"></param>
+		/// <returns>List of log files.</returns>
+		public IList<string> GetLogFiles()
+		{
+			try
+			{
+				return m_oFileListProvider(LogFilePath).OrderBy(x => x).ToList();
+			}
+			catch (Exception l_oExpetion)
+			{
+				// Getting list of log files found.
+				throw new FileOperationException("Getting list of log files failed.", l_oExpetion);
+			}
+		}
 
-        /// <summary>Holds delegate to provide file names.</summary>
-        private readonly Func<string, IList<string>> m_oFileListProvider;
+		/// <summary>Holds delegate to provide file names.</summary>
+		private readonly Func<string, IList<string>> m_oFileListProvider;
 
-        /// <summary>Holds delegate to delete files.</summary>
-        private readonly Action<string> m_oFileEraser;
+		/// <summary>Holds delegate to delete files.</summary>
+		private readonly Action<string> m_oFileEraser;
 
-        /// <summary>Holds delegate to provide file names.</summary>
-        private int m_iRetainedFilesCountLimit;
+		/// <summary>Holds delegate to provide file names.</summary>
+		private int m_iRetainedFilesCountLimit;
 
-        /// <summary> Holds the log file name. </summary>
-        private string LogFileTitle { get; }
+		/// <summary> Holds the log file name. </summary>
+		private string LogFileTitle { get; }
 
-        /// <summary> Holds the log file name. </summary>
-        public string LogFilePath { get; }
+		/// <summary> Holds the log file name. </summary>
+		public string LogFilePath { get; }
 
-        /// <summary> Holds the directory separator character. </summary>
-        private string DirectorySeparatorChar { get; }
+		/// <summary> Holds the directory separator character. </summary>
+		private string DirectorySeparatorChar { get; }
 
-        /// <summary> Holds the log file name. </summary>
-        public string LogFileName { get { return $"{LogFilePath}{DirectorySeparatorChar}{LogFileTitle}"; } }
-    }
+		/// <summary> Holds the log file name. </summary>
+		public string LogFileName { get { return $"{LogFilePath}{DirectorySeparatorChar}{LogFileTitle}"; } }
+	}
 }
diff --git a/TINKLib/Model/Map/IMapSpan.cs b/TINKLib/Model/Map/IMapSpan.cs
index c21bd1f..abf1af9 100644
--- a/TINKLib/Model/Map/IMapSpan.cs
+++ b/TINKLib/Model/Map/IMapSpan.cs
@@ -1,14 +1,14 @@
 namespace TINK.Model.Map
 {
-    public interface IMapSpan
-    {
-        /// <summary> Center of map displayed area.</summary>
-        IPosition Center { get; }
+	public interface IMapSpan
+	{
+		/// <summary> Center of map displayed area.</summary>
+		IPosition Center { get; }
 
-        /// <summary> Radius of displayed map area. </summary>
-        double Radius { get; }
+		/// <summary> Radius of displayed map area. </summary>
+		double Radius { get; }
 
-        /// <summary> Gets if map span is valid or not. </summary>
-        bool IsValid { get; }
-    }
+		/// <summary> Gets if map span is valid or not. </summary>
+		bool IsValid { get; }
+	}
 }
diff --git a/TINKLib/Model/Map/MapSpan.cs b/TINKLib/Model/Map/MapSpan.cs
index 05c3a5c..09a87c9 100644
--- a/TINKLib/Model/Map/MapSpan.cs
+++ b/TINKLib/Model/Map/MapSpan.cs
@@ -2,29 +2,29 @@
 
 namespace TINK.Model.Map
 {
-    /// <summary> Holds the displayed map area. </summary>
-    public class MapSpan : IMapSpan
-    {
-        internal MapSpan(IPosition center, double radius)
-        {
-            if (!GetIsValid(center, radius))
-                throw new ArgumentNullException();
+	/// <summary> Holds the displayed map area. </summary>
+	public class MapSpan : IMapSpan
+	{
+		internal MapSpan(IPosition center, double radius)
+		{
+			if (!GetIsValid(center, radius))
+				throw new ArgumentNullException();
 
-            Center = center;
-            Radius = radius;
-        }
+			Center = center;
+			Radius = radius;
+		}
 
-        /// <summary> Center of map displayed area.</summary>
-        public IPosition Center { get; }
+		/// <summary> Center of map displayed area.</summary>
+		public IPosition Center { get; }
 
-        /// <summary> Radius of displayed map area. </summary>
-        public double Radius { get; }
+		/// <summary> Radius of displayed map area. </summary>
+		public double Radius { get; }
 
-        public bool IsValid => GetIsValid(Center, Radius);
+		public bool IsValid => GetIsValid(Center, Radius);
 
-        public static bool GetIsValid(IPosition center, double radius)
-            => center != null
-                && center.IsValid
-                && !double.IsNaN(radius);
-    }
+		public static bool GetIsValid(IPosition center, double radius)
+			=> center != null
+				&& center.IsValid
+				&& !double.IsNaN(radius);
+	}
 }
diff --git a/TINKLib/Model/Map/MapSpanFactory.cs b/TINKLib/Model/Map/MapSpanFactory.cs
index 783863c..4237bc6 100644
--- a/TINKLib/Model/Map/MapSpanFactory.cs
+++ b/TINKLib/Model/Map/MapSpanFactory.cs
@@ -1,11 +1,11 @@
 
 namespace TINK.Model.Map
 {
-    public static class MapSpanFactory
-    {
-        public static IMapSpan Create(IPosition position = null, double radius = double.NaN)
-            => MapSpan.GetIsValid(position, radius)
-                ? new MapSpan(position, radius) as IMapSpan
-                : new NullMapSpan();
-    }
+	public static class MapSpanFactory
+	{
+		public static IMapSpan Create(IPosition position = null, double radius = double.NaN)
+			=> MapSpan.GetIsValid(position, radius)
+				? new MapSpan(position, radius) as IMapSpan
+				: new NullMapSpan();
+	}
 }
diff --git a/TINKLib/Model/Map/NullMapSpan.cs b/TINKLib/Model/Map/NullMapSpan.cs
index c3e27bf..58cdc5a 100644
--- a/TINKLib/Model/Map/NullMapSpan.cs
+++ b/TINKLib/Model/Map/NullMapSpan.cs
@@ -1,16 +1,16 @@
 
 namespace TINK.Model.Map
 {
-    public class NullMapSpan : IMapSpan
-    {
-        internal NullMapSpan() { }
+	public class NullMapSpan : IMapSpan
+	{
+		internal NullMapSpan() { }
 
-        /// <summary> Center of map displayed area.</summary>
-        public IPosition Center { get; } = PositionFactory.Create();
+		/// <summary> Center of map displayed area.</summary>
+		public IPosition Center { get; } = PositionFactory.Create();
 
-        /// <summary> Radius of displayed map area. </summary>
-        public double Radius => double.NaN;
+		/// <summary> Radius of displayed map area. </summary>
+		public double Radius => double.NaN;
 
-        public bool IsValid => MapSpan.GetIsValid(Center, Radius);
-    }
+		public bool IsValid => MapSpan.GetIsValid(Center, Radius);
+	}
 }
diff --git a/TINKLib/Model/MiniSurvey/IMiniSurveyModel.cs b/TINKLib/Model/MiniSurvey/IMiniSurveyModel.cs
index 8ac43f3..486295a 100644
--- a/TINKLib/Model/MiniSurvey/IMiniSurveyModel.cs
+++ b/TINKLib/Model/MiniSurvey/IMiniSurveyModel.cs
@@ -2,18 +2,18 @@
 
 namespace TINK.Model.MiniSurvey
 {
-    public interface IMiniSurveyModel
-    {
-        /// <summary> Holds the title of the mini survey. </summary>
-        string Title { get; set; }
+	public interface IMiniSurveyModel
+	{
+		/// <summary> Holds the title of the mini survey. </summary>
+		string Title { get; set; }
 
-        /// <summary> Holds the sub title of the mini survey. </summary>
-        string Subtitle { get; set; }
+		/// <summary> Holds the sub title of the mini survey. </summary>
+		string Subtitle { get; set; }
 
-        /// <summary> Holds the footer of the mini survey. </summary>
-        string Footer { get; set; }
+		/// <summary> Holds the footer of the mini survey. </summary>
+		string Footer { get; set; }
 
-        /// <summary> Holds the questions. </summary>
-        IDictionary<string, IQuestionModel> Questions { get; }
-    }
+		/// <summary> Holds the questions. </summary>
+		IDictionary<string, IQuestionModel> Questions { get; }
+	}
 }
diff --git a/TINKLib/Model/MiniSurvey/IQuestionModel.cs b/TINKLib/Model/MiniSurvey/IQuestionModel.cs
index 8c358fc..9780234 100644
--- a/TINKLib/Model/MiniSurvey/IQuestionModel.cs
+++ b/TINKLib/Model/MiniSurvey/IQuestionModel.cs
@@ -2,15 +2,15 @@
 
 namespace TINK.Model.MiniSurvey
 {
-    public interface IQuestionModel
-    {
-        /// <summary> Holds the query description. </summary>
-        string Text { get; set; }
+	public interface IQuestionModel
+	{
+		/// <summary> Holds the query description. </summary>
+		string Text { get; set; }
 
-        /// <summary> Holds the type of the question. </summary>
-        MiniSurveyModel.Type Type { get; set; }
+		/// <summary> Holds the type of the question. </summary>
+		MiniSurveyModel.Type Type { get; set; }
 
-        /// <summary>Holds the collection of possible answers.</summary>
-        Dictionary<string, string> PossibleAnswers { get; }
-    }
+		/// <summary>Holds the collection of possible answers.</summary>
+		Dictionary<string, string> PossibleAnswers { get; }
+	}
 }
diff --git a/TINKLib/Model/MiniSurvey/MiniSurveyModel.cs b/TINKLib/Model/MiniSurvey/MiniSurveyModel.cs
index 6ffa7c6..6a44e93 100644
--- a/TINKLib/Model/MiniSurvey/MiniSurveyModel.cs
+++ b/TINKLib/Model/MiniSurvey/MiniSurveyModel.cs
@@ -3,32 +3,32 @@
 namespace TINK.Model.MiniSurvey
 
 {
-    /// <summary>
-    /// Holds mini survey.
-    /// </summary>
-    public class MiniSurveyModel : IMiniSurveyModel
-    {
-        public MiniSurveyModel(Dictionary<string, IQuestionModel> questions = null)
-        {
-            Questions = questions ?? new Dictionary<string, IQuestionModel>();
-        }
+	/// <summary>
+	/// Holds mini survey.
+	/// </summary>
+	public class MiniSurveyModel : IMiniSurveyModel
+	{
+		public MiniSurveyModel(Dictionary<string, IQuestionModel> questions = null)
+		{
+			Questions = questions ?? new Dictionary<string, IQuestionModel>();
+		}
 
-        public enum Type
-        {
-            SingleAnswer,
-            CustomText
-        }
+		public enum Type
+		{
+			SingleAnswer,
+			CustomText
+		}
 
-        /// <summary> Holds the title of the mini survey. </summary>
-        public string Title { get; set; }
+		/// <summary> Holds the title of the mini survey. </summary>
+		public string Title { get; set; }
 
-        /// <summary> Holds the sub title of the mini survey. </summary>
-        public string Subtitle { get; set; }
+		/// <summary> Holds the sub title of the mini survey. </summary>
+		public string Subtitle { get; set; }
 
-        /// <summary> Holds the footer of the mini survey. </summary>
-        public string Footer { get; set; }
+		/// <summary> Holds the footer of the mini survey. </summary>
+		public string Footer { get; set; }
 
-        /// <summary> Holds the questions. </summary>
-        public IDictionary<string, IQuestionModel> Questions { get; }
-    }
+		/// <summary> Holds the questions. </summary>
+		public IDictionary<string, IQuestionModel> Questions { get; }
+	}
 }
diff --git a/TINKLib/Model/MiniSurvey/QuestionModel.cs b/TINKLib/Model/MiniSurvey/QuestionModel.cs
index 4a31d00..0025a93 100644
--- a/TINKLib/Model/MiniSurvey/QuestionModel.cs
+++ b/TINKLib/Model/MiniSurvey/QuestionModel.cs
@@ -2,15 +2,15 @@
 
 namespace TINK.Model.MiniSurvey
 {
-    public class QuestionModel : IQuestionModel
-    {
-        /// <summary> Holds the query description. </summary>
-        public string Text { get; set; }
+	public class QuestionModel : IQuestionModel
+	{
+		/// <summary> Holds the query description. </summary>
+		public string Text { get; set; }
 
-        /// <summary> Holds the type of the question. </summary>
-        public MiniSurveyModel.Type Type { get; set; }
+		/// <summary> Holds the type of the question. </summary>
+		public MiniSurveyModel.Type Type { get; set; }
 
-        /// <summary>Holds the collection of possible answers.</summary>
-        public Dictionary<string, string> PossibleAnswers { get; private set; } = new Dictionary<string, string>();
-    }
+		/// <summary>Holds the collection of possible answers.</summary>
+		public Dictionary<string, string> PossibleAnswers { get; private set; } = new Dictionary<string, string>();
+	}
 }
diff --git a/TINKLib/Model/NullPostion.cs b/TINKLib/Model/NullPostion.cs
index e3f10a3..0b91a46 100644
--- a/TINKLib/Model/NullPostion.cs
+++ b/TINKLib/Model/NullPostion.cs
@@ -1,17 +1,17 @@
 
 namespace TINK.Model
 {
-    public class NullPostion : IPosition
-    {
-        internal NullPostion() { }
+	public class NullPostion : IPosition
+	{
+		internal NullPostion() { }
 
-        public double Latitude => double.NaN;
+		public double Latitude => double.NaN;
 
-        public double Longitude => double.NaN;
+		public double Longitude => double.NaN;
 
-        public bool IsValid => Position.GetIsValid(Latitude, Longitude);
+		public bool IsValid => Position.GetIsValid(Latitude, Longitude);
 
-        public bool Equals(IPosition other)
-            => Position.GetEquals(this, other);
-    }
+		public bool Equals(IPosition other)
+			=> Position.GetEquals(this, other);
+	}
 }
diff --git a/TINKLib/Model/Position.cs b/TINKLib/Model/Position.cs
index 87cfa59..e070b9b 100644
--- a/TINKLib/Model/Position.cs
+++ b/TINKLib/Model/Position.cs
@@ -2,63 +2,63 @@
 
 namespace TINK.Model
 {
-    public class Position : IPosition
-    {
-        private const double PRECISSION_LATITUDE_LONGITUDE = 0.000000000000001;
+	public class Position : IPosition
+	{
+		private const double PRECISSION_LATITUDE_LONGITUDE = 0.000000000000001;
 
-        internal Position(double latitude, double longitude)
-        {
-            if (!GetIsValid(latitude, longitude))
-                throw new ArgumentNullException();
+		internal Position(double latitude, double longitude)
+		{
+			if (!GetIsValid(latitude, longitude))
+				throw new ArgumentNullException();
 
-            Latitude = latitude;
-            Longitude = longitude;
-        }
+			Latitude = latitude;
+			Longitude = longitude;
+		}
 
-        public double Latitude { get; private set; }
+		public double Latitude { get; private set; }
 
-        public double Longitude { get; private set; }
+		public double Longitude { get; private set; }
 
 
-        /// <summary>
-        /// Compares position with a target position.
-        /// </summary>
-        /// <param name="target">Target position to compare with.</param>
-        /// <returns>True if positions are equal.</returns>
-        public override bool Equals(object target)
-        {
-            if (!(target is IPosition targetPosition))
-                return false;
+		/// <summary>
+		/// Compares position with a target position.
+		/// </summary>
+		/// <param name="target">Target position to compare with.</param>
+		/// <returns>True if positions are equal.</returns>
+		public override bool Equals(object target)
+		{
+			if (!(target is IPosition targetPosition))
+				return false;
 
-            return GetEquals(this, targetPosition);
-        }
+			return GetEquals(this, targetPosition);
+		}
 
-        public bool Equals(IPosition other)
-            => (other is Position position) && position.Equals(this as object);
+		public bool Equals(IPosition other)
+			=> (other is Position position) && position.Equals(this as object);
 
-        public override int GetHashCode()
-        {
-            var hashCode = -1416534245;
-            hashCode = hashCode * -1521134295 + Latitude.GetHashCode();
-            hashCode = hashCode * -1521134295 + Longitude.GetHashCode();
-            return hashCode;
-        }
+		public override int GetHashCode()
+		{
+			var hashCode = -1416534245;
+			hashCode = hashCode * -1521134295 + Latitude.GetHashCode();
+			hashCode = hashCode * -1521134295 + Longitude.GetHashCode();
+			return hashCode;
+		}
 
-        public bool IsValid => GetIsValid(Latitude, Longitude);
+		public bool IsValid => GetIsValid(Latitude, Longitude);
 
-        public static bool GetEquals(IPosition source, IPosition target)
-        {
-            if (source == null || target == null)
-                return source == null ^ target == null;
+		public static bool GetEquals(IPosition source, IPosition target)
+		{
+			if (source == null || target == null)
+				return source == null ^ target == null;
 
-            if (!source.IsValid || !target.IsValid)
-                return !source.IsValid ^ !target.IsValid;
+			if (!source.IsValid || !target.IsValid)
+				return !source.IsValid ^ !target.IsValid;
 
-            return Math.Abs(source.Latitude - target.Latitude) < PRECISSION_LATITUDE_LONGITUDE
-                && Math.Abs(source.Longitude - target.Longitude) < PRECISSION_LATITUDE_LONGITUDE;
-        }
+			return Math.Abs(source.Latitude - target.Latitude) < PRECISSION_LATITUDE_LONGITUDE
+				&& Math.Abs(source.Longitude - target.Longitude) < PRECISSION_LATITUDE_LONGITUDE;
+		}
 
-        public static bool GetIsValid(double latitude, double longitude)
-            => !double.IsNaN(latitude) && !double.IsNaN(longitude);
-    }
+		public static bool GetIsValid(double latitude, double longitude)
+			=> !double.IsNaN(latitude) && !double.IsNaN(longitude);
+	}
 }
diff --git a/TINKLib/Model/PositionFactory.cs b/TINKLib/Model/PositionFactory.cs
index e1f271e..5cb3739 100644
--- a/TINKLib/Model/PositionFactory.cs
+++ b/TINKLib/Model/PositionFactory.cs
@@ -1,11 +1,11 @@
 
 namespace TINK.Model
 {
-    public static class PositionFactory
-    {
-        public static IPosition Create(double latitude = double.NaN, double longitude = double.NaN)
-            => Position.GetIsValid(longitude, latitude)
-                ? new Position(latitude, longitude) as IPosition
-                : new NullPostion();
-    }
+	public static class PositionFactory
+	{
+		public static IPosition Create(double latitude = double.NaN, double longitude = double.NaN)
+			=> Position.GetIsValid(longitude, latitude)
+				? new Position(latitude, longitude) as IPosition
+				: new NullPostion();
+	}
 }
diff --git a/TINKLib/Model/ResourceUrls.cs b/TINKLib/Model/ResourceUrls.cs
index 782f393..9efe4fd 100644
--- a/TINKLib/Model/ResourceUrls.cs
+++ b/TINKLib/Model/ResourceUrls.cs
@@ -1,29 +1,29 @@
 namespace TINK.Model
 {
-    public class ResourceUrls : IResourceUrls
-    {
-        public ResourceUrls(
-            string feesResourcePath = null,
-            string bikesResourcePath = null,
-            string agbResourcePath = null,
-            string privacyResourcePath = null,
-            string impressResourcePath = null)
-        {
-            FeesResourcePath = !string.IsNullOrEmpty(feesResourcePath) ? feesResourcePath : "site/tariff_info_1.html";
-            BikesResourcePath = !string.IsNullOrEmpty(bikesResourcePath) ? bikesResourcePath : "site/bike_info.html";
-            AgbResourcePath = !string.IsNullOrEmpty(agbResourcePath) ? agbResourcePath : "site/agb.html";
-            PrivacyResourcePath = !string.IsNullOrEmpty(privacyResourcePath) ? privacyResourcePath : "site/privacy.html";
-            ImpressResourcePath = !string.IsNullOrEmpty(impressResourcePath) ? impressResourcePath : "site/impress.html";
-        }
+	public class ResourceUrls : IResourceUrls
+	{
+		public ResourceUrls(
+			string feesResourcePath = null,
+			string bikesResourcePath = null,
+			string agbResourcePath = null,
+			string privacyResourcePath = null,
+			string impressResourcePath = null)
+		{
+			FeesResourcePath = !string.IsNullOrEmpty(feesResourcePath) ? feesResourcePath : "site/tariff_info_1.html";
+			BikesResourcePath = !string.IsNullOrEmpty(bikesResourcePath) ? bikesResourcePath : "site/bike_info.html";
+			AgbResourcePath = !string.IsNullOrEmpty(agbResourcePath) ? agbResourcePath : "site/agb.html";
+			PrivacyResourcePath = !string.IsNullOrEmpty(privacyResourcePath) ? privacyResourcePath : "site/privacy.html";
+			ImpressResourcePath = !string.IsNullOrEmpty(impressResourcePath) ? impressResourcePath : "site/impress.html";
+		}
 
-        public string FeesResourcePath { get; }
+		public string FeesResourcePath { get; }
 
-        public string BikesResourcePath { get; }
+		public string BikesResourcePath { get; }
 
-        public string AgbResourcePath { get; }
+		public string AgbResourcePath { get; }
 
-        public string PrivacyResourcePath { get; }
+		public string PrivacyResourcePath { get; }
 
-        public string ImpressResourcePath { get; }
-    }
+		public string ImpressResourcePath { get; }
+	}
 }
diff --git a/TINKLib/Model/Settings/GroupFilterSettings.cs b/TINKLib/Model/Settings/GroupFilterSettings.cs
index 522effb..9d57847 100644
--- a/TINKLib/Model/Settings/GroupFilterSettings.cs
+++ b/TINKLib/Model/Settings/GroupFilterSettings.cs
@@ -6,70 +6,70 @@ using TINK.Model.Connector.Filter;
 
 namespace TINK.ViewModel.Settings
 {
-    public class GroupFilterSettings : IGroupFilterSettings
-    {
+	public class GroupFilterSettings : IGroupFilterSettings
+	{
 
-        public GroupFilterSettings(IDictionary<string, FilterState> filterDictionary = null)
-        {
-            FilterDictionary = filterDictionary ?? new Dictionary<string, FilterState>();
+		public GroupFilterSettings(IDictionary<string, FilterState> filterDictionary = null)
+		{
+			FilterDictionary = filterDictionary ?? new Dictionary<string, FilterState>();
 
-            Filter = filterDictionary != null
-                ? (IGroupFilter)new IntersectGroupFilter(FilterDictionary.Where(x => x.Value == FilterState.On).Select(x => x.Key))
-                : new NullGroupFilter();
-        }
+			Filter = filterDictionary != null
+				? (IGroupFilter)new IntersectGroupFilter(FilterDictionary.Where(x => x.Value == FilterState.On).Select(x => x.Key))
+				: new NullGroupFilter();
+		}
 
-        private IDictionary<string, FilterState> FilterDictionary { get; set; }
+		private IDictionary<string, FilterState> FilterDictionary { get; set; }
 
-        private IGroupFilter Filter { get; }
+		private IGroupFilter Filter { get; }
 
-        /// <summary> Performs filtering on response -group. </summary>
-        public IEnumerable<string> DoFilter(IEnumerable<string> filter = null) => Filter.DoFilter(filter);
+		/// <summary> Performs filtering on response -group. </summary>
+		public IEnumerable<string> DoFilter(IEnumerable<string> filter = null) => Filter.DoFilter(filter);
 
-        public FilterState this[string key] { get => FilterDictionary[key]; set => FilterDictionary[key] = value; }
+		public FilterState this[string key] { get => FilterDictionary[key]; set => FilterDictionary[key] = value; }
 
-        public ICollection<string> Keys => FilterDictionary.Keys;
+		public ICollection<string> Keys => FilterDictionary.Keys;
 
-        public ICollection<FilterState> Values => FilterDictionary.Values;
+		public ICollection<FilterState> Values => FilterDictionary.Values;
 
-        public int Count => FilterDictionary.Count;
+		public int Count => FilterDictionary.Count;
 
-        public bool IsReadOnly => true;
+		public bool IsReadOnly => true;
 
-        public void Add(string key, FilterState value)
-        {
-            throw new System.NotImplementedException();
-        }
+		public void Add(string key, FilterState value)
+		{
+			throw new System.NotImplementedException();
+		}
 
-        public void Add(KeyValuePair<string, FilterState> item)
-        {
-            throw new System.NotImplementedException();
-        }
+		public void Add(KeyValuePair<string, FilterState> item)
+		{
+			throw new System.NotImplementedException();
+		}
 
-        public void Clear()
-        {
-            throw new System.NotImplementedException();
-        }
+		public void Clear()
+		{
+			throw new System.NotImplementedException();
+		}
 
-        public bool Contains(KeyValuePair<string, FilterState> item) => FilterDictionary.Contains(item);
+		public bool Contains(KeyValuePair<string, FilterState> item) => FilterDictionary.Contains(item);
 
-        public bool ContainsKey(string key) => FilterDictionary.ContainsKey(key);
+		public bool ContainsKey(string key) => FilterDictionary.ContainsKey(key);
 
-        public void CopyTo(KeyValuePair<string, FilterState>[] array, int arrayIndex) => FilterDictionary.CopyTo(array, arrayIndex);
+		public void CopyTo(KeyValuePair<string, FilterState>[] array, int arrayIndex) => FilterDictionary.CopyTo(array, arrayIndex);
 
-        public IEnumerator<KeyValuePair<string, FilterState>> GetEnumerator() => FilterDictionary.GetEnumerator();
+		public IEnumerator<KeyValuePair<string, FilterState>> GetEnumerator() => FilterDictionary.GetEnumerator();
 
-        public bool Remove(string key)
-        {
-            throw new System.NotImplementedException();
-        }
+		public bool Remove(string key)
+		{
+			throw new System.NotImplementedException();
+		}
 
-        public bool Remove(KeyValuePair<string, FilterState> item)
-        {
-            throw new System.NotImplementedException();
-        }
+		public bool Remove(KeyValuePair<string, FilterState> item)
+		{
+			throw new System.NotImplementedException();
+		}
 
-        public bool TryGetValue(string key, out FilterState value) => FilterDictionary.TryGetValue(key, out value);
+		public bool TryGetValue(string key, out FilterState value) => FilterDictionary.TryGetValue(key, out value);
 
-        IEnumerator IEnumerable.GetEnumerator() => FilterDictionary.GetEnumerator();
-    }
+		IEnumerator IEnumerable.GetEnumerator() => FilterDictionary.GetEnumerator();
+	}
 }
diff --git a/TINKLib/Model/Settings/IGroupFilterSettings.cs b/TINKLib/Model/Settings/IGroupFilterSettings.cs
index e2231a9..7646102 100644
--- a/TINKLib/Model/Settings/IGroupFilterSettings.cs
+++ b/TINKLib/Model/Settings/IGroupFilterSettings.cs
@@ -3,9 +3,9 @@ using TINK.Model;
 
 namespace TINK.ViewModel.Settings
 {
-    public interface IGroupFilterSettings : IDictionary<string, FilterState>
-    {
-        /// <summary> Performs filtering on response-group. </summary>
-        IEnumerable<string> DoFilter(IEnumerable<string> filter = null);
-    }
+	public interface IGroupFilterSettings : IDictionary<string, FilterState>
+	{
+		/// <summary> Performs filtering on response-group. </summary>
+		IEnumerable<string> DoFilter(IEnumerable<string> filter = null);
+	}
 }
diff --git a/TINKLib/Model/Settings/JsonSettingsDictionary.cs b/TINKLib/Model/Settings/JsonSettingsDictionary.cs
index 6126476..9080be2 100644
--- a/TINKLib/Model/Settings/JsonSettingsDictionary.cs
+++ b/TINKLib/Model/Settings/JsonSettingsDictionary.cs
@@ -13,542 +13,542 @@ using TINK.ViewModel.Settings;
 
 namespace TINK.Model.Settings
 {
-    public static class JsonSettingsDictionary
-    {
-        /// <summary>Title of the settings file.</summary>
-        public const string SETTINGSFILETITLE = "Setting.Json";
-
-        /// <summary> Key of the app version entry. </summary>
-        public const string APPVERIONKEY = "AppVersion";
-
-        /// <summary> Key of the app version entry. </summary>
-        public const string SHOWWHATSNEWKEY = "ShowWhatsNew";
-
-        /// <summary> Key of the app version entry. </summary>
-        public const string EXPIRESAFTER = "ExpiresAfter";
-
-        /// <summary> Key of the connect timeout. </summary>
-        public const string CONNECTTIMEOUT = "ConnectTimeout";
-
-        /// <summary> Key of the logging level entry. </summary>
-        public const string MINLOGGINGLEVELKEY = "MinimumLoggingLevel";
-
-        /// <summary> Key of the logging level entry. </summary>
-        public const string ISREPORTLEVELVERBOSEKEY = "IsReportLevelVerbose";
-
-        /// <summary> Key of the center to ... entry. </summary>
-        public const string CENTERMAPTOCURRENTLOCATION = "CenterMapToCurrentLocation";
-
-        public const string LOGTOEXTERNALFOLDER = "LogToExternalFolder";
-
-        public const string THEMEKEY = "Theme";
-
-        public const string ISSITECACHINGON = "IsSiteCachingOn";
-
-        /// <summary> Gets a nullable value.</summary>
-        /// <param name="settingsJSON">Dictionary to get value from.</param>
-        public static T? GetNullableEntry<T>(
-            string keyName,
-            Dictionary<string, string> settingsJSON) where T : struct
-        {
-            if (!settingsJSON.TryGetValue(keyName, out string boolText)
-                || string.IsNullOrEmpty(boolText))
-            {
-                // File holds no entry.
-                return null;
-            }
-
-            return JsonConvert.DeserializeObject<T>(boolText);
-        }
-
-        /// <summary> Gets a value to type class.</summary>
-        /// <param name="settingsJSON">Dictionary to get value from.</param>
-        public static T GetEntry<T>(
-            string keyName,
-            Dictionary<string, string> settingsJSON,
-            Func<string, string> legacyValueConverter = null) where T : class
-        {
-            if (string.IsNullOrEmpty(keyName)
-                || settingsJSON == null
-                || !settingsJSON.TryGetValue(keyName, out string valueJSON)
-                || string.IsNullOrEmpty(valueJSON))
-            {
-                // File holds no entry.
-                return null;
-            }
-
-            return JsonConvert.DeserializeObject<T>(legacyValueConverter != null
-                ? legacyValueConverter(valueJSON)
-                : valueJSON);
-        }
-
-        /// <summary> Sets a nullable.</summary>
-        /// <param name="entry">Entry to add to dictionary.</param>
-        /// <param name="keyName">Key to use for value. </param>
-        /// <param name="targetDictionary">Dictionary to set value to.</param>
-        public static Dictionary<string, string> SetEntry<T>(T entry, string keyName, IDictionary<string, string> targetDictionary)
-        {
-            // Set value.
-            if (targetDictionary == null)
-                throw new Exception($"Writing entry value {keyName} to dictionary failed. Dictionary must not be null.");
-
-            return targetDictionary.Union(new Dictionary<string, string>
-            {
-                { keyName, JsonConvert.SerializeObject(entry) }
-            }).ToDictionary(key => key.Key, value => value.Value);
-        }
-
-        /// <summary> Sets the timeout to apply when connecting to bluetooth lock.</summary>
-        /// <param name="targetDictionary">Dictionary to write information to.</param>
-        /// <param name="connectTimeout">Connect timeout value.</param>
-        public static Dictionary<string, string> SetConnectTimeout(
-            this IDictionary<string, string> targetDictionary,
-            TimeSpan connectTimeout)
-        {
-            if (targetDictionary == null)
-                throw new Exception("Writing conntect timeout info failed. Dictionary must not be null.");
-
-            return targetDictionary.Union(new Dictionary<string, string>
-            {
-                { CONNECTTIMEOUT, JsonConvert.SerializeObject(connectTimeout, new JavaScriptDateTimeConverter()) }
-            }).ToDictionary(key => key.Key, value => value.Value);
-        }
-        /// <summary> Sets the uri of the active copri host. </summary>
-        /// <param name="settingsJSON">Dictionary holding parameters from JSON.</param>
-        public static Dictionary<string, string> SetCopriHostUri(this IDictionary<string, string> p_oTargetDictionary, string p_strNextActiveUriText)
-        {
-            if (p_oTargetDictionary == null)
-                throw new Exception("Writing copri host uri to dictionary failed. Dictionary must not be null.");
-
-            return p_oTargetDictionary.Union(new Dictionary<string, string>
-            {
-                { typeof(CopriServerUriList).ToString(), JsonConvert.SerializeObject(p_strNextActiveUriText) },
-            }).ToDictionary(key => key.Key, value => value.Value);
-        }
-
-        /// <summary> Gets the timeout to apply when connecting to bluetooth lock.</summary>
-        /// <param name="settingsJSON">Dictionary to get information from.</param>
-        /// <returns>Connect timeout value.</returns>
-        public static TimeSpan? GetConnectTimeout(Dictionary<string, string> settingsJSON)
-        {
-            if (!settingsJSON.TryGetValue(CONNECTTIMEOUT, out string connectTimeout)
-                || string.IsNullOrEmpty(connectTimeout))
-            {
-                // File holds no entry.
-                return null;
-            }
-
-            return JsonConvert.DeserializeObject<TimeSpan>(connectTimeout, new JavaScriptDateTimeConverter());
-        }
-        /// <summary> Gets the logging level.</summary>
-        /// <param name="settingsJSON">Dictionary to get logging level from.</param>
-        /// <returns>Logging level</returns>
-        public static Uri GetCopriHostUri(this IDictionary<string, string> settingsJSON)
-        {
-            // Get uri of corpi server.
-            if (!settingsJSON.TryGetValue(typeof(CopriServerUriList).ToString(), out string uriText)
-                || string.IsNullOrEmpty(uriText))
-            {
-                // File holds no entry.
-                return null;
-            }
-
-
-            return JsonConvert.DeserializeObject<Uri>(uriText);
-        }
-
-        /// <summary> Sets the version of the app. </summary>
-        /// <param name="settingsJSON">Dictionary holding parameters from JSON.</param>
-        public static Dictionary<string, string> SetAppVersion(
-            this IDictionary<string, string> targetDictionary,
-            Version appVersion)
-        {
-            if (targetDictionary == null)
-                throw new Exception("Writing app version to dictionary failed. Dictionary must not be null.");
-
-            return targetDictionary.Union(new Dictionary<string, string>
-            {
-                {APPVERIONKEY , JsonConvert.SerializeObject(appVersion, new VersionConverter()) },
-            }).ToDictionary(key => key.Key, value => value.Value);
-        }
-
-        /// <summary> Gets the app versions.</summary>
-        /// <param name="settingsJSON">Dictionary to get logging level from.</param>
-        /// <returns>Logging level</returns>
-        public static Version GetAppVersion(this IDictionary<string, string> settingsJSON)
-        {
-            // Get the version of the app which wrote the settings file.
-            if (!settingsJSON.TryGetValue(APPVERIONKEY, out string appVersion)
-                || string.IsNullOrEmpty(appVersion))
-            {
-                // File holds no entry.
-                return null;
-            }
-
-            return appVersion.TrimStart().StartsWith("\"")
-                ? JsonConvert.DeserializeObject<Version>(appVersion, new VersionConverter())
-                : Version.Parse(appVersion); // Format used up to version 3.0.0.115
-        }
-
-
-        /// <summary> Sets whether polling is on or off and the periode if polling is on. </summary>
-        /// <param name="settingsJSON">Dictionary to write entries to.</param>
-        public static Dictionary<string, string> SetPollingParameters(this IDictionary<string, string> p_oTargetDictionary, PollingParameters p_oPollingParameter)
-        {
-            if (p_oTargetDictionary == null)
-                throw new Exception("Writing polling parameters to dictionary failed. Dictionary must not be null.");
-
-            return p_oTargetDictionary.Union(new Dictionary<string, string>
-            {
-                { $"{typeof(PollingParameters).Name}_{typeof(TimeSpan).Name}", JsonConvert.SerializeObject(p_oPollingParameter.Periode) },
-                { $"{typeof(PollingParameters).Name}_{typeof(bool).Name}", JsonConvert.SerializeObject(p_oPollingParameter.IsActivated) },
-            }).ToDictionary(key => key.Key, value => value.Value);
-        }
-
-        /// <summary> Get whether polling is on or off and the periode if polling is on. </summary>
-        /// <param name="settingsJSON">Dictionary holding parameters from JSON.</param>
-        /// <returns>Polling parameters.</returns>
-        public static PollingParameters GetPollingParameters(this IDictionary<string, string> settingsJSON)
-        {
-            // Check if dictionary contains entry for periode.
-            if (settingsJSON.TryGetValue($"{typeof(PollingParameters).Name}_{typeof(TimeSpan).Name}", out string periode)
-                && settingsJSON.TryGetValue($"{typeof(PollingParameters).Name}_{typeof(bool).Name}", out string active)
-                && !string.IsNullOrEmpty(periode)
-                && !string.IsNullOrEmpty(active))
-            {
-                return new PollingParameters(
-                    JsonConvert.DeserializeObject<TimeSpan>(periode),
-                    JsonConvert.DeserializeObject<bool>(active));
-            }
-
-            return null;
-        }
-
-        /// <summary> Saves object to file. </summary>
-        /// <param name="settingsList">Settings to save.</param>
-        public static void Serialize(string settingsFileFolder, IDictionary<string, string> settingsList)
-        {
-            // Save settings to file.
-            var l_oText = JsonConvert.SerializeObject(settingsList, Formatting.Indented);
-            var l_oFolder = settingsFileFolder;
-            System.IO.File.WriteAllText($"{l_oFolder}{System.IO.Path.DirectorySeparatorChar}{SETTINGSFILETITLE}", l_oText);
-        }
-
-        /// <summary> Gets TINK app settings form xml- file. </summary>
-        /// <param name="settingsDirectory">Directory to read settings from.</param>
-        /// <returns>Dictionary of settings.</returns>
-        public static Dictionary<string, string> Deserialize(string settingsDirectory)
-        {
-            var l_oFileName = $"{settingsDirectory}{System.IO.Path.DirectorySeparatorChar}{SETTINGSFILETITLE}";
-
-            if (!System.IO.File.Exists(l_oFileName))
-            {
-                // File is empty. Nothing to read.
-                return new Dictionary<string, string>(); ;
-            }
-
-            var l_oJSONFile = System.IO.File.ReadAllText(l_oFileName);
-
-            if (string.IsNullOrEmpty(l_oJSONFile))
-            {
-                // File is empty. Nothing to read.
-                return new Dictionary<string, string>();
-            }
-
-            // Load setting file.
-            return JsonConvert.DeserializeObject<Dictionary<string, string>>(l_oJSONFile);
-        }
-
-        /// <summary> Gets the logging level.</summary>
-        /// <param name="settingsJSON">Dictionary to get logging level from.</param>
-        /// <returns>Logging level.</returns>
-        public static LogEventLevel? GetMinimumLoggingLevel(
-            Dictionary<string, string> settingsJSON)
-        {
-            // Get logging level.
-            if (!settingsJSON.TryGetValue(MINLOGGINGLEVELKEY, out string level)
-                || string.IsNullOrEmpty(level))
-            {
-                // File holds no entry.
-                return null;
-            }
-
-            return (LogEventLevel)int.Parse(JsonConvert.DeserializeObject<string>(level));
-        }
-
-        /// <summary> Gets a value indicating whether report level is verbose or not.</summary>
-        /// <param name="settingsJSON">Dictionary to get value from.</param>
-        public static bool? GetIsReportLevelVerbose(Dictionary<string, string> settingsJSON) => GetNullableEntry<bool>(ISREPORTLEVELVERBOSEKEY, settingsJSON);
-
-        /// <summary> Sets a value indicating whether  report level is verbose or not.</summary>
-        /// <param name="settingsJSON">Dictionary to get value from.</param>
-        public static Dictionary<string, string> SetIsReportLevelVerbose(this IDictionary<string, string> targetDictionary, bool isReportLevelVerbose)
-            => SetEntry(isReportLevelVerbose, ISREPORTLEVELVERBOSEKEY, targetDictionary);
-
-
-        /// <summary> Sets the logging level.</summary>
-        /// <param name="settingsJSON">Dictionary to get logging level from.</param>
-        public static Dictionary<string, string> SetMinimumLoggingLevel(this IDictionary<string, string> p_oTargetDictionary, LogEventLevel p_oLevel)
-        {
-            // Set logging level.
-            if (p_oTargetDictionary == null)
-                throw new Exception("Writing logging level to dictionary failed. Dictionary must not be null.");
-
-            return p_oTargetDictionary.Union(new Dictionary<string, string>
-            {
-                { MINLOGGINGLEVELKEY, JsonConvert.SerializeObject((int)p_oLevel) }
-            }).ToDictionary(key => key.Key, value => value.Value);
-        }
-
-        /// <summary> Gets the version of app when whats new was shown.</summary>
-        /// <param name="settingsJSON">Dictionary to get logging level from.</param>
-        /// <returns>Version of the app.</returns>
-        public static Version GetWhatsNew(Dictionary<string, string> settingsJSON)
-        {
-            // Get logging level.
-            if (!settingsJSON.TryGetValue(SHOWWHATSNEWKEY, out string whatsNewVersion)
-                || string.IsNullOrEmpty(whatsNewVersion))
-            {
-                // File holds no entry.
-                return null;
-            }
-
-            return JsonConvert.DeserializeObject<Version>(whatsNewVersion, new VersionConverter());
-        }
-
-        /// <summary> Sets the version of app when whats new was shown.</summary>
-        /// <param name="settingsJSON">Dictionary to get information from.</param>
-        public static Dictionary<string, string> SetWhatsNew(this IDictionary<string, string> p_oTargetDictionary, Version p_oAppVersion)
-        {
-            // Set logging level.
-            if (p_oTargetDictionary == null)
-                throw new Exception("Writing WhatsNew info failed. Dictionary must not be null.");
-
-            return p_oTargetDictionary.Union(new Dictionary<string, string>
-            {
-                { SHOWWHATSNEWKEY, JsonConvert.SerializeObject(p_oAppVersion, new VersionConverter()) }
-            }).ToDictionary(key => key.Key, value => value.Value);
-        }
-
-        /// <summary> Gets the expires after value.</summary>
-        /// <param name="settingsJSON">Dictionary to get expries after value from.</param>
-        /// <returns>Expires after value.</returns>
-        public static TimeSpan? GetExpiresAfter(Dictionary<string, string> settingsJSON)
-        {
-            if (!settingsJSON.TryGetValue(EXPIRESAFTER, out string expiresAfter)
-                || string.IsNullOrEmpty(expiresAfter))
-            {
-                // File holds no entry.
-                return null;
-            }
-
-            return JsonConvert.DeserializeObject<TimeSpan>(expiresAfter, new JavaScriptDateTimeConverter());
-        }
-
-        /// <summary> Sets the the expiration time.</summary>
-        /// <param name="settingsJSON">Dictionary to write information to.</param>
-        public static Dictionary<string, string> SetExpiresAfter(this IDictionary<string, string> p_oTargetDictionary, TimeSpan expiresAfter)
-        {
-            if (p_oTargetDictionary == null)
-                throw new Exception("Writing ExpiresAfter info failed. Dictionary must not be null.");
-
-            return p_oTargetDictionary.Union(new Dictionary<string, string>
-            {
-                { EXPIRESAFTER, JsonConvert.SerializeObject(expiresAfter, new JavaScriptDateTimeConverter()) }
-            }).ToDictionary(key => key.Key, value => value.Value);
-        }
-
-        /// <summary> Sets the active lock service name. </summary>
-        /// <param name="targetDictionary">Dictionary holding parameters from JSON.</param>
-        public static Dictionary<string, string> SetActiveLockService(this IDictionary<string, string> targetDictionary, string activeLockService)
-        {
-            if (targetDictionary == null)
-                throw new Exception("Writing active lock service name to dictionary failed. Dictionary must not be null.");
-
-            return targetDictionary.Union(new Dictionary<string, string>
-            {
-                { typeof(ILocksService).Name, activeLockService },
-            }).ToDictionary(key => key.Key, value => value.Value);
-        }
-
-        /// <summary> Gets the active lock service name.</summary>
-        /// <param name="settingsJSON">Dictionary to get logging level from.</param>
-        /// <returns>Active lock service name.</returns>
-        public static string GetActiveLockService(this IDictionary<string, string> settingsJSON)
-        {
-            // Get uri of corpi server.
-            if (!settingsJSON.TryGetValue(typeof(ILocksService).Name, out string activeLockService)
-                || string.IsNullOrEmpty(activeLockService))
-            {
-                // File holds no entry.
-                return null;
-            }
-
-            if (activeLockService == "TINK.Services.BluetoothLock.BLE.LockItByScanService")
-            {
-                // Name of this service was switched.
-                return typeof(TINK.Services.BluetoothLock.BLE.LockItByScanServicePolling).FullName;
-            }
-
-            return activeLockService;
-        }
-
-        /// <summary> Sets the active Geolocation service name. </summary>
-        /// <param name="targetDictionary">Dictionary holding parameters from JSON.</param>
-        public static Dictionary<string, string> SetActiveGeolocationService(
-            this IDictionary<string, string> targetDictionary,
-            string activeGeolocationService)
-        {
-            if (targetDictionary == null)
-                throw new Exception("Writing active geolocation service name to dictionary failed. Dictionary must not be null.");
-
-            return targetDictionary.Union(new Dictionary<string, string>
-            {
-                { typeof(IGeolocation).Name, activeGeolocationService },
-            }).ToDictionary(key => key.Key, value => value.Value);
-        }
-
-        /// <summary> Gets the active Geolocation service name.</summary>
-        /// <param name="settingsJSON">Dictionary to get name of geolocation service from.</param>
-        /// <returns>Active lock service name.</returns>
-        public static string GetActiveGeolocationService(this IDictionary<string, string> settingsJSON)
-        {
-            // Get uri of corpi server.
-            if (!settingsJSON.TryGetValue(typeof(IGeolocation).Name, out string activeGeolocationService)
-                || string.IsNullOrEmpty(activeGeolocationService))
-            {
-                // File holds no entry.
-                return null;
-            }
-
-            return activeGeolocationService;
-        }
-
-        /// <summary> Gets a value indicating whether to center the map to location or not.</summary>
-        /// <param name="settingsJSON">Dictionary to get value from.</param>
-        public static bool? GetCenterMapToCurrentLocation(Dictionary<string, string> settingsJSON) => GetNullableEntry<bool>(CENTERMAPTOCURRENTLOCATION, settingsJSON);
-
-        /// <summary> Sets a value indicating whether to center the map to location or not.</summary>
-        /// <param name="settingsJSON">Dictionary to get value from.</param>
-        public static Dictionary<string, string> SetCenterMapToCurrentLocation(this IDictionary<string, string> targetDictionary, bool centerMapToCurrentLocation)
-            => SetEntry(centerMapToCurrentLocation, CENTERMAPTOCURRENTLOCATION, targetDictionary);
-
-        /// <summary> Gets whether to store logging data on SD card or not.</summary>
-        /// <param name="settingsJSON">Dictionary to get value from.</param>
-        public static bool? GetLogToExternalFolder(Dictionary<string, string> settingsJSON) => GetNullableEntry<bool>(LOGTOEXTERNALFOLDER, settingsJSON);
-
-        /// <summary> Gets full class name of active theme.</summary>
-        /// <param name="settingsJSON">Dictionary to get value from.</param>
-        public static string GetActiveTheme(Dictionary<string, string> settingsJSON)
-            => GetEntry<string>(THEMEKEY, settingsJSON, (value) =>
-            {
-                if (value == JsonConvert.SerializeObject(typeof(Themes.Konrad).FullName))
-                {
-                    return JsonConvert.SerializeObject(TINK.Services.ThemeNS.ThemeSet.Konrad.ToString());
-                }
-                else if (value == JsonConvert.SerializeObject(typeof(Themes.LastenradBayern).FullName))
-                {
-                    return JsonConvert.SerializeObject(TINK.Services.ThemeNS.ThemeSet.LastenradBayern.ToString());
-                }
-                else if (value == JsonConvert.SerializeObject(typeof(Themes.ShareeBike).FullName))
-                {
-                    return JsonConvert.SerializeObject(TINK.Services.ThemeNS.ThemeSet.ShareeBike.ToString());
-                }
-                else
-                {
-                    return value;
-                }
-            });
-
-        /// <summary> Gets a value indicating whether site caching is on or off.</summary>
-        /// <param name="settingsJSON">Dictionary to get value from.</param>
-        public static bool? GetIsSiteCachingOn(Dictionary<string, string> settingsJSON) => GetNullableEntry<bool>(ISSITECACHINGON, settingsJSON);
-
-        /// <summary> Sets whether to store logging data on SD card or not.</summary>
-        /// <param name="settingsJSON">Dictionary to get value from.</param>
-        public static Dictionary<string, string> SetLogToExternalFolder(this IDictionary<string, string> targetDictionary, bool useSdCard) => SetEntry(useSdCard, LOGTOEXTERNALFOLDER, targetDictionary);
-
-        /// <summary> Sets active theme.</summary>
-        /// <param name="targetDictionary">Dictionary to set value to.</param>
-        public static Dictionary<string, string> SetActiveTheme(
-            this IDictionary<string, string> targetDictionary,
-            string theme)
-            => SetEntry(theme, THEMEKEY, targetDictionary);
-
-        /// <summary> Sets whether site caching is on or off.</summary>
-        /// <param name="settingsJSON">Dictionary to get value from.</param>
-        public static Dictionary<string, string> SetIsSiteCachingOn(this IDictionary<string, string> targetDictionary, bool useSdCard) => SetEntry(useSdCard, ISSITECACHINGON, targetDictionary);
-
-        /// <summary> Gets the map page filter. </summary>
-        /// <param name="settings">Settings objet to load from.</param>
-        public static IGroupFilterMapPage GetGroupFilterMapPage(this IDictionary<string, string> settings)
-        {
-            var keyName = "FilterCollection_MapPageFilter";
-            if (settings == null || !settings.ContainsKey(keyName))
-            {
-                return null;
-            }
-
-            return new GroupFilterMapPage(JsonConvert.DeserializeObject<IDictionary<string, FilterState>>(settings[keyName]));
-        }
-
-        public static IDictionary<string, string> SetGroupFilterMapPage(
-            this IDictionary<string, string> settings,
-            IDictionary<string, FilterState> p_oFilterCollection)
-        {
-            if (settings == null
-                || p_oFilterCollection == null
-                || p_oFilterCollection.Count < 1)
-            {
-                return settings;
-            }
-
-            settings["FilterCollection_MapPageFilter"] = JsonConvert.SerializeObject(p_oFilterCollection);
-            return settings;
-        }
-
-        /// <summary> Gets the settings filter. </summary>
-        /// <param name="settings">Settings objet to load from.</param>
-        public static IGroupFilterSettings GetGoupFilterSettings(this IDictionary<string, string> settings)
-        {
-            var keyName = "FilterCollection";
-            if (settings == null || !settings.ContainsKey(keyName))
-            {
-                return null;
-            }
-
-            var legacyFilterCollection = new GroupFilterSettings(JsonConvert.DeserializeObject<IDictionary<string, FilterState>>(settings[keyName]));
-
-            // Process legacy entries.
-            var updatedFilterCollection = legacyFilterCollection.Where(x => x.Key.ToUpper() != "TINK.SMS" && x.Key.ToUpper() != "TINK.COPRI").ToDictionary(x => x.Key, x => x.Value);
-            if (legacyFilterCollection.Count() <= updatedFilterCollection.Count())
-            {
-                // No legacy entries "INK.SMS" or "TINK.COPRI" found.
-                return legacyFilterCollection;
-            }
-
-            var list = updatedFilterCollection.ToList();
-
-            updatedFilterCollection.Add(
-                "TINK",
-                legacyFilterCollection.Any(x => x.Key.ToUpper() == "TINK.COPRI") ? legacyFilterCollection.FirstOrDefault(x => x.Key.ToUpper() == "TINK.COPRI").Value : FilterState.Off);
-
-            return new GroupFilterSettings(updatedFilterCollection);
-        }
-
-        public static IDictionary<string, string> SetGroupFilterSettings(
-            this IDictionary<string, string> settings,
-            IDictionary<string, FilterState> p_oFilterCollection)
-        {
-            if (settings == null
-                || p_oFilterCollection == null
-                || p_oFilterCollection.Count < 1)
-            {
-                return settings;
-            }
-
-            settings["FilterCollection"] = JsonConvert.SerializeObject(p_oFilterCollection);
-            return settings;
-        }
-    }
+	public static class JsonSettingsDictionary
+	{
+		/// <summary>Title of the settings file.</summary>
+		public const string SETTINGSFILETITLE = "Setting.Json";
+
+		/// <summary> Key of the app version entry. </summary>
+		public const string APPVERIONKEY = "AppVersion";
+
+		/// <summary> Key of the app version entry. </summary>
+		public const string SHOWWHATSNEWKEY = "ShowWhatsNew";
+
+		/// <summary> Key of the app version entry. </summary>
+		public const string EXPIRESAFTER = "ExpiresAfter";
+
+		/// <summary> Key of the connect timeout. </summary>
+		public const string CONNECTTIMEOUT = "ConnectTimeout";
+
+		/// <summary> Key of the logging level entry. </summary>
+		public const string MINLOGGINGLEVELKEY = "MinimumLoggingLevel";
+
+		/// <summary> Key of the logging level entry. </summary>
+		public const string ISREPORTLEVELVERBOSEKEY = "IsReportLevelVerbose";
+
+		/// <summary> Key of the center to ... entry. </summary>
+		public const string CENTERMAPTOCURRENTLOCATION = "CenterMapToCurrentLocation";
+
+		public const string LOGTOEXTERNALFOLDER = "LogToExternalFolder";
+
+		public const string THEMEKEY = "Theme";
+
+		public const string ISSITECACHINGON = "IsSiteCachingOn";
+
+		/// <summary> Gets a nullable value.</summary>
+		/// <param name="settingsJSON">Dictionary to get value from.</param>
+		public static T? GetNullableEntry<T>(
+			string keyName,
+			Dictionary<string, string> settingsJSON) where T : struct
+		{
+			if (!settingsJSON.TryGetValue(keyName, out string boolText)
+				|| string.IsNullOrEmpty(boolText))
+			{
+				// File holds no entry.
+				return null;
+			}
+
+			return JsonConvert.DeserializeObject<T>(boolText);
+		}
+
+		/// <summary> Gets a value to type class.</summary>
+		/// <param name="settingsJSON">Dictionary to get value from.</param>
+		public static T GetEntry<T>(
+			string keyName,
+			Dictionary<string, string> settingsJSON,
+			Func<string, string> legacyValueConverter = null) where T : class
+		{
+			if (string.IsNullOrEmpty(keyName)
+				|| settingsJSON == null
+				|| !settingsJSON.TryGetValue(keyName, out string valueJSON)
+				|| string.IsNullOrEmpty(valueJSON))
+			{
+				// File holds no entry.
+				return null;
+			}
+
+			return JsonConvert.DeserializeObject<T>(legacyValueConverter != null
+				? legacyValueConverter(valueJSON)
+				: valueJSON);
+		}
+
+		/// <summary> Sets a nullable.</summary>
+		/// <param name="entry">Entry to add to dictionary.</param>
+		/// <param name="keyName">Key to use for value. </param>
+		/// <param name="targetDictionary">Dictionary to set value to.</param>
+		public static Dictionary<string, string> SetEntry<T>(T entry, string keyName, IDictionary<string, string> targetDictionary)
+		{
+			// Set value.
+			if (targetDictionary == null)
+				throw new Exception($"Writing entry value {keyName} to dictionary failed. Dictionary must not be null.");
+
+			return targetDictionary.Union(new Dictionary<string, string>
+			{
+				{ keyName, JsonConvert.SerializeObject(entry) }
+			}).ToDictionary(key => key.Key, value => value.Value);
+		}
+
+		/// <summary> Sets the timeout to apply when connecting to bluetooth lock.</summary>
+		/// <param name="targetDictionary">Dictionary to write information to.</param>
+		/// <param name="connectTimeout">Connect timeout value.</param>
+		public static Dictionary<string, string> SetConnectTimeout(
+			this IDictionary<string, string> targetDictionary,
+			TimeSpan connectTimeout)
+		{
+			if (targetDictionary == null)
+				throw new Exception("Writing conntect timeout info failed. Dictionary must not be null.");
+
+			return targetDictionary.Union(new Dictionary<string, string>
+			{
+				{ CONNECTTIMEOUT, JsonConvert.SerializeObject(connectTimeout, new JavaScriptDateTimeConverter()) }
+			}).ToDictionary(key => key.Key, value => value.Value);
+		}
+		/// <summary> Sets the uri of the active copri host. </summary>
+		/// <param name="settingsJSON">Dictionary holding parameters from JSON.</param>
+		public static Dictionary<string, string> SetCopriHostUri(this IDictionary<string, string> p_oTargetDictionary, string p_strNextActiveUriText)
+		{
+			if (p_oTargetDictionary == null)
+				throw new Exception("Writing copri host uri to dictionary failed. Dictionary must not be null.");
+
+			return p_oTargetDictionary.Union(new Dictionary<string, string>
+			{
+				{ typeof(CopriServerUriList).ToString(), JsonConvert.SerializeObject(p_strNextActiveUriText) },
+			}).ToDictionary(key => key.Key, value => value.Value);
+		}
+
+		/// <summary> Gets the timeout to apply when connecting to bluetooth lock.</summary>
+		/// <param name="settingsJSON">Dictionary to get information from.</param>
+		/// <returns>Connect timeout value.</returns>
+		public static TimeSpan? GetConnectTimeout(Dictionary<string, string> settingsJSON)
+		{
+			if (!settingsJSON.TryGetValue(CONNECTTIMEOUT, out string connectTimeout)
+				|| string.IsNullOrEmpty(connectTimeout))
+			{
+				// File holds no entry.
+				return null;
+			}
+
+			return JsonConvert.DeserializeObject<TimeSpan>(connectTimeout, new JavaScriptDateTimeConverter());
+		}
+		/// <summary> Gets the logging level.</summary>
+		/// <param name="settingsJSON">Dictionary to get logging level from.</param>
+		/// <returns>Logging level</returns>
+		public static Uri GetCopriHostUri(this IDictionary<string, string> settingsJSON)
+		{
+			// Get uri of corpi server.
+			if (!settingsJSON.TryGetValue(typeof(CopriServerUriList).ToString(), out string uriText)
+				|| string.IsNullOrEmpty(uriText))
+			{
+				// File holds no entry.
+				return null;
+			}
+
+
+			return JsonConvert.DeserializeObject<Uri>(uriText);
+		}
+
+		/// <summary> Sets the version of the app. </summary>
+		/// <param name="settingsJSON">Dictionary holding parameters from JSON.</param>
+		public static Dictionary<string, string> SetAppVersion(
+			this IDictionary<string, string> targetDictionary,
+			Version appVersion)
+		{
+			if (targetDictionary == null)
+				throw new Exception("Writing app version to dictionary failed. Dictionary must not be null.");
+
+			return targetDictionary.Union(new Dictionary<string, string>
+			{
+				{APPVERIONKEY , JsonConvert.SerializeObject(appVersion, new VersionConverter()) },
+			}).ToDictionary(key => key.Key, value => value.Value);
+		}
+
+		/// <summary> Gets the app versions.</summary>
+		/// <param name="settingsJSON">Dictionary to get logging level from.</param>
+		/// <returns>Logging level</returns>
+		public static Version GetAppVersion(this IDictionary<string, string> settingsJSON)
+		{
+			// Get the version of the app which wrote the settings file.
+			if (!settingsJSON.TryGetValue(APPVERIONKEY, out string appVersion)
+				|| string.IsNullOrEmpty(appVersion))
+			{
+				// File holds no entry.
+				return null;
+			}
+
+			return appVersion.TrimStart().StartsWith("\"")
+				? JsonConvert.DeserializeObject<Version>(appVersion, new VersionConverter())
+				: Version.Parse(appVersion); // Format used up to version 3.0.0.115
+		}
+
+
+		/// <summary> Sets whether polling is on or off and the periode if polling is on. </summary>
+		/// <param name="settingsJSON">Dictionary to write entries to.</param>
+		public static Dictionary<string, string> SetPollingParameters(this IDictionary<string, string> p_oTargetDictionary, PollingParameters p_oPollingParameter)
+		{
+			if (p_oTargetDictionary == null)
+				throw new Exception("Writing polling parameters to dictionary failed. Dictionary must not be null.");
+
+			return p_oTargetDictionary.Union(new Dictionary<string, string>
+			{
+				{ $"{typeof(PollingParameters).Name}_{typeof(TimeSpan).Name}", JsonConvert.SerializeObject(p_oPollingParameter.Periode) },
+				{ $"{typeof(PollingParameters).Name}_{typeof(bool).Name}", JsonConvert.SerializeObject(p_oPollingParameter.IsActivated) },
+			}).ToDictionary(key => key.Key, value => value.Value);
+		}
+
+		/// <summary> Get whether polling is on or off and the periode if polling is on. </summary>
+		/// <param name="settingsJSON">Dictionary holding parameters from JSON.</param>
+		/// <returns>Polling parameters.</returns>
+		public static PollingParameters GetPollingParameters(this IDictionary<string, string> settingsJSON)
+		{
+			// Check if dictionary contains entry for periode.
+			if (settingsJSON.TryGetValue($"{typeof(PollingParameters).Name}_{typeof(TimeSpan).Name}", out string periode)
+				&& settingsJSON.TryGetValue($"{typeof(PollingParameters).Name}_{typeof(bool).Name}", out string active)
+				&& !string.IsNullOrEmpty(periode)
+				&& !string.IsNullOrEmpty(active))
+			{
+				return new PollingParameters(
+					JsonConvert.DeserializeObject<TimeSpan>(periode),
+					JsonConvert.DeserializeObject<bool>(active));
+			}
+
+			return null;
+		}
+
+		/// <summary> Saves object to file. </summary>
+		/// <param name="settingsList">Settings to save.</param>
+		public static void Serialize(string settingsFileFolder, IDictionary<string, string> settingsList)
+		{
+			// Save settings to file.
+			var l_oText = JsonConvert.SerializeObject(settingsList, Formatting.Indented);
+			var l_oFolder = settingsFileFolder;
+			System.IO.File.WriteAllText($"{l_oFolder}{System.IO.Path.DirectorySeparatorChar}{SETTINGSFILETITLE}", l_oText);
+		}
+
+		/// <summary> Gets TINK app settings form xml- file. </summary>
+		/// <param name="settingsDirectory">Directory to read settings from.</param>
+		/// <returns>Dictionary of settings.</returns>
+		public static Dictionary<string, string> Deserialize(string settingsDirectory)
+		{
+			var l_oFileName = $"{settingsDirectory}{System.IO.Path.DirectorySeparatorChar}{SETTINGSFILETITLE}";
+
+			if (!System.IO.File.Exists(l_oFileName))
+			{
+				// File is empty. Nothing to read.
+				return new Dictionary<string, string>(); ;
+			}
+
+			var l_oJSONFile = System.IO.File.ReadAllText(l_oFileName);
+
+			if (string.IsNullOrEmpty(l_oJSONFile))
+			{
+				// File is empty. Nothing to read.
+				return new Dictionary<string, string>();
+			}
+
+			// Load setting file.
+			return JsonConvert.DeserializeObject<Dictionary<string, string>>(l_oJSONFile);
+		}
+
+		/// <summary> Gets the logging level.</summary>
+		/// <param name="settingsJSON">Dictionary to get logging level from.</param>
+		/// <returns>Logging level.</returns>
+		public static LogEventLevel? GetMinimumLoggingLevel(
+			Dictionary<string, string> settingsJSON)
+		{
+			// Get logging level.
+			if (!settingsJSON.TryGetValue(MINLOGGINGLEVELKEY, out string level)
+				|| string.IsNullOrEmpty(level))
+			{
+				// File holds no entry.
+				return null;
+			}
+
+			return (LogEventLevel)int.Parse(JsonConvert.DeserializeObject<string>(level));
+		}
+
+		/// <summary> Gets a value indicating whether report level is verbose or not.</summary>
+		/// <param name="settingsJSON">Dictionary to get value from.</param>
+		public static bool? GetIsReportLevelVerbose(Dictionary<string, string> settingsJSON) => GetNullableEntry<bool>(ISREPORTLEVELVERBOSEKEY, settingsJSON);
+
+		/// <summary> Sets a value indicating whether  report level is verbose or not.</summary>
+		/// <param name="settingsJSON">Dictionary to get value from.</param>
+		public static Dictionary<string, string> SetIsReportLevelVerbose(this IDictionary<string, string> targetDictionary, bool isReportLevelVerbose)
+			=> SetEntry(isReportLevelVerbose, ISREPORTLEVELVERBOSEKEY, targetDictionary);
+
+
+		/// <summary> Sets the logging level.</summary>
+		/// <param name="settingsJSON">Dictionary to get logging level from.</param>
+		public static Dictionary<string, string> SetMinimumLoggingLevel(this IDictionary<string, string> p_oTargetDictionary, LogEventLevel p_oLevel)
+		{
+			// Set logging level.
+			if (p_oTargetDictionary == null)
+				throw new Exception("Writing logging level to dictionary failed. Dictionary must not be null.");
+
+			return p_oTargetDictionary.Union(new Dictionary<string, string>
+			{
+				{ MINLOGGINGLEVELKEY, JsonConvert.SerializeObject((int)p_oLevel) }
+			}).ToDictionary(key => key.Key, value => value.Value);
+		}
+
+		/// <summary> Gets the version of app when whats new was shown.</summary>
+		/// <param name="settingsJSON">Dictionary to get logging level from.</param>
+		/// <returns>Version of the app.</returns>
+		public static Version GetWhatsNew(Dictionary<string, string> settingsJSON)
+		{
+			// Get logging level.
+			if (!settingsJSON.TryGetValue(SHOWWHATSNEWKEY, out string whatsNewVersion)
+				|| string.IsNullOrEmpty(whatsNewVersion))
+			{
+				// File holds no entry.
+				return null;
+			}
+
+			return JsonConvert.DeserializeObject<Version>(whatsNewVersion, new VersionConverter());
+		}
+
+		/// <summary> Sets the version of app when whats new was shown.</summary>
+		/// <param name="settingsJSON">Dictionary to get information from.</param>
+		public static Dictionary<string, string> SetWhatsNew(this IDictionary<string, string> p_oTargetDictionary, Version p_oAppVersion)
+		{
+			// Set logging level.
+			if (p_oTargetDictionary == null)
+				throw new Exception("Writing WhatsNew info failed. Dictionary must not be null.");
+
+			return p_oTargetDictionary.Union(new Dictionary<string, string>
+			{
+				{ SHOWWHATSNEWKEY, JsonConvert.SerializeObject(p_oAppVersion, new VersionConverter()) }
+			}).ToDictionary(key => key.Key, value => value.Value);
+		}
+
+		/// <summary> Gets the expires after value.</summary>
+		/// <param name="settingsJSON">Dictionary to get expries after value from.</param>
+		/// <returns>Expires after value.</returns>
+		public static TimeSpan? GetExpiresAfter(Dictionary<string, string> settingsJSON)
+		{
+			if (!settingsJSON.TryGetValue(EXPIRESAFTER, out string expiresAfter)
+				|| string.IsNullOrEmpty(expiresAfter))
+			{
+				// File holds no entry.
+				return null;
+			}
+
+			return JsonConvert.DeserializeObject<TimeSpan>(expiresAfter, new JavaScriptDateTimeConverter());
+		}
+
+		/// <summary> Sets the the expiration time.</summary>
+		/// <param name="settingsJSON">Dictionary to write information to.</param>
+		public static Dictionary<string, string> SetExpiresAfter(this IDictionary<string, string> p_oTargetDictionary, TimeSpan expiresAfter)
+		{
+			if (p_oTargetDictionary == null)
+				throw new Exception("Writing ExpiresAfter info failed. Dictionary must not be null.");
+
+			return p_oTargetDictionary.Union(new Dictionary<string, string>
+			{
+				{ EXPIRESAFTER, JsonConvert.SerializeObject(expiresAfter, new JavaScriptDateTimeConverter()) }
+			}).ToDictionary(key => key.Key, value => value.Value);
+		}
+
+		/// <summary> Sets the active lock service name. </summary>
+		/// <param name="targetDictionary">Dictionary holding parameters from JSON.</param>
+		public static Dictionary<string, string> SetActiveLockService(this IDictionary<string, string> targetDictionary, string activeLockService)
+		{
+			if (targetDictionary == null)
+				throw new Exception("Writing active lock service name to dictionary failed. Dictionary must not be null.");
+
+			return targetDictionary.Union(new Dictionary<string, string>
+			{
+				{ typeof(ILocksService).Name, activeLockService },
+			}).ToDictionary(key => key.Key, value => value.Value);
+		}
+
+		/// <summary> Gets the active lock service name.</summary>
+		/// <param name="settingsJSON">Dictionary to get logging level from.</param>
+		/// <returns>Active lock service name.</returns>
+		public static string GetActiveLockService(this IDictionary<string, string> settingsJSON)
+		{
+			// Get uri of corpi server.
+			if (!settingsJSON.TryGetValue(typeof(ILocksService).Name, out string activeLockService)
+				|| string.IsNullOrEmpty(activeLockService))
+			{
+				// File holds no entry.
+				return null;
+			}
+
+			if (activeLockService == "TINK.Services.BluetoothLock.BLE.LockItByScanService")
+			{
+				// Name of this service was switched.
+				return typeof(TINK.Services.BluetoothLock.BLE.LockItByScanServicePolling).FullName;
+			}
+
+			return activeLockService;
+		}
+
+		/// <summary> Sets the active Geolocation service name. </summary>
+		/// <param name="targetDictionary">Dictionary holding parameters from JSON.</param>
+		public static Dictionary<string, string> SetActiveGeolocationService(
+			this IDictionary<string, string> targetDictionary,
+			string activeGeolocationService)
+		{
+			if (targetDictionary == null)
+				throw new Exception("Writing active geolocation service name to dictionary failed. Dictionary must not be null.");
+
+			return targetDictionary.Union(new Dictionary<string, string>
+			{
+				{ typeof(IGeolocation).Name, activeGeolocationService },
+			}).ToDictionary(key => key.Key, value => value.Value);
+		}
+
+		/// <summary> Gets the active Geolocation service name.</summary>
+		/// <param name="settingsJSON">Dictionary to get name of geolocation service from.</param>
+		/// <returns>Active lock service name.</returns>
+		public static string GetActiveGeolocationService(this IDictionary<string, string> settingsJSON)
+		{
+			// Get uri of corpi server.
+			if (!settingsJSON.TryGetValue(typeof(IGeolocation).Name, out string activeGeolocationService)
+				|| string.IsNullOrEmpty(activeGeolocationService))
+			{
+				// File holds no entry.
+				return null;
+			}
+
+			return activeGeolocationService;
+		}
+
+		/// <summary> Gets a value indicating whether to center the map to location or not.</summary>
+		/// <param name="settingsJSON">Dictionary to get value from.</param>
+		public static bool? GetCenterMapToCurrentLocation(Dictionary<string, string> settingsJSON) => GetNullableEntry<bool>(CENTERMAPTOCURRENTLOCATION, settingsJSON);
+
+		/// <summary> Sets a value indicating whether to center the map to location or not.</summary>
+		/// <param name="settingsJSON">Dictionary to get value from.</param>
+		public static Dictionary<string, string> SetCenterMapToCurrentLocation(this IDictionary<string, string> targetDictionary, bool centerMapToCurrentLocation)
+			=> SetEntry(centerMapToCurrentLocation, CENTERMAPTOCURRENTLOCATION, targetDictionary);
+
+		/// <summary> Gets whether to store logging data on SD card or not.</summary>
+		/// <param name="settingsJSON">Dictionary to get value from.</param>
+		public static bool? GetLogToExternalFolder(Dictionary<string, string> settingsJSON) => GetNullableEntry<bool>(LOGTOEXTERNALFOLDER, settingsJSON);
+
+		/// <summary> Gets full class name of active theme.</summary>
+		/// <param name="settingsJSON">Dictionary to get value from.</param>
+		public static string GetActiveTheme(Dictionary<string, string> settingsJSON)
+			=> GetEntry<string>(THEMEKEY, settingsJSON, (value) =>
+			{
+				if (value == JsonConvert.SerializeObject(typeof(Themes.Konrad).FullName))
+				{
+					return JsonConvert.SerializeObject(TINK.Services.ThemeNS.ThemeSet.Konrad.ToString());
+				}
+				else if (value == JsonConvert.SerializeObject(typeof(Themes.LastenradBayern).FullName))
+				{
+					return JsonConvert.SerializeObject(TINK.Services.ThemeNS.ThemeSet.LastenradBayern.ToString());
+				}
+				else if (value == JsonConvert.SerializeObject(typeof(Themes.ShareeBike).FullName))
+				{
+					return JsonConvert.SerializeObject(TINK.Services.ThemeNS.ThemeSet.ShareeBike.ToString());
+				}
+				else
+				{
+					return value;
+				}
+			});
+
+		/// <summary> Gets a value indicating whether site caching is on or off.</summary>
+		/// <param name="settingsJSON">Dictionary to get value from.</param>
+		public static bool? GetIsSiteCachingOn(Dictionary<string, string> settingsJSON) => GetNullableEntry<bool>(ISSITECACHINGON, settingsJSON);
+
+		/// <summary> Sets whether to store logging data on SD card or not.</summary>
+		/// <param name="settingsJSON">Dictionary to get value from.</param>
+		public static Dictionary<string, string> SetLogToExternalFolder(this IDictionary<string, string> targetDictionary, bool useSdCard) => SetEntry(useSdCard, LOGTOEXTERNALFOLDER, targetDictionary);
+
+		/// <summary> Sets active theme.</summary>
+		/// <param name="targetDictionary">Dictionary to set value to.</param>
+		public static Dictionary<string, string> SetActiveTheme(
+			this IDictionary<string, string> targetDictionary,
+			string theme)
+			=> SetEntry(theme, THEMEKEY, targetDictionary);
+
+		/// <summary> Sets whether site caching is on or off.</summary>
+		/// <param name="settingsJSON">Dictionary to get value from.</param>
+		public static Dictionary<string, string> SetIsSiteCachingOn(this IDictionary<string, string> targetDictionary, bool useSdCard) => SetEntry(useSdCard, ISSITECACHINGON, targetDictionary);
+
+		/// <summary> Gets the map page filter. </summary>
+		/// <param name="settings">Settings objet to load from.</param>
+		public static IGroupFilterMapPage GetGroupFilterMapPage(this IDictionary<string, string> settings)
+		{
+			var keyName = "FilterCollection_MapPageFilter";
+			if (settings == null || !settings.ContainsKey(keyName))
+			{
+				return null;
+			}
+
+			return new GroupFilterMapPage(JsonConvert.DeserializeObject<IDictionary<string, FilterState>>(settings[keyName]));
+		}
+
+		public static IDictionary<string, string> SetGroupFilterMapPage(
+			this IDictionary<string, string> settings,
+			IDictionary<string, FilterState> p_oFilterCollection)
+		{
+			if (settings == null
+				|| p_oFilterCollection == null
+				|| p_oFilterCollection.Count < 1)
+			{
+				return settings;
+			}
+
+			settings["FilterCollection_MapPageFilter"] = JsonConvert.SerializeObject(p_oFilterCollection);
+			return settings;
+		}
+
+		/// <summary> Gets the settings filter. </summary>
+		/// <param name="settings">Settings objet to load from.</param>
+		public static IGroupFilterSettings GetGoupFilterSettings(this IDictionary<string, string> settings)
+		{
+			var keyName = "FilterCollection";
+			if (settings == null || !settings.ContainsKey(keyName))
+			{
+				return null;
+			}
+
+			var legacyFilterCollection = new GroupFilterSettings(JsonConvert.DeserializeObject<IDictionary<string, FilterState>>(settings[keyName]));
+
+			// Process legacy entries.
+			var updatedFilterCollection = legacyFilterCollection.Where(x => x.Key.ToUpper() != "TINK.SMS" && x.Key.ToUpper() != "TINK.COPRI").ToDictionary(x => x.Key, x => x.Value);
+			if (legacyFilterCollection.Count() <= updatedFilterCollection.Count())
+			{
+				// No legacy entries "INK.SMS" or "TINK.COPRI" found.
+				return legacyFilterCollection;
+			}
+
+			var list = updatedFilterCollection.ToList();
+
+			updatedFilterCollection.Add(
+				"TINK",
+				legacyFilterCollection.Any(x => x.Key.ToUpper() == "TINK.COPRI") ? legacyFilterCollection.FirstOrDefault(x => x.Key.ToUpper() == "TINK.COPRI").Value : FilterState.Off);
+
+			return new GroupFilterSettings(updatedFilterCollection);
+		}
+
+		public static IDictionary<string, string> SetGroupFilterSettings(
+			this IDictionary<string, string> settings,
+			IDictionary<string, FilterState> p_oFilterCollection)
+		{
+			if (settings == null
+				|| p_oFilterCollection == null
+				|| p_oFilterCollection.Count < 1)
+			{
+				return settings;
+			}
+
+			settings["FilterCollection"] = JsonConvert.SerializeObject(p_oFilterCollection);
+			return settings;
+		}
+	}
 }
diff --git a/TINKLib/Model/Settings/PollingParameters.cs b/TINKLib/Model/Settings/PollingParameters.cs
index 36c85b8..076387a 100644
--- a/TINKLib/Model/Settings/PollingParameters.cs
+++ b/TINKLib/Model/Settings/PollingParameters.cs
@@ -2,99 +2,99 @@
 
 namespace TINK.Settings
 {
-    /// <summary> Holds polling parameters.</summary>
-    public sealed class PollingParameters : IEquatable<PollingParameters>
-    {
-        /// <summary> Holds default polling parameters. </summary>
-        public static PollingParameters Default { get; } = new PollingParameters(
-            new TimeSpan(0, 0, 0, 10 /*secs*/, 0),// Default polling interval.
-            true);
+	/// <summary> Holds polling parameters.</summary>
+	public sealed class PollingParameters : IEquatable<PollingParameters>
+	{
+		/// <summary> Holds default polling parameters. </summary>
+		public static PollingParameters Default { get; } = new PollingParameters(
+			new TimeSpan(0, 0, 0, 10 /*secs*/, 0),// Default polling interval.
+			true);
 
-        /// <summary> Holds polling parameters which represent polling off (empty polling object). </summary>
-        public static PollingParameters NoPolling { get; } = new PollingParameters(
-            TimeSpan.MaxValue,// Very long intervall which should never be used because polling IsActivated property is set to false.
-            false);
+		/// <summary> Holds polling parameters which represent polling off (empty polling object). </summary>
+		public static PollingParameters NoPolling { get; } = new PollingParameters(
+			TimeSpan.MaxValue,// Very long intervall which should never be used because polling IsActivated property is set to false.
+			false);
 
-        /// <summary> Constructs a polling parameter object. </summary>
-        /// <param name="p_oPeriode">Polling periode.</param>
-        /// <param name="p_bIsActivated">True if polling is activated.</param>
-        public PollingParameters(TimeSpan p_oPeriode, bool p_bIsActivated)
-        {
-            Periode = p_oPeriode; // Can not be null because is a struct.
-            IsActivated = p_bIsActivated;
-        }
+		/// <summary> Constructs a polling parameter object. </summary>
+		/// <param name="p_oPeriode">Polling periode.</param>
+		/// <param name="p_bIsActivated">True if polling is activated.</param>
+		public PollingParameters(TimeSpan p_oPeriode, bool p_bIsActivated)
+		{
+			Periode = p_oPeriode; // Can not be null because is a struct.
+			IsActivated = p_bIsActivated;
+		}
 
-        /// <summary>Holds the polling periode.</summary>
-        public TimeSpan Periode { get; }
+		/// <summary>Holds the polling periode.</summary>
+		public TimeSpan Periode { get; }
 
-        /// <summary> Holds value whether polling is activated or not.</summary>
-        public bool IsActivated { get; }
+		/// <summary> Holds value whether polling is activated or not.</summary>
+		public bool IsActivated { get; }
 
-        /// <summary> Checks equallity.</summary>
-        /// <param name="other">Object to compare with.</param>
-        /// <returns>True if objects are equal.</returns>
-        public bool Equals(PollingParameters other)
-        {
-            return this == other;
-        }
+		/// <summary> Checks equallity.</summary>
+		/// <param name="other">Object to compare with.</param>
+		/// <returns>True if objects are equal.</returns>
+		public bool Equals(PollingParameters other)
+		{
+			return this == other;
+		}
 
-        /// <summary> Checks equallity.</summary>
-        /// <param name="obj">Object to compare with.</param>
-        /// <returns>True if objects are equal.</returns>
-        public override bool Equals(object obj)
-        {
-            var l_oParameters = obj as PollingParameters;
-            if (l_oParameters == null)
-            {
-                return false;
-            }
+		/// <summary> Checks equallity.</summary>
+		/// <param name="obj">Object to compare with.</param>
+		/// <returns>True if objects are equal.</returns>
+		public override bool Equals(object obj)
+		{
+			var l_oParameters = obj as PollingParameters;
+			if (l_oParameters == null)
+			{
+				return false;
+			}
 
-            return this == l_oParameters;
-        }
+			return this == l_oParameters;
+		}
 
-        /// <summary> Gets the has code of object.</summary>
-        /// <returns></returns>
-        public override int GetHashCode()
-        {
-            return Periode.GetHashCode() ^ IsActivated.GetHashCode();
-        }
+		/// <summary> Gets the has code of object.</summary>
+		/// <returns></returns>
+		public override int GetHashCode()
+		{
+			return Periode.GetHashCode() ^ IsActivated.GetHashCode();
+		}
 
-        /// <summary> Gets the string representation of the object.</summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            return $"Polling is on={IsActivated}, polling interval={Periode.TotalSeconds}[sec].";
-        }
+		/// <summary> Gets the string representation of the object.</summary>
+		/// <returns></returns>
+		public override string ToString()
+		{
+			return $"Polling is on={IsActivated}, polling interval={Periode.TotalSeconds}[sec].";
+		}
 
-        /// <summary>Defines equality of thwo polling parameter objects.</summary>
-        /// <param name="p_oSource">First object to compare.</param>
-        /// <param name="p_oTarget">Second object to compare.</param>
-        /// <returns>True if objects are equal</returns>
-        public static bool operator ==(PollingParameters p_oSource, PollingParameters p_oTarget)
-        {
-            if (p_oSource is null && p_oTarget is null)
-            {
-                // Both object are null
-                return true;
-            }
+		/// <summary>Defines equality of thwo polling parameter objects.</summary>
+		/// <param name="p_oSource">First object to compare.</param>
+		/// <param name="p_oTarget">Second object to compare.</param>
+		/// <returns>True if objects are equal</returns>
+		public static bool operator ==(PollingParameters p_oSource, PollingParameters p_oTarget)
+		{
+			if (p_oSource is null && p_oTarget is null)
+			{
+				// Both object are null
+				return true;
+			}
 
-            if (p_oSource is null ^ p_oTarget is null)
-            {
-                // Only one object is null.
-                return false;
-            }
+			if (p_oSource is null ^ p_oTarget is null)
+			{
+				// Only one object is null.
+				return false;
+			}
 
-            return p_oSource.Periode == p_oTarget.Periode
-                && p_oSource.IsActivated == p_oTarget.IsActivated;
-        }
+			return p_oSource.Periode == p_oTarget.Periode
+				&& p_oSource.IsActivated == p_oTarget.IsActivated;
+		}
 
-        /// <summary>Defines equality of thwo polling parameter objects.</summary>
-        /// <param name="p_oSource">First object to compare.</param>
-        /// <param name="p_oTarget">Second object to compare.</param>
-        /// <returns>True if objects are equal</returns>
-        public static bool operator !=(PollingParameters p_oSource, PollingParameters p_oTarget)
-        {
-            return (p_oSource == p_oTarget) == false;
-        }
-    }
+		/// <summary>Defines equality of thwo polling parameter objects.</summary>
+		/// <param name="p_oSource">First object to compare.</param>
+		/// <param name="p_oTarget">Second object to compare.</param>
+		/// <returns>True if objects are equal</returns>
+		public static bool operator !=(PollingParameters p_oSource, PollingParameters p_oTarget)
+		{
+			return (p_oSource == p_oTarget) == false;
+		}
+	}
 }
diff --git a/TINKLib/Model/Settings/Settings.cs b/TINKLib/Model/Settings/Settings.cs
index f4da330..0d9ad20 100644
--- a/TINKLib/Model/Settings/Settings.cs
+++ b/TINKLib/Model/Settings/Settings.cs
@@ -10,113 +10,113 @@ using TINK.ViewModel.Settings;
 
 namespace TINK.Model.Settings
 {
-    /// <summary> Holds settings which are persisted.</summary>
-    public class Settings
-    {
-        public const LogEventLevel DEFAULTLOGGINLEVEL = LogEventLevel.Error;
+	/// <summary> Holds settings which are persisted.</summary>
+	public class Settings
+	{
+		public const LogEventLevel DEFAULTLOGGINLEVEL = LogEventLevel.Error;
 
-        public const bool DEFAULTREPOTLEVEL = false;
+		public const bool DEFAULTREPOTLEVEL = false;
 
-        /// <summary> Gets the type of the default geolocation service. </summary>
-        /// <remarks> Swtiched from GeolocationService (GeolocationAccuracyMediumService) to GeolocationAccuracyHighService in app version 3.0.290.</remarks>
-        public static Type DefaultLocationService => typeof(GeolocationAccuracyHighService);
+		/// <summary> Gets the type of the default geolocation service. </summary>
+		/// <remarks> Swtiched from GeolocationService (GeolocationAccuracyMediumService) to GeolocationAccuracyHighService in app version 3.0.290.</remarks>
+		public static Type DefaultLocationService => typeof(GeolocationAccuracyHighService);
 
-        // Default value of the expires after entry. Controls the expiration time of the cache values.
-        private TimeSpan DEFAULTEXPIRESAFTER = TimeSpan.FromSeconds(1);
+		// Default value of the expires after entry. Controls the expiration time of the cache values.
+		private TimeSpan DEFAULTEXPIRESAFTER = TimeSpan.FromSeconds(1);
 
-        /// <summary> Constructs settings object. </summary>
-        /// <param name="groupFilterMapPage">filter which is applied on the map view. Either TINK or Konrad stations are displayed.</param>
-        /// <param name="groupFilterSettings"></param>
-        /// <param name="activeUri"></param>
-        /// <param name="pollingParameters"></param>
-        /// <param name="minimumLogEventLevel">Minimum logging level to be applied.</param>
-        /// <param name="isReportLevelVerbose">True if logging level is verbose.</param>
-        /// <param name="expiresAfter">Holds the expires after value.</param>
-        /// <param name="activeLockService">Gets the name of the lock service to use.</param>
-        /// <param name="connectTimeout">Timeout to apply when connecting to bluetooth lock</param>
-        /// <param name="activeTheme">Full class name of active app theme.</param>
-        public Settings(
-            IGroupFilterMapPage groupFilterMapPage = null,
-            IGroupFilterSettings groupFilterSettings = null,
-            Uri activeUri = null,
-            PollingParameters pollingParameters = null,
-            LogEventLevel? minimumLogEventLevel = null,
-            bool? isReportLevelVerbose = null,
-            TimeSpan? expiresAfter = null,
-            string activeLockService = null,
-            TimeSpan? connectTimeout = null,
-            string activeGeolocationService = null,
-            bool? centerMapToCurrentLocation = null,
-            Xamarin.Forms.GoogleMaps.MapSpan mapSpan = null,
-            bool? logToExternalFolder = null,
-            bool? isSiteCachingOn = null,
-            string activeTheme = null)
-        {
-            GroupFilterMapPage = groupFilterMapPage ?? new GroupFilterMapPage(); // Default behaviour: No filtering.
-            GroupFilterSettings = groupFilterSettings ?? new GroupFilterSettings(); // Default behaviour: No filtering.
-            ActiveUri = GetActiveUri(activeUri);
-            PollingParameters = pollingParameters ?? PollingParameters.Default;
-            MinimumLogEventLevel = minimumLogEventLevel ?? DEFAULTLOGGINLEVEL;
-            IsReportLevelVerbose = isReportLevelVerbose ?? DEFAULTREPOTLEVEL;
-            ExpiresAfter = expiresAfter ?? DEFAULTEXPIRESAFTER;
-            ActiveLockService = activeLockService ?? LocksServicesContainerMutable.DefaultLocksservice;
-            ConnectTimeout = connectTimeout ?? new TimeSpan(0, 0, TimeOutProvider.DEFAULT_BLUETOOTHCONNECT_TIMEOUTSECONDS); // Try one sec. to connect. 
-            ActiveGeolocationService = activeGeolocationService ?? DefaultLocationService.Name;
-            CenterMapToCurrentLocation = centerMapToCurrentLocation ?? GetCenterMapToCurrentLocation(activeUri);
-            MapSpan = mapSpan;
-            LogToExternalFolder = logToExternalFolder ?? false;
-            IsSiteCachingOn = isSiteCachingOn ?? true;
-            ActiveTheme = activeTheme ?? typeof(Themes.ShareeBike).Name;
-        }
+		/// <summary> Constructs settings object. </summary>
+		/// <param name="groupFilterMapPage">filter which is applied on the map view. Either TINK or Konrad stations are displayed.</param>
+		/// <param name="groupFilterSettings"></param>
+		/// <param name="activeUri"></param>
+		/// <param name="pollingParameters"></param>
+		/// <param name="minimumLogEventLevel">Minimum logging level to be applied.</param>
+		/// <param name="isReportLevelVerbose">True if logging level is verbose.</param>
+		/// <param name="expiresAfter">Holds the expires after value.</param>
+		/// <param name="activeLockService">Gets the name of the lock service to use.</param>
+		/// <param name="connectTimeout">Timeout to apply when connecting to bluetooth lock</param>
+		/// <param name="activeTheme">Full class name of active app theme.</param>
+		public Settings(
+			IGroupFilterMapPage groupFilterMapPage = null,
+			IGroupFilterSettings groupFilterSettings = null,
+			Uri activeUri = null,
+			PollingParameters pollingParameters = null,
+			LogEventLevel? minimumLogEventLevel = null,
+			bool? isReportLevelVerbose = null,
+			TimeSpan? expiresAfter = null,
+			string activeLockService = null,
+			TimeSpan? connectTimeout = null,
+			string activeGeolocationService = null,
+			bool? centerMapToCurrentLocation = null,
+			Xamarin.Forms.GoogleMaps.MapSpan mapSpan = null,
+			bool? logToExternalFolder = null,
+			bool? isSiteCachingOn = null,
+			string activeTheme = null)
+		{
+			GroupFilterMapPage = groupFilterMapPage ?? new GroupFilterMapPage(); // Default behaviour: No filtering.
+			GroupFilterSettings = groupFilterSettings ?? new GroupFilterSettings(); // Default behaviour: No filtering.
+			ActiveUri = GetActiveUri(activeUri);
+			PollingParameters = pollingParameters ?? PollingParameters.Default;
+			MinimumLogEventLevel = minimumLogEventLevel ?? DEFAULTLOGGINLEVEL;
+			IsReportLevelVerbose = isReportLevelVerbose ?? DEFAULTREPOTLEVEL;
+			ExpiresAfter = expiresAfter ?? DEFAULTEXPIRESAFTER;
+			ActiveLockService = activeLockService ?? LocksServicesContainerMutable.DefaultLocksservice;
+			ConnectTimeout = connectTimeout ?? new TimeSpan(0, 0, TimeOutProvider.DEFAULT_BLUETOOTHCONNECT_TIMEOUTSECONDS); // Try one sec. to connect. 
+			ActiveGeolocationService = activeGeolocationService ?? DefaultLocationService.Name;
+			CenterMapToCurrentLocation = centerMapToCurrentLocation ?? GetCenterMapToCurrentLocation(activeUri);
+			MapSpan = mapSpan;
+			LogToExternalFolder = logToExternalFolder ?? false;
+			IsSiteCachingOn = isSiteCachingOn ?? true;
+			ActiveTheme = activeTheme ?? typeof(Themes.ShareeBike).Name;
+		}
 
-        /// <summary> Holds the filter which is applied on the map view. Either TINK or Konrad stations are displayed. </summary>
-        public IGroupFilterMapPage GroupFilterMapPage { get; }
+		/// <summary> Holds the filter which is applied on the map view. Either TINK or Konrad stations are displayed. </summary>
+		public IGroupFilterMapPage GroupFilterMapPage { get; }
 
-        /// <summary> Holds the filters loaded from settings. </summary>
-        public IGroupFilterSettings GroupFilterSettings { get; }
+		/// <summary> Holds the filters loaded from settings. </summary>
+		public IGroupFilterSettings GroupFilterSettings { get; }
 
-        /// <summary> Holds the uri to connect to. </summary>
-        public Uri ActiveUri { get; }
+		/// <summary> Holds the uri to connect to. </summary>
+		public Uri ActiveUri { get; }
 
-        /// <summary> Holds the polling parameters. </summary>
-        public PollingParameters PollingParameters { get; }
+		/// <summary> Holds the polling parameters. </summary>
+		public PollingParameters PollingParameters { get; }
 
-        /// <summary> Gets the minimum logging level. </summary>
-        public LogEventLevel MinimumLogEventLevel { get; }
+		/// <summary> Gets the minimum logging level. </summary>
+		public LogEventLevel MinimumLogEventLevel { get; }
 
-        /// <summary> Gets the expires after value.</summary>
-        public TimeSpan ExpiresAfter { get; }
+		/// <summary> Gets the expires after value.</summary>
+		public TimeSpan ExpiresAfter { get; }
 
-        /// <summary> Gets the lock service to use.</summary>
-        public string ActiveLockService { get; private set; }
+		/// <summary> Gets the lock service to use.</summary>
+		public string ActiveLockService { get; private set; }
 
-        /// <summary> Timeout to apply when connecting to bluetooth lock.</summary>
-        public TimeSpan ConnectTimeout { get; }
+		/// <summary> Timeout to apply when connecting to bluetooth lock.</summary>
+		public TimeSpan ConnectTimeout { get; }
 
-        /// <summary> Gets the geolocation service to use.</summary>
-        public string ActiveGeolocationService { get; }
+		/// <summary> Gets the geolocation service to use.</summary>
+		public string ActiveGeolocationService { get; }
 
-        /// <summary> True if map is centered to current positon, false if not to center map.</summary>
-        public bool CenterMapToCurrentLocation { get; }
+		/// <summary> True if map is centered to current positon, false if not to center map.</summary>
+		public bool CenterMapToCurrentLocation { get; }
 
-        /// <summary> Holds the map area to display. </summary>
-        public Xamarin.Forms.GoogleMaps.MapSpan MapSpan { get; }
+		/// <summary> Holds the map area to display. </summary>
+		public Xamarin.Forms.GoogleMaps.MapSpan MapSpan { get; }
 
-        public bool LogToExternalFolder { get; }
+		public bool LogToExternalFolder { get; }
 
-        public bool IsSiteCachingOn { get; }
+		public bool IsSiteCachingOn { get; }
 
-        public string ActiveTheme { get; }
+		public string ActiveTheme { get; }
 
-        /// <summary> Gets a value indicating whether reporting level is verbose or not.</summary>
-        public bool IsReportLevelVerbose { get; }
+		/// <summary> Gets a value indicating whether reporting level is verbose or not.</summary>
+		public bool IsReportLevelVerbose { get; }
 
-        public static Uri GetActiveUri(Uri activeUri) => activeUri ?? Services.CopriApi.ServerUris.CopriServerUriList.DefaultActiveUri;
+		public static Uri GetActiveUri(Uri activeUri) => activeUri ?? Services.CopriApi.ServerUris.CopriServerUriList.DefaultActiveUri;
 
-        public static bool GetCenterMapToCurrentLocation(Uri activeUri)
-        {
-            // TINK does not require acess to current location. Deactivate center map to current location for this reason. 
-            return !GetActiveUri(activeUri).Host.GetIsCopri();
-        }
-    }
+		public static bool GetCenterMapToCurrentLocation(Uri activeUri)
+		{
+			// TINK does not require acess to current location. Deactivate center map to current location for this reason. 
+			return !GetActiveUri(activeUri).Host.GetIsCopri();
+		}
+	}
 }
diff --git a/TINKLib/Model/State/BaseState.cs b/TINKLib/Model/State/BaseState.cs
index c251907..00daa42 100644
--- a/TINKLib/Model/State/BaseState.cs
+++ b/TINKLib/Model/State/BaseState.cs
@@ -2,23 +2,23 @@
 
 namespace TINK.Model.State
 {
-    /// <summary>
-    /// Base type for serialization purposes.
-    /// </summary>
-    [DataContract]
-    [KnownType(typeof(StateFeedbackPendingInfo))]
-    [KnownType(typeof(StateAvailableInfo))]
-    [KnownType(typeof(StateRequestedInfo))]
-    [KnownType(typeof(StateOccupiedInfo))]
-    public abstract class BaseState
-    {
-        /// <summary> Constructor for Json serialization. </summary>
-        /// <param name="value">State value.</param>
-        protected BaseState(InUseStateEnum value) { }
+	/// <summary>
+	/// Base type for serialization purposes.
+	/// </summary>
+	[DataContract]
+	[KnownType(typeof(StateFeedbackPendingInfo))]
+	[KnownType(typeof(StateAvailableInfo))]
+	[KnownType(typeof(StateRequestedInfo))]
+	[KnownType(typeof(StateOccupiedInfo))]
+	public abstract class BaseState
+	{
+		/// <summary> Constructor for Json serialization. </summary>
+		/// <param name="value">State value.</param>
+		protected BaseState(InUseStateEnum value) { }
 
-        /// <summary>
-        /// Holds the state value.
-        /// </summary>
-        public abstract InUseStateEnum Value { get; }
-    }
+		/// <summary>
+		/// Holds the state value.
+		/// </summary>
+		public abstract InUseStateEnum Value { get; }
+	}
 }
diff --git a/TINKLib/Model/State/IBaseState.cs b/TINKLib/Model/State/IBaseState.cs
index a2659cf..a8aa379 100644
--- a/TINKLib/Model/State/IBaseState.cs
+++ b/TINKLib/Model/State/IBaseState.cs
@@ -1,11 +1,11 @@
 
 namespace TINK.Model.State
 {
-    /// <summary>
-    /// Base state information. 
-    /// </summary>
-    public interface IBaseState
-    {
-        InUseStateEnum Value { get; }
-    }
+	/// <summary>
+	/// Base state information. 
+	/// </summary>
+	public interface IBaseState
+	{
+		InUseStateEnum Value { get; }
+	}
 }
diff --git a/TINKLib/Model/State/INotAvailableState.cs b/TINKLib/Model/State/INotAvailableState.cs
index d453cb2..cb65f45 100644
--- a/TINKLib/Model/State/INotAvailableState.cs
+++ b/TINKLib/Model/State/INotAvailableState.cs
@@ -2,13 +2,13 @@
 
 namespace TINK.Model.State
 {
-    /// <summary>
-    /// State of bikes which are either reserved or booked.
-    /// </summary>
-    public interface INotAvailableState : IBaseState
-    {
-        DateTime From { get; }
-        string MailAddress { get; }
-        string Code { get; }
-    }
+	/// <summary>
+	/// State of bikes which are either reserved or booked.
+	/// </summary>
+	public interface INotAvailableState : IBaseState
+	{
+		DateTime From { get; }
+		string MailAddress { get; }
+		string Code { get; }
+	}
 }
diff --git a/TINKLib/Model/State/IStateInfo.cs b/TINKLib/Model/State/IStateInfo.cs
index b1c6fe0..a146814 100644
--- a/TINKLib/Model/State/IStateInfo.cs
+++ b/TINKLib/Model/State/IStateInfo.cs
@@ -2,15 +2,15 @@
 
 namespace TINK.Model.State
 {
-    /// <summary>
-    /// Interface to access informations about bike information.
-    /// </summary>
-    public interface IStateInfo : IBaseState
-    {
-        string MailAddress { get; }
+	/// <summary>
+	/// Interface to access informations about bike information.
+	/// </summary>
+	public interface IStateInfo : IBaseState
+	{
+		string MailAddress { get; }
 
-        DateTime? From { get; }
+		DateTime? From { get; }
 
-        string Code { get; }
-    }
+		string Code { get; }
+	}
 }
diff --git a/TINKLib/Model/State/IStateInfoMutable.cs b/TINKLib/Model/State/IStateInfoMutable.cs
index ddaf1c3..12cc69f 100644
--- a/TINKLib/Model/State/IStateInfoMutable.cs
+++ b/TINKLib/Model/State/IStateInfoMutable.cs
@@ -2,21 +2,21 @@
 
 namespace TINK.Model.State
 {
-    public interface IStateInfoMutable
-    {
-        InUseStateEnum Value { get; }
+	public interface IStateInfoMutable
+	{
+		InUseStateEnum Value { get; }
 
-        /// <summary> Updates state from webserver. </summary>
-        /// <param name="state">State of the bike.</param>
-        /// <param name="from">Date time when bike was reserved/ booked.</param>
-        /// <param name="mailAddress">Mailaddress of the one which reserved/ booked.</param>
-        /// <param name="code">Booking code if bike is booked or reserved.</param>
-        /// <param name="notifyLevel">Controls whether notify property changed events are fired or not.</param>
-        void Load(
-            InUseStateEnum state,
-            DateTime? from = null,
-            string mailAddress = null,
-            string code = null,
-            Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel notifyLevel = Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.All);
-    }
+		/// <summary> Updates state from webserver. </summary>
+		/// <param name="state">State of the bike.</param>
+		/// <param name="from">Date time when bike was reserved/ booked.</param>
+		/// <param name="mailAddress">Mailaddress of the one which reserved/ booked.</param>
+		/// <param name="code">Booking code if bike is booked or reserved.</param>
+		/// <param name="notifyLevel">Controls whether notify property changed events are fired or not.</param>
+		void Load(
+			InUseStateEnum state,
+			DateTime? from = null,
+			string mailAddress = null,
+			string code = null,
+			Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel notifyLevel = Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.All);
+	}
 }
diff --git a/TINKLib/Model/State/StateAvailableInfo.cs b/TINKLib/Model/State/StateAvailableInfo.cs
index 2b8b711..cfa0030 100644
--- a/TINKLib/Model/State/StateAvailableInfo.cs
+++ b/TINKLib/Model/State/StateAvailableInfo.cs
@@ -3,26 +3,26 @@ using Newtonsoft.Json;
 
 namespace TINK.Model.State
 {
-    /// <summary>
-    /// Represents the state available.
-    /// </summary>
-    [DataContract]
-    public sealed class StateAvailableInfo : BaseState, IBaseState
-    {
-        /// <summary>
-        /// Constructs state info object representing state available.
-        /// </summary>
-        public StateAvailableInfo() : base(InUseStateEnum.Disposable) { }
+	/// <summary>
+	/// Represents the state available.
+	/// </summary>
+	[DataContract]
+	public sealed class StateAvailableInfo : BaseState, IBaseState
+	{
+		/// <summary>
+		/// Constructs state info object representing state available.
+		/// </summary>
+		public StateAvailableInfo() : base(InUseStateEnum.Disposable) { }
 
-        /// <summary> Constructor for Json serialization. </summary>
-        /// <param name="value">Unused value.</param>
-        [JsonConstructor]
-        private StateAvailableInfo(InUseStateEnum value) : base(InUseStateEnum.Disposable) { }
+		/// <summary> Constructor for Json serialization. </summary>
+		/// <param name="value">Unused value.</param>
+		[JsonConstructor]
+		private StateAvailableInfo(InUseStateEnum value) : base(InUseStateEnum.Disposable) { }
 
-        /// <summary>
-        /// Gets the info that state is disposable.
-        /// Setter exists only for serialization purposes.
-        /// </summary>
-        public override InUseStateEnum Value => InUseStateEnum.Disposable;
-    }
+		/// <summary>
+		/// Gets the info that state is disposable.
+		/// Setter exists only for serialization purposes.
+		/// </summary>
+		public override InUseStateEnum Value => InUseStateEnum.Disposable;
+	}
 }
diff --git a/TINKLib/Model/State/StateFeedbackPendingInfo.cs b/TINKLib/Model/State/StateFeedbackPendingInfo.cs
index c8eab44..ef64116 100644
--- a/TINKLib/Model/State/StateFeedbackPendingInfo.cs
+++ b/TINKLib/Model/State/StateFeedbackPendingInfo.cs
@@ -3,26 +3,26 @@ using Newtonsoft.Json;
 
 namespace TINK.Model.State
 {
-    /// <summary>
-    /// Represents the state feedback pending.
-    /// </summary>
-    [DataContract]
-    public sealed class StateFeedbackPendingInfo : BaseState, IBaseState
-    {
-        /// <summary>
-        /// Constructs state info object representing feedback pending.
-        /// </summary>
-        public StateFeedbackPendingInfo() : base(InUseStateEnum.FeedbackPending) { }
+	/// <summary>
+	/// Represents the state feedback pending.
+	/// </summary>
+	[DataContract]
+	public sealed class StateFeedbackPendingInfo : BaseState, IBaseState
+	{
+		/// <summary>
+		/// Constructs state info object representing feedback pending.
+		/// </summary>
+		public StateFeedbackPendingInfo() : base(InUseStateEnum.FeedbackPending) { }
 
-        /// <summary> Constructor for Json serialization. </summary>
-        /// <param name="value">Unused value.</param>
-        [JsonConstructor]
-        private StateFeedbackPendingInfo(InUseStateEnum value) : base(InUseStateEnum.FeedbackPending) { }
+		/// <summary> Constructor for Json serialization. </summary>
+		/// <param name="value">Unused value.</param>
+		[JsonConstructor]
+		private StateFeedbackPendingInfo(InUseStateEnum value) : base(InUseStateEnum.FeedbackPending) { }
 
-        /// <summary>
-        /// Gets the info that state is disposable.
-        /// Setter exists only for serialization purposes.
-        /// </summary>
-        public override InUseStateEnum Value => InUseStateEnum.FeedbackPending;
-    }
+		/// <summary>
+		/// Gets the info that state is disposable.
+		/// Setter exists only for serialization purposes.
+		/// </summary>
+		public override InUseStateEnum Value => InUseStateEnum.FeedbackPending;
+	}
 }
diff --git a/TINKLib/Model/State/StateInfo.cs b/TINKLib/Model/State/StateInfo.cs
index 0e719de..9c9b28a 100644
--- a/TINKLib/Model/State/StateInfo.cs
+++ b/TINKLib/Model/State/StateInfo.cs
@@ -2,168 +2,168 @@
 
 namespace TINK.Model.State
 {
-    /// <summary>
-    /// Types of rent states
-    /// </summary>
-    public enum InUseStateEnum
-    {
-        /// <summary>
-        /// Bike was returned but no feedback given. 
-        /// This applies to COPRI locks only because returning of bike is not done using app (Status: Supported locks are ILockIt and COPRI).
-        /// </summary>
-        FeedbackPending,
+	/// <summary>
+	/// Types of rent states
+	/// </summary>
+	public enum InUseStateEnum
+	{
+		/// <summary>
+		/// Bike was returned but no feedback given. 
+		/// This applies to COPRI locks only because returning of bike is not done using app (Status: Supported locks are ILockIt and COPRI).
+		/// </summary>
+		FeedbackPending,
 
-        /// <summary>
-        /// Bike is not in use. Corresponding COPRI state is "available".
-        /// </summary>
-        Disposable,
+		/// <summary>
+		/// Bike is not in use. Corresponding COPRI state is "available".
+		/// </summary>
+		Disposable,
 
-        /// <summary>
-        /// Bike is reserved. Corresponding COPRI state is "requested".
-        /// </summary>
-        Reserved,
+		/// <summary>
+		/// Bike is reserved. Corresponding COPRI state is "requested".
+		/// </summary>
+		Reserved,
 
-        /// <summary>
-        /// Bike is booked. Corresponding COPRI statie is "occupied".
-        /// </summary>
-        Booked
-    }
+		/// <summary>
+		/// Bike is booked. Corresponding COPRI statie is "occupied".
+		/// </summary>
+		Booked
+	}
 
-    /// <summary>
-    /// Manages the state of a bike.
-    /// </summary>
-    public class StateInfo : IStateInfo
-    {
-        // Holds the current disposable state value.
-        private readonly BaseState _InUseState;
+	/// <summary>
+	/// Manages the state of a bike.
+	/// </summary>
+	public class StateInfo : IStateInfo
+	{
+		// Holds the current disposable state value.
+		private readonly BaseState _InUseState;
 
-        /// <summary>
-        /// Constructs a state info object when state is available.
-        /// </summary>
-        /// <param name="isFeedbackPending">Specifieds whether feedback is pending or not.</param>
-        public StateInfo(bool isFeedbackPending = false)
-        {
-            _InUseState = isFeedbackPending
-                ? (BaseState)new StateFeedbackPendingInfo()
-                : new StateAvailableInfo();
-        }
+		/// <summary>
+		/// Constructs a state info object when state is available.
+		/// </summary>
+		/// <param name="isFeedbackPending">Specifieds whether feedback is pending or not.</param>
+		public StateInfo(bool isFeedbackPending = false)
+		{
+			_InUseState = isFeedbackPending
+				? (BaseState)new StateFeedbackPendingInfo()
+				: new StateAvailableInfo();
+		}
 
-        /// <summary>
-        /// Constructs a state info object when state is requested.
-        /// </summary>
-        /// <param name="requestedAt">Date time when bike was requested</param>
-        /// <param name="mailAddress">Mail address of user which requested bike.</param>
-        /// <param name="code">Booking code.</param>
-        /// <param name="dateTimeNowProvider">Date time provider to calculate reaining time.</param>
-        public StateInfo(
-            Func<DateTime> dateTimeNowProvider,
-            DateTime requestedAt,
-            string mailAddress,
-            string code)
-        {
-            // Todo: Handle p_oFrom == null here.
-            // Todo: Handle p_oDuration == null here.
-            _InUseState = new StateRequestedInfo(
-                dateTimeNowProvider ?? (() => DateTime.Now),
-                requestedAt,
-                mailAddress,
-                code);
-        }
+		/// <summary>
+		/// Constructs a state info object when state is requested.
+		/// </summary>
+		/// <param name="requestedAt">Date time when bike was requested</param>
+		/// <param name="mailAddress">Mail address of user which requested bike.</param>
+		/// <param name="code">Booking code.</param>
+		/// <param name="dateTimeNowProvider">Date time provider to calculate reaining time.</param>
+		public StateInfo(
+			Func<DateTime> dateTimeNowProvider,
+			DateTime requestedAt,
+			string mailAddress,
+			string code)
+		{
+			// Todo: Handle p_oFrom == null here.
+			// Todo: Handle p_oDuration == null here.
+			_InUseState = new StateRequestedInfo(
+				dateTimeNowProvider ?? (() => DateTime.Now),
+				requestedAt,
+				mailAddress,
+				code);
+		}
 
-        /// <summary>
-        /// Constructs a state info object when state is booked.
-        /// </summary>
-        /// <param name="p_oBookedAt">Date time when bike was booked</param>
-        /// <param name="p_strMailAddress">Mail address of user which booked bike.</param>
-        /// <param name="p_strCode">Booking code.</param>
-        public StateInfo(
-            DateTime p_oBookedAt,
-            string p_strMailAddress,
-            string p_strCode)
-        {
-            // Todo: Handle p_oFrom == null here.
-            // Todo: Clearify question: What to do if code changes form one value to another? This should never happen.
-            // Todo: Clearify question: What to do if from time changes form one value to another? This should never happen.
-            _InUseState = new StateOccupiedInfo(
-                p_oBookedAt,
-                p_strMailAddress,
-                p_strCode);
-        }
+		/// <summary>
+		/// Constructs a state info object when state is booked.
+		/// </summary>
+		/// <param name="p_oBookedAt">Date time when bike was booked</param>
+		/// <param name="p_strMailAddress">Mail address of user which booked bike.</param>
+		/// <param name="p_strCode">Booking code.</param>
+		public StateInfo(
+			DateTime p_oBookedAt,
+			string p_strMailAddress,
+			string p_strCode)
+		{
+			// Todo: Handle p_oFrom == null here.
+			// Todo: Clearify question: What to do if code changes form one value to another? This should never happen.
+			// Todo: Clearify question: What to do if from time changes form one value to another? This should never happen.
+			_InUseState = new StateOccupiedInfo(
+				p_oBookedAt,
+				p_strMailAddress,
+				p_strCode);
+		}
 
-        /// <summary>
-        /// Gets the state value of object.
-        /// </summary>
-        public InUseStateEnum Value
-        {
-            get { return _InUseState.Value; }
-        }
+		/// <summary>
+		/// Gets the state value of object.
+		/// </summary>
+		public InUseStateEnum Value
+		{
+			get { return _InUseState.Value; }
+		}
 
-        /// <summary>
-        /// Member for serialization purposes.
-        /// </summary>
-        internal BaseState StateInfoObject
-        {
-            get { return _InUseState; }
-        }
-        /// Transforms object to string.
-        /// </summary>
-        /// <returns></returns>
-        public new string ToString()
-        {
-            return _InUseState.Value.ToString("g");
-        }
+		/// <summary>
+		/// Member for serialization purposes.
+		/// </summary>
+		internal BaseState StateInfoObject
+		{
+			get { return _InUseState; }
+		}
+		/// Transforms object to string.
+		/// </summary>
+		/// <returns></returns>
+		public new string ToString()
+		{
+			return _InUseState.Value.ToString("g");
+		}
 
-        /// <summary>
-        /// Date of request/ bookeing action.
-        /// </summary>
-        public DateTime? From
-        {
-            get
-            {
-                var l_oNotDisposableInfo = _InUseState as INotAvailableState;
-                return l_oNotDisposableInfo != null ? l_oNotDisposableInfo.From : (DateTime?)null;
-            }
-        }
+		/// <summary>
+		/// Date of request/ bookeing action.
+		/// </summary>
+		public DateTime? From
+		{
+			get
+			{
+				var l_oNotDisposableInfo = _InUseState as INotAvailableState;
+				return l_oNotDisposableInfo != null ? l_oNotDisposableInfo.From : (DateTime?)null;
+			}
+		}
 
-        /// <summary>
-        /// Mail address.
-        /// </summary>
-        public string MailAddress
-        {
-            get
-            {
-                var l_oNotDisposableInfo = _InUseState as INotAvailableState;
-                return l_oNotDisposableInfo?.MailAddress;
-            }
-        }
+		/// <summary>
+		/// Mail address.
+		/// </summary>
+		public string MailAddress
+		{
+			get
+			{
+				var l_oNotDisposableInfo = _InUseState as INotAvailableState;
+				return l_oNotDisposableInfo?.MailAddress;
+			}
+		}
 
-        /// <summary>
-        /// Reservation code.
-        /// </summary>
-        public string Code
-        {
-            get
-            {
-                var l_oNotDisposableInfo = _InUseState as INotAvailableState;
-                return l_oNotDisposableInfo?.Code;
-            }
-        }
+		/// <summary>
+		/// Reservation code.
+		/// </summary>
+		public string Code
+		{
+			get
+			{
+				var l_oNotDisposableInfo = _InUseState as INotAvailableState;
+				return l_oNotDisposableInfo?.Code;
+			}
+		}
 
-        /// <summary>
-        /// Tries update 
-        /// </summary>
-        /// <returns>True if reservation span has not exeeded and state remains reserved, false otherwise.</returns>
-        /// <todo>Implement logging of time stamps.</todo>
-        public bool GetIsStillReserved(out TimeSpan? p_oRemainingTime)
-        {
-            var l_oReservedInfo = _InUseState as StateRequestedInfo;
-            if (l_oReservedInfo == null)
-            {
-                p_oRemainingTime = null;
-                return false;
-            }
+		/// <summary>
+		/// Tries update 
+		/// </summary>
+		/// <returns>True if reservation span has not exeeded and state remains reserved, false otherwise.</returns>
+		/// <todo>Implement logging of time stamps.</todo>
+		public bool GetIsStillReserved(out TimeSpan? p_oRemainingTime)
+		{
+			var l_oReservedInfo = _InUseState as StateRequestedInfo;
+			if (l_oReservedInfo == null)
+			{
+				p_oRemainingTime = null;
+				return false;
+			}
 
-            return l_oReservedInfo.GetIsStillReserved(out p_oRemainingTime);
-        }
-    }
+			return l_oReservedInfo.GetIsStillReserved(out p_oRemainingTime);
+		}
+	}
 }
diff --git a/TINKLib/Model/State/StateInfoHelper.cs b/TINKLib/Model/State/StateInfoHelper.cs
index c8c0890..c7bbdea 100644
--- a/TINKLib/Model/State/StateInfoHelper.cs
+++ b/TINKLib/Model/State/StateInfoHelper.cs
@@ -1,13 +1,13 @@
 namespace TINK.Model.State
 {
-    public static class StateInfoHelper
-    {
-        /// <summary>
-        /// Gets whether bike is available or occupied, i.e. reserved or booked.
-        /// </summary>
-        /// <param name="state">State to be info from.</param>
-        /// <returns>True if bike is reserved to booked.</returns>
-        public static bool IsOccupied(this InUseStateEnum state)
-            => state != InUseStateEnum.Disposable && state != InUseStateEnum.FeedbackPending;
-    }
+	public static class StateInfoHelper
+	{
+		/// <summary>
+		/// Gets whether bike is available or occupied, i.e. reserved or booked.
+		/// </summary>
+		/// <param name="state">State to be info from.</param>
+		/// <returns>True if bike is reserved to booked.</returns>
+		public static bool IsOccupied(this InUseStateEnum state)
+			=> state != InUseStateEnum.Disposable && state != InUseStateEnum.FeedbackPending;
+	}
 }
diff --git a/TINKLib/Model/State/StateInfoMutable.cs b/TINKLib/Model/State/StateInfoMutable.cs
index 71d8f02..241308f 100644
--- a/TINKLib/Model/State/StateInfoMutable.cs
+++ b/TINKLib/Model/State/StateInfoMutable.cs
@@ -2,296 +2,296 @@
 
 namespace TINK.Model.State
 {
-    using System.ComponentModel;
-    using System.Runtime.Serialization;
+	using System.ComponentModel;
+	using System.Runtime.Serialization;
 
-    /// <summary>
-    /// Manges the state of a bike.
-    /// </summary>
-    [DataContract]
-    public class StateInfoMutable : INotifyPropertyChanged, IStateInfoMutable
-    {
-        /// <summary>
-        /// Provider for current date time to calculate remainig time on demand for state of type reserved.
-        /// </summary>
-        private readonly Func<DateTime> _DateTimeNowProvider;
+	/// <summary>
+	/// Manges the state of a bike.
+	/// </summary>
+	[DataContract]
+	public class StateInfoMutable : INotifyPropertyChanged, IStateInfoMutable
+	{
+		/// <summary>
+		/// Provider for current date time to calculate remainig time on demand for state of type reserved.
+		/// </summary>
+		private readonly Func<DateTime> _DateTimeNowProvider;
 
-        // Holds the current disposable state value
-        private StateInfo _StateInfo;
+		// Holds the current disposable state value
+		private StateInfo _StateInfo;
 
-        /// <summary>
-        /// Backs up remaining time of child object.
-        /// </summary>
-        private TimeSpan? _RemainingTime = null;
+		/// <summary>
+		/// Backs up remaining time of child object.
+		/// </summary>
+		private TimeSpan? _RemainingTime = null;
 
-        /// <summary> Notifies clients about state changes. </summary>
-        public event PropertyChangedEventHandler PropertyChanged;
+		/// <summary> Notifies clients about state changes. </summary>
+		public event PropertyChangedEventHandler PropertyChanged;
 
-        /// <summary>
-        /// Constructs a state object from source.
-        /// </summary>
-        /// <param name="state">State info to load from.</param>
-        public StateInfoMutable(
-            Func<DateTime> dateTimeNowProvider = null,
-            IStateInfo state = null)
-        {
-            // Back up date time provider to be able to pass this to requested- object if state changes to requested.
-            _DateTimeNowProvider = dateTimeNowProvider != null
-                ? dateTimeNowProvider
-                : () => DateTime.Now;
+		/// <summary>
+		/// Constructs a state object from source.
+		/// </summary>
+		/// <param name="state">State info to load from.</param>
+		public StateInfoMutable(
+			Func<DateTime> dateTimeNowProvider = null,
+			IStateInfo state = null)
+		{
+			// Back up date time provider to be able to pass this to requested- object if state changes to requested.
+			_DateTimeNowProvider = dateTimeNowProvider != null
+				? dateTimeNowProvider
+				: () => DateTime.Now;
 
-            _StateInfo = Create(state, dateTimeNowProvider);
-        }
+			_StateInfo = Create(state, dateTimeNowProvider);
+		}
 
-        /// <summary>
-        /// Loads state from immutable source.
-        /// </summary>
-        /// <param name="state">State to load from.</param>
-        public void Load(IStateInfo state)
-        {
-            if (state == null)
-            {
-                throw new ArgumentException("Can not load state info, object must not be null.");
-            }
+		/// <summary>
+		/// Loads state from immutable source.
+		/// </summary>
+		/// <param name="state">State to load from.</param>
+		public void Load(IStateInfo state)
+		{
+			if (state == null)
+			{
+				throw new ArgumentException("Can not load state info, object must not be null.");
+			}
 
-            // Back up last state value and remaining time value
-            // to be able to check whether an event has to be fired or not.
-            var l_oLastState = Value;
-            var l_oLastRemainingTime = _RemainingTime;
+			// Back up last state value and remaining time value
+			// to be able to check whether an event has to be fired or not.
+			var l_oLastState = Value;
+			var l_oLastRemainingTime = _RemainingTime;
 
-            // Create new state info object from source.
-            _StateInfo = Create(state, _DateTimeNowProvider);
+			// Create new state info object from source.
+			_StateInfo = Create(state, _DateTimeNowProvider);
 
-            // Update remaining time value.
-            _StateInfo.GetIsStillReserved(out _RemainingTime);
+			// Update remaining time value.
+			_StateInfo.GetIsStillReserved(out _RemainingTime);
 
-            if (l_oLastState == _StateInfo.Value
-                && l_oLastRemainingTime == _RemainingTime)
-            {
-                return;
-            }
+			if (l_oLastState == _StateInfo.Value
+				&& l_oLastRemainingTime == _RemainingTime)
+			{
+				return;
+			}
 
-            // State has changed, notify clients.
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(State)));
-        }
+			// State has changed, notify clients.
+			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(State)));
+		}
 
-        /// <summary>
-        /// Creates a state info object.
-        /// </summary>
-        /// <param name="state">State to load from.</param>
-        private static StateInfo Create(
-            IStateInfo state,
-            Func<DateTime> dateTimeNowProvider)
-        {
-            switch (state != null ? state.Value : InUseStateEnum.Disposable)
-            {
-                case InUseStateEnum.Disposable:
-                case InUseStateEnum.FeedbackPending:
-                    return new StateInfo(state != null ? state.Value == InUseStateEnum.FeedbackPending : false);
+		/// <summary>
+		/// Creates a state info object.
+		/// </summary>
+		/// <param name="state">State to load from.</param>
+		private static StateInfo Create(
+			IStateInfo state,
+			Func<DateTime> dateTimeNowProvider)
+		{
+			switch (state != null ? state.Value : InUseStateEnum.Disposable)
+			{
+				case InUseStateEnum.Disposable:
+				case InUseStateEnum.FeedbackPending:
+					return new StateInfo(state != null ? state.Value == InUseStateEnum.FeedbackPending : false);
 
-                case InUseStateEnum.Reserved:
-                    // Todo: Handle p_oFrom == null here.
-                    // Todo: Handle p_oDuration == null here.
-                    return new StateInfo(
-                        dateTimeNowProvider,
-                        state.From.Value,
-                        state.MailAddress,
-                        state.Code);
+				case InUseStateEnum.Reserved:
+					// Todo: Handle p_oFrom == null here.
+					// Todo: Handle p_oDuration == null here.
+					return new StateInfo(
+						dateTimeNowProvider,
+						state.From.Value,
+						state.MailAddress,
+						state.Code);
 
 
-                case InUseStateEnum.Booked:
-                    // Todo: Handle p_oFrom == null here.
-                    // Todo: Clearify question: What to do if code changes form one value to another? This should never happen.
-                    // Todo: Clearify question: What to do if from time changes form one value to another? This should never happen.
-                    return new StateInfo(
-                        state.From.Value,
-                        state.MailAddress,
-                        state.Code);
+				case InUseStateEnum.Booked:
+					// Todo: Handle p_oFrom == null here.
+					// Todo: Clearify question: What to do if code changes form one value to another? This should never happen.
+					// Todo: Clearify question: What to do if from time changes form one value to another? This should never happen.
+					return new StateInfo(
+						state.From.Value,
+						state.MailAddress,
+						state.Code);
 
-                default:
-                    // Todo: New state Busy has to be defined.
-                    throw new Exception(string.Format("Can not create new state info object. Unknown state {0} detected.", state.Value));
-            }
-        }
+				default:
+					// Todo: New state Busy has to be defined.
+					throw new Exception(string.Format("Can not create new state info object. Unknown state {0} detected.", state.Value));
+			}
+		}
 
-        /// <summary>
-        /// Gets the state value of object.
-        /// </summary>
-        public InUseStateEnum Value
-            => _StateInfo.Value;
+		/// <summary>
+		/// Gets the state value of object.
+		/// </summary>
+		public InUseStateEnum Value
+			=> _StateInfo.Value;
 
-        /// <summary>
-        /// Member for serialization purposes.
-        /// </summary>
-        [DataMember]
-        private BaseState StateInfoObject
-        {
-            get { return _StateInfo.StateInfoObject; }
-            set
-            {
-                var l_oStateOccupied = value as StateOccupiedInfo;
-                if (l_oStateOccupied != null)
-                {
-                    _StateInfo = new StateInfo(l_oStateOccupied.From, l_oStateOccupied.MailAddress, l_oStateOccupied.Code);
-                    return;
-                }
+		/// <summary>
+		/// Member for serialization purposes.
+		/// </summary>
+		[DataMember]
+		private BaseState StateInfoObject
+		{
+			get { return _StateInfo.StateInfoObject; }
+			set
+			{
+				var l_oStateOccupied = value as StateOccupiedInfo;
+				if (l_oStateOccupied != null)
+				{
+					_StateInfo = new StateInfo(l_oStateOccupied.From, l_oStateOccupied.MailAddress, l_oStateOccupied.Code);
+					return;
+				}
 
-                var l_oStateRequested = value as StateRequestedInfo;
-                if (l_oStateRequested != null)
-                {
-                    _StateInfo = new StateInfo(_DateTimeNowProvider, l_oStateRequested.From, l_oStateRequested.MailAddress, l_oStateRequested.Code);
-                    return;
-                }
+				var l_oStateRequested = value as StateRequestedInfo;
+				if (l_oStateRequested != null)
+				{
+					_StateInfo = new StateInfo(_DateTimeNowProvider, l_oStateRequested.From, l_oStateRequested.MailAddress, l_oStateRequested.Code);
+					return;
+				}
 
-                _StateInfo = new StateInfo();
+				_StateInfo = new StateInfo();
 
-            }
-        }
-        /// Transforms object to string.
-        /// </summary>
-        /// <returns></returns>
-        public new string ToString()
-        {
-            return _StateInfo.ToString();
-        }
+			}
+		}
+		/// Transforms object to string.
+		/// </summary>
+		/// <returns></returns>
+		public new string ToString()
+		{
+			return _StateInfo.ToString();
+		}
 
-        /// <summary>
-        /// Checks and updates state if required.
-        /// </summary>
-        /// <returns>Value indicating wheter state has changed</returns>
-        public void UpdateOnTimeElapsed()
-        {
-            switch (_StateInfo.Value)
-            {
-                // State is disposable or booked. No need to update "OnTimeElapsed"
-                case InUseStateEnum.Disposable:
-                case InUseStateEnum.Booked:
-                    return;
-            }
+		/// <summary>
+		/// Checks and updates state if required.
+		/// </summary>
+		/// <returns>Value indicating wheter state has changed</returns>
+		public void UpdateOnTimeElapsed()
+		{
+			switch (_StateInfo.Value)
+			{
+				// State is disposable or booked. No need to update "OnTimeElapsed"
+				case InUseStateEnum.Disposable:
+				case InUseStateEnum.Booked:
+					return;
+			}
 
-            // Check if maximum reserved time has elapsed.
-            if (!_StateInfo.GetIsStillReserved(out _RemainingTime))
-            {
-                // Time has elapsed, switch state to disposable and notfiy client
-                _StateInfo = new StateInfo();
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(State)));
-                return;
-            }
+			// Check if maximum reserved time has elapsed.
+			if (!_StateInfo.GetIsStillReserved(out _RemainingTime))
+			{
+				// Time has elapsed, switch state to disposable and notfiy client
+				_StateInfo = new StateInfo();
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(State)));
+				return;
+			}
 
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(RemainingTime)));
-        }
+			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(RemainingTime)));
+		}
 
-        /// <summary> Updates state from webserver. </summary>
-        /// <param name="state">State of the bike.</param>
-        /// <param name="from">Date time when bike was reserved/ booked.</param>
-        /// <param name="mailAddress">Mailaddress of the one which reserved/ booked.</param>
-        /// <param name="code">Booking code if bike is booked or reserved.</param>
-        /// <param name="supressNotifyPropertyChanged">Controls whether notify property changed events are fired or not.</param>
-        public void Load(
-            InUseStateEnum state,
-            DateTime? from = null,
-            string mailAddress = null,
-            string code = null,
-            Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel notifyLevel = Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.All)
-        {
-            var lastState = _StateInfo.Value;
+		/// <summary> Updates state from webserver. </summary>
+		/// <param name="state">State of the bike.</param>
+		/// <param name="from">Date time when bike was reserved/ booked.</param>
+		/// <param name="mailAddress">Mailaddress of the one which reserved/ booked.</param>
+		/// <param name="code">Booking code if bike is booked or reserved.</param>
+		/// <param name="supressNotifyPropertyChanged">Controls whether notify property changed events are fired or not.</param>
+		public void Load(
+			InUseStateEnum state,
+			DateTime? from = null,
+			string mailAddress = null,
+			string code = null,
+			Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel notifyLevel = Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.All)
+		{
+			var lastState = _StateInfo.Value;
 
-            switch (state)
-            {
-                case InUseStateEnum.Disposable:
-                    _StateInfo = new StateInfo();
+			switch (state)
+			{
+				case InUseStateEnum.Disposable:
+					_StateInfo = new StateInfo();
 
-                    // Set value to null. Otherwise potentially obsolete value will be taken remaining time.
-                    _RemainingTime = null;
-                    break;
+					// Set value to null. Otherwise potentially obsolete value will be taken remaining time.
+					_RemainingTime = null;
+					break;
 
-                case InUseStateEnum.Reserved:
-                    // Todo: Handle p_oFrom == null here.
-                    // Todo: Handle p_oDuration == null here.
-                    _StateInfo = new StateInfo(
-                        _DateTimeNowProvider,
-                        from.Value,
-                        mailAddress,
-                        code);
+				case InUseStateEnum.Reserved:
+					// Todo: Handle p_oFrom == null here.
+					// Todo: Handle p_oDuration == null here.
+					_StateInfo = new StateInfo(
+						_DateTimeNowProvider,
+						from.Value,
+						mailAddress,
+						code);
 
-                    // Set value to null. Otherwise potentially obsolete value will be taken remaining time.
-                    _RemainingTime = null;
-                    break;
+					// Set value to null. Otherwise potentially obsolete value will be taken remaining time.
+					_RemainingTime = null;
+					break;
 
-                case InUseStateEnum.Booked:
-                    // Todo: Handle p_oFrom == null here.
-                    // Todo: Clearify question: What to do if code changes form one value to another? This should never happen.
-                    // Todo: Clearify question: What to do if from time changes form one value to another? This should never happen.
-                    _StateInfo = new StateInfo(
-                        from.Value,
-                        mailAddress,
-                        code);
+				case InUseStateEnum.Booked:
+					// Todo: Handle p_oFrom == null here.
+					// Todo: Clearify question: What to do if code changes form one value to another? This should never happen.
+					// Todo: Clearify question: What to do if from time changes form one value to another? This should never happen.
+					_StateInfo = new StateInfo(
+						from.Value,
+						mailAddress,
+						code);
 
-                    // Set value to null. Otherwise potentially obsolete value will be taken remaining time.
-                    _RemainingTime = null;
-                    break;
+					// Set value to null. Otherwise potentially obsolete value will be taken remaining time.
+					_RemainingTime = null;
+					break;
 
-                default:
-                    // Todo: New state Busy has to be defined.
-                    break;
-            }
+				default:
+					// Todo: New state Busy has to be defined.
+					break;
+			}
 
-            if (lastState != _StateInfo.Value
-                && notifyLevel == Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.All)
-            {
-                // State has changed, notify clients.
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(State)));
-            }
-        }
+			if (lastState != _StateInfo.Value
+				&& notifyLevel == Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.All)
+			{
+				// State has changed, notify clients.
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(State)));
+			}
+		}
 
-        /// <summary>
-        /// If bike is reserved time raimaining while bike stays reserved, null otherwise.
-        /// </summary>
-        public TimeSpan? RemainingTime
-        {
-            get
-            {
-                switch (_StateInfo.Value)
-                {
-                    // State is either available or occupied.
-                    case InUseStateEnum.Disposable:
-                    case InUseStateEnum.Booked:
-                        return null;
-                }
+		/// <summary>
+		/// If bike is reserved time raimaining while bike stays reserved, null otherwise.
+		/// </summary>
+		public TimeSpan? RemainingTime
+		{
+			get
+			{
+				switch (_StateInfo.Value)
+				{
+					// State is either available or occupied.
+					case InUseStateEnum.Disposable:
+					case InUseStateEnum.Booked:
+						return null;
+				}
 
-                if (_RemainingTime.HasValue == false)
-                {
-                    // Value was not yet querried.
-                    // Do querry before returning object.
-                    _StateInfo.GetIsStillReserved(out _RemainingTime);
-                }
+				if (_RemainingTime.HasValue == false)
+				{
+					// Value was not yet querried.
+					// Do querry before returning object.
+					_StateInfo.GetIsStillReserved(out _RemainingTime);
+				}
 
-                return _RemainingTime;
-            }
-        }
+				return _RemainingTime;
+			}
+		}
 
-        public DateTime? From
-        {
-            get
-            {
-                return _StateInfo.From;
-            }
-        }
+		public DateTime? From
+		{
+			get
+			{
+				return _StateInfo.From;
+			}
+		}
 
-        public string MailAddress
-        {
-            get
-            {
-                return _StateInfo.MailAddress;
-            }
-        }
+		public string MailAddress
+		{
+			get
+			{
+				return _StateInfo.MailAddress;
+			}
+		}
 
-        public string Code
-        {
-            get
-            {
-                return _StateInfo.Code;
-            }
-        }
-    }
+		public string Code
+		{
+			get
+			{
+				return _StateInfo.Code;
+			}
+		}
+	}
 }
diff --git a/TINKLib/Model/State/StateOccupiedInfo.cs b/TINKLib/Model/State/StateOccupiedInfo.cs
index 45f4c3b..07b1d8b 100644
--- a/TINKLib/Model/State/StateOccupiedInfo.cs
+++ b/TINKLib/Model/State/StateOccupiedInfo.cs
@@ -4,77 +4,77 @@ using Newtonsoft.Json;
 
 namespace TINK.Model.State
 {
-    /// <summary>
-    /// Manages state booked.
-    /// </summary>
-    [DataContract]
-    public sealed class StateOccupiedInfo : BaseState, IBaseState, INotAvailableState
-    {
-        /// <summary>
-        /// Prevents an invalid instance to be created.
-        /// </summary>
-        private StateOccupiedInfo() : base(InUseStateEnum.Booked)
-        {
-        }
+	/// <summary>
+	/// Manages state booked.
+	/// </summary>
+	[DataContract]
+	public sealed class StateOccupiedInfo : BaseState, IBaseState, INotAvailableState
+	{
+		/// <summary>
+		/// Prevents an invalid instance to be created.
+		/// </summary>
+		private StateOccupiedInfo() : base(InUseStateEnum.Booked)
+		{
+		}
 
-        /// <summary>
-        /// Constructs an object holding booked state info.
-        /// </summary>
-        /// <param name="p_oFrom">Date time when bike was booked</param>
-        /// <param name="p_strMailAddress"></param>
-        /// <param name="p_strCode"></param>
-        public StateOccupiedInfo(
-            DateTime p_oFrom,
-            string p_strMailAddress,
-            string p_strCode) : base(InUseStateEnum.Booked)
-        {
-            From = p_oFrom;
-            MailAddress = p_strMailAddress;
-            Code = p_strCode;
-        }
+		/// <summary>
+		/// Constructs an object holding booked state info.
+		/// </summary>
+		/// <param name="p_oFrom">Date time when bike was booked</param>
+		/// <param name="p_strMailAddress"></param>
+		/// <param name="p_strCode"></param>
+		public StateOccupiedInfo(
+			DateTime p_oFrom,
+			string p_strMailAddress,
+			string p_strCode) : base(InUseStateEnum.Booked)
+		{
+			From = p_oFrom;
+			MailAddress = p_strMailAddress;
+			Code = p_strCode;
+		}
 
-        /// <summary> Constructor for Json serialization. </summary>
-        /// <param name="Value">Unused value.</param>
-        /// <param name="From">Date time when bike was booked</param>
-        /// <param name="MailAddress"></param>
-        /// <param name="Code"></param>
-        [JsonConstructor]
-        private StateOccupiedInfo(
-            InUseStateEnum Value,
-            DateTime From,
-            string MailAddress,
-            string Code) : this(From, MailAddress, Code)
-        {
-        }
+		/// <summary> Constructor for Json serialization. </summary>
+		/// <param name="Value">Unused value.</param>
+		/// <param name="From">Date time when bike was booked</param>
+		/// <param name="MailAddress"></param>
+		/// <param name="Code"></param>
+		[JsonConstructor]
+		private StateOccupiedInfo(
+			InUseStateEnum Value,
+			DateTime From,
+			string MailAddress,
+			string Code) : this(From, MailAddress, Code)
+		{
+		}
 
-        /// <summary>
-        /// Gets the info that state is reserved.
-        /// Setter exists only for serialization purposes.
-        /// </summary>
-        public override InUseStateEnum Value
-        {
-            get
-            {
-                return InUseStateEnum.Booked;
-            }
-        }
+		/// <summary>
+		/// Gets the info that state is reserved.
+		/// Setter exists only for serialization purposes.
+		/// </summary>
+		public override InUseStateEnum Value
+		{
+			get
+			{
+				return InUseStateEnum.Booked;
+			}
+		}
 
-        /// <summary>
-        /// Prevents an invalid instance to be created.
-        /// </summary>
-        [DataMember]
-        public DateTime From { get; }
+		/// <summary>
+		/// Prevents an invalid instance to be created.
+		/// </summary>
+		[DataMember]
+		public DateTime From { get; }
 
-        /// <summary>
-        /// Mail address of user who bookec the bike.
-        /// </summary>
-        [DataMember]
-        public string MailAddress { get; }
+		/// <summary>
+		/// Mail address of user who bookec the bike.
+		/// </summary>
+		[DataMember]
+		public string MailAddress { get; }
 
-        /// <summary>
-        /// Booking code.
-        /// </summary>
-        [DataMember]
-        public string Code { get; }
-    }
+		/// <summary>
+		/// Booking code.
+		/// </summary>
+		[DataMember]
+		public string Code { get; }
+	}
 }
diff --git a/TINKLib/Model/State/StateRequestedInfo.cs b/TINKLib/Model/State/StateRequestedInfo.cs
index cbc50da..74d192f 100644
--- a/TINKLib/Model/State/StateRequestedInfo.cs
+++ b/TINKLib/Model/State/StateRequestedInfo.cs
@@ -4,110 +4,110 @@ using Newtonsoft.Json;
 
 namespace TINK.Model.State
 {
-    /// <summary>
-    /// Manages state reserved.
-    /// </summary>
-    [DataContract]
-    public sealed class StateRequestedInfo : BaseState, IBaseState, INotAvailableState
-    {
-        // Maximum time while reserving request is kept.
-        public static readonly TimeSpan MaximumReserveTime = new TimeSpan(0, 15, 0); // 15 mins
+	/// <summary>
+	/// Manages state reserved.
+	/// </summary>
+	[DataContract]
+	public sealed class StateRequestedInfo : BaseState, IBaseState, INotAvailableState
+	{
+		// Maximum time while reserving request is kept.
+		public static readonly TimeSpan MaximumReserveTime = new TimeSpan(0, 15, 0); // 15 mins
 
-        // Reference to date time provider.
-        private Func<DateTime> _DateTimeNowProvider;
+		// Reference to date time provider.
+		private Func<DateTime> _DateTimeNowProvider;
 
-        /// <summary>
-        /// Prevents an invalid instance to be created.
-        /// Used by serializer only.
-        /// </summary>
-        private StateRequestedInfo() : base(InUseStateEnum.Reserved)
-        {
-            // Is called in context of JSON deserialization.
-            _DateTimeNowProvider = () => DateTime.Now;
-        }
+		/// <summary>
+		/// Prevents an invalid instance to be created.
+		/// Used by serializer only.
+		/// </summary>
+		private StateRequestedInfo() : base(InUseStateEnum.Reserved)
+		{
+			// Is called in context of JSON deserialization.
+			_DateTimeNowProvider = () => DateTime.Now;
+		}
 
-        /// <summary>
-        /// Reservation performed with other device/ before start of app. 
-        /// Date time info when bike was reserved has been received from webserver.
-        /// </summary>
-        /// <param name="p_oRemainingTime">Time span which holds duration how long bike still will be reserved.</param>
-        [JsonConstructor]
-        private StateRequestedInfo(
-            InUseStateEnum Value,
-            DateTime From,
-            string MailAddress,
-            string Code) : this(() => DateTime.Now, From, MailAddress, Code)
-        {
-        }
+		/// <summary>
+		/// Reservation performed with other device/ before start of app. 
+		/// Date time info when bike was reserved has been received from webserver.
+		/// </summary>
+		/// <param name="p_oRemainingTime">Time span which holds duration how long bike still will be reserved.</param>
+		[JsonConstructor]
+		private StateRequestedInfo(
+			InUseStateEnum Value,
+			DateTime From,
+			string MailAddress,
+			string Code) : this(() => DateTime.Now, From, MailAddress, Code)
+		{
+		}
 
-        /// <summary>
-        /// Reservation performed with other device/ before start of app. 
-        /// Date time info when bike was reserved has been received from webserver.
-        /// </summary>
-        /// <param name="dateTimeNowProvider">
-        /// Used to  to provide current date time information for potential calls of <seealso cref="GetIsStillReserved"/>.
-        /// Not used to calculate remaining time because this duration whould always be shorter as the one received from webserver.
-        /// </param>
-        public StateRequestedInfo(
-            Func<DateTime> dateTimeNowProvider,
-            DateTime from,
-            string mailAddress,
-            string code) : base(InUseStateEnum.Reserved)
-        {
-            _DateTimeNowProvider = dateTimeNowProvider ?? (() => DateTime.Now);
-            From = from;
-            MailAddress = mailAddress;
-            Code = code;
-        }
+		/// <summary>
+		/// Reservation performed with other device/ before start of app. 
+		/// Date time info when bike was reserved has been received from webserver.
+		/// </summary>
+		/// <param name="dateTimeNowProvider">
+		/// Used to  to provide current date time information for potential calls of <seealso cref="GetIsStillReserved"/>.
+		/// Not used to calculate remaining time because this duration whould always be shorter as the one received from webserver.
+		/// </param>
+		public StateRequestedInfo(
+			Func<DateTime> dateTimeNowProvider,
+			DateTime from,
+			string mailAddress,
+			string code) : base(InUseStateEnum.Reserved)
+		{
+			_DateTimeNowProvider = dateTimeNowProvider ?? (() => DateTime.Now);
+			From = from;
+			MailAddress = mailAddress;
+			Code = code;
+		}
 
-        /// <summary>
-        /// Tries update 
-        /// </summary>
-        /// <returns>True if reservation span has not exeeded and state remains reserved, false otherwise.</returns>
-        /// <todo>Implement logging of time stamps.</todo>
-        public bool GetIsStillReserved(out TimeSpan? p_oRemainingTime)
-        {
-            var l_oTimeReserved = _DateTimeNowProvider().Subtract(From);
-            if (l_oTimeReserved > MaximumReserveTime)
+		/// <summary>
+		/// Tries update 
+		/// </summary>
+		/// <returns>True if reservation span has not exeeded and state remains reserved, false otherwise.</returns>
+		/// <todo>Implement logging of time stamps.</todo>
+		public bool GetIsStillReserved(out TimeSpan? p_oRemainingTime)
+		{
+			var l_oTimeReserved = _DateTimeNowProvider().Subtract(From);
+			if (l_oTimeReserved > MaximumReserveTime)
 
-            {
-                // Reservation has elapsed. To not update remaining time.                
-                p_oRemainingTime = null;
-                return false;
-            }
+			{
+				// Reservation has elapsed. To not update remaining time.                
+				p_oRemainingTime = null;
+				return false;
+			}
 
-            p_oRemainingTime = MaximumReserveTime - l_oTimeReserved;
-            return true;
-        }
+			p_oRemainingTime = MaximumReserveTime - l_oTimeReserved;
+			return true;
+		}
 
-        /// <summary>
-        /// State reserved. 
-        /// Setter exists only for serialization purposes.
-        /// </summary>
-        public override InUseStateEnum Value
-        {
-            get
-            {
-                return InUseStateEnum.Reserved;
-            }
-        }
+		/// <summary>
+		/// State reserved. 
+		/// Setter exists only for serialization purposes.
+		/// </summary>
+		public override InUseStateEnum Value
+		{
+			get
+			{
+				return InUseStateEnum.Reserved;
+			}
+		}
 
-        /// <summary>
-        /// Date time when bike was reserved.
-        /// </summary>
-        [DataMember]
-        public DateTime From { get; }
+		/// <summary>
+		/// Date time when bike was reserved.
+		/// </summary>
+		[DataMember]
+		public DateTime From { get; }
 
-        /// <summary>
-        /// Mail address of user who reserved the bike.
-        /// </summary>
-        [DataMember]
-        public string MailAddress { get; }
+		/// <summary>
+		/// Mail address of user who reserved the bike.
+		/// </summary>
+		[DataMember]
+		public string MailAddress { get; }
 
-        /// <summary>
-        /// Booking code.
-        /// </summary>
-        [DataMember]
-        public string Code { get; }
-    }
+		/// <summary>
+		/// Booking code.
+		/// </summary>
+		[DataMember]
+		public string Code { get; }
+	}
 }
diff --git a/TINKLib/Model/Station/IStation.cs b/TINKLib/Model/Station/IStation.cs
index 4461bd8..778d487 100644
--- a/TINKLib/Model/Station/IStation.cs
+++ b/TINKLib/Model/Station/IStation.cs
@@ -3,21 +3,21 @@ using TINK.Model.Station.Operator;
 
 namespace TINK.Model.Station
 {
-    public interface IStation
-    {
-        /// <summary> Holds the unique id of the station.c</summary>
-        string Id { get; }
+	public interface IStation
+	{
+		/// <summary> Holds the unique id of the station.c</summary>
+		string Id { get; }
 
-        /// <summary> Holds the group to which the station belongs.</summary>
-        IEnumerable<string> Group { get; }
+		/// <summary> Holds the group to which the station belongs.</summary>
+		IEnumerable<string> Group { get; }
 
-        /// <summary> Gets the name of the station.</summary>
-        string StationName { get; }
+		/// <summary> Gets the name of the station.</summary>
+		string StationName { get; }
 
-        /// <summary> Holds the gps- position of the station.</summary>
-        IPosition Position { get; }
+		/// <summary> Holds the gps- position of the station.</summary>
+		IPosition Position { get; }
 
-        /// <summary> Holds operator related data.</summary>
-        IData OperatorData { get; }
-    }
+		/// <summary> Holds operator related data.</summary>
+		IData OperatorData { get; }
+	}
 }
diff --git a/TINKLib/Model/Station/NullStation.cs b/TINKLib/Model/Station/NullStation.cs
index e416c24..50e2e4e 100644
--- a/TINKLib/Model/Station/NullStation.cs
+++ b/TINKLib/Model/Station/NullStation.cs
@@ -3,22 +3,22 @@ using TINK.Model.Station.Operator;
 
 namespace TINK.Model.Station
 {
-    /// <summary> Holds object representing null station.</summary>
-    public class NullStation : IStation
-    {
-        /// <summary> Holds the unique id of the station.c</summary>
-        public string Id => null;
+	/// <summary> Holds object representing null station.</summary>
+	public class NullStation : IStation
+	{
+		/// <summary> Holds the unique id of the station.c</summary>
+		public string Id => null;
 
-        /// <summary> Holds the group to which the station belongs.</summary>
-        public IEnumerable<string> Group => new List<string>();
+		/// <summary> Holds the group to which the station belongs.</summary>
+		public IEnumerable<string> Group => new List<string>();
 
-        /// <summary> Gets the name of the station.</summary>
-        public string StationName => string.Empty;
+		/// <summary> Gets the name of the station.</summary>
+		public string StationName => string.Empty;
 
-        /// <summary> Holds the gps- position of the station.</summary>
-        public IPosition Position => PositionFactory.Create();
+		/// <summary> Holds the gps- position of the station.</summary>
+		public IPosition Position => PositionFactory.Create();
 
-        /// <summary> Holds operator related data.</summary>
-        public IData OperatorData => new Data();
-    }
+		/// <summary> Holds operator related data.</summary>
+		public IData OperatorData => new Data();
+	}
 }
diff --git a/TINKLib/Model/Station/Operator/Data.cs b/TINKLib/Model/Station/Operator/Data.cs
index 4a14d05..16b6d3b 100644
--- a/TINKLib/Model/Station/Operator/Data.cs
+++ b/TINKLib/Model/Station/Operator/Data.cs
@@ -2,35 +2,35 @@
 
 namespace TINK.Model.Station.Operator
 {
-    /// <summary> Holds operator related data.</summary>
-    public class Data : IData
-    {
-        public Data(
-            string name = null,
-            string phoneNumberText = null,
-            string hours = null,
-            string mailAddressText = null, Color? color = null)
-        {
-            Name = name ?? string.Empty;
-            PhoneNumberText = phoneNumberText ?? string.Empty;
-            Hours = hours ?? string.Empty;
-            MailAddressText = mailAddressText ?? string.Empty;
-            Color = color;
-        }
+	/// <summary> Holds operator related data.</summary>
+	public class Data : IData
+	{
+		public Data(
+			string name = null,
+			string phoneNumberText = null,
+			string hours = null,
+			string mailAddressText = null, Color? color = null)
+		{
+			Name = name ?? string.Empty;
+			PhoneNumberText = phoneNumberText ?? string.Empty;
+			Hours = hours ?? string.Empty;
+			MailAddressText = mailAddressText ?? string.Empty;
+			Color = color;
+		}
 
-        /// <summary> Name of the operator.</summary>
-        public string Name { get; private set; }
+		/// <summary> Name of the operator.</summary>
+		public string Name { get; private set; }
 
-        /// <summary> Support phone number of the operator.</summary>
-        public string PhoneNumberText { get; private set; }
+		/// <summary> Support phone number of the operator.</summary>
+		public string PhoneNumberText { get; private set; }
 
-        /// <summary> Office times when support is available.</summary>
-        public string Hours { get; private set; }
+		/// <summary> Office times when support is available.</summary>
+		public string Hours { get; private set; }
 
-        /// <summary> Support mails address of the operator.</summary>
-        public string MailAddressText { get; private set; }
+		/// <summary> Support mails address of the operator.</summary>
+		public string MailAddressText { get; private set; }
 
-        /// <summary> Color of the operator (operator specific skin)</summary>
-        public Color? Color { get; private set; }
-    }
+		/// <summary> Color of the operator (operator specific skin)</summary>
+		public Color? Color { get; private set; }
+	}
 }
diff --git a/TINKLib/Model/Station/Operator/IData.cs b/TINKLib/Model/Station/Operator/IData.cs
index ba1c73e..417565d 100644
--- a/TINKLib/Model/Station/Operator/IData.cs
+++ b/TINKLib/Model/Station/Operator/IData.cs
@@ -2,21 +2,21 @@
 
 namespace TINK.Model.Station.Operator
 {
-    public interface IData
-    {
-        /// <summary> Name of the operator.</summary>
-        string Name { get; }
+	public interface IData
+	{
+		/// <summary> Name of the operator.</summary>
+		string Name { get; }
 
-        /// <summary> Support phone number of the operator.</summary>
-        string PhoneNumberText { get; }
+		/// <summary> Support phone number of the operator.</summary>
+		string PhoneNumberText { get; }
 
-        /// <summary> Office times when support is available.</summary>
-        string Hours { get; }
+		/// <summary> Office times when support is available.</summary>
+		string Hours { get; }
 
-        /// <summary> Support mails address of the operator.</summary>
-        string MailAddressText { get; }
+		/// <summary> Support mails address of the operator.</summary>
+		string MailAddressText { get; }
 
-        /// <summary> Color of the operator (operator specific skin)</summary>
-        Color? Color { get; }
-    }
+		/// <summary> Color of the operator (operator specific skin)</summary>
+		Color? Color { get; }
+	}
 }
diff --git a/TINKLib/Model/Station/Station.cs b/TINKLib/Model/Station/Station.cs
index 33ff3f3..34d9964 100644
--- a/TINKLib/Model/Station/Station.cs
+++ b/TINKLib/Model/Station/Station.cs
@@ -4,41 +4,41 @@ using TINK.Model.Station.Operator;
 
 namespace TINK.Model.Station
 {
-    /// <summary> Holds station info. </summary>
-    public class Station : IStation
-    {
-        /// <summary> Constructs a station object.</summary>
-        /// <param name="id">Id of the station.</param>
-        /// <param name="group">Group (TINK, Konrad) to which station is related.</param>
-        /// <param name="position">GPS- position of the station.</param>
-        /// <param name="stationName">Name of the station.</param>
-        public Station(
-            string id,
-            IEnumerable<string> group,
-            IPosition position,
-            string stationName = "",
-            Data operatorData = null)
-        {
-            Id = id;
-            Group = group ?? throw new ArgumentException("Can not construct station object. Group of stations must not be null.");
-            Position = position;
-            StationName = stationName ?? string.Empty;
-            OperatorData = operatorData ?? new Data();
-        }
+	/// <summary> Holds station info. </summary>
+	public class Station : IStation
+	{
+		/// <summary> Constructs a station object.</summary>
+		/// <param name="id">Id of the station.</param>
+		/// <param name="group">Group (TINK, Konrad) to which station is related.</param>
+		/// <param name="position">GPS- position of the station.</param>
+		/// <param name="stationName">Name of the station.</param>
+		public Station(
+			string id,
+			IEnumerable<string> group,
+			IPosition position,
+			string stationName = "",
+			Data operatorData = null)
+		{
+			Id = id;
+			Group = group ?? throw new ArgumentException("Can not construct station object. Group of stations must not be null.");
+			Position = position;
+			StationName = stationName ?? string.Empty;
+			OperatorData = operatorData ?? new Data();
+		}
 
-        /// <summary> Holds the unique id of the station.c</summary>
-        public string Id { get; }
+		/// <summary> Holds the unique id of the station.c</summary>
+		public string Id { get; }
 
-        /// <summary> Holds the group to which the station belongs.</summary>
-        public IEnumerable<string> Group { get; }
+		/// <summary> Holds the group to which the station belongs.</summary>
+		public IEnumerable<string> Group { get; }
 
-        /// <summary> Gets the name of the station.</summary>
-        public string StationName { get; }
+		/// <summary> Gets the name of the station.</summary>
+		public string StationName { get; }
 
-        /// <summary> Holds the gps- position of the station.</summary>
-        public IPosition Position { get; }
+		/// <summary> Holds the gps- position of the station.</summary>
+		public IPosition Position { get; }
 
-        /// <summary> Holds operator related info.</summary>
-        public IData OperatorData { get; }
-    }
+		/// <summary> Holds operator related info.</summary>
+		public IData OperatorData { get; }
+	}
 }
diff --git a/TINKLib/Model/Station/StationCollection.cs b/TINKLib/Model/Station/StationCollection.cs
index ce54fc0..da1602a 100644
--- a/TINKLib/Model/Station/StationCollection.cs
+++ b/TINKLib/Model/Station/StationCollection.cs
@@ -4,94 +4,94 @@ using System.Collections.Generic;
 
 namespace TINK.Model.Station
 {
-    public class StationDictionary : IEnumerable<IStation>
-    {
-        /// <summary> Holds the list of stations. </summary>
-        private readonly IDictionary<string, IStation> m_oStationDictionary;
+	public class StationDictionary : IEnumerable<IStation>
+	{
+		/// <summary> Holds the list of stations. </summary>
+		private readonly IDictionary<string, IStation> m_oStationDictionary;
 
-        /// <summary> Count of stations. </summary>
-        public int Count { get { return m_oStationDictionary.Count; } }
+		/// <summary> Count of stations. </summary>
+		public int Count { get { return m_oStationDictionary.Count; } }
 
-        public Version CopriVersion { get; }
+		public Version CopriVersion { get; }
 
-        /// <summary> Constructs a station dictionary object. </summary>
-        /// <param name="p_oVersion">Version of copri- service.</param>
-        public StationDictionary(Version p_oVersion = null, IDictionary<string, IStation> p_oStations = null)
-        {
-            m_oStationDictionary = p_oStations ?? new Dictionary<string, IStation>();
+		/// <summary> Constructs a station dictionary object. </summary>
+		/// <param name="p_oVersion">Version of copri- service.</param>
+		public StationDictionary(Version p_oVersion = null, IDictionary<string, IStation> p_oStations = null)
+		{
+			m_oStationDictionary = p_oStations ?? new Dictionary<string, IStation>();
 
-            CopriVersion = p_oVersion != null
-                ? new Version(p_oVersion.Major, p_oVersion.Minor, p_oVersion.Revision, p_oVersion.Build)
-                : new Version(0, 0, 0, 0);
-        }
+			CopriVersion = p_oVersion != null
+				? new Version(p_oVersion.Major, p_oVersion.Minor, p_oVersion.Revision, p_oVersion.Build)
+				: new Version(0, 0, 0, 0);
+		}
 
-        public IEnumerator<IStation> GetEnumerator()
-        {
-            return m_oStationDictionary.Values.GetEnumerator();
-        }
+		public IEnumerator<IStation> GetEnumerator()
+		{
+			return m_oStationDictionary.Values.GetEnumerator();
+		}
 
-        /// <summary>
-        /// Deteermines whether a station by given key exists.
-        /// </summary>
-        /// <param name="key">Key to check.</param>
-        /// <returns>True if station exists.</returns>
-        public bool ContainsKey(string key)
-        {
-            return m_oStationDictionary.ContainsKey(key);
-        }
+		/// <summary>
+		/// Deteermines whether a station by given key exists.
+		/// </summary>
+		/// <param name="key">Key to check.</param>
+		/// <returns>True if station exists.</returns>
+		public bool ContainsKey(string key)
+		{
+			return m_oStationDictionary.ContainsKey(key);
+		}
 
-        /// <summary>
-        /// Remove a station by station id.
-        /// </summary>
-        /// <param name="id"></param>
-        public void RemoveById(string id)
-        {
-            if (!m_oStationDictionary.ContainsKey(id))
-            {
-                // Nothing to do if there is no station with given name.
-                return;
-            }
+		/// <summary>
+		/// Remove a station by station id.
+		/// </summary>
+		/// <param name="id"></param>
+		public void RemoveById(string id)
+		{
+			if (!m_oStationDictionary.ContainsKey(id))
+			{
+				// Nothing to do if there is no station with given name.
+				return;
+			}
 
-            m_oStationDictionary.Remove(id);
-        }
+			m_oStationDictionary.Remove(id);
+		}
 
-        /// <summary>
-        /// Remove a station by station name.
-        /// </summary>
-        /// <param name="id"></param>
-        public IStation GetById(string id)
-        {
-            if (!m_oStationDictionary.ContainsKey(id))
-            {
-                // Nothing to do if there is no station with given name.
-                return null;
-            }
+		/// <summary>
+		/// Remove a station by station name.
+		/// </summary>
+		/// <param name="id"></param>
+		public IStation GetById(string id)
+		{
+			if (!m_oStationDictionary.ContainsKey(id))
+			{
+				// Nothing to do if there is no station with given name.
+				return null;
+			}
 
-            return m_oStationDictionary[id];
-        }
+			return m_oStationDictionary[id];
+		}
 
-        /// <summary>
-        /// Adds a station to dictionary of stations.
-        /// </summary>
-        /// <param name="p_oStation"></param>
-        public void Add(Station p_oStation)
-        {
-            if (p_oStation == null)
-            {
-                throw new ArgumentException("Can not add empty station to collection of stations.");
-            }
+		/// <summary>
+		/// Adds a station to dictionary of stations.
+		/// </summary>
+		/// <param name="p_oStation"></param>
+		public void Add(Station p_oStation)
+		{
+			if (p_oStation == null)
+			{
+				throw new ArgumentException("Can not add empty station to collection of stations.");
+			}
 
-            if (m_oStationDictionary.ContainsKey(p_oStation.Id))
-            {
-                throw new ArgumentException(string.Format("Can not add station {0} to collection of stations. A station with given name already exists.", p_oStation.Id));
-            }
+			if (m_oStationDictionary.ContainsKey(p_oStation.Id))
+			{
+				throw new ArgumentException(string.Format("Can not add station {0} to collection of stations. A station with given name already exists.", p_oStation.Id));
+			}
 
-            m_oStationDictionary.Add(p_oStation.Id, p_oStation);
-        }
+			m_oStationDictionary.Add(p_oStation.Id, p_oStation);
+		}
 
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return m_oStationDictionary.Values.GetEnumerator();
-        }
-    }
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return m_oStationDictionary.Values.GetEnumerator();
+		}
+	}
 }
diff --git a/TINKLib/Model/TinkApp.cs b/TINKLib/Model/TinkApp.cs
index 11d1c8b..bc22049 100644
--- a/TINKLib/Model/TinkApp.cs
+++ b/TINKLib/Model/TinkApp.cs
@@ -29,179 +29,181 @@ using TINK.ViewModel.Settings;
 
 namespace TINK.Model
 {
-    [DataContract]
-    public class TinkApp : ITinkApp
-    {
-        /// <summary> Delegate used by login view to commit user name and password. </summary>
-        /// <param name="p_strMailAddress">Mail address used as id login.</param>
-        /// <param name="p_strPassword">Password for login.</param>
-        /// <returns>True if setting credentials succeeded.</returns>
-        public delegate bool SetCredentialsDelegate(string p_strMailAddress, string p_strPassword);
+	[DataContract]
+	public class TinkApp : ITinkApp
+	{
+		/// <summary> Delegate used by login view to commit user name and password. </summary>
+		/// <param name="p_strMailAddress">Mail address used as id login.</param>
+		/// <param name="p_strPassword">Password for login.</param>
+		/// <returns>True if setting credentials succeeded.</returns>
+		public delegate bool SetCredentialsDelegate(string p_strMailAddress, string p_strPassword);
 
-        /// <summary>Returns the id of the app (sharee.bike) to be identified by copri.</summary>
-        public static string MerchantId { get; private set; }
+		/// <summary>Returns the id of the app (sharee.bike) to be identified by copri.</summary>
+		public static string MerchantId { get; private set; }
 
-        /// <summary>
-        /// Holds status about whants new page.
-        /// </summary>
-        public WhatsNew WhatsNew { get; private set; }
+		/// <summary>
+		/// Holds status about whants new page.
+		/// </summary>
+		public WhatsNew WhatsNew { get; private set; }
 
-        /// <summary>Holds uris of copri servers. </summary>
-        public CopriServerUriList Uris { get; private set; }
+		/// <summary>Holds uris of copri servers. </summary>
+		public CopriServerUriList Uris { get; private set; }
 
-        /// <summary> Holds the filters loaded from settings. </summary>
-        public IGroupFilterSettings FilterGroupSetting { get; set; }
+		/// <summary> Holds the filters loaded from settings. </summary>
+		public IGroupFilterSettings FilterGroupSetting { get; set; }
 
-        /// <summary> Holds the filter which is applied on the map view. Either TINK or Konrad stations are displayed. </summary>
-        private IGroupFilterMapPage m_oFilterDictionaryMapPage;
+		/// <summary> Holds the filter which is applied on the map view. Either TINK or Konrad stations are displayed. </summary>
+		private IGroupFilterMapPage m_oFilterDictionaryMapPage;
 
-        /// <summary> Holds the filter which is applied on the map view. Either TINK or Konrad stations are displayed. </summary>
-        public IGroupFilterMapPage GroupFilterMapPage
-        {
-            get => m_oFilterDictionaryMapPage;
-            set => m_oFilterDictionaryMapPage = value ?? new GroupFilterMapPage();
-        }
+		/// <summary> Holds the filter which is applied on the map view. Either TINK or Konrad stations are displayed. </summary>
+		public IGroupFilterMapPage GroupFilterMapPage
+		{
+			get => m_oFilterDictionaryMapPage;
+			set => m_oFilterDictionaryMapPage = value ?? new GroupFilterMapPage();
+		}
 
-        /// <summary> Value indicating whether map is centerted to current position or not. </summary>
-        public bool CenterMapToCurrentLocation { get; set; }
+		/// <summary> Value indicating whether map is centerted to current position or not. </summary>
+		public bool CenterMapToCurrentLocation { get; set; }
 
-        /// <summary> Holds the map area to display when starting app for first time/ when center map to is off. </summary>
-        private Xamarin.Forms.GoogleMaps.MapSpan HomeMapSpan { get; }
+		/// <summary> Holds the map area to display when starting app for first time/ when center map to is off. </summary>
+		private Xamarin.Forms.GoogleMaps.MapSpan HomeMapSpan { get; }
 
-        /// <summary> Holds the map area where user is or was located or null if this position is unknown. </summary>
-        public Xamarin.Forms.GoogleMaps.MapSpan UserMapSpan { get; set; } = null;
+		/// <summary> Holds the map area where user is or was located or null if this position is unknown. </summary>
+		public Xamarin.Forms.GoogleMaps.MapSpan UserMapSpan { get; set; } = null;
 
-        /// <summary> Holds the map span to display either default span or span centered to current position depending on option <see cref="CenterMapToCurrentLocation"/>.</summary>
-        public Xamarin.Forms.GoogleMaps.MapSpan ActiveMapSpan
-            => CenterMapToCurrentLocation
-                ? UserMapSpan ?? HomeMapSpan
-                : HomeMapSpan;
+		/// <summary> Holds the map span to display either default span or span centered to current position depending on option <see cref="CenterMapToCurrentLocation"/>.</summary>
+		public Xamarin.Forms.GoogleMaps.MapSpan ActiveMapSpan
+			=> CenterMapToCurrentLocation
+				? UserMapSpan ?? HomeMapSpan
+				: HomeMapSpan;
 
-        /// <summary> Gets the minimum logging level. </summary>
-        public LogEventLevel MinimumLogEventLevel { get; set; }
+		/// <summary> Gets the minimum logging level. </summary>
+		public LogEventLevel MinimumLogEventLevel { get; set; }
 
-        /// <summary> Gets a value indicating whether reporting level is verbose or not.</summary>
-        public bool IsReportLevelVerbose { get; set; }
+		/// <summary> Gets a value indicating whether reporting level is verbose or not.</summary>
+		public bool IsReportLevelVerbose { get; set; }
 
-        /// <summary> Holds the uri which is applied after restart. </summary>
-        public Uri NextActiveUri { get; set; }
+		/// <summary> Holds the uri which is applied after restart. </summary>
+		public Uri NextActiveUri { get; set; }
 
-        /// <summary> Saves object to file. </summary>
-        public void Save()
-            => JsonSettingsDictionary.Serialize(
-                        SettingsFileFolder,
-                        new Dictionary<string, string>()
-                            .SetGroupFilterMapPage(GroupFilterMapPage)
-                            .SetCopriHostUri(NextActiveUri.AbsoluteUri)
-                            .SetPollingParameters(Polling)
-                            .SetGroupFilterSettings(FilterGroupSetting)
-                            .SetAppVersion(AppVersion)
-                            .SetMinimumLoggingLevel(MinimumLogEventLevel)
-                            .SetIsReportLevelVerbose(IsReportLevelVerbose)
-                            .SetExpiresAfter(ExpiresAfter)
-                            .SetWhatsNew(AppVersion)
-                            .SetActiveLockService(LocksServices.Active.GetType().FullName)
-                            .SetActiveGeolocationService(GeolocationServices.Active.GetType().FullName)
-                            .SetCenterMapToCurrentLocation(CenterMapToCurrentLocation)
-                            .SetLogToExternalFolder(LogToExternalFolder)
-                            .SetConnectTimeout(LocksServices.Active.TimeOut.MultiConnect)
-                            .SetIsSiteCachingOn(IsSiteCachingOn)
-                            .SetActiveTheme(Themes.Active));
+		/// <summary> Saves object to file. </summary>
+		public void Save()
+			=> JsonSettingsDictionary.Serialize(
+						SettingsFileFolder,
+						new Dictionary<string, string>()
+							.SetGroupFilterMapPage(GroupFilterMapPage)
+							.SetCopriHostUri(NextActiveUri.AbsoluteUri)
+							.SetPollingParameters(Polling)
+							.SetGroupFilterSettings(FilterGroupSetting)
+							.SetAppVersion(AppVersion)
+							.SetMinimumLoggingLevel(MinimumLogEventLevel)
+							.SetIsReportLevelVerbose(IsReportLevelVerbose)
+							.SetExpiresAfter(ExpiresAfter)
+							.SetWhatsNew(AppVersion)
+							.SetActiveLockService(LocksServices.Active.GetType().FullName)
+							.SetActiveGeolocationService(GeolocationServices.Active.GetType().FullName)
+							.SetCenterMapToCurrentLocation(CenterMapToCurrentLocation)
+							.SetLogToExternalFolder(LogToExternalFolder)
+							.SetConnectTimeout(LocksServices.Active.TimeOut.MultiConnect)
+							.SetIsSiteCachingOn(IsSiteCachingOn)
+							.SetActiveTheme(Themes.Active));
 
-        /// <summary> 
-        /// Update connector from filters when
-        /// - login state changes
-        /// - view is toggled (TINK to Kornrad and vice versa)
-        /// </summary>
-        public void UpdateConnector()
-        {
-            // Create filtered connector.
-            m_oConnector = FilteredConnectorFactory.Create(
-                FilterGroupSetting.DoFilter(ActiveUser.DoFilter(GroupFilterMapPage.DoFilter())),
-                m_oConnector.Connector);
-        }
+		/// <summary> 
+		/// Update connector from filters when
+		/// - login state changes
+		/// - view is toggled (TINK to Kornrad and vice versa)
+		/// </summary>
+		public void UpdateConnector()
+		{
+			// Create filtered connector.
+			m_oConnector = FilteredConnectorFactory.Create(
+				FilterGroupSetting.DoFilter(ActiveUser.DoFilter(GroupFilterMapPage.DoFilter())),
+				m_oConnector.Connector);
+		}
 
-        /// <summary>Polling periode.</summary>
-        public PollingParameters Polling { get; set; }
+		/// <summary>Polling periode.</summary>
+		public PollingParameters Polling { get; set; }
 
-        public TimeSpan ExpiresAfter { get; set; }
+		public TimeSpan ExpiresAfter { get; set; }
 
-        /// <summary> Holds the version of the app.</summary>
-        public Version AppVersion { get; }
+		/// <summary> Holds the version of the app.</summary>
+		public Version AppVersion { get; }
 
-        /// <summary>
-        /// Holds the default polling value.
-        /// </summary>
+		/// <summary>
+		/// Holds the default polling value.
+		/// </summary>
 #if USCSHARP9
         public TimeSpan DefaultPolling => new (0, 0, 10);
 #else
-        public TimeSpan DefaultPolling => new TimeSpan(0, 0, 10);
+		public TimeSpan DefaultPolling => new TimeSpan(0, 0, 10);
 #endif
 
-        /// <summary> Constructs TinkApp object. </summary>
-        /// <param name="settings"></param>
-        /// <param name="accountStore"></param>
-        /// <param name="passwordValidator"></param>
-        /// <param name="p_oConnectorFactory"></param>
-        /// <param name="geolocationService">Null in productive context. Service to querry geoloation for testing purposes. Parameter can be made optional.</param>
-        /// <param name="locksService">Null in productive context. Service to control locks/ get locks information for testing proposes. Parameter can be made optional.</param>
-        /// <param name="device">Object allowing platform specific operations.</param>
-        /// <param name="specialFolder"></param>
-        /// <param name="p_oDateTimeProvider"></param>
-        /// <param name="isConnectedFunc">True if connector has access to copri server, false if cached values are used.</param>
-        /// <param name="currentVersion">Version of the app. If null version is set to a fixed dummy value (3.0.122) for testing purposes.</param>
-        /// <param name="lastVersion">Version of app which was used before this session, null if app is installed for the first time.</param>
-        /// <param name="whatsNewShownInVersion"> Holds 
-        /// - the version when whats new info was shown last or 
-        /// - version of application used last if whats new functionality was not implemented in this version or
-        /// - null if app is installed for the first time.
-        /// /// </param>
-        public TinkApp(
-            Settings.Settings settings,
-            IStore accountStore,
-            Func<bool> isConnectedFunc,
-            Func<bool, Uri, string /* session cookie*/, string /* mail address*/, TimeSpan, IConnector> connectorFactory,
-            string merchantId,
-            IBluetoothLE bluetoothService,
-            ILocationPermission locationPermissionsService,
-            IServicesContainer<IGeolocation> locationServicesContainer,
-            ILocksService locksService,
-            ISmartDevice device,
-            ISpecialFolder specialFolder,
-            ICipher cipher,
-            ITheme theme,
-            object arendiCentral = null,
-            Action<SendOrPostCallback, object> postAction = null,
-            Version currentVersion = null,
-            Version lastVersion = null,
-            Version whatsNewShownInVersion = null,
-            AppFlavor appFlavor = AppFlavor.ShareeBike)
-        {
-            PostAction = postAction
-                ?? ((d, obj) => d(obj));
+		/// <summary> Constructs TinkApp object. </summary>
+		/// <param name="settings"></param>
+		/// <param name="accountStore"></param>
+		/// <param name="passwordValidator"></param>
+		/// <param name="p_oConnectorFactory"></param>
+		/// <param name="geolocationService">Null in productive context. Service to querry geoloation for testing purposes. Parameter can be made optional.</param>
+		/// <param name="locksService">Null in productive context. Service to control locks/ get locks information for testing proposes. Parameter can be made optional.</param>
+		/// <param name="device">Object allowing platform specific operations.</param>
+		/// <param name="specialFolder"></param>
+		/// <param name="p_oDateTimeProvider"></param>
+		/// <param name="isConnectedFunc">True if connector has access to copri server, false if cached values are used.</param>
+		/// <param name="currentVersion">Version of the app. If null version is set to a fixed dummy value (3.0.122) for testing purposes.</param>
+		/// <param name="lastVersion">Version of app which was used before this session, null if app is installed for the first time.</param>
+		/// <param name="whatsNewShownInVersion"> Holds 
+		/// - the version when whats new info was shown last or 
+		/// - version of application used last if whats new functionality was not implemented in this version or
+		/// - null if app is installed for the first time.
+		/// /// </param>
+		public TinkApp(
+			Settings.Settings settings,
+			IStore accountStore,
+			Func<bool> isConnectedFunc,
+			Func<bool, Uri, string /* session cookie*/, string /* mail address*/, TimeSpan, IConnector> connectorFactory,
+			string merchantId,
+			IBluetoothLE bluetoothService,
+			ILocationPermission locationPermissionsService,
+			IServicesContainer<IGeolocation> locationServicesContainer,
+			ILocksService locksService,
+			ISmartDevice device,
+			ISpecialFolder specialFolder,
+			ICipher cipher,
+			ITheme theme,
+			object arendiCentral = null,
+			Action<SendOrPostCallback, object> postAction = null,
+			Version currentVersion = null,
+			Version lastVersion = null,
+			Version whatsNewShownInVersion = null,
+			AppFlavor flavor = AppFlavor.ShareeBike)
+		{
+			PostAction = postAction
+				?? ((d, obj) => d(obj));
 
-            ConnectorFactory = connectorFactory
-                ?? throw new ArgumentException("Can not instantiate TinkApp- object. No connector factory object available.");
+			ConnectorFactory = connectorFactory
+				?? throw new ArgumentException("Can not instantiate TinkApp- object. No connector factory object available.");
 
-            MerchantId = merchantId
-                ?? throw new ArgumentException($"Can not instantiate {nameof(TinkApp)}. No merchant id available.");
+			MerchantId = merchantId
+				?? throw new ArgumentException($"Can not instantiate {nameof(TinkApp)}. No merchant id available.");
 
-            Cipher = cipher ?? new Cipher();
+			Cipher = cipher ?? new Cipher();
 
-            var locksServices = locksService != null
-                ? new HashSet<ILocksService> { locksService }
-                : new HashSet<ILocksService> {
-                    new LockItByScanServiceEventBased(
-                        Cipher,
-                        bluetoothService,
-                        async () => device.Platform == Xamarin.Essentials.DevicePlatform.Android &&  await locationPermissionsService.CheckStatusAsync() != Status.Granted,
-                        () => device.Platform == Xamarin.Essentials.DevicePlatform.Android && !locationServicesContainer.Active.IsGeolcationEnabled),
-                    new LockItByScanServicePolling(
-                        Cipher,
-                        bluetoothService,
-                        async () => device.Platform == Xamarin.Essentials.DevicePlatform.Android &&  await locationPermissionsService.CheckStatusAsync() != Status.Granted,
-                        () => device.Platform == Xamarin.Essentials.DevicePlatform.Android && !locationServicesContainer.Active.IsGeolcationEnabled),
-                    new LockItByGuidService(Cipher),
+			Flavor = flavor;
+
+			var locksServices = locksService != null
+				? new HashSet<ILocksService> { locksService }
+				: new HashSet<ILocksService> {
+					new LockItByScanServiceEventBased(
+						Cipher,
+						bluetoothService,
+						async () => device.Platform == Xamarin.Essentials.DevicePlatform.Android &&  await locationPermissionsService.CheckStatusAsync() != Status.Granted,
+						() => device.Platform == Xamarin.Essentials.DevicePlatform.Android && !locationServicesContainer.Active.IsGeolcationEnabled),
+					new LockItByScanServicePolling(
+						Cipher,
+						bluetoothService,
+						async () => device.Platform == Xamarin.Essentials.DevicePlatform.Android &&  await locationPermissionsService.CheckStatusAsync() != Status.Granted,
+						() => device.Platform == Xamarin.Essentials.DevicePlatform.Android && !locationServicesContainer.Active.IsGeolcationEnabled),
+					new LockItByGuidService(Cipher),
 #if BLUETOOTHLE // Requires LockItBluetoothle library.
                     new Bluetoothle.LockItByGuidService(Cipher),
 #endif
@@ -210,241 +212,246 @@ namespace TINK.Model
                     new Arendi.LockItByScanService(Cipher, arendiCentral),
 #endif
                     new LocksServiceInReach(),
-                    new LocksServiceOutOfReach(),
-                };
+					new LocksServiceOutOfReach(),
+				};
 
-            LocksServices = new LocksServicesContainerMutable(
-                lastVersion >= new Version(3, 0, 173) ? settings.ActiveLockService : LocksServicesContainerMutable.DefaultLocksservice,
-                locksServices);
+			LocksServices = new LocksServicesContainerMutable(
+				lastVersion >= new Version(3, 0, 173) ? settings.ActiveLockService : LocksServicesContainerMutable.DefaultLocksservice,
+				locksServices);
 
-            LocksServices.SetTimeOut(settings.ConnectTimeout);
+			LocksServices.SetTimeOut(settings.ConnectTimeout);
 
-            Themes = new ServicesContainerMutable(
-                new HashSet<string> {
-                    ThemeSet.Konrad.ToString(),
-                    ThemeSet.ShareeBike.ToString(),
-                    ThemeSet.LastenradBayern.ToString()
-                },
-                Enum.TryParse(settings.ActiveTheme, true, out ThemeSet active) ? active.ToString() : ThemeSet.ShareeBike.ToString());
+			Themes = new ServicesContainerMutable(
+				new HashSet<string> {
+					ThemeSet.Konrad.ToString(),
+					ThemeSet.ShareeBike.ToString(),
+					ThemeSet.LastenradBayern.ToString()
+				},
+				Enum.TryParse(settings.ActiveTheme, true, out ThemeSet active) ? active.ToString() : ThemeSet.ShareeBike.ToString());
 
-            GeolocationServices = locationServicesContainer
-                ?? throw new ArgumentException($"Can not instantiate {nameof(TinkApp)}- object. No geolocation services container object available.");
+			GeolocationServices = locationServicesContainer
+				?? throw new ArgumentException($"Can not instantiate {nameof(TinkApp)}- object. No geolocation services container object available.");
 
-            FilterGroupSetting = settings.GroupFilterSettings;
-            GroupFilterMapPage = settings.GroupFilterMapPage;
+			FilterGroupSetting = settings.GroupFilterSettings;
+			GroupFilterMapPage = settings.GroupFilterMapPage;
 
-            CenterMapToCurrentLocation = settings.CenterMapToCurrentLocation;
+			CenterMapToCurrentLocation = settings.CenterMapToCurrentLocation;
 
-            HomeMapSpan = settings.MapSpan;
+			HomeMapSpan = settings.MapSpan;
 
-            SmartDevice = device
-               ?? throw new ArgumentException("Can not instantiate TinkApp- object. No device information provider available.");
+			SmartDevice = device
+			   ?? throw new ArgumentException("Can not instantiate TinkApp- object. No device information provider available.");
 
-            if (specialFolder == null)
-            {
-                throw new ArgumentException("Can not instantiate TinkApp- object. No special folder provider available.");
-            }
+			if (specialFolder == null)
+			{
+				throw new ArgumentException("Can not instantiate TinkApp- object. No special folder provider available.");
+			}
 
-            // Set logging level.
-            Level.MinimumLevel = settings.MinimumLogEventLevel;
+			// Set logging level.
+			Level.MinimumLevel = settings.MinimumLogEventLevel;
 
-            LogToExternalFolder = settings.LogToExternalFolder;
+			LogToExternalFolder = settings.LogToExternalFolder;
 
-            IsSiteCachingOn = settings.IsSiteCachingOn;
+			IsSiteCachingOn = settings.IsSiteCachingOn;
 
-            ExternalFolder = specialFolder.GetExternalFilesDir();
+			ExternalFolder = specialFolder.GetExternalFilesDir();
 
-            SettingsFileFolder = specialFolder.GetInternalPersonalDir();
+			SettingsFileFolder = specialFolder.GetInternalPersonalDir();
 
-            ActiveUser = new User.User(
-                accountStore.GetType().Name == "StoreLegacy" ? new Store() : accountStore,
-                accountStore.Load().Result,
-                device.Identifier);
+			ActiveUser = new User.User(
+				accountStore.GetType().Name == "StoreLegacy" ? new Store() : accountStore,
+				accountStore.Load().Result,
+				device.Identifier);
 
-            this.isConnectedFunc = isConnectedFunc ?? (() => CrossConnectivity.Current.IsConnected);
+			this.isConnectedFunc = isConnectedFunc ?? (() => CrossConnectivity.Current.IsConnected);
 
-            ExpiresAfter = settings.ExpiresAfter;
+			ExpiresAfter = settings.ExpiresAfter;
 
-            // Create filtered connector for offline mode.
-            m_oConnector = FilteredConnectorFactory.Create(
-                FilterGroupSetting.DoFilter(GroupFilterMapPage.DoFilter()),
-                ConnectorFactory(GetIsConnected(), settings.ActiveUri, ActiveUser.SessionCookie, ActiveUser.Mail, ExpiresAfter));
+			// Create filtered connector for offline mode.
+			m_oConnector = FilteredConnectorFactory.Create(
+				FilterGroupSetting.DoFilter(GroupFilterMapPage.DoFilter()),
+				ConnectorFactory(GetIsConnected(), settings.ActiveUri, ActiveUser.SessionCookie, ActiveUser.Mail, ExpiresAfter));
 
-            // Get uris from file.
-            // Initialize all settings to defaults
-            // Process uris.
-            Uris = new CopriServerUriList(settings.ActiveUri);
+			// Get uris from file.
+			// Initialize all settings to defaults
+			// Process uris.
+			Uris = new CopriServerUriList(settings.ActiveUri);
 
-            NextActiveUri = Uris.ActiveUri;
+			NextActiveUri = Uris.ActiveUri;
 
-            Polling = settings.PollingParameters ??
-                throw new ArgumentException("Can not instantiate TinkApp- object. Polling parameters must never be null.");
+			Polling = settings.PollingParameters ??
+				throw new ArgumentException("Can not instantiate TinkApp- object. Polling parameters must never be null.");
 
-            AppVersion = currentVersion ?? new Version(3, 0, 122);
+			AppVersion = currentVersion ?? new Version(3, 0, 122);
 
-            MinimumLogEventLevel = settings.MinimumLogEventLevel;
+			MinimumLogEventLevel = settings.MinimumLogEventLevel;
 
-            IsReportLevelVerbose = settings.IsReportLevelVerbose;
+			IsReportLevelVerbose = settings.IsReportLevelVerbose;
 
-            WhatsNew = new WhatsNew(AppVersion, lastVersion, whatsNewShownInVersion, appFlavor, SmartDevice.Platform);
+			WhatsNew = new WhatsNew(AppVersion, lastVersion, whatsNewShownInVersion, Flavor, SmartDevice.Platform);
 
-            if (Themes.Active.GetType().FullName == typeof(Themes.ShareeBike).FullName)
-            {
-                // Nothing to do.
-                // Theme to activate is default theme.
-                return;
-            }
+			if (Themes.Active.GetType().FullName == typeof(Themes.ShareeBike).FullName)
+			{
+				// Nothing to do.
+				// Theme to activate is default theme.
+				return;
+			}
 
-            // Set active app theme from settings.
-            // Value might differ from default scheme value defined in ResourceDictionary.MergedDictionaries (App.xaml)
-            if (theme == null)
-            {
-                Log.ForContext<TinkApp>().Error("No merged dictionary available.");
-                return;
-            }
+			// Set active app theme from settings.
+			// Value might differ from default scheme value defined in ResourceDictionary.MergedDictionaries (App.xaml)
+			if (theme == null)
+			{
+				Log.ForContext<TinkApp>().Error("No merged dictionary available.");
+				return;
+			}
 
-            theme.SetActiveTheme(Themes.Active);
-        }
+			theme.SetActiveTheme(Themes.Active);
+		}
 
-        /// <summary> Holds the user of the app. </summary>
-        [DataMember]
-        public User.User ActiveUser { get; }
+		/// <summary> Holds the user of the app. </summary>
+		[DataMember]
+		public User.User ActiveUser { get; }
 
-        /// <summary> Reference of object which provides device information. </summary>
-        public ISmartDevice SmartDevice { get; }
+		/// <summary> Reference of object which provides device information. </summary>
+		public ISmartDevice SmartDevice { get; }
 
-        /// <summary> Holds delegate to determine whether device is connected or not.</summary>
-        private readonly Func<bool> isConnectedFunc;
+		/// <summary> Holds delegate to determine whether device is connected or not.</summary>
+		private readonly Func<bool> isConnectedFunc;
 
-        /// <summary> Gets whether device is connected to internet or not. </summary>
-        public bool GetIsConnected() => isConnectedFunc();
+		/// <summary> Gets whether device is connected to internet or not. </summary>
+		public bool GetIsConnected() => isConnectedFunc();
 
-        /// <summary> Holds the folder where settings files are stored. </summary>
-        public string SettingsFileFolder { get; }
+		/// <summary> Holds the folder where settings files are stored. </summary>
+		public string SettingsFileFolder { get; }
 
-        /// <summary> Holds folder parent of the folder where log files are stored. </summary>
-        public string LogFileParentFolder => LogToExternalFolder && !string.IsNullOrEmpty(ExternalFolder) ? ExternalFolder : SettingsFileFolder;
+		/// <summary> Holds folder parent of the folder where log files are stored. </summary>
+		public string LogFileParentFolder => LogToExternalFolder && !string.IsNullOrEmpty(ExternalFolder) ? ExternalFolder : SettingsFileFolder;
 
-        /// <summary> Holds a value indicating whether to log to external or internal folder. </summary>
-        public bool LogToExternalFolder { get; set; }
+		/// <summary> Holds a value indicating whether to log to external or internal folder. </summary>
+		public bool LogToExternalFolder { get; set; }
 
-        /// <summary> Holds a value indicating whether Site caching is on or off. </summary>
-        public bool IsSiteCachingOn { get; set; }
+		/// <summary> Holds a value indicating whether Site caching is on or off. </summary>
+		public bool IsSiteCachingOn { get; set; }
 
-        /// <summary> External folder. </summary>
-        public string ExternalFolder { get; }
+		/// <summary> External folder. </summary>
+		public string ExternalFolder { get; }
 
-        public ICipher Cipher { get; }
+		public ICipher Cipher { get; }
 
-        /// <summary> Name of the station which is selected. </summary>
-        public IStation SelectedStation { get; set; } = new NullStation();
+		/// <summary> Name of the station which is selected. </summary>
+		public IStation SelectedStation { get; set; } = new NullStation();
 
-        /// <summary> Holds the stations availalbe. </summary>
-        public IEnumerable<IStation> Stations { get; set; } = new List<Station.Station>();
+		/// <summary> Holds the stations availalbe. </summary>
+		public IEnumerable<IStation> Stations { get; set; } = new List<Station.Station>();
 
-        public IResourceUrls ResourceUrls { get; set; } = new ResourceUrls();
+		public IResourceUrls ResourceUrls { get; set; } = new ResourceUrls();
 
-        /// <summary> Action to post to GUI thread.</summary>
-        public Action<SendOrPostCallback, object> PostAction { get; }
+		/// <summary> Action to post to GUI thread.</summary>
+		public Action<SendOrPostCallback, object> PostAction { get; }
 
-        /// <summary> Function which creates a connector depending on connected status.</summary>
-        private Func<bool, Uri, string /*userAgent*/, string /*sessionCookie*/, TimeSpan, IConnector> ConnectorFactory { get; }
+		/// <summary> Function which creates a connector depending on connected status.</summary>
+		private Func<bool, Uri, string /*userAgent*/, string /*sessionCookie*/, TimeSpan, IConnector> ConnectorFactory { get; }
 
-        /// <summary> Holds the object which provides offline data.</summary>
-        private IFilteredConnector m_oConnector;
+		/// <summary> Holds the object which provides offline data.</summary>
+		private IFilteredConnector m_oConnector;
 
-        /// <summary> Holds the system to copri.</summary>
-        public IFilteredConnector GetConnector(bool isConnected)
-        {
-            if (m_oConnector.IsConnected == isConnected
-                && m_oConnector.Command.SessionCookie == ActiveUser.SessionCookie)
-            {
-                // Neither connection nor logged in stated changed.
-                return m_oConnector;
-            }
+		/// <summary> Holds the system to copri.</summary>
+		public IFilteredConnector GetConnector(bool isConnected)
+		{
+			if (m_oConnector.IsConnected == isConnected
+				&& m_oConnector.Command.SessionCookie == ActiveUser.SessionCookie)
+			{
+				// Neither connection nor logged in stated changed.
+				return m_oConnector;
+			}
 
-            // Connected state changed. New connection object has to be created.
-            m_oConnector = FilteredConnectorFactory.Create(
-                FilterGroupSetting.DoFilter(ActiveUser.DoFilter(GroupFilterMapPage.DoFilter())),
-                ConnectorFactory(
-                    isConnected,
-                    Uris.ActiveUri,
-                    ActiveUser.SessionCookie,
-                    ActiveUser.Mail,
-                    ExpiresAfter));
+			// Connected state changed. New connection object has to be created.
+			m_oConnector = FilteredConnectorFactory.Create(
+				FilterGroupSetting.DoFilter(ActiveUser.DoFilter(GroupFilterMapPage.DoFilter())),
+				ConnectorFactory(
+					isConnected,
+					Uris.ActiveUri,
+					ActiveUser.SessionCookie,
+					ActiveUser.Mail,
+					ExpiresAfter));
 
-            return m_oConnector;
-        }
+			return m_oConnector;
+		}
 
-        /// <summary> Manages the different types of LocksService objects.</summary>
-        public LocksServicesContainerMutable LocksServices { get; set; }
+		/// <summary> Manages the different types of LocksService objects.</summary>
+		public LocksServicesContainerMutable LocksServices { get; set; }
 
-        /// <summary> Holds available app themes.</summary>
-        public IServicesContainer<IGeolocation> GeolocationServices { get; }
+		/// <summary> Holds available app themes.</summary>
+		public IServicesContainer<IGeolocation> GeolocationServices { get; }
 
-        /// <summary> Manages the different types of LocksService objects.</summary>
-        public ServicesContainerMutable Themes { get; private set; }
+		/// <summary> Holds the flavor of the app, i.e. specifies if app is sharee.bike, Mein konrad or Lastenrad Bayern.</summary>
+		public AppFlavor Flavor { get; private set; }
 
-        /// <summary> Object to switch logging level. </summary>
-        private LoggingLevelSwitch m_oLoggingLevelSwitch;
+		/// <summary> Manages the different types of LocksService objects.</summary>
+		public ServicesContainerMutable Themes { get; private set; }
 
-        /// <summary>
-        /// Object to allow swithing logging level
-        /// </summary>
-        public LoggingLevelSwitch Level
-        {
-            get
-            {
-                if (m_oLoggingLevelSwitch == null)
-                {
-                    m_oLoggingLevelSwitch = new LoggingLevelSwitch
-                    {
+		/// <summary> Object to switch logging level. </summary>
+		private LoggingLevelSwitch m_oLoggingLevelSwitch;
 
-                        // Set warning level to error.
-                        MinimumLevel = Settings.Settings.DEFAULTLOGGINLEVEL
-                    };
-                }
+		/// <summary>
+		/// Object to allow swithing logging level
+		/// </summary>
+		public LoggingLevelSwitch Level
+		{
+			get
+			{
+				if (m_oLoggingLevelSwitch == null)
+				{
+					m_oLoggingLevelSwitch = new LoggingLevelSwitch
+					{
 
-                return m_oLoggingLevelSwitch;
-            }
-        }
+						// Set warning level to error.
+						MinimumLevel = Settings.Settings.DEFAULTLOGGINLEVEL
+					};
+				}
 
-        /// <summary> Updates logging level. </summary>
-        /// <param name="minimumLevel">New level to set.</param>
-        public void UpdateLoggingLevel(LogEventLevel minimumLevel)
-        {
-            if (Level.MinimumLevel == minimumLevel)
-            {
-                // Nothing to do.
-                return;
-            }
+				return m_oLoggingLevelSwitch;
+			}
+		}
 
-            Log.CloseAndFlush(); // Close before modifying logger configuration. Otherwise a sharing vialation occurs.
+		/// <summary> Updates logging level. </summary>
+		/// <param name="minimumLevel">New level to set.</param>
+		public void UpdateLoggingLevel(LogEventLevel minimumLevel)
+		{
+			if (Level.MinimumLevel == minimumLevel)
+			{
+				// Nothing to do.
+				return;
+			}
 
-            Level.MinimumLevel = minimumLevel;
+			Log.CloseAndFlush(); // Close before modifying logger configuration. Otherwise a sharing vialation occurs.
 
-            SetupLogging(Level, LogFileParentFolder);
-        }
+			Level.MinimumLevel = minimumLevel;
 
-        /// <summary>
-        /// Sets up logging.
-        /// </summary>
-        /// <param name="levelSwitch">Logging level to use.</param>
-        /// <param name="logFilePath">Path to logging file.</param>
-        public static void SetupLogging(
-            LoggingLevelSwitch levelSwitch,
-            string logFilePath)
-        {
-            Log.Logger = new LoggerConfiguration()
-                .MinimumLevel.ControlledBy(levelSwitch)
-                .WriteTo.Debug()
-                .WriteTo.File(logFilePath, Logging.RollingInterval.Session)
-                .WriteTo.Logger(lg => lg
-                    .MinimumLevel.ControlledBy(new LoggingLevelSwitch(LogEventLevel.Debug))
-                    .Filter.ByIncludingOnly(Matching.FromSource("TINK.Services.BluetoothLock.BLE"))
-                    .WriteTo.MemoryQueueSink()
-                )
-                .CreateLogger();
-        }
-    }
+			SetupLogging(Level, LogFileParentFolder);
+		}
+
+		/// <summary>
+		/// Sets up logging.
+		/// </summary>
+		/// <param name="levelSwitch">Logging level to use.</param>
+		/// <param name="logFilePath">Path to logging file.</param>
+		public static void SetupLogging(
+			LoggingLevelSwitch levelSwitch,
+			string logFilePath)
+		{
+			Log.Logger = new LoggerConfiguration()
+				.MinimumLevel.ControlledBy(levelSwitch)
+				.MinimumLevel.Override("TINK.Services.BluetoothLock.BLE", LogEventLevel.Debug) /* Scanning, connect and management functionality */
+				.MinimumLevel.Override("TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler", LogEventLevel.Information) /* Provides use case context  */
+				.WriteTo.Debug()
+				.WriteTo.File(logFilePath, Logging.RollingInterval.Session)
+				.WriteTo.Logger(lg => lg
+					.MinimumLevel.ControlledBy(new LoggingLevelSwitch(LogEventLevel.Debug))
+					.Filter.ByIncludingOnly(Matching.FromSource("TINK.Services.BluetoothLock.BLE"))
+					.WriteTo.MemoryQueueSink()
+				)
+				.CreateLogger();
+		}
+	}
 }
diff --git a/TINKLib/Model/User/Account/Account.cs b/TINKLib/Model/User/Account/Account.cs
index c23959e..b85ba0f 100644
--- a/TINKLib/Model/User/Account/Account.cs
+++ b/TINKLib/Model/User/Account/Account.cs
@@ -4,99 +4,99 @@ using System.Linq;
 
 namespace TINK.Model.User.Account
 {
-    /// <summary> Specifies extra user permissions. </summary>
-    [Flags]
-    public enum Permissions
-    {
-        None = 0, // No extra permissions.
-        PickCopriServer = 2, // Allows user to switch COPRI server.
-        ManageCopriCacheExpiration = 4, // Allows to manage the livetime of COPRI cache entries.
-        ManagePolling = 8, // Turn polling off or on and set pollig frequency.
-        PickLockServiceImplementation = 16, // Allows to pick the implementation which controls bluetooth lock mangement.
-        PickLocationServiceImplementation = 32, // Allows to pick the implementation which gets location information.
-        PickLoggingLevel = 64, // Allows to select the logging level.
-        ShowDiagnostics = 128, // Turns on display of diagnostics.
-        SwitchNoSiteCaching = 1024, // Allows to turn off/ on caching of  sites displayed in app hosted by COPRI
-        ReportLevel = 2048, // Allows extent to show error messages.
-        SwitchTheme = 4096, // Allows user to switch theme (sharee.bike, Meinkonrad, Lastenrad Bayern)
-        All = PickCopriServer +
-            ManageCopriCacheExpiration +
-            ManagePolling +
-            PickLockServiceImplementation +
-            PickLocationServiceImplementation +
-            PickLoggingLevel +
-            ShowDiagnostics +
-            SwitchNoSiteCaching +
-            ReportLevel +
-            SwitchTheme,
-    }
+	/// <summary> Specifies extra user permissions. </summary>
+	[Flags]
+	public enum Permissions
+	{
+		None = 0, // No extra permissions.
+		PickCopriServer = 2, // Allows user to switch COPRI server.
+		ManageCopriCacheExpiration = 4, // Allows to manage the livetime of COPRI cache entries.
+		ManagePolling = 8, // Turn polling off or on and set pollig frequency.
+		PickLockServiceImplementation = 16, // Allows to pick the implementation which controls bluetooth lock mangement.
+		PickLocationServiceImplementation = 32, // Allows to pick the implementation which gets location information.
+		PickLoggingLevel = 64, // Allows to select the logging level.
+		ShowDiagnostics = 128, // Turns on display of diagnostics.
+		SwitchNoSiteCaching = 1024, // Allows to turn off/ on caching of  sites displayed in app hosted by COPRI
+		ReportLevel = 2048, // Allows extent to show error messages.
+		SwitchTheme = 4096, // Allows user to switch theme (sharee.bike, Meinkonrad, Lastenrad Bayern)
+		All = PickCopriServer +
+			ManageCopriCacheExpiration +
+			ManagePolling +
+			PickLockServiceImplementation +
+			PickLocationServiceImplementation +
+			PickLoggingLevel +
+			ShowDiagnostics +
+			SwitchNoSiteCaching +
+			ReportLevel +
+			SwitchTheme,
+	}
 
-    /// <summary>
-    /// Specifies parts of account data. 
-    /// </summary>
-    /// <remarks>
-    /// Usage: Account can be valid (user and password set) partly valid or completely invalid.
-    /// </remarks>
-    [Flags]
-    public enum Elements
-    {
-        None = 0,
-        Mail = 1,
-        Password = 2,
-        Account = Mail + Password
-    }
+	/// <summary>
+	/// Specifies parts of account data. 
+	/// </summary>
+	/// <remarks>
+	/// Usage: Account can be valid (user and password set) partly valid or completely invalid.
+	/// </remarks>
+	[Flags]
+	public enum Elements
+	{
+		None = 0,
+		Mail = 1,
+		Password = 2,
+		Account = Mail + Password
+	}
 
-    /// <summary>
-    /// Holds account data.
-    /// </summary>
-    public class Account : IAccount
-    {
-        public const bool DEFAULTISAGBACKNOWLEDGED = false;
+	/// <summary>
+	/// Holds account data.
+	/// </summary>
+	public class Account : IAccount
+	{
+		public const bool DEFAULTISAGBACKNOWLEDGED = false;
 
-        /// <summary> Constructs an account object.</summary>
-        /// <param name="mail">Mail address of the account holder.</param>
-        /// <param name="password">Password.</param>
-        /// <param name="sessionCookie">Session cookie from copri.</param>
-        /// <param name="bikeGroup">Group holdig info about Group (TINK, Konrad, ...)</param>
-        /// <param name="p_iDebugLevel">Flag which controls display of debug settings.</param>
-        public Account(
-            string mail,
-            string password,
-            bool isAgbAcknowledged,
-            string sessionCookie,
-            IEnumerable<string> bikeGroup,
-            Permissions debugLevel = Permissions.None)
-        {
-            Mail = mail;
-            Pwd = password;
-            IsAgbAcknowledged = isAgbAcknowledged;
-            SessionCookie = sessionCookie;
-            DebugLevel = debugLevel;
-            Group = bikeGroup != null
-                ? new HashSet<string>(bikeGroup).ToList()
-                : throw new ArgumentException("Can not instantiate account object. Reference to group list must not be empty.");
-        }
+		/// <summary> Constructs an account object.</summary>
+		/// <param name="mail">Mail address of the account holder.</param>
+		/// <param name="password">Password.</param>
+		/// <param name="sessionCookie">Session cookie from copri.</param>
+		/// <param name="bikeGroup">Group holdig info about Group (TINK, Konrad, ...)</param>
+		/// <param name="p_iDebugLevel">Flag which controls display of debug settings.</param>
+		public Account(
+			string mail,
+			string password,
+			bool isAgbAcknowledged,
+			string sessionCookie,
+			IEnumerable<string> bikeGroup,
+			Permissions debugLevel = Permissions.None)
+		{
+			Mail = mail;
+			Pwd = password;
+			IsAgbAcknowledged = isAgbAcknowledged;
+			SessionCookie = sessionCookie;
+			DebugLevel = debugLevel;
+			Group = bikeGroup != null
+				? new HashSet<string>(bikeGroup).ToList()
+				: throw new ArgumentException("Can not instantiate account object. Reference to group list must not be empty.");
+		}
 
-        public Account(IAccount source) : this(source?.Mail, source?.Pwd, source?.IsAgbAcknowledged ?? DEFAULTISAGBACKNOWLEDGED, source?.SessionCookie, source?.Group, source?.DebugLevel ?? Permissions.None)
-        {
-        }
+		public Account(IAccount source) : this(source?.Mail, source?.Pwd, source?.IsAgbAcknowledged ?? DEFAULTISAGBACKNOWLEDGED, source?.SessionCookie, source?.Group, source?.DebugLevel ?? Permissions.None)
+		{
+		}
 
-        /// <summary>Mail address of the account holder.</summary>
-        public string Mail { get; }
+		/// <summary>Mail address of the account holder.</summary>
+		public string Mail { get; }
 
-        /// <summary>Password of to authenticate.</summary>
-        public string Pwd { get; }
+		/// <summary>Password of to authenticate.</summary>
+		public string Pwd { get; }
 
-        /// <summary>True if user acknowleged agbs.</summary>
-        public bool IsAgbAcknowledged { get; }
+		/// <summary>True if user acknowleged agbs.</summary>
+		public bool IsAgbAcknowledged { get; }
 
-        /// <summary>Session cookie used to sign in to copri.</summary>
-        public string SessionCookie { get; }
+		/// <summary>Session cookie used to sign in to copri.</summary>
+		public string SessionCookie { get; }
 
-        /// <summary>Debug level used to determine which features are available.</summary>
-        public Permissions DebugLevel { get; }
+		/// <summary>Debug level used to determine which features are available.</summary>
+		public Permissions DebugLevel { get; }
 
-        /// <summary> Holds the group of the bike (TINK, Konrad, ...).</summary>
-        public IEnumerable<string> Group { get; }
-    }
+		/// <summary> Holds the group of the bike (TINK, Konrad, ...).</summary>
+		public IEnumerable<string> Group { get; }
+	}
 }
diff --git a/TINKLib/Model/User/Account/AccountExtensions.cs b/TINKLib/Model/User/Account/AccountExtensions.cs
index eb6ad2a..093929a 100644
--- a/TINKLib/Model/User/Account/AccountExtensions.cs
+++ b/TINKLib/Model/User/Account/AccountExtensions.cs
@@ -3,32 +3,32 @@ using TINK.Model.Connector.Filter;
 
 namespace TINK.Model.User.Account
 {
-    public static class AccountExtensions
-    {
-        /// <summary> Gets information whether user is logged in or not from account object. </summary>
-        /// <param name="account">Object to get information from.</param>
-        /// <returns>True if user is logged in, false if not.</returns>
-        public static bool GetIsLoggedIn(this IAccount account)
-        {
-            return !string.IsNullOrEmpty(account.Mail)
-                && !string.IsNullOrEmpty(account.SessionCookie);
-        }
+	public static class AccountExtensions
+	{
+		/// <summary> Gets information whether user is logged in or not from account object. </summary>
+		/// <param name="account">Object to get information from.</param>
+		/// <returns>True if user is logged in, false if not.</returns>
+		public static bool GetIsLoggedIn(this IAccount account)
+		{
+			return !string.IsNullOrEmpty(account.Mail)
+				&& !string.IsNullOrEmpty(account.SessionCookie);
+		}
 
-        /// <summary> 
-        /// Filters bike groups depending on whether user has access to all groups of bikes.
-        /// Some user may be "TINK"- user only, some "Konrad" and some may be "TINK" and "Konrad" users.
-        /// </summary>
-        /// <param name="account">Account to filter with.</param>
-        /// <param name="filter">Groups to filter.</param>
-        /// <returns>Filtered bike groups.</returns>
-        public static IEnumerable<string> DoFilter(
-            this IAccount account,
-            IEnumerable<string> filter)
-        {
+		/// <summary> 
+		/// Filters bike groups depending on whether user has access to all groups of bikes.
+		/// Some user may be "TINK"- user only, some "Konrad" and some may be "TINK" and "Konrad" users.
+		/// </summary>
+		/// <param name="account">Account to filter with.</param>
+		/// <param name="filter">Groups to filter.</param>
+		/// <returns>Filtered bike groups.</returns>
+		public static IEnumerable<string> DoFilter(
+			this IAccount account,
+			IEnumerable<string> filter)
+		{
 
-            return GetIsLoggedIn(account)
-                ? GroupFilterFactory.Create(account.Group).DoFilter(filter) // Filter if user is logged in.
-                : new NullGroupFilter().DoFilter(filter); // Do not filter if no user is logged in.
-        }
-    }
+			return GetIsLoggedIn(account)
+				? GroupFilterFactory.Create(account.Group).DoFilter(filter) // Filter if user is logged in.
+				: new NullGroupFilter().DoFilter(filter); // Do not filter if no user is logged in.
+		}
+	}
 }
diff --git a/TINKLib/Model/User/Account/AccountMutable.cs b/TINKLib/Model/User/Account/AccountMutable.cs
index 54c08f8..726ff02 100644
--- a/TINKLib/Model/User/Account/AccountMutable.cs
+++ b/TINKLib/Model/User/Account/AccountMutable.cs
@@ -2,72 +2,72 @@
 
 namespace TINK.Model.User.Account
 {
-    /// <summary>
-    /// Holds email address and password.
-    /// </summary>
-    public class AccountMutable : IAccount
-    {
-        /// <summary>
-        /// Holds the account data.
-        /// </summary>
-        private Account m_oAccount;
+	/// <summary>
+	/// Holds email address and password.
+	/// </summary>
+	public class AccountMutable : IAccount
+	{
+		/// <summary>
+		/// Holds the account data.
+		/// </summary>
+		private Account m_oAccount;
 
 
-        public AccountMutable(IAccount p_oSource)
-        {
-            m_oAccount = new Account(p_oSource);
-        }
+		public AccountMutable(IAccount p_oSource)
+		{
+			m_oAccount = new Account(p_oSource);
+		}
 
-        public void Copy(IAccount p_oSource)
-        {
-            m_oAccount = new Account(p_oSource);
-        }
+		public void Copy(IAccount p_oSource)
+		{
+			m_oAccount = new Account(p_oSource);
+		}
 
-        /// <summary>
-        /// Mail address.
-        /// </summary>
-        public string Mail
-        {
-            get { return m_oAccount.Mail; }
-            set { m_oAccount = new Account(value, m_oAccount.Pwd, m_oAccount.IsAgbAcknowledged, m_oAccount.SessionCookie, m_oAccount.Group, m_oAccount.DebugLevel); }
-        }
+		/// <summary>
+		/// Mail address.
+		/// </summary>
+		public string Mail
+		{
+			get { return m_oAccount.Mail; }
+			set { m_oAccount = new Account(value, m_oAccount.Pwd, m_oAccount.IsAgbAcknowledged, m_oAccount.SessionCookie, m_oAccount.Group, m_oAccount.DebugLevel); }
+		}
 
-        /// <summary>
-        /// Password of the account.
-        /// </summary>
-        public string Pwd
-        {
-            get { return m_oAccount.Pwd; }
-            set { m_oAccount = new Account(m_oAccount.Mail, value, m_oAccount.IsAgbAcknowledged, m_oAccount.SessionCookie, m_oAccount.Group, m_oAccount.DebugLevel); }
-        }
+		/// <summary>
+		/// Password of the account.
+		/// </summary>
+		public string Pwd
+		{
+			get { return m_oAccount.Pwd; }
+			set { m_oAccount = new Account(m_oAccount.Mail, value, m_oAccount.IsAgbAcknowledged, m_oAccount.SessionCookie, m_oAccount.Group, m_oAccount.DebugLevel); }
+		}
 
-        /// <summary>True if user acknowleged agbs.</summary>
-        public bool IsAgbAcknowledged => m_oAccount.IsAgbAcknowledged;
+		/// <summary>True if user acknowleged agbs.</summary>
+		public bool IsAgbAcknowledged => m_oAccount.IsAgbAcknowledged;
 
-        /// <summary>
-        /// Session cookie used to sign in to copri.
-        /// </summary>
-        public string SessionCookie
-        {
-            get { return m_oAccount.SessionCookie; }
-            set { m_oAccount = new Account(m_oAccount.Mail, m_oAccount.Pwd, m_oAccount.IsAgbAcknowledged, value, m_oAccount.Group, m_oAccount.DebugLevel); }
-        }
+		/// <summary>
+		/// Session cookie used to sign in to copri.
+		/// </summary>
+		public string SessionCookie
+		{
+			get { return m_oAccount.SessionCookie; }
+			set { m_oAccount = new Account(m_oAccount.Mail, m_oAccount.Pwd, m_oAccount.IsAgbAcknowledged, value, m_oAccount.Group, m_oAccount.DebugLevel); }
+		}
 
-        /// <summary> 
-        /// Holds the group of the bike (TINK, Konrad, ...).
-        /// </summary>
-        public IEnumerable<string> Group
-        {
-            get { return m_oAccount.Group; }
-        }
+		/// <summary> 
+		/// Holds the group of the bike (TINK, Konrad, ...).
+		/// </summary>
+		public IEnumerable<string> Group
+		{
+			get { return m_oAccount.Group; }
+		}
 
-        /// <summary>
-        /// Debug level used to determine which features are available.
-        /// </summary>
-        public Permissions DebugLevel
-        {
-            get { return m_oAccount.DebugLevel; }
-            set { m_oAccount = new Account(m_oAccount.Mail, m_oAccount.Pwd, m_oAccount.IsAgbAcknowledged, m_oAccount.SessionCookie, m_oAccount.Group, value); }
-        }
-    }
+		/// <summary>
+		/// Debug level used to determine which features are available.
+		/// </summary>
+		public Permissions DebugLevel
+		{
+			get { return m_oAccount.DebugLevel; }
+			set { m_oAccount = new Account(m_oAccount.Mail, m_oAccount.Pwd, m_oAccount.IsAgbAcknowledged, m_oAccount.SessionCookie, m_oAccount.Group, value); }
+		}
+	}
 }
diff --git a/TINKLib/Model/User/Account/EmptyAccount.cs b/TINKLib/Model/User/Account/EmptyAccount.cs
index 12e164f..1502065 100644
--- a/TINKLib/Model/User/Account/EmptyAccount.cs
+++ b/TINKLib/Model/User/Account/EmptyAccount.cs
@@ -2,19 +2,19 @@
 
 namespace TINK.Model.User.Account
 {
-    /// <summary> Represents an empty account.</summary>
-    public class EmptyAccount : IAccount
-    {
-        public string Mail => null;
+	/// <summary> Represents an empty account.</summary>
+	public class EmptyAccount : IAccount
+	{
+		public string Mail => null;
 
-        public string Pwd => null;
+		public string Pwd => null;
 
-        public bool IsAgbAcknowledged => false;
+		public bool IsAgbAcknowledged => false;
 
-        public string SessionCookie => null;
+		public string SessionCookie => null;
 
-        public Permissions DebugLevel => Permissions.None;
+		public Permissions DebugLevel => Permissions.None;
 
-        public IEnumerable<string> Group => new List<string>();
-    }
+		public IEnumerable<string> Group => new List<string>();
+	}
 }
diff --git a/TINKLib/Model/User/Account/IAccount.cs b/TINKLib/Model/User/Account/IAccount.cs
index d0b8166..e0c603f 100644
--- a/TINKLib/Model/User/Account/IAccount.cs
+++ b/TINKLib/Model/User/Account/IAccount.cs
@@ -2,27 +2,27 @@
 
 namespace TINK.Model.User.Account
 {
-    /// <summary>
-    /// Holds account data.
-    /// </summary>
-    public interface IAccount
-    {
-        /// <summary>Mail address.</summary>
-        string Mail { get; }
+	/// <summary>
+	/// Holds account data.
+	/// </summary>
+	public interface IAccount
+	{
+		/// <summary>Mail address.</summary>
+		string Mail { get; }
 
-        /// <summary>Password of the account.</summary>
-        string Pwd { get; }
+		/// <summary>Password of the account.</summary>
+		string Pwd { get; }
 
-        /// <summary>True if user acknowleged agbs.</summary>
-        bool IsAgbAcknowledged { get; }
+		/// <summary>True if user acknowleged agbs.</summary>
+		bool IsAgbAcknowledged { get; }
 
-        /// <summary>Session cookie used to sign in to copri.</summary>
-        string SessionCookie { get; }
+		/// <summary>Session cookie used to sign in to copri.</summary>
+		string SessionCookie { get; }
 
-        /// <summary>Debug level used to determine which features are available.</summary>
-        Permissions DebugLevel { get; }
+		/// <summary>Debug level used to determine which features are available.</summary>
+		Permissions DebugLevel { get; }
 
-        /// <summary> Holds the group of the bike (TINK, Konrad, ...).</summary>
-        IEnumerable<string> Group { get; }
-    }
+		/// <summary> Holds the group of the bike (TINK, Konrad, ...).</summary>
+		IEnumerable<string> Group { get; }
+	}
 }
diff --git a/TINKLib/Model/User/Account/IStore.cs b/TINKLib/Model/User/Account/IStore.cs
index 5cd95c5..ac88119 100644
--- a/TINKLib/Model/User/Account/IStore.cs
+++ b/TINKLib/Model/User/Account/IStore.cs
@@ -2,25 +2,25 @@
 
 namespace TINK.Model.User.Account
 {
-    /// <summary>Interface to manage an account store.</summary>
-    public interface IStore
-    {
-        /// <summary>
-        /// Reads mail address and password from account store.
-        /// </summary>
-        /// <returns></returns>
-        Task<IAccount> Load();
+	/// <summary>Interface to manage an account store.</summary>
+	public interface IStore
+	{
+		/// <summary>
+		/// Reads mail address and password from account store.
+		/// </summary>
+		/// <returns></returns>
+		Task<IAccount> Load();
 
-        /// <summary>
-        /// Writes mail address and password to account store.
-        /// </summary>
-        /// <param name="mailAndPwd"></param>
-        Task Save(IAccount mailAndPwd);
+		/// <summary>
+		/// Writes mail address and password to account store.
+		/// </summary>
+		/// <param name="mailAndPwd"></param>
+		Task Save(IAccount mailAndPwd);
 
-        /// <summary>
-        /// Deletes mail address and password from account store.
-        /// </summary>
-        /// <returns> Empty account instance if deleting succeeded.</returns>
-        IAccount Delete(IAccount mailAndPwd);
-    }
+		/// <summary>
+		/// Deletes mail address and password from account store.
+		/// </summary>
+		/// <returns> Empty account instance if deleting succeeded.</returns>
+		IAccount Delete(IAccount mailAndPwd);
+	}
 }
diff --git a/TINKLib/Model/User/Account/Store.cs b/TINKLib/Model/User/Account/Store.cs
index 0823ff6..cccf2c3 100644
--- a/TINKLib/Model/User/Account/Store.cs
+++ b/TINKLib/Model/User/Account/Store.cs
@@ -6,68 +6,68 @@ using Xamarin.Essentials;
 
 namespace TINK.Model.User.Account
 {
-    public class Store : IStore
-    {
-        /// <summary> Holds id of the debug level key. </summary>
-        private const string KEY_DEBUGLEVEL = "DebugLevel";
+	public class Store : IStore
+	{
+		/// <summary> Holds id of the debug level key. </summary>
+		private const string KEY_DEBUGLEVEL = "DebugLevel";
 
-        /// <summary> Holds the id of the session. </summary>
-        private const string KEY_SESSIONCOOKIE = "SessionCookie";
+		/// <summary> Holds the id of the session. </summary>
+		private const string KEY_SESSIONCOOKIE = "SessionCookie";
 
-        /// <summary> Holds id of the mail address key. </summary>
-        private const string KEY_MAILADDRESS = "MailAddress";
+		/// <summary> Holds id of the mail address key. </summary>
+		private const string KEY_MAILADDRESS = "MailAddress";
 
-        /// <summary> Holds key for flag is agb acknowledged. </summary>
-        private const string KEY_ISAGBACKNOWLEDGED = "IsAgbAcknowledged";
+		/// <summary> Holds key for flag is agb acknowledged. </summary>
+		private const string KEY_ISAGBACKNOWLEDGED = "IsAgbAcknowledged";
 
-        public IAccount Delete(IAccount account)
-        {
-            SecureStorage.RemoveAll();
-            return new EmptyAccount();
-        }
+		public IAccount Delete(IAccount account)
+		{
+			SecureStorage.RemoveAll();
+			return new EmptyAccount();
+		}
 
-        public async Task<IAccount> Load()
-        {
+		public async Task<IAccount> Load()
+		{
 
-            var mail = string.Empty;
-            var isAgbAcknowledged = Account.DEFAULTISAGBACKNOWLEDGED;
-            var sessionCookie = string.Empty;
-            var debugLevel = Permissions.None;
+			var mail = string.Empty;
+			var isAgbAcknowledged = Account.DEFAULTISAGBACKNOWLEDGED;
+			var sessionCookie = string.Empty;
+			var debugLevel = Permissions.None;
 
-            try
-            {
-                mail = await SecureStorage.GetAsync(KEY_MAILADDRESS);
-                bool.TryParse(await SecureStorage.GetAsync(KEY_ISAGBACKNOWLEDGED), out isAgbAcknowledged);
-                sessionCookie = await SecureStorage.GetAsync(KEY_SESSIONCOOKIE);
-                Enum.TryParse(await SecureStorage.GetAsync(KEY_DEBUGLEVEL), out debugLevel);
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<Store>().Error("Loading account from store failed. {Exception}", exception);
-            }
+			try
+			{
+				mail = await SecureStorage.GetAsync(KEY_MAILADDRESS);
+				bool.TryParse(await SecureStorage.GetAsync(KEY_ISAGBACKNOWLEDGED), out isAgbAcknowledged);
+				sessionCookie = await SecureStorage.GetAsync(KEY_SESSIONCOOKIE);
+				Enum.TryParse(await SecureStorage.GetAsync(KEY_DEBUGLEVEL), out debugLevel);
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<Store>().Error("Loading account from store failed. {Exception}", exception);
+			}
 
-            return new Account(
-                mail,
-                string.Empty,
-                isAgbAcknowledged,
-                sessionCookie,
-                new List<string>(),
-                debugLevel);
-        }
+			return new Account(
+				mail,
+				string.Empty,
+				isAgbAcknowledged,
+				sessionCookie,
+				new List<string>(),
+				debugLevel);
+		}
 
-        public async Task Save(IAccount mailAndPwd)
-        {
-            try
-            {
-                await SecureStorage.SetAsync(KEY_MAILADDRESS, mailAndPwd.Mail);
-                await SecureStorage.SetAsync(KEY_ISAGBACKNOWLEDGED, mailAndPwd.IsAgbAcknowledged.ToString());
-                await SecureStorage.SetAsync(KEY_SESSIONCOOKIE, mailAndPwd.SessionCookie);
-                await SecureStorage.SetAsync(KEY_DEBUGLEVEL, mailAndPwd.DebugLevel.ToString());
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<Store>().Error("Saving account from store failed. {Exception}", exception);
-            }
-        }
-    }
+		public async Task Save(IAccount mailAndPwd)
+		{
+			try
+			{
+				await SecureStorage.SetAsync(KEY_MAILADDRESS, mailAndPwd.Mail);
+				await SecureStorage.SetAsync(KEY_ISAGBACKNOWLEDGED, mailAndPwd.IsAgbAcknowledged.ToString());
+				await SecureStorage.SetAsync(KEY_SESSIONCOOKIE, mailAndPwd.SessionCookie);
+				await SecureStorage.SetAsync(KEY_DEBUGLEVEL, mailAndPwd.DebugLevel.ToString());
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<Store>().Error("Saving account from store failed. {Exception}", exception);
+			}
+		}
+	}
 }
diff --git a/TINKLib/Model/User/Account/Validator.cs b/TINKLib/Model/User/Account/Validator.cs
index 0bc02b0..675432a 100644
--- a/TINKLib/Model/User/Account/Validator.cs
+++ b/TINKLib/Model/User/Account/Validator.cs
@@ -4,164 +4,164 @@ using System.Linq;
 
 namespace TINK.Model.User.Account
 {
-    /// <summary>
-    /// Holds the state of mail and password and information about some invalid parts if there are.
-    /// </summary>
-    public class State
-    {
-        /// <summary>
-        /// Consider state to be invalid after construction.
-        /// </summary>
-        private Elements m_eElements = Elements.None;
+	/// <summary>
+	/// Holds the state of mail and password and information about some invalid parts if there are.
+	/// </summary>
+	public class State
+	{
+		/// <summary>
+		/// Consider state to be invalid after construction.
+		/// </summary>
+		private Elements m_eElements = Elements.None;
 
-        private Dictionary<Elements, string> m_oDescription = new Dictionary<Elements, string>();
+		private Dictionary<Elements, string> m_oDescription = new Dictionary<Elements, string>();
 
-        /// <summary>
-        /// Constructs object to state all entries are valid.
-        /// </summary>
-        public State()
-        {
-            m_eElements = Elements.Account;
+		/// <summary>
+		/// Constructs object to state all entries are valid.
+		/// </summary>
+		public State()
+		{
+			m_eElements = Elements.Account;
 
-            m_oDescription = new Dictionary<Elements, string>
-            {
-                { Elements.None, string.Empty },
-                { Elements.Account, string.Empty }
-            };
-        }
+			m_oDescription = new Dictionary<Elements, string>
+			{
+				{ Elements.None, string.Empty },
+				{ Elements.Account, string.Empty }
+			};
+		}
 
-        /// <summary>
-        /// Constructs object to state some/ all elements are invalid.
-        /// </summary>
-        /// <param name="p_oValidParts">Specifies the parts which are invalid.</param>
-        /// <param name="p_oDescription">Description of invalid parts.</param>
-        public State(Elements p_oValidParts, Dictionary<Elements, string> p_oDescription)
-        {
-            m_eElements = p_oValidParts;
+		/// <summary>
+		/// Constructs object to state some/ all elements are invalid.
+		/// </summary>
+		/// <param name="p_oValidParts">Specifies the parts which are invalid.</param>
+		/// <param name="p_oDescription">Description of invalid parts.</param>
+		public State(Elements p_oValidParts, Dictionary<Elements, string> p_oDescription)
+		{
+			m_eElements = p_oValidParts;
 
-            m_oDescription = p_oDescription ?? new Dictionary<Elements, string>();
+			m_oDescription = p_oDescription ?? new Dictionary<Elements, string>();
 
-            // Ensure consistency
-            foreach (Elements l_oElement in Enum.GetValues(typeof(Elements)))
-            {
-                if (!m_oDescription.ContainsKey(l_oElement))
-                {
-                    switch (l_oElement)
-                    {
-                        case Elements.Account:
-                        case Elements.None:
-                            continue;
+			// Ensure consistency
+			foreach (Elements l_oElement in Enum.GetValues(typeof(Elements)))
+			{
+				if (!m_oDescription.ContainsKey(l_oElement))
+				{
+					switch (l_oElement)
+					{
+						case Elements.Account:
+						case Elements.None:
+							continue;
 
-                    }
+					}
 
-                    m_oDescription.Add(l_oElement, string.Empty);
-                }
-            }
-        }
+					m_oDescription.Add(l_oElement, string.Empty);
+				}
+			}
+		}
 
-        /// <summary>
-        /// True if account is valid.
-        /// </summary>
-        public bool IsValid { get { return ValidElement == Elements.Account; } }
+		/// <summary>
+		/// True if account is valid.
+		/// </summary>
+		public bool IsValid { get { return ValidElement == Elements.Account; } }
 
-        /// <summary>
-        /// Specifies if both mail and password are valid, one of them or none.
-        /// </summary>
-        public Elements ValidElement
-        {
-            get
-            {
-                return m_eElements;
-            }
-        }
+		/// <summary>
+		/// Specifies if both mail and password are valid, one of them or none.
+		/// </summary>
+		public Elements ValidElement
+		{
+			get
+			{
+				return m_eElements;
+			}
+		}
 
-        /// <summary>
-        /// Holds the message about invalid elements.
-        /// </summary>
-        public Dictionary<Elements, string> Description
-        {
-            get
-            {
-                var l_oUserFriendlyDescription = new Dictionary<Elements, string>();
-                foreach (Elements l_oElement in Enum.GetValues(typeof(Elements)))
-                {
-                    switch (l_oElement)
-                    {
-                        case Elements.Account:
-                        case Elements.None:
-                            continue;
+		/// <summary>
+		/// Holds the message about invalid elements.
+		/// </summary>
+		public Dictionary<Elements, string> Description
+		{
+			get
+			{
+				var l_oUserFriendlyDescription = new Dictionary<Elements, string>();
+				foreach (Elements l_oElement in Enum.GetValues(typeof(Elements)))
+				{
+					switch (l_oElement)
+					{
+						case Elements.Account:
+						case Elements.None:
+							continue;
 
-                    }
+					}
 
-                    l_oUserFriendlyDescription.Add(
-                        l_oElement,
-                        m_oDescription.ContainsKey(l_oElement) ? m_oDescription[l_oElement] : string.Empty);
-                }
+					l_oUserFriendlyDescription.Add(
+						l_oElement,
+						m_oDescription.ContainsKey(l_oElement) ? m_oDescription[l_oElement] : string.Empty);
+				}
 
-                l_oUserFriendlyDescription.Add(
-                    Elements.Account,
-                    string.Join(";", l_oUserFriendlyDescription.Where(x => x.Value.Length > 0).Select(x => x.Value).ToArray()));
+				l_oUserFriendlyDescription.Add(
+					Elements.Account,
+					string.Join(";", l_oUserFriendlyDescription.Where(x => x.Value.Length > 0).Select(x => x.Value).ToArray()));
 
-                return l_oUserFriendlyDescription;
-            }
-        }
-    }
+				return l_oUserFriendlyDescription;
+			}
+		}
+	}
 
-    /// <summary>
-    /// Verifies if a password is valid or not.
-    /// </summary>
-    /// <param name="p_strMail"></param>
-    /// <param name="p_strPassword"></param>
-    /// <returns></returns>
-    public delegate State PasswordValidator(string p_strMail, string p_strPassword);
+	/// <summary>
+	/// Verifies if a password is valid or not.
+	/// </summary>
+	/// <param name="p_strMail"></param>
+	/// <param name="p_strPassword"></param>
+	/// <returns></returns>
+	public delegate State PasswordValidator(string p_strMail, string p_strPassword);
 
-    public static class Validator
-    {
-        public static State ValidateMailAndPasswordDelegate(string p_strMail, string p_strPassword)
-        {
-            var l_oElements = Elements.None;
-            var l_oDescription = new Dictionary<Elements, string>();
+	public static class Validator
+	{
+		public static State ValidateMailAndPasswordDelegate(string p_strMail, string p_strPassword)
+		{
+			var l_oElements = Elements.None;
+			var l_oDescription = new Dictionary<Elements, string>();
 
-            // Validate mail address.
-            if (string.IsNullOrEmpty(p_strMail))
-            {
-                l_oDescription.Add(Elements.Mail, "Email Addresse darf nicht leer sein.");
-            }
-            else if (p_strMail.ToString().Split('@').Length < 2)
-            {
-                l_oDescription.Add(Elements.Mail, "Email Adresse mit Zeichen \"@\" enthalten.");
-            }
-            else if (p_strMail.ToString().Split('@')[0].Length <= 0)
-            {
-                l_oDescription.Add(Elements.Mail, "Benutzername in Email Adresse darf nicht leer sein.");
-            }
-            else if (p_strMail.ToString().Split('@')[1].Length <= 0)
-            {
-                // Data has been entered
-                l_oDescription.Add(Elements.Mail, "Domain- Name in Email Adresse darf nicht leer sein.");
-            }
-            else
-            {
-                // Input mail address is ok
-                l_oElements = Elements.Mail;
-                l_oDescription.Add(Elements.Mail, string.Empty);
-            }
+			// Validate mail address.
+			if (string.IsNullOrEmpty(p_strMail))
+			{
+				l_oDescription.Add(Elements.Mail, "Email Addresse darf nicht leer sein.");
+			}
+			else if (p_strMail.ToString().Split('@').Length < 2)
+			{
+				l_oDescription.Add(Elements.Mail, "Email Adresse mit Zeichen \"@\" enthalten.");
+			}
+			else if (p_strMail.ToString().Split('@')[0].Length <= 0)
+			{
+				l_oDescription.Add(Elements.Mail, "Benutzername in Email Adresse darf nicht leer sein.");
+			}
+			else if (p_strMail.ToString().Split('@')[1].Length <= 0)
+			{
+				// Data has been entered
+				l_oDescription.Add(Elements.Mail, "Domain- Name in Email Adresse darf nicht leer sein.");
+			}
+			else
+			{
+				// Input mail address is ok
+				l_oElements = Elements.Mail;
+				l_oDescription.Add(Elements.Mail, string.Empty);
+			}
 
-            // Validate password.
-            if (string.IsNullOrEmpty(p_strPassword) || p_strPassword.Length < 8)
-            {
-                // Data has been entered
-                l_oDescription.Add(Elements.Password, "Passwort is zu kurz.");
-            }
-            else
-            {
-                // Password is ok
-                l_oElements |= Elements.Password;
-                l_oDescription.Add(Elements.Password, string.Empty);
-            }
+			// Validate password.
+			if (string.IsNullOrEmpty(p_strPassword) || p_strPassword.Length < 8)
+			{
+				// Data has been entered
+				l_oDescription.Add(Elements.Password, "Passwort is zu kurz.");
+			}
+			else
+			{
+				// Password is ok
+				l_oElements |= Elements.Password;
+				l_oDescription.Add(Elements.Password, string.Empty);
+			}
 
-            return new State(l_oElements, l_oDescription);
-        }
-    }
+			return new State(l_oElements, l_oDescription);
+		}
+	}
 
 }
diff --git a/TINKLib/Model/User/IUser.cs b/TINKLib/Model/User/IUser.cs
index eaa0fba..28258fb 100644
--- a/TINKLib/Model/User/IUser.cs
+++ b/TINKLib/Model/User/IUser.cs
@@ -2,15 +2,15 @@
 
 namespace TINK.Model.User
 {
-    public interface IUser
-    {
-        /// <summary> Holds a value indicating whether user is logged in or not.</summary>
-        bool IsLoggedIn { get; }
+	public interface IUser
+	{
+		/// <summary> Holds a value indicating whether user is logged in or not.</summary>
+		bool IsLoggedIn { get; }
 
-        /// <summary> Holds the mail address. </summary>
-        string Mail { get; }
+		/// <summary> Holds the mail address. </summary>
+		string Mail { get; }
 
-        /// <summary>Holds the debug level.</summary>
-        Permissions DebugLevel { get; }
-    }
+		/// <summary>Holds the debug level.</summary>
+		Permissions DebugLevel { get; }
+	}
 }
diff --git a/TINKLib/Model/User/User.cs b/TINKLib/Model/User/User.cs
index a02d04e..d48c9ff 100644
--- a/TINKLib/Model/User/User.cs
+++ b/TINKLib/Model/User/User.cs
@@ -5,144 +5,144 @@ using TINK.Model.User.Account;
 
 namespace TINK.Model.User
 {
-    public delegate void LoginStateChangedDelegate(object p_oSender, EventArgs p_oEventArgs);
+	public delegate void LoginStateChangedDelegate(object p_oSender, EventArgs p_oEventArgs);
 
 
-    /// <summary>
-    /// Manages user of the app.
-    /// </summary>
-    public class User : IUser
-    {
-        /// <summary> Holds account data. </summary>
-        private AccountMutable Account { get; }
+	/// <summary>
+	/// Manages user of the app.
+	/// </summary>
+	public class User : IUser
+	{
+		/// <summary> Holds account data. </summary>
+		private AccountMutable Account { get; }
 
-        /// <summary>
-        /// Provides storing functionality.
-        /// </summary>
-        private IStore Store { get; }
+		/// <summary>
+		/// Provides storing functionality.
+		/// </summary>
+		private IStore Store { get; }
 
-        /// <summary> Holds the id of the device. </summary>
-        public string DeviceId { get; }
+		/// <summary> Holds the id of the device. </summary>
+		public string DeviceId { get; }
 
-        /// Loads user name and passwort from account store.
-        /// </summary>
-        /// <param name="p_oAccountStore"> Object to use for loading and saving user data.</param>
-        public User(
-            IStore accountStore,
-            IAccount account,
-            string deviceId)
-        {
-            Store = accountStore
-                ?? throw new ArgumentException("Can not instantiate user- object. No store functionality available.");
-            DeviceId = deviceId;
-            Account = new AccountMutable(account);
-        }
+		/// Loads user name and passwort from account store.
+		/// </summary>
+		/// <param name="p_oAccountStore"> Object to use for loading and saving user data.</param>
+		public User(
+			IStore accountStore,
+			IAccount account,
+			string deviceId)
+		{
+			Store = accountStore
+				?? throw new ArgumentException("Can not instantiate user- object. No store functionality available.");
+			DeviceId = deviceId;
+			Account = new AccountMutable(account);
+		}
 
-        /// <summary> Is fired wheneverlogin state changes. </summary>
-        public event LoginStateChangedDelegate StateChanged;
+		/// <summary> Is fired wheneverlogin state changes. </summary>
+		public event LoginStateChangedDelegate StateChanged;
 
-        /// <summary>
-        /// Holds a value indicating whether user is logged in or not.
-        /// </summary>
-        public bool IsLoggedIn => Account.GetIsLoggedIn();
+		/// <summary>
+		/// Holds a value indicating whether user is logged in or not.
+		/// </summary>
+		public bool IsLoggedIn => Account.GetIsLoggedIn();
 
-        /// <summary>
-        /// Holds the mail address.
-        /// </summary>
-        public string Mail
-        {
-            get { return Account.Mail; }
-        }
+		/// <summary>
+		/// Holds the mail address.
+		/// </summary>
+		public string Mail
+		{
+			get { return Account.Mail; }
+		}
 
-        /// <summary>
-        /// Gets the sessiong cookie.
-        /// </summary>
-        public string SessionCookie
-        {
-            get { return Account.SessionCookie; }
-        }
-        /// <summary>
-        /// Holds the password.
-        /// </summary>
-        public string Password
-        {
-            get { return Account.Pwd; }
-        }
+		/// <summary>
+		/// Gets the sessiong cookie.
+		/// </summary>
+		public string SessionCookie
+		{
+			get { return Account.SessionCookie; }
+		}
+		/// <summary>
+		/// Holds the password.
+		/// </summary>
+		public string Password
+		{
+			get { return Account.Pwd; }
+		}
 
-        /// <summary>Holds the debug level.</summary>
-        public Permissions DebugLevel
-        {
-            get { return Account.DebugLevel; }
-        }
+		/// <summary>Holds the debug level.</summary>
+		public Permissions DebugLevel
+		{
+			get { return Account.DebugLevel; }
+		}
 
-        /// <summary> Holds the group of the bike (TINK, Konrad, ...).</summary>
-        public IEnumerable<string> Group { get { return Account.Group; } }
+		/// <summary> Holds the group of the bike (TINK, Konrad, ...).</summary>
+		public IEnumerable<string> Group { get { return Account.Group; } }
 
-        /// <summary> Logs in user. </summary>
-        /// <param name="p_oAccount">Account to use for login.</param>
-        /// <param name="p_str_DeviceId">Holds the Id to identify the device.</param>
-        /// <param name="isConnected">True if connector has access to copri server, false if cached values are used.</param>
-        public void CheckIsPasswordValid(string mail, string password)
-        {
-            if (IsLoggedIn)
-            {
-                throw new Exception($"Can not log in user {mail} because user {Account} is already logged in.");
-            }
+		/// <summary> Logs in user. </summary>
+		/// <param name="p_oAccount">Account to use for login.</param>
+		/// <param name="p_str_DeviceId">Holds the Id to identify the device.</param>
+		/// <param name="isConnected">True if connector has access to copri server, false if cached values are used.</param>
+		public void CheckIsPasswordValid(string mail, string password)
+		{
+			if (IsLoggedIn)
+			{
+				throw new Exception($"Can not log in user {mail} because user {Account} is already logged in.");
+			}
 
-            // Check if password might be valid before connecting to copri.
-            var l_oResult = Validator.ValidateMailAndPasswordDelegate(mail, password);
+			// Check if password might be valid before connecting to copri.
+			var l_oResult = Validator.ValidateMailAndPasswordDelegate(mail, password);
 
-            if (!l_oResult.IsValid)
-            {
-                // Password is not valid.
-                throw new ArgumentException(l_oResult.Description[Elements.Account]);
-            }
-        }
+			if (!l_oResult.IsValid)
+			{
+				// Password is not valid.
+				throw new ArgumentException(l_oResult.Description[Elements.Account]);
+			}
+		}
 
-        /// <summary> Logs in user. </summary>
-        /// <param name="p_oAccount">Account to use for login.</param>
-        /// <param name="p_str_DeviceId">Holds the Id to identify the device.</param>
-        /// <param name="isConnected">True if connector has access to copri server, false if cached values are used.</param>
-        public async Task Login(IAccount account)
-        {
-            // Update account instance from copri data.
-            Account.Copy(account);
+		/// <summary> Logs in user. </summary>
+		/// <param name="p_oAccount">Account to use for login.</param>
+		/// <param name="p_str_DeviceId">Holds the Id to identify the device.</param>
+		/// <param name="isConnected">True if connector has access to copri server, false if cached values are used.</param>
+		public async Task Login(IAccount account)
+		{
+			// Update account instance from copri data.
+			Account.Copy(account);
 
-            // Save data to store.
-            await Store.Save(Account);
+			// Save data to store.
+			await Store.Save(Account);
 
-            // Nothing to do because state did not change.
-            StateChanged?.Invoke(this, new EventArgs());
-        }
+			// Nothing to do because state did not change.
+			StateChanged?.Invoke(this, new EventArgs());
+		}
 
-        /// <summary> Logs in user</summary>
-        /// <returns></returns>
-        public void Logout()
-        {
-            var l_oPreviousState = IsLoggedIn;
+		/// <summary> Logs in user</summary>
+		/// <returns></returns>
+		public void Logout()
+		{
+			var l_oPreviousState = IsLoggedIn;
 
-            Account.Copy(Store.Delete(Account));
+			Account.Copy(Store.Delete(Account));
 
-            if (IsLoggedIn == l_oPreviousState)
-            {
-                // Nothing to do because state did not change.
-                return;
-            }
+			if (IsLoggedIn == l_oPreviousState)
+			{
+				// Nothing to do because state did not change.
+				return;
+			}
 
-            StateChanged?.Invoke(this, new EventArgs());
-        }
+			StateChanged?.Invoke(this, new EventArgs());
+		}
 
-        /// <summary> 
-        /// Filters bike groups depending on whether user has access to all groups of bikes.
-        /// Some user may be "TINK"- user only, some "Konrad" and some may be "TINK" and "Konrad" users.
-        /// </summary>
-        /// <param name="p_oAccount">Account to filter with.</param>
-        /// <param name="source">Groups to filter..</param>
-        /// <returns>Filtered bike groups.</returns>
-        public IEnumerable<string> DoFilter(IEnumerable<string> source = null)
-        {
-            return Account.DoFilter(source);
-        }
-    }
+		/// <summary> 
+		/// Filters bike groups depending on whether user has access to all groups of bikes.
+		/// Some user may be "TINK"- user only, some "Konrad" and some may be "TINK" and "Konrad" users.
+		/// </summary>
+		/// <param name="p_oAccount">Account to filter with.</param>
+		/// <param name="source">Groups to filter..</param>
+		/// <returns>Filtered bike groups.</returns>
+		public IEnumerable<string> DoFilter(IEnumerable<string> source = null)
+		{
+			return Account.DoFilter(source);
+		}
+	}
 }
 
diff --git a/TINKLib/Model/User/UsernamePasswordInvalidException.cs b/TINKLib/Model/User/UsernamePasswordInvalidException.cs
index 1e7b916..904a77e 100644
--- a/TINKLib/Model/User/UsernamePasswordInvalidException.cs
+++ b/TINKLib/Model/User/UsernamePasswordInvalidException.cs
@@ -2,10 +2,10 @@
 
 namespace TINK.Model.User
 {
-    public class UsernamePasswordInvalidException : Exception
-    {
-        public UsernamePasswordInvalidException() : base("Benutzername und/ oder Passwort sind ungültig. Cookie ist leer.")
-        {
-        }
-    }
+	public class UsernamePasswordInvalidException : Exception
+	{
+		public UsernamePasswordInvalidException() : base("Benutzername und/ oder Passwort sind ungültig. Cookie ist leer.")
+		{
+		}
+	}
 }
diff --git a/TINKLib/Model/WhatsNew.cs b/TINKLib/Model/WhatsNew.cs
index a27d390..42829c5 100644
--- a/TINKLib/Model/WhatsNew.cs
+++ b/TINKLib/Model/WhatsNew.cs
@@ -5,630 +5,640 @@ using Xamarin.Essentials;
 
 namespace TINK.Model
 {
-    /// <summary> Holds information about app development (whats new messages) and info whenther AGB have to be shown or not. </summary>
-    public class WhatsNew
-    {
-        private static readonly Version AGBMODIFIEDBUILD = new Version(3, 0, 131);
+	/// <summary> Holds information about app development (whats new messages) and info whenther AGB have to be shown or not. </summary>
+	public class WhatsNew
+	{
+		private static readonly Version AGBMODIFIEDBUILD = new Version(3, 0, 131);
 
-        /// <summary>Change of of think App.</summary>
-        public static WhatsNewMessages AllFlavorsAndPlatformMessages = new WhatsNewMessages
-            {
-                {
-                    new Version(3, 0, 0, 115),
-                    "Benutzeroberfläche verbessert.\r\n\r\n"
-                },
-                {
-                    new Version(3, 0, 120),
-                    "Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\n" +
-                        "Offlineanzeige Stationen/ Räderinfo.\r\n\r\n"
-                },
-                {
-                    AGBMODIFIEDBUILD,
-                    "Neue Seiten eingebaut\r\n" +
-                    "-zum erstmaligem Registrieren\r\n" +
-                    "-zur Verwaltung des Benutzerkontos\r\n" +
-                    "-zum Zurücksetzen des Passworts\r\n" +
-                    "\r\n" +
-                    "Anzeige Verbindungsstatus auf den Seiten\r\n" +
-                    "-Kartenansicht Fahrradstandorte\r\n" +
-                    "-Fahrräder an Station\r\n" +
-                    "-Meine Fahrräder\r\n\r\n"
-                },
-                {
-                    new Version(3, 0, 137),
-                    "Verschiedene kleine Verbesserungen und Korrekturen.\r\n"
-                },
-                {
-                    new Version(3, 0, 141),
-                    "Erste I LOCK IT Unterstützung.\r\n" +
-                    "Erweiterte Optionen: Zwei Schlosssimulationen.\r\n"
-                },
-                {
-                    new Version(3, 0, 142),
-                    "Sharee Server verfügbar.\r\n"
-                },
-                {
-                    new Version(3, 0, 143),
-                    "Geolocation wird am Gerät abgefragt.\r\n" +
-                    "Erweiterte Optionen: Genauer Standort kann abgefragt werden, Standortsimulation verfügbar.\r\n"
-                },
-                {
-                    new Version(3, 0, 144),
-                    "Diverse Fehler behoben.\r\n" +
-                    "Erweiterte Optionen: Texte Auswahlboxen für Copri-Server, Schlosssteuerung und Geolocation verständlicher gemacht.\r\n"
-                },
-                {
-                    new Version(3, 0, 145),
-                    "Kleine Fehler behoben.\r\n" +
-                    "Erweiterte Option ein/ ausschalten \"Karte auf aktuelle Position ausrichten\" hinzugefügt.\r\n" +
-                    "Für gemietete Räder ausserhalb der Reichweite wird Knof \"Schloss suchen\" angezeigt."
-                },
-                {
-                    new Version(3, 0, 146),
-                    "Fehler behoben: Aktion Schloss schließen wird jetzt durchgeführt.\r\n" +
-                    "Benennung: \"Miete weiterführen\" -> \"Miete fortsetzen\".\r\n"
-                },
-                {
-                    new Version(3, 0, 147),
-                    "Erste prototypische Unterstützung des ILOCKIT-Schlosses.\r\n"
-                },
-                {
-                    new Version(3, 0, 148),
-                    "Schloss-Guid wird an CORI bei Buchung übermittelt.\r\n"
-                },
-                {
-                    new Version(3, 0, 149),
-                    "Schlösser mit neuem Advertisement-Name ISHAREIT+XXXXXXX unterstützt.\r\n"
-                },
-                {
-                    new Version(3, 0, 150),
-                    "Verbesserung: Schlossstatus wird nach Öffnen/ Schließen abgefragt.\r\n"
-                },
-                {
-                    new Version(3, 0, 151),
-                    "Verbesserungen:\r\n" +
-                    "Erweiterte Optionen: Auswahl, ob log-Dateien auf internem Speicher oder SD-Karte abgelegt werden, ist konfigurierbar.\r\n" +
-                    "Leistung: Suche nach Bluetooth Schlössern deutlich beschleunigt.\r\n" +
-                    "Kleine Textkorrekturen.\r\n." +
-                    "Fehlerbehebung: Schloss kann direkt nach Reservierung geöffnet werden.\r\n"
-                },
-                {
-                    new Version(3, 0, 152),
-                    "Verbesserungen: Aufforderung zum Aktivieren von Bluetooth beim Öffnen der Seiten Meine Räder und Räder an Station implementiert.\r\n" +
-                    "Fehlerbehebung: Seite Meine Räder kann auch geöffnet werden, ohne dass Räder reserviert oder gemietet sein müssen.\r\n"
-                },
-                {
-                    new Version(3, 0, 153),
-                    "Stabilität erhöht.\r\n"
-                },
-                {
-                    new Version(3, 0, 154),
-                    "Stationen in Freiburg werden angezeigt.\r\n"
-                },
-                {
-                    new Version(3, 0, 155),
-                    "Schlosssuche verbessert.\r\n"
-                },
-                {
-                    new Version(3, 0, 156),
-                    "Abschalten von Sounds und Alarm für offene, reservierte Räder hinzugefügt.\r\n" +
-                    "Kleine Fehler behoben.\r\n"
-                },
-                {
-                    new Version(3, 0, 157),
-                    "Versenden von Mail mit Diagnoseinformation funktioniert wieder.\r\n" +
-                    "Stationen werden nicht mehr fälschlicherweise ausgeblendet nach Verlassen von Einstellungsseite.\r\n" +
-                    "Absturz bei minimieren von App behoben.\r\n" +
-                    "Stabilität Bluetoothverbindung bei erstmaligem Verbinden verbessert.\r\n" +
-                    "Stabilität Bluetoothverbindung bei wiederholtem Verbinden verbessert.\r\n" +
-                    "Absturz bei Drehen von Smartdevice behoben.\r\n" +
-                    "Absturz bei minimieren von App behoben.\r\n"
-                },
-                {
-                    new Version(3, 0, 158),
-                    "Bugfix: Auf Endgerät mit deutscher Sprache werden Texte wieder auf deutsch angezeigt.\r\n" +
-                    "Erweiterung: Räderinfo für TINK-Räder werden nur noch bei Anmeldung mit TINK-Konto angezeigt.\r\n" +
-                    "Erweiterung: Anwendergruppeninfotext \"TINK\" bzw. \"Konrad\" wird nur noch angezeigt, wenn Konto ein TINK- bzw. Konradrechte hat.\r\n"
-                },
-                {
-                    new Version(3, 0, 159),
-                    "Bugfix: Asynchrone Bluetooth Aktualisierung für Android entfernt, da nicht unterstützt.\r\n"
-                },
-                {
-                    new Version(3, 0, 162),
-                    "App umbenannt von TINKApp in sharee.bike.\r\n"
-                },
-                {
-                    new Version(3, 0, 163),
-                    "Schlossstatus wird an COPRI übermittelt.\r\n"
-                },
-                {
-                    new Version(3, 0, 164),
-                    "Wechsel Standard Lock-Umsetzung: GUID-Verbindungsaufbau wird statt Scan benutzt.\r\n" +
-                    "Datenquellen für \"Passwort vergessen\", \"Persönliche Daten Verwalten\", \"Datenschutz\" und \"AGB\" aktualisiert.\r\n"
-                },
-                {
-                    new Version(3, 0, 165),
-                    "Menüstruktur überarbeitet.\r\n"
-                },
-                {
-                    new Version(3, 0, 167),
-                    "Standardeinstellung geändert: Kartenansicht wird per Default auf aktuelle Position zentriert.\r\n"
-                },
-                {
-                    new Version(3, 0, 168),
-                    "Konfigurierbaren Connect Timeout eingebaut.\r\n" +
-                    "Impressum, Radinfo und Tarifinfo wird von Server geladen.\r\n" +
-                    "Adressen für share.bike erweitert.\r\n"
-                },
-                {
-                    new Version(3, 0, 169),
-                    "Verschiedene Fehler behoben.\r\n"
-                },
-                {
-                    new Version(3, 0, 170),
-                    "Fehler behoben: nach Sequenz Rad Zurückgeben-Resverieren-Mieten ist wieder Verbindung zu Schloss möglich.\r\n" +
-                    "Zielplatform Android 10-Q"
-                },
-                {
-                    new Version(3, 0, 171),
-                    "Fehler behoben: nach Sequenz von Homescreen wieder App aktivieren wenn Meine Räder offen ist für nicht mehr zu Crash.\r\n" +
-                    "Fehlermeldung verbessert für den Fall, dass Bluetooth abgeschaltet ist."
-                },
-                {
-                    new Version(3, 0, 172),
-                    "Spezielle Fehler Schloss blockiert beim Öffnen/ Schließen und Fahrrad in Bewegung beim Schließen werden in Alert angezeigt.\r\n" +
-                    "Fehlerzustände werden detaillierter in Alerts angezeigt.\r\n" +
-                    "Überprüfung, ob von COPRI gelieferte GUID gültig ist für bekannte Schlösser.\r\n" +
-                    "Überprüfung, dass Seed nur einmalig verwendet werden.\r\n" +
-                    "Verschiedene kleinere Verbesserungen."
-                },
-                {
-                    new Version(3, 0, 173),
-                    "Fehlerzustände werden detaillierter in Alerts angezeigt.\r\n" +
-                    "Aktualisierung auf Android 10."
-                },
-                {
-                    new Version(3, 0, 174),
-                    "Fehlerkorrketur: GPS-Korrdianten werden länderinvariant übertragen. \r\n" +
-                    "Nutzer mit erweiterten Rechten: Alarm- und Soundeinstellungen können verwaltet werden."
-                },
-                {
-                    new Version(3, 0, 175),
-                    "Fehlerkorrektur: Nach Bluetooth-Wiederverbindung kann Schloss wieder geöffnet und geschlossen werden."
-                },
-                {
-                    new Version(3, 0, 176),
-                    "Wiederholen-/ Abbrechen-Schleife beim Verbinden mit Schlössern umgesetzt. Beim Wiederholen wird die Timeoutzeit jeweils verdoppelt bis zum Faktor vier.\r\n" +
-                    "Kein Neustart mehr notwendig nach Änderung der Timeouts."
-                },
-                {
-                    new Version(3, 0, 177),
-                    "Beim Schließen des Schlosses wird geänderter Zustand an COPRI übermittelt.\r\n" +
-                    "Beim Miete beenden, ohne dass unmittelbar voher das Schloss zu geschlossen wurde, werden keine Koordinaten an COPRI übermittelt.\r\n" +
-                    "Meldungen zu nichkritische Fehlern werden in der Statuszeile angezeigt. "
-                },
-                {
-                    new Version(3, 0, 178),
-                    "Bei Fehlern bei Radrückgabe Fehlermeldung verbessert.\r\n" +
-                    "Activity Indicator (Sanduhr) eingebaut.\r\n" +
-                    "Timeout von 3 auf 5 Sekunden erhöht insbesonders für standard Lock-Umsetzung Live-Scan."
-                },
-                {
-                    new Version(3, 0, 179),
-                    "Verbesserte Fehlermeldungen bei Statusaktualisierung und Radrückgabe.\r\n" +
-                    "Fehlerbehebung: Alter Geoloationinformation wird korrekt übertragen.\r\n" +
-                    "Optimierung Benutzung Geolocationcache."
-                },
-                {
-                    new Version(3, 0, 180),
-                    "Akkufüllstand wir an COPRI übermittelt beim Schloss öffnen."
-                },
-                {
-                    new Version(3, 0, 190),
-                    "Erste Version für iOS."
-                },
-                {
-                    new Version(3, 0, 191),
-                    "Für Seiten \"Fahrradstandorte\", \"Meine Räder\" und \"Räder an Station\":\r\n" +
-                    "- Activity Indicator (Sanduhr) eingebaut\r\n" +
-                    "- Statusmeldungen eingebaut\r\n" +
-                    "Karte wird initial auf Verleistationen zentriert.\r\n" +
-                    "Geschwindikgeitsverbesserungen und Fehler behoben."
-                },
-                {
-                    new Version(3, 0, 192),
-                    "Erweiterung: Benutzerfreundliche Fehlermeldung für Szenario\r\n" +
-                    "-Rückgabe außerhalb von Station\r\n" +
-                    "-Rückgabe ohne GPS-Info\r\n" +
-                    "Standortabfrage bei Radrückgabe von bereits verschlossenem Rad, wenn Schloss in Bluetoothreichweite ist.\r\n" +
-                    "Fehlerbehebung: Passwort-Vergessen Funktionaliät wieder verfügbar.\r\n" +
-                    "Kontakt-Seite aktualisiert (Telefonnummer, Mail, ...)."
-                },
-                {
-                    new Version(3, 0, 193),
-                    "Erweiterte Benutzerrechte können selektiv akiviert werden.\r\n" +
-                    "Verschiedene Umbenennungen."
-                },
-                {
-                    new Version(3, 0, 194),
-                    "Fehlerkorrektur: Wenn kein Benutzer angemeldet ist werden nur noch öffentliche Stationen angezeigt.\r\n" +
-                    "Master-Detail Elemente werden in sharee.bike- Farbe angezeigt."
-                },
-                {
-                    new Version(3, 0, 195),
-                    "Fehlerkorrektur: Android action bar an sharee.bike- Farbenschema angepasst."
-                },
-                {
-                    new Version(3, 0, 196),
-                    "Fehlerkorrektur: Registrieren-Link korrigiert.\r\n" +
-                    "\"Kontakt\"-Seite überarbeitet."
-                },
-                {
-                    new Version(3, 0, 197),
-                    "Android: App ist nicht mehr verfügbar Geräte ohne BluetoothLE/ ohne GPS.\r\n" +
-                    "iOS:\r\n" +
-                    "- Bugfix: Nicht mehr benötigtes Recht \"Standort im Hintergrund\" entfernt.\r\n" +
-                    "- Schreibfehler behoben.\r\n" +
-                    "Fehlerhandling bei Benutzung von mehr als acht Geräte verbessert."
-                },
-                {
-                    new Version(3, 0, 198),
-                    "Fehlermeldungen angepasst.\r\n"
-                },
-                {
-                    new Version(3, 0, 199),
-                    "Radbeschreibung auf sharee.bike angepasst.\r\n" +
-                    "iOS: Berechtigungsfehler behoben."
-                },
-                {
-                    new Version(3, 0, 200),
-                    "Titel von Seite Fahrradstandort verbessert.\r\n" +
-                    "Statusmeldungen verbessert."
-                },
-                {
-                    new Version(3, 0, 201),
-                    "iOS: Darstellung verbessert.\r\n" +
-                    "Weitere Teile der App englischsprachig verfügbar."
-                },
-                {
-                    new Version(3, 0, 202),
-                    "Kleinere Verbesserrungen bezüglich Stabilität und Benutzbarkeit.\r\n"
-                },
-                {
-                    new Version(3, 0, 203),
-                    AppResources.ChangeLog3_0_203
-                },
-                {
-                    new Version(3, 0, 204),
-                    AppResources.ChangeLog3_0_204
-                },
-                {
-                    new Version(3, 0, 205),
-                    AppResources.ChangeLog3_0_205
-                },
-                {
-                    new Version(3, 0, 206),
-                    AppResources.ChangeLog3_0_206
-                },
-                {
-                    new Version(3, 0, 207),
-                    AppResources.ChangeLog3_0_207
-                },
-                {
-                    new Version(3, 0, 208),
-                    AppResources.ChangeLog3_0_208 // Minor fixes.
-                },
-                {
-                    new Version(3, 0, 209),
-                    AppResources.ChangeLog3_0_209
-                },
-                {
-                    new Version(3, 0, 214),
-                    AppResources.ChangeLog3_0_214
-                },
-                {
-                    new Version(3, 0, 215),
-                    AppResources.ChangeLog3_0_215
-                },
-                {
-                    new Version(3, 0, 216),
-                    AppResources.ChangeLog3_0_216
-                },
-                {
-                    new Version(3, 0, 217),
-                    AppResources.ChangeLog3_0_217
-                },
-                {
-                    new Version(3, 0, 218),
-                    AppResources.ChangeLog3_0_208
-                },
-                {
-                    new Version(3, 0, 219),
-                    AppResources.ChangeLog3_0_219
-                },
-                {
-                    new Version(3, 0, 220),
-                    AppResources.ChangeLog3_0_220
-                },
-                {
-                    new Version(3, 0, 222),
-                    AppResources.ChangeLog3_0_222
-                },
-                {
-                    new Version(3, 0, 223),
-                    AppResources.ChangeLog3_0_208
-                },
-                {
-                    new Version(3, 0, 224),
-                    AppResources.ChangeLog3_0_224
-                },
-                {
-                    new Version(3, 0, 225),
-                    AppResources.ChangeLog3_0_208
-                },
-                {
-                    new Version(3, 0, 226),
-                    AppResources.ChangeLog3_0_226
-                },
-                {
-                    new Version(3, 0, 227),
-                    AppResources.ChangeLog3_0_227
-                },
-                {
-                    new Version(3, 0, 228),
-                    AppResources.ChangeLog3_0_208
-                },
-                {
-                    new Version(3, 0, 231),
-                    AppResources.ChangeLog3_0_231
-                },
-                {
-                    new Version(3, 0, 232),
-                    AppResources.ChangeLog3_0_232
-                },
-                {
-                    new Version(3, 0, 234),
-                    AppResources.ChangeLog3_0_234
-                },
-                {
-                    new Version(3, 0, 235),
-                    AppResources.ChangeLog3_0_235
-                },
-                {
-                    new Version(3, 0, 236),
-                    AppResources.ChangeLog3_0_236
-                },
-                {
-                    new Version(3, 0, 237),
-                    AppResources.ChangeLog3_0_237
-                },
-                {
-                    new Version(3, 0, 238),
-                    AppResources.ChangeLog3_0_231
-                },
-                {
-                    new Version(3, 0, 239),
-                    AppResources.ChangeLog3_0_239
-                },
-                {
-                    new Version(3, 0, 240),
-                    AppResources.ChangeLog3_0_240
-                },
-                {
-                    new Version(3, 0, 241),
-                    AppResources.ChangeLog3_0_241
-                },
-                {
-                    new Version(3, 0, 242),
-                    AppResources.ChangeLog3_0_242
-                },
-                {
-                    new Version(3, 0, 243),
-                    AppResources.ChangeLog3_0_243
-                },
-                {
-                    new Version(3, 0, 244),
-                    AppResources.ChangeLog3_0_231 // Minor improvements.
-                },
-                {
-                    new Version(3, 0, 245),
-                    AppResources.ChangeLog3_0_231 // Minor improvements.
-                },
-                {
-                    new Version(3, 0, 246),
-                    AppResources.ChangeLog3_0_231 // Minor improvements.
-                },
-                {
-                    new Version(3, 0, 247),
-                    AppResources.ChangeLog3_0_231 // Minor improvements.
-                },
-                {
-                    new Version(3, 0, 248),
-                    AppResources.ChangeLog3_0_231 // Minor improvements.
-                },
-                {
-                    new Version(3, 0, 249),
-                    AppResources.ChangeLog3_0_249 // Third-party components updated.
-                },
-                {
-                    new Version(3, 0, 250),
-                    AppResources.ChangeLog3_0_250 // Third-party components updated.
-                },
-                {
-                    new Version(3, 0, 260),
+		/// <summary>Change of of think App.</summary>
+		public static WhatsNewMessages AllFlavorsAndPlatformMessages = new WhatsNewMessages
+			{
+				{
+					new Version(3, 0, 0, 115),
+					"Benutzeroberfläche verbessert.\r\n\r\n"
+				},
+				{
+					new Version(3, 0, 120),
+					"Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\n" +
+						"Offlineanzeige Stationen/ Räderinfo.\r\n\r\n"
+				},
+				{
+					AGBMODIFIEDBUILD,
+					"Neue Seiten eingebaut\r\n" +
+					"-zum erstmaligem Registrieren\r\n" +
+					"-zur Verwaltung des Benutzerkontos\r\n" +
+					"-zum Zurücksetzen des Passworts\r\n" +
+					"\r\n" +
+					"Anzeige Verbindungsstatus auf den Seiten\r\n" +
+					"-Kartenansicht Fahrradstandorte\r\n" +
+					"-Fahrräder an Station\r\n" +
+					"-Meine Fahrräder\r\n\r\n"
+				},
+				{
+					new Version(3, 0, 137),
+					"Verschiedene kleine Verbesserungen und Korrekturen.\r\n"
+				},
+				{
+					new Version(3, 0, 141),
+					"Erste I LOCK IT Unterstützung.\r\n" +
+					"Erweiterte Optionen: Zwei Schlosssimulationen.\r\n"
+				},
+				{
+					new Version(3, 0, 142),
+					"Sharee Server verfügbar.\r\n"
+				},
+				{
+					new Version(3, 0, 143),
+					"Geolocation wird am Gerät abgefragt.\r\n" +
+					"Erweiterte Optionen: Genauer Standort kann abgefragt werden, Standortsimulation verfügbar.\r\n"
+				},
+				{
+					new Version(3, 0, 144),
+					"Diverse Fehler behoben.\r\n" +
+					"Erweiterte Optionen: Texte Auswahlboxen für Copri-Server, Schlosssteuerung und Geolocation verständlicher gemacht.\r\n"
+				},
+				{
+					new Version(3, 0, 145),
+					"Kleine Fehler behoben.\r\n" +
+					"Erweiterte Option ein/ ausschalten \"Karte auf aktuelle Position ausrichten\" hinzugefügt.\r\n" +
+					"Für gemietete Räder ausserhalb der Reichweite wird Knof \"Schloss suchen\" angezeigt."
+				},
+				{
+					new Version(3, 0, 146),
+					"Fehler behoben: Aktion Schloss schließen wird jetzt durchgeführt.\r\n" +
+					"Benennung: \"Miete weiterführen\" -> \"Miete fortsetzen\".\r\n"
+				},
+				{
+					new Version(3, 0, 147),
+					"Erste prototypische Unterstützung des ILOCKIT-Schlosses.\r\n"
+				},
+				{
+					new Version(3, 0, 148),
+					"Schloss-Guid wird an CORI bei Buchung übermittelt.\r\n"
+				},
+				{
+					new Version(3, 0, 149),
+					"Schlösser mit neuem Advertisement-Name ISHAREIT+XXXXXXX unterstützt.\r\n"
+				},
+				{
+					new Version(3, 0, 150),
+					"Verbesserung: Schlossstatus wird nach Öffnen/ Schließen abgefragt.\r\n"
+				},
+				{
+					new Version(3, 0, 151),
+					"Verbesserungen:\r\n" +
+					"Erweiterte Optionen: Auswahl, ob log-Dateien auf internem Speicher oder SD-Karte abgelegt werden, ist konfigurierbar.\r\n" +
+					"Leistung: Suche nach Bluetooth Schlössern deutlich beschleunigt.\r\n" +
+					"Kleine Textkorrekturen.\r\n." +
+					"Fehlerbehebung: Schloss kann direkt nach Reservierung geöffnet werden.\r\n"
+				},
+				{
+					new Version(3, 0, 152),
+					"Verbesserungen: Aufforderung zum Aktivieren von Bluetooth beim Öffnen der Seiten Meine Räder und Räder an Station implementiert.\r\n" +
+					"Fehlerbehebung: Seite Meine Räder kann auch geöffnet werden, ohne dass Räder reserviert oder gemietet sein müssen.\r\n"
+				},
+				{
+					new Version(3, 0, 153),
+					"Stabilität erhöht.\r\n"
+				},
+				{
+					new Version(3, 0, 154),
+					"Stationen in Freiburg werden angezeigt.\r\n"
+				},
+				{
+					new Version(3, 0, 155),
+					"Schlosssuche verbessert.\r\n"
+				},
+				{
+					new Version(3, 0, 156),
+					"Abschalten von Sounds und Alarm für offene, reservierte Räder hinzugefügt.\r\n" +
+					"Kleine Fehler behoben.\r\n"
+				},
+				{
+					new Version(3, 0, 157),
+					"Versenden von Mail mit Diagnoseinformation funktioniert wieder.\r\n" +
+					"Stationen werden nicht mehr fälschlicherweise ausgeblendet nach Verlassen von Einstellungsseite.\r\n" +
+					"Absturz bei minimieren von App behoben.\r\n" +
+					"Stabilität Bluetoothverbindung bei erstmaligem Verbinden verbessert.\r\n" +
+					"Stabilität Bluetoothverbindung bei wiederholtem Verbinden verbessert.\r\n" +
+					"Absturz bei Drehen von Smartdevice behoben.\r\n" +
+					"Absturz bei minimieren von App behoben.\r\n"
+				},
+				{
+					new Version(3, 0, 158),
+					"Bugfix: Auf Endgerät mit deutscher Sprache werden Texte wieder auf deutsch angezeigt.\r\n" +
+					"Erweiterung: Räderinfo für TINK-Räder werden nur noch bei Anmeldung mit TINK-Konto angezeigt.\r\n" +
+					"Erweiterung: Anwendergruppeninfotext \"TINK\" bzw. \"Konrad\" wird nur noch angezeigt, wenn Konto ein TINK- bzw. Konradrechte hat.\r\n"
+				},
+				{
+					new Version(3, 0, 159),
+					"Bugfix: Asynchrone Bluetooth Aktualisierung für Android entfernt, da nicht unterstützt.\r\n"
+				},
+				{
+					new Version(3, 0, 162),
+					"App umbenannt von TINKApp in sharee.bike.\r\n"
+				},
+				{
+					new Version(3, 0, 163),
+					"Schlossstatus wird an COPRI übermittelt.\r\n"
+				},
+				{
+					new Version(3, 0, 164),
+					"Wechsel Standard Lock-Umsetzung: GUID-Verbindungsaufbau wird statt Scan benutzt.\r\n" +
+					"Datenquellen für \"Passwort vergessen\", \"Persönliche Daten Verwalten\", \"Datenschutz\" und \"AGB\" aktualisiert.\r\n"
+				},
+				{
+					new Version(3, 0, 165),
+					"Menüstruktur überarbeitet.\r\n"
+				},
+				{
+					new Version(3, 0, 167),
+					"Standardeinstellung geändert: Kartenansicht wird per Default auf aktuelle Position zentriert.\r\n"
+				},
+				{
+					new Version(3, 0, 168),
+					"Konfigurierbaren Connect Timeout eingebaut.\r\n" +
+					"Impressum, Radinfo und Tarifinfo wird von Server geladen.\r\n" +
+					"Adressen für share.bike erweitert.\r\n"
+				},
+				{
+					new Version(3, 0, 169),
+					"Verschiedene Fehler behoben.\r\n"
+				},
+				{
+					new Version(3, 0, 170),
+					"Fehler behoben: nach Sequenz Rad Zurückgeben-Resverieren-Mieten ist wieder Verbindung zu Schloss möglich.\r\n" +
+					"Zielplatform Android 10-Q"
+				},
+				{
+					new Version(3, 0, 171),
+					"Fehler behoben: nach Sequenz von Homescreen wieder App aktivieren wenn Meine Räder offen ist für nicht mehr zu Crash.\r\n" +
+					"Fehlermeldung verbessert für den Fall, dass Bluetooth abgeschaltet ist."
+				},
+				{
+					new Version(3, 0, 172),
+					"Spezielle Fehler Schloss blockiert beim Öffnen/ Schließen und Fahrrad in Bewegung beim Schließen werden in Alert angezeigt.\r\n" +
+					"Fehlerzustände werden detaillierter in Alerts angezeigt.\r\n" +
+					"Überprüfung, ob von COPRI gelieferte GUID gültig ist für bekannte Schlösser.\r\n" +
+					"Überprüfung, dass Seed nur einmalig verwendet werden.\r\n" +
+					"Verschiedene kleinere Verbesserungen."
+				},
+				{
+					new Version(3, 0, 173),
+					"Fehlerzustände werden detaillierter in Alerts angezeigt.\r\n" +
+					"Aktualisierung auf Android 10."
+				},
+				{
+					new Version(3, 0, 174),
+					"Fehlerkorrketur: GPS-Korrdianten werden länderinvariant übertragen. \r\n" +
+					"Nutzer mit erweiterten Rechten: Alarm- und Soundeinstellungen können verwaltet werden."
+				},
+				{
+					new Version(3, 0, 175),
+					"Fehlerkorrektur: Nach Bluetooth-Wiederverbindung kann Schloss wieder geöffnet und geschlossen werden."
+				},
+				{
+					new Version(3, 0, 176),
+					"Wiederholen-/ Abbrechen-Schleife beim Verbinden mit Schlössern umgesetzt. Beim Wiederholen wird die Timeoutzeit jeweils verdoppelt bis zum Faktor vier.\r\n" +
+					"Kein Neustart mehr notwendig nach Änderung der Timeouts."
+				},
+				{
+					new Version(3, 0, 177),
+					"Beim Schließen des Schlosses wird geänderter Zustand an COPRI übermittelt.\r\n" +
+					"Beim Miete beenden, ohne dass unmittelbar voher das Schloss zu geschlossen wurde, werden keine Koordinaten an COPRI übermittelt.\r\n" +
+					"Meldungen zu nichkritische Fehlern werden in der Statuszeile angezeigt. "
+				},
+				{
+					new Version(3, 0, 178),
+					"Bei Fehlern bei Radrückgabe Fehlermeldung verbessert.\r\n" +
+					"Activity Indicator (Sanduhr) eingebaut.\r\n" +
+					"Timeout von 3 auf 5 Sekunden erhöht insbesonders für standard Lock-Umsetzung Live-Scan."
+				},
+				{
+					new Version(3, 0, 179),
+					"Verbesserte Fehlermeldungen bei Statusaktualisierung und Radrückgabe.\r\n" +
+					"Fehlerbehebung: Alter Geoloationinformation wird korrekt übertragen.\r\n" +
+					"Optimierung Benutzung Geolocationcache."
+				},
+				{
+					new Version(3, 0, 180),
+					"Akkufüllstand wir an COPRI übermittelt beim Schloss öffnen."
+				},
+				{
+					new Version(3, 0, 190),
+					"Erste Version für iOS."
+				},
+				{
+					new Version(3, 0, 191),
+					"Für Seiten \"Fahrradstandorte\", \"Meine Räder\" und \"Räder an Station\":\r\n" +
+					"- Activity Indicator (Sanduhr) eingebaut\r\n" +
+					"- Statusmeldungen eingebaut\r\n" +
+					"Karte wird initial auf Verleistationen zentriert.\r\n" +
+					"Geschwindikgeitsverbesserungen und Fehler behoben."
+				},
+				{
+					new Version(3, 0, 192),
+					"Erweiterung: Benutzerfreundliche Fehlermeldung für Szenario\r\n" +
+					"-Rückgabe außerhalb von Station\r\n" +
+					"-Rückgabe ohne GPS-Info\r\n" +
+					"Standortabfrage bei Radrückgabe von bereits verschlossenem Rad, wenn Schloss in Bluetoothreichweite ist.\r\n" +
+					"Fehlerbehebung: Passwort-Vergessen Funktionaliät wieder verfügbar.\r\n" +
+					"Kontakt-Seite aktualisiert (Telefonnummer, Mail, ...)."
+				},
+				{
+					new Version(3, 0, 193),
+					"Erweiterte Benutzerrechte können selektiv akiviert werden.\r\n" +
+					"Verschiedene Umbenennungen."
+				},
+				{
+					new Version(3, 0, 194),
+					"Fehlerkorrektur: Wenn kein Benutzer angemeldet ist werden nur noch öffentliche Stationen angezeigt.\r\n" +
+					"Master-Detail Elemente werden in sharee.bike- Farbe angezeigt."
+				},
+				{
+					new Version(3, 0, 195),
+					"Fehlerkorrektur: Android action bar an sharee.bike- Farbenschema angepasst."
+				},
+				{
+					new Version(3, 0, 196),
+					"Fehlerkorrektur: Registrieren-Link korrigiert.\r\n" +
+					"\"Kontakt\"-Seite überarbeitet."
+				},
+				{
+					new Version(3, 0, 197),
+					"Android: App ist nicht mehr verfügbar Geräte ohne BluetoothLE/ ohne GPS.\r\n" +
+					"iOS:\r\n" +
+					"- Bugfix: Nicht mehr benötigtes Recht \"Standort im Hintergrund\" entfernt.\r\n" +
+					"- Schreibfehler behoben.\r\n" +
+					"Fehlerhandling bei Benutzung von mehr als acht Geräte verbessert."
+				},
+				{
+					new Version(3, 0, 198),
+					"Fehlermeldungen angepasst.\r\n"
+				},
+				{
+					new Version(3, 0, 199),
+					"Radbeschreibung auf sharee.bike angepasst.\r\n" +
+					"iOS: Berechtigungsfehler behoben."
+				},
+				{
+					new Version(3, 0, 200),
+					"Titel von Seite Fahrradstandort verbessert.\r\n" +
+					"Statusmeldungen verbessert."
+				},
+				{
+					new Version(3, 0, 201),
+					"iOS: Darstellung verbessert.\r\n" +
+					"Weitere Teile der App englischsprachig verfügbar."
+				},
+				{
+					new Version(3, 0, 202),
+					"Kleinere Verbesserrungen bezüglich Stabilität und Benutzbarkeit.\r\n"
+				},
+				{
+					new Version(3, 0, 203),
+					AppResources.ChangeLog3_0_203
+				},
+				{
+					new Version(3, 0, 204),
+					AppResources.ChangeLog3_0_204
+				},
+				{
+					new Version(3, 0, 205),
+					AppResources.ChangeLog3_0_205
+				},
+				{
+					new Version(3, 0, 206),
+					AppResources.ChangeLog3_0_206
+				},
+				{
+					new Version(3, 0, 207),
+					AppResources.ChangeLog3_0_207
+				},
+				{
+					new Version(3, 0, 208),
+					AppResources.ChangeLog3_0_208 // Minor fixes.
+                },
+				{
+					new Version(3, 0, 209),
+					AppResources.ChangeLog3_0_209
+				},
+				{
+					new Version(3, 0, 214),
+					AppResources.ChangeLog3_0_214
+				},
+				{
+					new Version(3, 0, 215),
+					AppResources.ChangeLog3_0_215
+				},
+				{
+					new Version(3, 0, 216),
+					AppResources.ChangeLog3_0_216
+				},
+				{
+					new Version(3, 0, 217),
+					AppResources.ChangeLog3_0_217
+				},
+				{
+					new Version(3, 0, 218),
+					AppResources.ChangeLog3_0_208
+				},
+				{
+					new Version(3, 0, 219),
+					AppResources.ChangeLog3_0_219
+				},
+				{
+					new Version(3, 0, 220),
+					AppResources.ChangeLog3_0_220
+				},
+				{
+					new Version(3, 0, 222),
+					AppResources.ChangeLog3_0_222
+				},
+				{
+					new Version(3, 0, 223),
+					AppResources.ChangeLog3_0_208
+				},
+				{
+					new Version(3, 0, 224),
+					AppResources.ChangeLog3_0_224
+				},
+				{
+					new Version(3, 0, 225),
+					AppResources.ChangeLog3_0_208
+				},
+				{
+					new Version(3, 0, 226),
+					AppResources.ChangeLog3_0_226
+				},
+				{
+					new Version(3, 0, 227),
+					AppResources.ChangeLog3_0_227
+				},
+				{
+					new Version(3, 0, 228),
+					AppResources.ChangeLog3_0_208
+				},
+				{
+					new Version(3, 0, 231),
+					AppResources.ChangeLog3_0_231
+				},
+				{
+					new Version(3, 0, 232),
+					AppResources.ChangeLog3_0_232
+				},
+				{
+					new Version(3, 0, 234),
+					AppResources.ChangeLog3_0_234
+				},
+				{
+					new Version(3, 0, 235),
+					AppResources.ChangeLog3_0_235
+				},
+				{
+					new Version(3, 0, 236),
+					AppResources.ChangeLog3_0_236
+				},
+				{
+					new Version(3, 0, 237),
+					AppResources.ChangeLog3_0_237
+				},
+				{
+					new Version(3, 0, 238),
+					AppResources.ChangeLog3_0_231
+				},
+				{
+					new Version(3, 0, 239),
+					AppResources.ChangeLog3_0_239
+				},
+				{
+					new Version(3, 0, 240),
+					AppResources.ChangeLog3_0_240
+				},
+				{
+					new Version(3, 0, 241),
+					AppResources.ChangeLog3_0_241
+				},
+				{
+					new Version(3, 0, 242),
+					AppResources.ChangeLog3_0_242
+				},
+				{
+					new Version(3, 0, 243),
+					AppResources.ChangeLog3_0_243
+				},
+				{
+					new Version(3, 0, 244),
+					AppResources.ChangeLog3_0_231 // Minor improvements.
+                },
+				{
+					new Version(3, 0, 245),
+					AppResources.ChangeLog3_0_231 // Minor improvements.
+                },
+				{
+					new Version(3, 0, 246),
+					AppResources.ChangeLog3_0_231 // Minor improvements.
+                },
+				{
+					new Version(3, 0, 247),
+					AppResources.ChangeLog3_0_231 // Minor improvements.
+                },
+				{
+					new Version(3, 0, 248),
+					AppResources.ChangeLog3_0_231 // Minor improvements.
+                },
+				{
+					new Version(3, 0, 249),
+					AppResources.ChangeLog3_0_249 // Third-party components updated.
+                },
+				{
+					new Version(3, 0, 250),
+					AppResources.ChangeLog3_0_250 // Third-party components updated.
+                },
+				{
+					new Version(3, 0, 260),
                     // Same info as for version 3.0.251 and 3.0.252
                     AppResources.ChangeLog3_0_231 // Minor improvements.
                 },
-                {
-                    new Version(3, 0, 263),
-                    AppResources.ChangeLog3_0_263
+				{
+					new Version(3, 0, 263),
+					AppResources.ChangeLog3_0_263
+				},
+				{
+					new Version(3, 0, 264),
+					AppResources.ChangeLog3_0_264
+				},
+				{
+					new Version(3, 0, 265),
+					AppResources.ChangeLog3_0_265
+				},
+				{
+					new Version(3, 0, 266),
+					AppResources.ChangeLog3_0_266
+				},
+				{
+					new Version(3, 0, 276),
+					AppResources.ChangeLog3_0_276
+				},
+				{
+					new Version(3, 0, 277),
+					AppResources.ChangeLog3_0_277
+				},
+				{
+					new Version(3, 0, 279),
+					AppResources.ChangeLog3_0_278 // Addition spelling corrected and missing translation added.
                 },
-                {
-                    new Version(3, 0, 264),
-                    AppResources.ChangeLog3_0_264
+				{
+					new Version(3, 0, 280),
+					AppResources.ChangeLog3_0_280
+				},
+				{
+					new Version(3, 0, 281),
+					AppResources.ChangeLog3_0_280
+				},
+				{
+					new Version(3, 0, 283),
+					AppResources.ChangeLog3_0_282
+				},
+				{
+					new Version(3, 0, 284),
+					AppResources.ChangeLog3_0_284
+				},
+				{
+					new Version(3, 0, 285),
+					AppResources.ChangeLog3_0_285
+				},
+				{
+					new Version(3, 0, 289),
+					AppResources.ChangeLog3_0_289
+				},
+				{
+					new Version(3, 0, 290),
+					AppResources.ChangeLog3_0_290
+				},
+				{
+					new Version(3, 0, 297),
+					AppResources.ChangeLog3_0_293
+				},
+				{
+					new Version(3, 0, 298),
+					AppResources.ChangeLog3_0_298
+				},
+				{
+					new Version(3, 0, 299),
+					AppResources.ChangeLog3_0_299
+				},
+				{
+					new Version(3, 0, 300),
+					AppResources.ChangeLog3_0_231 // Minor improvements.
                 },
-                {
-                    new Version(3, 0, 265),
-                    AppResources.ChangeLog3_0_265
+				{
+					new Version(3, 0, 311),
+					AppResources.ChangeLog3_0_301
+				},
+				{
+					new Version(3, 0, 312),
+					AppResources.ChangeLog3_0_312
+				},
+				{
+					new Version(3, 0, 323),
+					AppResources.ChangeLog3_0_318 // Support for new lock added.
                 },
-                {
-                    new Version(3, 0, 266),
-                    AppResources.ChangeLog3_0_266
+				{
+					new Version(3, 0, 324),
+					AppResources.ChangeLog3_0_324
+				},
+				{
+					new Version(3, 0, 333),
+					AppResources.ChangeLog3_0_326 // Battery level display and input.
                 },
-                {
-                    new Version(3, 0, 276),
-                    AppResources.ChangeLog3_0_276
+				{
+					new Version(3, 0, 335),
+					AppResources.ChangeLog3_0_326 // Battery level display and input.
                 },
-                {
-                    new Version(3, 0, 277),
-                    AppResources.ChangeLog3_0_277
+				{
+					new Version(3, 0, 336),
+					AppResources.ChangeLog3_0_335 // Sharee.bike design improved.
                 },
-                {
-                    new Version(3, 0, 279),
-                    AppResources.ChangeLog3_0_278 // Addition spelling corrected and missing translation added.
-                },
-                {
-                    new Version(3, 0, 280),
-                    AppResources.ChangeLog3_0_280
-                },
-                {
-                    new Version(3, 0, 281),
-                    AppResources.ChangeLog3_0_280
-                },
-                {
-                    new Version(3, 0, 283),
-                    AppResources.ChangeLog3_0_282
-                },
-                {
-                    new Version(3, 0, 284),
-                    AppResources.ChangeLog3_0_284
-                },
-                {
-                    new Version(3, 0, 285),
-                    AppResources.ChangeLog3_0_285
-                },
-                {
-                    new Version(3, 0, 289),
-                    AppResources.ChangeLog3_0_289
-                },
-                {
-                    new Version(3, 0, 290),
-                    AppResources.ChangeLog3_0_290
-                },
-                {
-                    new Version(3, 0, 297),
-                    AppResources.ChangeLog3_0_293
-                },
-                {
-                    new Version(3, 0, 298),
-                    AppResources.ChangeLog3_0_298
-                },
-                {
-                    new Version(3, 0, 299),
-                    AppResources.ChangeLog3_0_299
-                },
-                {
-                    new Version(3, 0, 300),
-                    AppResources.ChangeLog3_0_231 // Minor improvements.
-                },
-                {
-                    new Version(3, 0, 311),
-                    AppResources.ChangeLog3_0_301
-                },
-                {
-                    new Version(3, 0, 312),
-                    AppResources.ChangeLog3_0_312
-                },
-                {
-                    new Version(3, 0, 323),
-                    AppResources.ChangeLog3_0_318 // Support for new lock added.
-                },
-                {
-                    new Version(3, 0, 324),
-                    AppResources.ChangeLog3_0_324
-                },
-                {
-                    new Version(3, 0, 333),
-                    AppResources.ChangeLog3_0_326 // Battery level display and input.
-                },
-                {
-                    new Version(3, 0, 335),
-                    AppResources.ChangeLog3_0_326 // Battery level display and input.
-                },
-                {
-                    new Version(3, 0, 336),
-                    AppResources.ChangeLog3_0_335 // Sharee.bike design improved.
-                },
-                {
-                    new Version(3, 0, 337),
-                    AppResources.ChangeLog3_0_337_SB, // New Design
+				{
+					new Version(3, 0, 337),
+					AppResources.ChangeLog3_0_337_SB, // New Design
                     new List<AppFlavor> { AppFlavor.ShareeBike }
-                },
-                {
-                    new Version(3, 0, 337),
-                    AppResources.ChangeLog3_0_337_MK, // Notice for low battery
+				},
+				{
+					new Version(3, 0, 337),
+					AppResources.ChangeLog3_0_337_MK, // Notice for low battery
                     new List<AppFlavor> { AppFlavor.MeinKonrad }
-                },
-                {
-                    new Version(3, 0, 337),
-                    AppResources.ChangeLog_MinorBugFixes,
-                    new List<AppFlavor> { AppFlavor.LastenradBayern }
-                }
-        };
+				},
+				{
+					new Version(3, 0, 337),
+					AppResources.ChangeLog_MinorBugFixes,
+					new List<AppFlavor> { AppFlavor.LastenradBayern }
+				},
+				{
+					new Version(3, 0, 338),
+					AppResources.ChangeLog3_0_338_LB_MK,
+					new List<AppFlavor> { AppFlavor.LastenradBayern, AppFlavor.MeinKonrad }
+				},
+				{
+					new Version(3, 0, 338),
+					AppResources.ChangeLog3_0_338_SB,
+					new List<AppFlavor> { AppFlavor.ShareeBike }
+				}
+		};
 
-        /// <summary> Manges the whats new information.</summary>
-        /// <param name="currentVersion">Current version of the app.</param>
-        /// <param name="lastVersion">Version of app which was used before this session, null if app is installed for the first time.</param>
-        /// <param name="shownInVersion">Null or version in which whats new dialog was shown last. Used to determine if AGB dialog has to be shown.</param>
-        /// <param name="flavor">Flavor of the app, i.e. specified if app is sharee.bike, Lastenrad Bayern, ...</param>
-        /// <param name="platform">Platform on which app is running.</param>
-        /// <param name="messages">Messages to inject for testing.</param>
-        public WhatsNew(
-            Version currentVersion,
-            Version lastVersion,
-            Version shownInVersion,
-            AppFlavor flavor,
-            DevicePlatform platform,
-            WhatsNewMessages messages = null)
-        {
-            WasShownVersion = shownInVersion;
+		/// <summary> Manges the whats new information.</summary>
+		/// <param name="currentVersion">Current version of the app.</param>
+		/// <param name="lastVersion">Version of app which was used before this session, null if app is installed for the first time.</param>
+		/// <param name="shownInVersion">Null or version in which whats new dialog was shown last. Used to determine if AGB dialog has to be shown.</param>
+		/// <param name="flavor">Flavor of the app, i.e. specified if app is sharee.bike, Lastenrad Bayern, ...</param>
+		/// <param name="platform">Platform on which app is running.</param>
+		/// <param name="messages">Messages to inject for testing.</param>
+		public WhatsNew(
+			Version currentVersion,
+			Version lastVersion,
+			Version shownInVersion,
+			AppFlavor flavor,
+			DevicePlatform platform,
+			WhatsNewMessages messages = null)
+		{
+			WasShownVersion = shownInVersion;
 
-            if (currentVersion == null || lastVersion == null)
-            {
-                WasShownInCurrentSession = false;
-                IsShowRequired = false;
-                WhatsNewText = new Dictionary<Version, string>();
-                return;
-            }
+			if (currentVersion == null || lastVersion == null)
+			{
+				WasShownInCurrentSession = false;
+				IsShowRequired = false;
+				WhatsNewText = new Dictionary<Version, string>();
+				return;
+			}
 
-            WhatsNewText = (messages ?? AllFlavorsAndPlatformMessages).GetFilteredMessages(flavor, platform, WasShownVersion ?? lastVersion, currentVersion);
+			WhatsNewText = (messages ?? AllFlavorsAndPlatformMessages).GetFilteredMessages(flavor, platform, WasShownVersion ?? lastVersion, currentVersion);
 
-            if (WhatsNewText.Count <= 0)
-            {
-                WasShownInCurrentSession = false;
-                IsShowRequired = false;
-                return;
-            }
+			if (WhatsNewText.Count <= 0)
+			{
+				WasShownInCurrentSession = false;
+				IsShowRequired = false;
+				return;
+			}
 
-            WasShownInCurrentSession = false;
-            IsShowRequired = true;
-        }
+			WasShownInCurrentSession = false;
+			IsShowRequired = true;
+		}
 
-        /// <summary> Gets or sets value whehter whats new was alreay shonw in current settion or not. </summary>
-        public bool WasShownInCurrentSession { get; set; }
+		/// <summary> Gets or sets value whehter whats new was alreay shonw in current settion or not. </summary>
+		public bool WasShownInCurrentSession { get; set; }
 
-        /// <summary> Holds the information in which version of the app the whats new dialog has been shown.</summary>
-        private Version WasShownVersion { get; }
+		/// <summary> Holds the information in which version of the app the whats new dialog has been shown.</summary>
+		private Version WasShownVersion { get; }
 
-        /// <summary> Holds information whether whats new page was already shown or not.</summary>
-        public bool IsShowRequired { get; }
+		/// <summary> Holds information whether whats new page was already shown or not.</summary>
+		public bool IsShowRequired { get; }
 
-        /// <summary> True if info about modified agb has to be displayed. </summary>
-        public bool IsShowAgbRequired => (WasShownVersion ?? AGBMODIFIEDBUILD) < AGBMODIFIEDBUILD;
+		/// <summary> True if info about modified agb has to be displayed. </summary>
+		public bool IsShowAgbRequired => (WasShownVersion ?? AGBMODIFIEDBUILD) < AGBMODIFIEDBUILD;
 
-        /// <summary> Get the whats new text depening of version gap.</summary>
-        /// <param name="messages">Messages to process.</param>
-        public IDictionary<Version, string> WhatsNewText { get; }
-    }
+		/// <summary> Get the whats new text depening of version gap.</summary>
+		/// <param name="messages">Messages to process.</param>
+		public IDictionary<Version, string> WhatsNewText { get; }
+	}
 }
diff --git a/TINKLib/Model/WhatsNewMessages.cs b/TINKLib/Model/WhatsNewMessages.cs
index 5c86cf7..ddb5368 100644
--- a/TINKLib/Model/WhatsNewMessages.cs
+++ b/TINKLib/Model/WhatsNewMessages.cs
@@ -5,100 +5,100 @@ using Xamarin.Essentials;
 
 namespace TINK.Model
 {
-    /// <summary>
-    /// Single whats new entry.
-    /// </summary>
-    public struct WhatsNewEntry
-    {
-        public readonly Version Version;
-        public readonly string Message;
-        public readonly IEnumerable<AppFlavor> Flavors;
-        public readonly IEnumerable<DevicePlatform> Platforms;
+	/// <summary>
+	/// Single whats new entry.
+	/// </summary>
+	public struct WhatsNewEntry
+	{
+		public readonly Version Version;
+		public readonly string Message;
+		public readonly IEnumerable<AppFlavor> Flavors;
+		public readonly IEnumerable<DevicePlatform> Platforms;
 
-        public WhatsNewEntry(
-            string message,
-            Version version,
-            IEnumerable<AppFlavor> concernedFlavors,
-            IEnumerable<DevicePlatform> concernedPlatforms)
-        {
-            Version = version;
-            Message = message;
-            Flavors = concernedFlavors;
-            Platforms = concernedPlatforms;
-        }
-    }
+		public WhatsNewEntry(
+			string message,
+			Version version,
+			IEnumerable<AppFlavor> concernedFlavors,
+			IEnumerable<DevicePlatform> concernedPlatforms)
+		{
+			Version = version;
+			Message = message;
+			Flavors = concernedFlavors;
+			Platforms = concernedPlatforms;
+		}
+	}
 
-    /// <summary>
-    /// Manges whats new messages.
-    /// </summary>
-    public class WhatsNewMessages : List<WhatsNewEntry>, IEnumerable<WhatsNewEntry>
-    {
-        /// <summary>
-        /// Add a new entry to whats new messages
-        /// </summary>
-        /// <param name="version">When change was introduced.</param>
-        /// <param name="message">Text describing </param>
-        /// <param name="concernedFlavors">List of apps to which the message appiles. Null or empty list if message applies to all flavors.</param>
-        /// <param name="concernedPlatforms">List of platforms to which the message applies. Null or empty list if message applies to all platorms.</param>
-        public void Add(
-            Version version,
-            string message,
-            IEnumerable<AppFlavor> concernedFlavors = null,
-            IEnumerable<DevicePlatform> concernedPlatforms = null)
-        {
-            if (string.IsNullOrEmpty(message?.Trim()))
-            {
-                // Igore enties which hold not text.
-                return;
-            }
+	/// <summary>
+	/// Manges whats new messages.
+	/// </summary>
+	public class WhatsNewMessages : List<WhatsNewEntry>, IEnumerable<WhatsNewEntry>
+	{
+		/// <summary>
+		/// Add a new entry to whats new messages
+		/// </summary>
+		/// <param name="version">When change was introduced.</param>
+		/// <param name="message">Text describing </param>
+		/// <param name="concernedFlavors">List of apps to which the message appiles. Null or empty list if message applies to all flavors.</param>
+		/// <param name="concernedPlatforms">List of platforms to which the message applies. Null or empty list if message applies to all platorms.</param>
+		public void Add(
+			Version version,
+			string message,
+			IEnumerable<AppFlavor> concernedFlavors = null,
+			IEnumerable<DevicePlatform> concernedPlatforms = null)
+		{
+			if (string.IsNullOrEmpty(message?.Trim()))
+			{
+				// Igore enties which hold not text.
+				return;
+			}
 
-            if (version == null || version == new Version())
-            {
-                // Igore enties which hold an invalid version.
-                return;
-            }
+			if (version == null || version == new Version())
+			{
+				// Igore enties which hold an invalid version.
+				return;
+			}
 
-            Add(new WhatsNewEntry(
-                message,
-                version,
-                concernedFlavors ?? new List<AppFlavor>(),
-                concernedPlatforms ?? new List<DevicePlatform>()));
-        }
+			Add(new WhatsNewEntry(
+				message,
+				version,
+				concernedFlavors ?? new List<AppFlavor>(),
+				concernedPlatforms ?? new List<DevicePlatform>()));
+		}
 
-        /// <summary>
-        /// Filters messges for a given version of the app, a flavor of app and a given environment from object which holds all messages.
-        /// </summary>
-        /// <remarks>
-        /// A log message might apply to all app flavors (sharee.bike, Lastenrad Bayern, ...) all OS and ís assigned to a version.
-        /// </remarks>
-        /// <param name="flavor">Flavor to filter for.</param>
-        /// <param name="platform">Platform to filter for.</param>
-        /// <returns>Filtered messages.</returns>
-        public Dictionary<Version, string> GetFilteredMessages(
-            AppFlavor flavor,
-            DevicePlatform platform,
-            Version shownInVersionOrLastVersion,
-            Version currentVersion)
-        {
-            if (shownInVersionOrLastVersion == null
-                || shownInVersionOrLastVersion == new Version())
-            {
-                // Initial install detected.
-                return new Dictionary<Version, string>();
-            }
+		/// <summary>
+		/// Filters messges for a given version of the app, a flavor of app and a given environment from object which holds all messages.
+		/// </summary>
+		/// <remarks>
+		/// A log message might apply to all app flavors (sharee.bike, Lastenrad Bayern, ...) all OS and ís assigned to a version.
+		/// </remarks>
+		/// <param name="flavor">Flavor to filter for.</param>
+		/// <param name="platform">Platform to filter for.</param>
+		/// <returns>Filtered messages.</returns>
+		public Dictionary<Version, string> GetFilteredMessages(
+			AppFlavor flavor,
+			DevicePlatform platform,
+			Version shownInVersionOrLastVersion,
+			Version currentVersion)
+		{
+			if (shownInVersionOrLastVersion == null
+				|| shownInVersionOrLastVersion == new Version())
+			{
+				// Initial install detected.
+				return new Dictionary<Version, string>();
+			}
 
-            if (currentVersion == null || currentVersion == new Version())
-            {
-                // Invalid state detected.
-                return new Dictionary<Version, string>();
-            }
+			if (currentVersion == null || currentVersion == new Version())
+			{
+				// Invalid state detected.
+				return new Dictionary<Version, string>();
+			}
 
-            return this.Where(element =>
-                shownInVersionOrLastVersion < element.Version /* do not show messages for old version */
-                && element.Version <= currentVersion /* do not show message entered for future versions */
-                && (element.Flavors.Count() == 0 || element.Flavors.Contains(flavor)) /* filter by app flavor */
-                && (element.Platforms.Count() == 0 || element.Platforms.Contains(platform))/* filter by platorm */ )
-                .ToDictionary(element => element.Version, element => element.Message);
-        }
-    }
+			return this.Where(element =>
+				shownInVersionOrLastVersion < element.Version /* do not show messages for old version */
+				&& element.Version <= currentVersion /* do not show message entered for future versions */
+				&& (element.Flavors.Count() == 0 || element.Flavors.Contains(flavor)) /* filter by app flavor */
+				&& (element.Platforms.Count() == 0 || element.Platforms.Contains(platform))/* filter by platorm */ )
+				.ToDictionary(element => element.Version, element => element.Message);
+		}
+	}
 }
diff --git a/TINKLib/MultilingualResources/AppResources.Designer.cs b/TINKLib/MultilingualResources/AppResources.Designer.cs
index 0b0bebc..6ecd09e 100644
--- a/TINKLib/MultilingualResources/AppResources.Designer.cs
+++ b/TINKLib/MultilingualResources/AppResources.Designer.cs
@@ -1184,6 +1184,32 @@ namespace TINK.MultilingualResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Besides minor bug fixes we have simplified the contact procedure:
+        ///- For acute questions/problems about the bike or rental process, please contact the fleet operator.
+        ///- For communication with the app developers, select &quot;Feedback about the App&quot;.
+        ///To better analyze and improve processes in the app, please accept attaching your log file to your message. We appreciate both critical and positive feedback!.
+        /// </summary>
+        public static string ChangeLog3_0_338_LB_MK {
+            get {
+                return ResourceManager.GetString("ChangeLog3_0_338_LB_MK", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Besides minor bug fixes we have simplified the contact procedure:
+        ///- For acute questions/problems about the bike or rental process, please contact the fleet operator.
+        ///- For communication with the app developers, select &quot;Feedback about the App&quot;.
+        ///To better analyze and improve processes in the app, please accept attaching your log file to your message. We appreciate both critical and positive feedback!
+        ///
+        ///In addition: Small graphics let you see at a glance what type of bike it is..
+        /// </summary>
+        public static string ChangeLog3_0_338_SB {
+            get {
+                return ResourceManager.GetString("ChangeLog3_0_338_SB", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Failed to query available bikes..
         /// </summary>
@@ -1194,7 +1220,7 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Lock of rented bike cannot be be connected right now..
+        ///   Looks up a localized string similar to Your mobile device does not connect to the bike lock. Please step as close as possible to the bike and try again..
         /// </summary>
         public static string ErrorBookedSearchMessage {
             get {
@@ -1203,11 +1229,7 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Lock of rented bike cannot be be connected right now.
-        ///If the bike is nearby:
-        ///- restart app and repeat action
-        ///- restart phone and repeat action
-        ///to connect the lock..
+        ///   Looks up a localized string similar to Your mobile device still does not connect to the bike lock. Please restart the app or even your mobile device and repeat the process..
         /// </summary>
         public static string ErrorBookedSearchMessageEscalationLevel1 {
             get {
@@ -1216,19 +1238,12 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Lock of rented bike cannot be be connected right now.
-        ///If the bike is nearby:
-        ///- restart app and repeat action
-        ///- restart phone and repeat action
-        ///to connect the lock.
+        ///   Looks up a localized string similar to Unfortunately, it is still not possible to establish a connection between your mobile device and the bike lock. Please contact customer support.
         ///
-        ///Return bike manually. 
-        ///Steps 1: Close lock manually if lock is still open
-        ///- close app  
-        ///- press on button at the top of the lock until it starts blinking
-        ///- wait until lock is closed completely
-        ///Step 2: 
-        ///- contact support regarding manual locking please to terminate rent.
+        ///As a last resort, please close the lock by hand AND contact customer support so that they can terminate your chargeable rental. To do this:
+        ///1. close the app,
+        ///2. press the button at the top of the lock briefly and quickly release it as soon as it starts flashing,
+        ///3. wait until the lock is completely closed and remains closed..
         /// </summary>
         public static string ErrorBookedSearchMessageEscalationLevel2 {
             get {
@@ -1455,7 +1470,7 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Lock of reserved bike can not be found..
+        ///   Looks up a localized string similar to Your mobile device does not connect to the bike lock. Please step as close as possible to the bike and try again..
         /// </summary>
         public static string ErrorReservedSearchMessage {
             get {
@@ -1464,11 +1479,7 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Lock of reserved bike cannot be be connected right now.
-        ///If the bike is nearby:
-        ///- restart app and repeat action
-        ///- restart phone and repeat action
-        ///to connect the lock.
+        ///   Looks up a localized string similar to Your mobile device still does not connect to the bike lock. Please restart the app or even your mobile device and repeat the process..
         /// </summary>
         public static string ErrorReservedSearchMessageEscalationLevel1 {
             get {
@@ -2697,6 +2708,15 @@ namespace TINK.MultilingualResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to No, do not attach file.
+        /// </summary>
+        public static string QuestionSupportmailAnswerNo {
+            get {
+                return ResourceManager.GetString("QuestionSupportmailAnswerNo", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to {0} request.
         /// </summary>
@@ -2707,7 +2727,9 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Attach file containing diagnosis information to mail?.
+        ///   Looks up a localized string similar to I hereby consent to the transmission of my log file.
+        ///
+        ///The log file contains your app usage data as well as system information. The data will only be used for diagnostic purposes or to improve the app..
         /// </summary>
         public static string QuestionSupportmailAttachment {
             get {
@@ -2724,6 +2746,15 @@ namespace TINK.MultilingualResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Consent.
+        /// </summary>
+        public static string QuestionSupportmailTitle {
+            get {
+                return ResourceManager.GetString("QuestionSupportmailTitle", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Question.
         /// </summary>
@@ -2876,5 +2907,23 @@ namespace TINK.MultilingualResources {
                 return ResourceManager.GetString("StatusTextReservationExpiredRemaining", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to {0}-app request.
+        /// </summary>
+        public static string SupportmailSubjectAppmail {
+            get {
+                return ResourceManager.GetString("SupportmailSubjectAppmail", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to {0} request.
+        /// </summary>
+        public static string SupportmailSubjectOperatormail {
+            get {
+                return ResourceManager.GetString("SupportmailSubjectOperatormail", resourceCulture);
+            }
+        }
     }
 }
diff --git a/TINKLib/MultilingualResources/AppResources.de.resx b/TINKLib/MultilingualResources/AppResources.de.resx
index 047bfc0..c7e75a1 100644
--- a/TINKLib/MultilingualResources/AppResources.de.resx
+++ b/TINKLib/MultilingualResources/AppResources.de.resx
@@ -106,10 +106,10 @@
     <value>Schloss kann erst geschlossen werden, wenn Rad nicht mehr bewegt wird. Bitte Rad abstellen und Vorgang wiederholen.</value>
   </data>
   <data name="ErrorBookedSearchMessage" xml:space="preserve">
-    <value>Das Schloss des gemieteten Rads kann im Moment nicht verbunden werden.</value>
+    <value>Ihr mobiles Gerät verbindet sich nicht mit dem Fahrradschloss. Bitte treten Sie möglichst nah an das Rad heran und probieren Sie es erneut. </value>
   </data>
   <data name="ErrorReservedSearchMessage" xml:space="preserve">
-    <value>Schloss des reservierten Rads kann nicht gefunden werden.</value>
+    <value>Ihr mobiles Gerät verbindet sich nicht mit dem Fahrradschloss. Bitte treten Sie möglichst nah an das Rad heran und probieren Sie es erneut. </value>
   </data>
   <data name="ActivityTextBikesAtStationGetBikes" xml:space="preserve">
     <value>Lade Räder an Station...</value>
@@ -170,7 +170,9 @@ Eine Radrückgabe ist nur möglich, wenn das Rad in Reichweite ist und Standorti
     <value>Ja</value>
   </data>
   <data name="QuestionSupportmailAttachment" xml:space="preserve">
-    <value>Soll der Mail eine Datei mit Diagnoseinformationen angehängt werden?</value>
+    <value>Hiermit stimme ich der Übermittlung meiner Protokolldatei zu.
+
+Die Protokolldatei enthält Ihre App-Nutzungsdaten sowie Systeminformationen. Die Daten werden ausschließlich für Diagnosezwecke bzw. Verbesserung der App verwendet.</value>
   </data>
   <data name="QuestionTitle" xml:space="preserve">
     <value>Frage</value>
@@ -750,11 +752,7 @@ Fehlerbehebung: Supportmails können wieder verschickt werden.</value>
     <value>Fehlerbehebung: App schließt sich nicht mehr auf Fahrrad Wählen-Seite.</value>
   </data>
   <data name="ErrorBookedSearchMessageEscalationLevel1" xml:space="preserve">
-    <value>Das Schloss des gemieteten Fahrrads kann im Moment nicht verbunden werden.
-Wenn das Fahrrad in der Nähe ist:
-- App neu starten und Vorgang wiederholen
-- Telefon neu starten und Vorgang wiederholen
-um das Schloss zu verbinden.</value>
+    <value>Ihr mobiles Gerät verbindet sich immer noch nicht mit dem Fahrradschloss. Bitte starten Sie die App oder sogar Ihr mobiles Gerät neu und wiederholen Sie den Vorgang.</value>
   </data>
   <data name="MessageAnswerCancel" xml:space="preserve">
     <value>Abbrechen</value>
@@ -766,19 +764,12 @@ um das Schloss zu verbinden.</value>
     <value>Fehler beim Verbinden mit Schloss!</value>
   </data>
   <data name="ErrorBookedSearchMessageEscalationLevel2" xml:space="preserve">
-    <value>Das Schloss des gemieteten Fahrrads kann im Moment nicht verbunden werden.
-Wenn das Fahrrad in der Nähe ist:
-- App neu starten und Vorgang wiederholen
-- Telefon neu starten und Vorgang wiederholen
-um das Schloss zu verbinden.
+    <value>Es kann leider weiterhin keine Verbindung zwischen Ihrem mobilen Gerät und dem Fahrradschloss aufgebaut werden. Bitte kontaktieren Sie den Kundensupport.
 
-Manuelle Fahrradrückgabe. 
-Schitt 1: Schloss manuell schließen wenn nötig. Dazu
-- App schließen
-- auf den Knopf oben am Schloss drücken, bis dieser zu blinken beginnt
-- warten, bis das Schloss vollständig geschlossen ist
-Schritt 2:
-- Support bitte bezüglich der manuellen Schließung kontaktieren um Miete abzuschließen</value>
+Als aller letzten Ausweg das Schloss bitte per Hand schließen UND den Kundensupport zu kontaktieren, damit dieser Ihre kostenpflichtige Miete beenden kann. Dazu:
+1. App schließen,
+2. auf den Knopf oben am Schloss kurz drücken und schnell loslassen sobald bis dieser zu blinken beginnt,
+3. warten, bis das Schloss vollständig geschlossen ist und geschlossen bleibt. </value>
   </data>
   <data name="ChangeLog3_0_278" xml:space="preserve">
     <value>Hinweise hinzugefügt, um das Schließen des Schlosses zu erleichtern, falls dies nicht beim ersten Versuch gelingt.</value>
@@ -828,11 +819,7 @@ Schritt 2:
 - die Standorterkennung deaktiviert ist.</value>
   </data>
   <data name="ErrorReservedSearchMessageEscalationLevel1" xml:space="preserve">
-    <value>Das Schloss des reservierten Fahrrads kann im Moment nicht verbunden werden.
-Wenn das Fahrrad in der Nähe ist:
-- App neu starten und Vorgang wiederholen
-- Telefon neu starten und Vorgang wiederholen
-um das Schloss zu verbinden.</value>
+    <value>Ihr mobiles Gerät verbindet sich immer noch nicht mit dem Fahrradschloss. Bitte starten Sie die App oder sogar Ihr mobiles Gerät neu und wiederholen Sie den Vorgang.</value>
   </data>
   <data name="ChangeLog3_0_282" xml:space="preserve">
     <value>Freigabe-Erlaubnisanfragen unter iOS ausführlicher formuliert.
@@ -1007,4 +994,30 @@ Kleinere Fehlerbehebungen.
   <data name="ChangeLog_MinorBugFixes" xml:space="preserve">
     <value>Wir haben einige Fehler behoben. Genießen Sie die Fahrt!</value>
   </data>
+  <data name="ChangeLog3_0_338_LB_MK" xml:space="preserve">
+    <value>Neben kleineren Fehlerbehebungen haben wir die Kontaktaufnahme vereinfacht:
+- Bei akuten Fragen/Problemen zum Rad bzw. Mietvorgang bitte den Flottenbetreiber kontaktieren.
+- Für eine Kommunikation mit den App-Entwicklern, wählen Sie "Rückmeldung zur App".
+Um Prozesse in der App besser analysieren und verbessern zu können, akzeptieren Sie bitte das Anhängen Ihrer Protokolldatei an Ihre Nachricht. Wir freuen uns sowohl über kritische als auch über positive Rückmeldungen!</value>
+  </data>
+  <data name="ChangeLog3_0_338_SB" xml:space="preserve">
+    <value>Neben kleineren Fehlerbehebungen haben wir die Kontaktaufnahme vereinfacht: 
+- Bei akuten Fragen/Problemen zum Rad bzw. Mietvorgang bitte den Flottenbetreiber kontaktieren.
+- Für eine Kommunikation mit den App-Entwicklern, wählen Sie "Rückmeldung zur App".
+Um Prozesse in der App besser analysieren und verbessern zu können, akzeptieren Sie bitte das Anhängen Ihrer Protokolldatei an Ihre Nachricht. Wir freuen uns sowohl über kritische als auch über positive Rückmeldungen!
+
+Außerdem: Kleine Grafiken lassen auf einen Blick erkennen um was für einen Rad-Typ es sich handelt.</value>
+  </data>
+  <data name="SupportmailSubjectAppmail" xml:space="preserve">
+    <value>{0}-App Anfrage</value>
+  </data>
+  <data name="SupportmailSubjectOperatormail" xml:space="preserve">
+    <value>{0} Anfrage</value>
+  </data>
+  <data name="QuestionSupportmailAnswerNo" xml:space="preserve">
+    <value>Nein, Datei nicht anhängen</value>
+  </data>
+  <data name="QuestionSupportmailTitle" xml:space="preserve">
+    <value>Einwilligung</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TINKLib/MultilingualResources/AppResources.resx b/TINKLib/MultilingualResources/AppResources.resx
index 6a5e345..35d1727 100644
--- a/TINKLib/MultilingualResources/AppResources.resx
+++ b/TINKLib/MultilingualResources/AppResources.resx
@@ -148,7 +148,7 @@
     <value>Loading Stations and Bikes...</value>
   </data>
   <data name="ErrorBookedSearchMessage" xml:space="preserve">
-    <value>Lock of rented bike cannot be be connected right now.</value>
+    <value>Your mobile device does not connect to the bike lock. Please step as close as possible to the bike and try again.</value>
   </data>
   <data name="ErrorCloseLockBoldBlockedMessage" xml:space="preserve">
     <value>Lock is blocked. Please ensure that no spoke or any other obstacle prevents the lock from closing and try again.</value>
@@ -157,7 +157,7 @@
     <value>Lock can only be closed if bike is not moving. Please park bike and try again.</value>
   </data>
   <data name="ErrorReservedSearchMessage" xml:space="preserve">
-    <value>Lock of reserved bike can not be found.</value>
+    <value>Your mobile device does not connect to the bike lock. Please step as close as possible to the bike and try again.</value>
   </data>
   <data name="ErrorReturnBikeLockClosedNoGPSMessage" xml:space="preserve">
     <value>Returning bike at an unknown location is not possible.
@@ -267,7 +267,9 @@ Please login to app once again.</value>
     <value>{0} request</value>
   </data>
   <data name="QuestionSupportmailAttachment" xml:space="preserve">
-    <value>Attach file containing diagnosis information to mail?</value>
+    <value>I hereby consent to the transmission of my log file.
+
+The log file contains your app usage data as well as system information. The data will only be used for diagnostic purposes or to improve the app.</value>
   </data>
   <data name="QuestionSupportmailSubject" xml:space="preserve">
     <value>Does your request/ comment relate to the {0}-app or to a more general subject?</value>
@@ -845,11 +847,7 @@ Bugfix: Sending support mails works again. </value>
     <value>Bugfix: No more closing of app on Select Bike page.</value>
   </data>
   <data name="ErrorBookedSearchMessageEscalationLevel1" xml:space="preserve">
-    <value>Lock of rented bike cannot be be connected right now.
-If the bike is nearby:
-- restart app and repeat action
-- restart phone and repeat action
-to connect the lock.</value>
+    <value>Your mobile device still does not connect to the bike lock. Please restart the app or even your mobile device and repeat the process.</value>
   </data>
   <data name="MessageAnswerCancel" xml:space="preserve">
     <value>Cancel</value>
@@ -861,19 +859,12 @@ to connect the lock.</value>
     <value>Error when connecting with lock!</value>
   </data>
   <data name="ErrorBookedSearchMessageEscalationLevel2" xml:space="preserve">
-    <value>Lock of rented bike cannot be be connected right now.
-If the bike is nearby:
-- restart app and repeat action
-- restart phone and repeat action
-to connect the lock.
+    <value>Unfortunately, it is still not possible to establish a connection between your mobile device and the bike lock. Please contact customer support.
 
-Return bike manually. 
-Steps 1: Close lock manually if lock is still open
-- close app  
-- press on button at the top of the lock until it starts blinking
-- wait until lock is closed completely
-Step 2: 
-- contact support regarding manual locking please to terminate rent</value>
+As a last resort, please close the lock by hand AND contact customer support so that they can terminate your chargeable rental. To do this:
+1. close the app,
+2. press the button at the top of the lock briefly and quickly release it as soon as it starts flashing,
+3. wait until the lock is completely closed and remains closed.</value>
   </data>
   <data name="ChangeLog3_0_278" xml:space="preserve">
     <value>Hints added to ease closing of lock in case closing does not succeed on first try.</value>
@@ -921,11 +912,7 @@ Step 2:
 - location is off.</value>
   </data>
   <data name="ErrorReservedSearchMessageEscalationLevel1" xml:space="preserve">
-    <value>Lock of reserved bike cannot be be connected right now.
-If the bike is nearby:
-- restart app and repeat action
-- restart phone and repeat action
-to connect the lock</value>
+    <value>Your mobile device still does not connect to the bike lock. Please restart the app or even your mobile device and repeat the process.</value>
   </data>
   <data name="ChangeLog3_0_282" xml:space="preserve">
     <value>Permission requests messages on iOS formulated in more detail.
@@ -1099,4 +1086,30 @@ Minor bugfixes.</value>
   <data name="ChangeLog_MinorBugFixes" xml:space="preserve">
     <value>We have fixed some bugs. Enjoy the ride!</value>
   </data>
+  <data name="ChangeLog3_0_338_LB_MK" xml:space="preserve">
+    <value>Besides minor bug fixes we have simplified the contact procedure:
+- For acute questions/problems about the bike or rental process, please contact the fleet operator.
+- For communication with the app developers, select "Feedback about the App".
+To better analyze and improve processes in the app, please accept attaching your log file to your message. We appreciate both critical and positive feedback!</value>
+  </data>
+  <data name="ChangeLog3_0_338_SB" xml:space="preserve">
+    <value>Besides minor bug fixes we have simplified the contact procedure:
+- For acute questions/problems about the bike or rental process, please contact the fleet operator.
+- For communication with the app developers, select "Feedback about the App".
+To better analyze and improve processes in the app, please accept attaching your log file to your message. We appreciate both critical and positive feedback!
+
+In addition: Small graphics let you see at a glance what type of bike it is.</value>
+  </data>
+  <data name="SupportmailSubjectAppmail" xml:space="preserve">
+    <value>{0}-app request</value>
+  </data>
+  <data name="SupportmailSubjectOperatormail" xml:space="preserve">
+    <value>{0} request</value>
+  </data>
+  <data name="QuestionSupportmailAnswerNo" xml:space="preserve">
+    <value>No, do not attach file</value>
+  </data>
+  <data name="QuestionSupportmailTitle" xml:space="preserve">
+    <value>Consent</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TINKLib/MultilingualResources/TINKLib.de.xlf b/TINKLib/MultilingualResources/TINKLib.de.xlf
index 4e31abb..1bc164c 100644
--- a/TINKLib/MultilingualResources/TINKLib.de.xlf
+++ b/TINKLib/MultilingualResources/TINKLib.de.xlf
@@ -131,12 +131,12 @@
           <target state="final">Schloss kann erst geschlossen werden, wenn Rad nicht mehr bewegt wird. Bitte Rad abstellen und Vorgang wiederholen.</target>
         </trans-unit>
         <trans-unit id="ErrorBookedSearchMessage" translate="yes" xml:space="preserve">
-          <source>Lock of rented bike cannot be be connected right now.</source>
-          <target state="translated">Das Schloss des gemieteten Rads kann im Moment nicht verbunden werden.</target>
+          <source>Your mobile device does not connect to the bike lock. Please step as close as possible to the bike and try again.</source>
+          <target state="translated">Ihr mobiles Gerät verbindet sich nicht mit dem Fahrradschloss. Bitte treten Sie möglichst nah an das Rad heran und probieren Sie es erneut. </target>
         </trans-unit>
         <trans-unit id="ErrorReservedSearchMessage" translate="yes" xml:space="preserve">
-          <source>Lock of reserved bike can not be found.</source>
-          <target state="translated">Schloss des reservierten Rads kann nicht gefunden werden.</target>
+          <source>Your mobile device does not connect to the bike lock. Please step as close as possible to the bike and try again.</source>
+          <target state="translated">Ihr mobiles Gerät verbindet sich nicht mit dem Fahrradschloss. Bitte treten Sie möglichst nah an das Rad heran und probieren Sie es erneut. </target>
         </trans-unit>
         <trans-unit id="ActivityTextBikesAtStationGetBikes" translate="yes" xml:space="preserve">
           <source>Loading bikes located at station...</source>
@@ -219,8 +219,12 @@ Eine Radrückgabe ist nur möglich, wenn das Rad in Reichweite ist und Standorti
           <target state="translated">Ja</target>
         </trans-unit>
         <trans-unit id="QuestionSupportmailAttachment" translate="yes" xml:space="preserve">
-          <source>Attach file containing diagnosis information to mail?</source>
-          <target state="translated">Soll der Mail eine Datei mit Diagnoseinformationen angehängt werden?</target>
+          <source>I hereby consent to the transmission of my log file.
+
+The log file contains your app usage data as well as system information. The data will only be used for diagnostic purposes or to improve the app.</source>
+          <target state="translated">Hiermit stimme ich der Übermittlung meiner Protokolldatei zu.
+
+Die Protokolldatei enthält Ihre App-Nutzungsdaten sowie Systeminformationen. Die Daten werden ausschließlich für Diagnosezwecke bzw. Verbesserung der App verwendet.</target>
         </trans-unit>
         <trans-unit id="QuestionTitle" translate="yes" xml:space="preserve">
           <source>Question</source>
@@ -1007,16 +1011,8 @@ Fehlerbehebung: Supportmails können wieder verschickt werden.</target>
           <target state="translated">Fehlerbehebung: App schließt sich nicht mehr auf Fahrrad Wählen-Seite.</target>
         </trans-unit>
         <trans-unit id="ErrorBookedSearchMessageEscalationLevel1" translate="yes" xml:space="preserve">
-          <source>Lock of rented bike cannot be be connected right now.
-If the bike is nearby:
-- restart app and repeat action
-- restart phone and repeat action
-to connect the lock.</source>
-          <target state="translated">Das Schloss des gemieteten Fahrrads kann im Moment nicht verbunden werden.
-Wenn das Fahrrad in der Nähe ist:
-- App neu starten und Vorgang wiederholen
-- Telefon neu starten und Vorgang wiederholen
-um das Schloss zu verbinden.</target>
+          <source>Your mobile device still does not connect to the bike lock. Please restart the app or even your mobile device and repeat the process.</source>
+          <target state="translated">Ihr mobiles Gerät verbindet sich immer noch nicht mit dem Fahrradschloss. Bitte starten Sie die App oder sogar Ihr mobiles Gerät neu und wiederholen Sie den Vorgang.</target>
         </trans-unit>
         <trans-unit id="MessageAnswerCancel" translate="yes" xml:space="preserve">
           <source>Cancel</source>
@@ -1031,32 +1027,18 @@ um das Schloss zu verbinden.</target>
           <target state="translated">Fehler beim Verbinden mit Schloss!</target>
         </trans-unit>
         <trans-unit id="ErrorBookedSearchMessageEscalationLevel2" translate="yes" xml:space="preserve">
-          <source>Lock of rented bike cannot be be connected right now.
-If the bike is nearby:
-- restart app and repeat action
-- restart phone and repeat action
-to connect the lock.
+          <source>Unfortunately, it is still not possible to establish a connection between your mobile device and the bike lock. Please contact customer support.
 
-Return bike manually. 
-Steps 1: Close lock manually if lock is still open
-- close app  
-- press on button at the top of the lock until it starts blinking
-- wait until lock is closed completely
-Step 2: 
-- contact support regarding manual locking please to terminate rent</source>
-          <target state="translated">Das Schloss des gemieteten Fahrrads kann im Moment nicht verbunden werden.
-Wenn das Fahrrad in der Nähe ist:
-- App neu starten und Vorgang wiederholen
-- Telefon neu starten und Vorgang wiederholen
-um das Schloss zu verbinden.
+As a last resort, please close the lock by hand AND contact customer support so that they can terminate your chargeable rental. To do this:
+1. close the app,
+2. press the button at the top of the lock briefly and quickly release it as soon as it starts flashing,
+3. wait until the lock is completely closed and remains closed.</source>
+          <target state="translated">Es kann leider weiterhin keine Verbindung zwischen Ihrem mobilen Gerät und dem Fahrradschloss aufgebaut werden. Bitte kontaktieren Sie den Kundensupport.
 
-Manuelle Fahrradrückgabe. 
-Schitt 1: Schloss manuell schließen wenn nötig. Dazu
-- App schließen
-- auf den Knopf oben am Schloss drücken, bis dieser zu blinken beginnt
-- warten, bis das Schloss vollständig geschlossen ist
-Schritt 2:
-- Support bitte bezüglich der manuellen Schließung kontaktieren um Miete abzuschließen</target>
+Als aller letzten Ausweg das Schloss bitte per Hand schließen UND den Kundensupport zu kontaktieren, damit dieser Ihre kostenpflichtige Miete beenden kann. Dazu:
+1. App schließen,
+2. auf den Knopf oben am Schloss kurz drücken und schnell loslassen sobald bis dieser zu blinken beginnt,
+3. warten, bis das Schloss vollständig geschlossen ist und geschlossen bleibt. </target>
         </trans-unit>
         <trans-unit id="ChangeLog3_0_278" translate="yes" xml:space="preserve">
           <source>Hints added to ease closing of lock in case closing does not succeed on first try.</source>
@@ -1123,16 +1105,8 @@ Schritt 2:
 - die Standorterkennung deaktiviert ist.</target>
         </trans-unit>
         <trans-unit id="ErrorReservedSearchMessageEscalationLevel1" translate="yes" xml:space="preserve">
-          <source>Lock of reserved bike cannot be be connected right now.
-If the bike is nearby:
-- restart app and repeat action
-- restart phone and repeat action
-to connect the lock</source>
-          <target state="translated">Das Schloss des reservierten Fahrrads kann im Moment nicht verbunden werden.
-Wenn das Fahrrad in der Nähe ist:
-- App neu starten und Vorgang wiederholen
-- Telefon neu starten und Vorgang wiederholen
-um das Schloss zu verbinden.</target>
+          <source>Your mobile device still does not connect to the bike lock. Please restart the app or even your mobile device and repeat the process.</source>
+          <target state="translated">Ihr mobiles Gerät verbindet sich immer noch nicht mit dem Fahrradschloss. Bitte starten Sie die App oder sogar Ihr mobiles Gerät neu und wiederholen Sie den Vorgang.</target>
         </trans-unit>
         <trans-unit id="ChangeLog3_0_282" translate="yes" xml:space="preserve">
           <source>Permission requests messages on iOS formulated in more detail.
@@ -1370,6 +1344,46 @@ Kleinere Fehlerbehebungen.
           <source>We have fixed some bugs. Enjoy the ride!</source>
           <target state="translated">Wir haben einige Fehler behoben. Genießen Sie die Fahrt!</target>
         </trans-unit>
+        <trans-unit id="ChangeLog3_0_338_LB_MK" translate="yes" xml:space="preserve">
+          <source>Besides minor bug fixes we have simplified the contact procedure:
+- For acute questions/problems about the bike or rental process, please contact the fleet operator.
+- For communication with the app developers, select "Feedback about the App".
+To better analyze and improve processes in the app, please accept attaching your log file to your message. We appreciate both critical and positive feedback!</source>
+          <target state="translated">Neben kleineren Fehlerbehebungen haben wir die Kontaktaufnahme vereinfacht:
+- Bei akuten Fragen/Problemen zum Rad bzw. Mietvorgang bitte den Flottenbetreiber kontaktieren.
+- Für eine Kommunikation mit den App-Entwicklern, wählen Sie "Rückmeldung zur App".
+Um Prozesse in der App besser analysieren und verbessern zu können, akzeptieren Sie bitte das Anhängen Ihrer Protokolldatei an Ihre Nachricht. Wir freuen uns sowohl über kritische als auch über positive Rückmeldungen!</target>
+        </trans-unit>
+        <trans-unit id="ChangeLog3_0_338_SB" translate="yes" xml:space="preserve">
+          <source>Besides minor bug fixes we have simplified the contact procedure:
+- For acute questions/problems about the bike or rental process, please contact the fleet operator.
+- For communication with the app developers, select "Feedback about the App".
+To better analyze and improve processes in the app, please accept attaching your log file to your message. We appreciate both critical and positive feedback!
+
+In addition: Small graphics let you see at a glance what type of bike it is.</source>
+          <target state="translated">Neben kleineren Fehlerbehebungen haben wir die Kontaktaufnahme vereinfacht: 
+- Bei akuten Fragen/Problemen zum Rad bzw. Mietvorgang bitte den Flottenbetreiber kontaktieren.
+- Für eine Kommunikation mit den App-Entwicklern, wählen Sie "Rückmeldung zur App".
+Um Prozesse in der App besser analysieren und verbessern zu können, akzeptieren Sie bitte das Anhängen Ihrer Protokolldatei an Ihre Nachricht. Wir freuen uns sowohl über kritische als auch über positive Rückmeldungen!
+
+Außerdem: Kleine Grafiken lassen auf einen Blick erkennen um was für einen Rad-Typ es sich handelt.</target>
+        </trans-unit>
+        <trans-unit id="SupportmailSubjectAppmail" translate="yes" xml:space="preserve">
+          <source>{0}-app request</source>
+          <target state="translated">{0}-App Anfrage</target>
+        </trans-unit>
+        <trans-unit id="SupportmailSubjectOperatormail" translate="yes" xml:space="preserve">
+          <source>{0} request</source>
+          <target state="translated">{0} Anfrage</target>
+        </trans-unit>
+        <trans-unit id="QuestionSupportmailAnswerNo" translate="yes" xml:space="preserve">
+          <source>No, do not attach file</source>
+          <target state="translated">Nein, Datei nicht anhängen</target>
+        </trans-unit>
+        <trans-unit id="QuestionSupportmailTitle" translate="yes" xml:space="preserve">
+          <source>Consent</source>
+          <target state="translated">Einwilligung</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/TINKLib/Repository/AppContextInfo.cs b/TINKLib/Repository/AppContextInfo.cs
index a35f504..3c3479c 100644
--- a/TINKLib/Repository/AppContextInfo.cs
+++ b/TINKLib/Repository/AppContextInfo.cs
@@ -2,34 +2,34 @@
 
 namespace TINK.Repository
 {
-    /// <summary>
-    /// Holds info passed to COPRI.
-    /// </summary>
-    public class AppContextInfo
-    {
-        public AppContextInfo(string merchantId, string name, Version version)
-        {
-            Name = !string.IsNullOrEmpty(name)
-                ? name
-                : throw new ArgumentNullException(nameof(name));
+	/// <summary>
+	/// Holds info passed to COPRI.
+	/// </summary>
+	public class AppContextInfo
+	{
+		public AppContextInfo(string merchantId, string name, Version version)
+		{
+			Name = !string.IsNullOrEmpty(name)
+				? name
+				: throw new ArgumentNullException(nameof(name));
 
-            Version = version;
+			Version = version;
 
-            MerchantId = !string.IsNullOrEmpty(merchantId)
-                ? merchantId
-                : throw new ArgumentNullException(nameof(merchantId));
-        }
+			MerchantId = !string.IsNullOrEmpty(merchantId)
+				? merchantId
+				: throw new ArgumentNullException(nameof(merchantId));
+		}
 
-        /// <summary> Name of the app. </summary>
-        public string Name { get; private set; }
+		/// <summary> Name of the app. </summary>
+		public string Name { get; private set; }
 
-        /// <summary> Version of the app.</summary>
-        public Version Version { get; private set; }
+		/// <summary> Version of the app.</summary>
+		public Version Version { get; private set; }
 
-        /// <summary> Merchang id of the app. </summary>
-        public string MerchantId { get; private set; }
+		/// <summary> Merchang id of the app. </summary>
+		public string MerchantId { get; private set; }
 
-        /// <summary> Returns http- user agent.</summary>
-        public string UserAgent { get => $"{Name}/{Version}"; }
-    }
+		/// <summary> Returns http- user agent.</summary>
+		public string UserAgent { get => $"{Name}/{Version}"; }
+	}
 }
diff --git a/TINKLib/Repository/CopriCallsHttps.cs b/TINKLib/Repository/CopriCallsHttps.cs
index a9a59e2..271479f 100644
--- a/TINKLib/Repository/CopriCallsHttps.cs
+++ b/TINKLib/Repository/CopriCallsHttps.cs
@@ -14,894 +14,894 @@ using TINK.Repository.Response;
 
 namespace TINK.Repository
 {
-    /// <summary> Object which manages calls to copri. </summary>
-    public class CopriCallsHttps : ICopriServer
-    {
-        /// <summary> Builds requests.</summary>
-        private IRequestBuilder requestBuilder;
+	/// <summary> Object which manages calls to copri. </summary>
+	public class CopriCallsHttps : ICopriServer
+	{
+		/// <summary> Builds requests.</summary>
+		private IRequestBuilder requestBuilder;
 
-        /// <summary> Initializes a instance of the copri calls https object. </summary>
-        /// <param name="copriHost">Host to connect to. </param>
-        /// <param name="appContextInfo">Provides app related info (app name and version, merchantid) to pass to COPRI.</param>
-        /// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
-        /// <param name="sessionCookie">Session cookie if user is logged in, null otherwise.</param>
-        public CopriCallsHttps(
-            Uri copriHost,
-            AppContextInfo appContextInfo,
-            string uiIsoLangugageName,
-            string sessionCookie = null)
-        {
-            m_oCopriHost = copriHost
-                ?? throw new System.Exception($"Can not construct {GetType()}- object. Uri of copri host must not be null.");
+		/// <summary> Initializes a instance of the copri calls https object. </summary>
+		/// <param name="copriHost">Host to connect to. </param>
+		/// <param name="appContextInfo">Provides app related info (app name and version, merchantid) to pass to COPRI.</param>
+		/// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
+		/// <param name="sessionCookie">Session cookie if user is logged in, null otherwise.</param>
+		public CopriCallsHttps(
+			Uri copriHost,
+			AppContextInfo appContextInfo,
+			string uiIsoLangugageName,
+			string sessionCookie = null)
+		{
+			m_oCopriHost = copriHost
+				?? throw new System.Exception($"Can not construct {GetType()}- object. Uri of copri host must not be null.");
 
-            UserAgent = appContextInfo != null
-                ? appContextInfo.UserAgent
-                : throw new System.Exception($"Can not construct {GetType()}- object. User agent must not be null or empty.");
+			UserAgent = appContextInfo != null
+				? appContextInfo.UserAgent
+				: throw new System.Exception($"Can not construct {GetType()}- object. User agent must not be null or empty.");
 
-            requestBuilder = string.IsNullOrEmpty(sessionCookie)
-                ? new RequestBuilder(appContextInfo.MerchantId, uiIsoLangugageName) as IRequestBuilder
-                : new RequestBuilderLoggedIn(appContextInfo.MerchantId, uiIsoLangugageName, sessionCookie);
-        }
+			requestBuilder = string.IsNullOrEmpty(sessionCookie)
+				? new RequestBuilder(appContextInfo.MerchantId, uiIsoLangugageName) as IRequestBuilder
+				: new RequestBuilderLoggedIn(appContextInfo.MerchantId, uiIsoLangugageName, sessionCookie);
+		}
 
-        /// <summary> Holds the URL for rest calls.</summary>
-        private Uri m_oCopriHost;
+		/// <summary> Holds the URL for rest calls.</summary>
+		private Uri m_oCopriHost;
 
-        /// <summary> Spacifies name and version of app. </summary>
-        private string UserAgent { get; }
+		/// <summary> Spacifies name and version of app. </summary>
+		private string UserAgent { get; }
 
-        /// <summary> Returns true because value requested form copri server are returned. </summary>
-        public bool IsConnected => true;
+		/// <summary> Returns true because value requested form copri server are returned. </summary>
+		public bool IsConnected => true;
 
-        /// <summary> Gets the merchant id.</summary>
-        public string MerchantId => requestBuilder.MerchantId;
+		/// <summary> Gets the merchant id.</summary>
+		public string MerchantId => requestBuilder.MerchantId;
 
-        /// <summary> Gets the session cookie if user is logged in, an empty string otherwise. </summary>
-        public string SessionCookie => requestBuilder.SessionCookie;
+		/// <summary> Gets the session cookie if user is logged in, an empty string otherwise. </summary>
+		public string SessionCookie => requestBuilder.SessionCookie;
 
-        /// <summary> Logs user in. </summary>
-        /// <param name="mailAddress">Mailaddress of user to log in.</param>
-        /// <param name="password">Password to log in.</param>
-        /// <param name="deviceId">Id specifying user and hardware.</param>
-        /// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
-        public async Task<AuthorizationResponse> DoAuthorizationAsync(
-            string mailAddress,
-            string password,
-            string deviceId)
-            => await DoAuthorizationAsync(
-                m_oCopriHost.AbsoluteUri,
-                requestBuilder.DoAuthorization(mailAddress, password, deviceId),
-                () => requestBuilder.DoAuthorization(mailAddress, "********", deviceId),
-                UserAgent);
+		/// <summary> Logs user in. </summary>
+		/// <param name="mailAddress">Mailaddress of user to log in.</param>
+		/// <param name="password">Password to log in.</param>
+		/// <param name="deviceId">Id specifying user and hardware.</param>
+		/// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
+		public async Task<AuthorizationResponse> DoAuthorizationAsync(
+			string mailAddress,
+			string password,
+			string deviceId)
+			=> await DoAuthorizationAsync(
+				m_oCopriHost.AbsoluteUri,
+				requestBuilder.DoAuthorization(mailAddress, password, deviceId),
+				() => requestBuilder.DoAuthorization(mailAddress, "********", deviceId),
+				UserAgent);
 
-        /// <summary> Logs user out. </summary>
-        /// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
-        public async Task<AuthorizationoutResponse> DoAuthoutAsync()
-            => await DoAuthoutAsync(m_oCopriHost.AbsoluteUri, requestBuilder.DoAuthout(), UserAgent);
+		/// <summary> Logs user out. </summary>
+		/// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
+		public async Task<AuthorizationoutResponse> DoAuthoutAsync()
+			=> await DoAuthoutAsync(m_oCopriHost.AbsoluteUri, requestBuilder.DoAuthout(), UserAgent);
 
-        /// <summary>Gets bikes available.</summary>
-        /// <returns>Response holding list of bikes.</returns>
-        public async Task<BikesAvailableResponse> GetBikesAvailableAsync()
-            => await GetBikesAvailableAsync(m_oCopriHost.AbsoluteUri, requestBuilder.GetBikesAvailable(), UserAgent);
+		/// <summary>Gets bikes available.</summary>
+		/// <returns>Response holding list of bikes.</returns>
+		public async Task<BikesAvailableResponse> GetBikesAvailableAsync()
+			=> await GetBikesAvailableAsync(m_oCopriHost.AbsoluteUri, requestBuilder.GetBikesAvailable(), UserAgent);
 
-        /// <summary> Gets a list of bikes reserved/ booked by acctive user. </summary>
-        /// <returns>Response holding list of bikes.</returns>
-        public async Task<BikesReservedOccupiedResponse> GetBikesOccupiedAsync()
-        {
-            try
-            {
-                return await GetBikesOccupiedAsync(m_oCopriHost.AbsoluteUri, requestBuilder.GetBikesOccupied(), UserAgent);
-            }
-            catch (NotSupportedException)
-            {
-                // No user logged in.
-                await Task.CompletedTask;
-                return ResponseHelper.GetBikesOccupiedNone();
-            }
-        }
+		/// <summary> Gets a list of bikes reserved/ booked by acctive user. </summary>
+		/// <returns>Response holding list of bikes.</returns>
+		public async Task<BikesReservedOccupiedResponse> GetBikesOccupiedAsync()
+		{
+			try
+			{
+				return await GetBikesOccupiedAsync(m_oCopriHost.AbsoluteUri, requestBuilder.GetBikesOccupied(), UserAgent);
+			}
+			catch (NotSupportedException)
+			{
+				// No user logged in.
+				await Task.CompletedTask;
+				return ResponseHelper.GetBikesOccupiedNone();
+			}
+		}
 
-        /// <summary> Get list of stations. </summary>
-        /// <returns>List of files.</returns>
-        public async Task<StationsAvailableResponse> GetStationsAsync()
-            => await GetStationsAsync(m_oCopriHost.AbsoluteUri, requestBuilder.GetStations(), UserAgent);
+		/// <summary> Get list of stations. </summary>
+		/// <returns>List of files.</returns>
+		public async Task<StationsAvailableResponse> GetStationsAsync()
+			=> await GetStationsAsync(m_oCopriHost.AbsoluteUri, requestBuilder.GetStations(), UserAgent);
 
-        /// <summary> Get authentication keys. </summary>
-        /// <param name="bikeId">Id of the bike to get keys for.</param>
-        /// <returns>Response holding authentication keys.</returns>
-        public async Task<ReservationBookingResponse> GetAuthKeys(string bikeId)
-            => await GetAuthKeysAsync(m_oCopriHost.AbsoluteUri, requestBuilder.CalculateAuthParameters(bikeId), UserAgent);
+		/// <summary> Get authentication keys. </summary>
+		/// <param name="bikeId">Id of the bike to get keys for.</param>
+		/// <returns>Response holding authentication keys.</returns>
+		public async Task<ReservationBookingResponse> GetAuthKeys(string bikeId)
+			=> await GetAuthKeysAsync(m_oCopriHost.AbsoluteUri, requestBuilder.CalculateAuthParameters(bikeId), UserAgent);
 
 
-        /// <summary> Gets booking request response.</summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Booking response.</returns>
-        public async Task<ReservationBookingResponse> DoReserveAsync(
-            string bikeId,
-            Uri operatorUri)
-            => await DoReserveAsync(
-                operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
-                requestBuilder.DoReserve(bikeId),
-                UserAgent);
+		/// <summary> Gets booking request response.</summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Booking response.</returns>
+		public async Task<ReservationBookingResponse> DoReserveAsync(
+			string bikeId,
+			Uri operatorUri)
+			=> await DoReserveAsync(
+				operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
+				requestBuilder.DoReserve(bikeId),
+				UserAgent);
 
-        /// <summary> Gets canel booking request response.</summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on cancel booking request.</returns>
-        public async Task<ReservationCancelReturnResponse> DoCancelReservationAsync(
-            string bikeId,
-            Uri operatorUri)
-            => await DoCancelReservationAsync(
-                operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
-                requestBuilder.DoCancelReservation(bikeId),
-                UserAgent);
+		/// <summary> Gets canel booking request response.</summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on cancel booking request.</returns>
+		public async Task<ReservationCancelReturnResponse> DoCancelReservationAsync(
+			string bikeId,
+			Uri operatorUri)
+			=> await DoCancelReservationAsync(
+				operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
+				requestBuilder.DoCancelReservation(bikeId),
+				UserAgent);
 
-        /// <summary> Get authentication keys. </summary>
-        /// <param name="bikeId">Id of the bike to get keys for.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response holding authentication keys.</returns>
-        public async Task<ReservationBookingResponse> CalculateAuthKeysAsync(
-            string bikeId,
-            Uri operatorUri)
-            => await GetAuthKeysAsync(
-                operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
-                requestBuilder.CalculateAuthParameters(bikeId),
-                UserAgent);
+		/// <summary> Get authentication keys. </summary>
+		/// <param name="bikeId">Id of the bike to get keys for.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response holding authentication keys.</returns>
+		public async Task<ReservationBookingResponse> CalculateAuthKeysAsync(
+			string bikeId,
+			Uri operatorUri)
+			=> await GetAuthKeysAsync(
+				operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
+				requestBuilder.CalculateAuthParameters(bikeId),
+				UserAgent);
 
-        /// <summary> Notifies COPRI about start of returning sequence. </summary>
-        /// <remarks> Operator specific call.</remarks>
-        /// <param name="bikeId">Id of the bike to return.</param>+
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on notification about start of returning sequence.</returns>
-        public async Task<ResponseBase> StartReturningBike(
-            string bikeId,
-            Uri operatorUri)
-            => await DoStartReturningBike(
-                operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
-                requestBuilder.StartReturningBike(bikeId),
-                UserAgent);
+		/// <summary> Notifies COPRI about start of returning sequence. </summary>
+		/// <remarks> Operator specific call.</remarks>
+		/// <param name="bikeId">Id of the bike to return.</param>+
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on notification about start of returning sequence.</returns>
+		public async Task<ResponseBase> StartReturningBike(
+			string bikeId,
+			Uri operatorUri)
+			=> await DoStartReturningBike(
+				operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
+				requestBuilder.StartReturningBike(bikeId),
+				UserAgent);
 
-        /// <summary> Updates lock state for a booked bike. </summary>
-        /// <param name="bikeId">Id of the bike to update locking state for.</param>
-        /// <param name="location">Geolocation of lock.</param>
-        /// <param name="state">New locking state.</param>
-        /// <param name="batteryPercentage">Holds the filling level percentage of the battery.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on updating locking state.</returns>
-        public async Task<ReservationBookingResponse> UpdateLockingStateAsync(
-            string bikeId,
-            lock_state state,
-            Uri operatorUri,
-            LocationDto location,
-            double batteryLevel) =>
-                await DoUpdateLockingStateAsync(
-                    operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
-                    requestBuilder.UpateLockingState(bikeId, state, location, batteryLevel),
-                    UserAgent);
+		/// <summary> Updates lock state for a booked bike. </summary>
+		/// <param name="bikeId">Id of the bike to update locking state for.</param>
+		/// <param name="location">Geolocation of lock.</param>
+		/// <param name="state">New locking state.</param>
+		/// <param name="batteryPercentage">Holds the filling level percentage of the battery.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on updating locking state.</returns>
+		public async Task<ReservationBookingResponse> UpdateLockingStateAsync(
+			string bikeId,
+			lock_state state,
+			Uri operatorUri,
+			LocationDto location,
+			double batteryLevel) =>
+				await DoUpdateLockingStateAsync(
+					operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
+					requestBuilder.UpateLockingState(bikeId, state, location, batteryLevel),
+					UserAgent);
 
-        /// <summary> Gets booking request request. </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <param name="guid">Used to publish GUID from app to copri. Used for initial setup of bike in copri.</param>
-        /// <param name="batteryPercentage">Holds the filling level percentage of the battery.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Requst on booking request.</returns>
-        public async Task<ReservationBookingResponse> DoBookAsync(
-            string bikeId,
-            Guid guid,
-            double batteryPercentage,
-            Uri operatorUri)
-            => await DoBookAsync(
-                operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
-                requestBuilder.DoBook(bikeId, guid, batteryPercentage),
-                UserAgent);
+		/// <summary> Gets booking request request. </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <param name="guid">Used to publish GUID from app to copri. Used for initial setup of bike in copri.</param>
+		/// <param name="batteryPercentage">Holds the filling level percentage of the battery.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Requst on booking request.</returns>
+		public async Task<ReservationBookingResponse> DoBookAsync(
+			string bikeId,
+			Guid guid,
+			double batteryPercentage,
+			Uri operatorUri)
+			=> await DoBookAsync(
+				operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
+				requestBuilder.DoBook(bikeId, guid, batteryPercentage),
+				UserAgent);
 
-        /// <summary> Books a bike and starts opening bike. </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on booking request.</returns>
-        public async Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(
-            string bikeId,
-            Uri operatorUri)
-            => await DoBookAsync(
-                operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
-                requestBuilder.BookAvailableAndStartOpening(bikeId),
-                UserAgent);
+		/// <summary> Books a bike and starts opening bike. </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on booking request.</returns>
+		public async Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(
+			string bikeId,
+			Uri operatorUri)
+			=> await DoBookAsync(
+				operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
+				requestBuilder.BookAvailableAndStartOpening(bikeId),
+				UserAgent);
 
-        /// <summary> Books a bike and starts opening bike. </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on booking request.</returns>
-        public async Task<ReservationBookingResponse> BookReservedAndStartOpeningAsync(
-            string bikeId,
-            Uri operatorUri)
-            => await DoBookAsync(
-                operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
-                requestBuilder.BookReservedAndStartOpening(bikeId),
-                UserAgent);
+		/// <summary> Books a bike and starts opening bike. </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on booking request.</returns>
+		public async Task<ReservationBookingResponse> BookReservedAndStartOpeningAsync(
+			string bikeId,
+			Uri operatorUri)
+			=> await DoBookAsync(
+				operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
+				requestBuilder.BookReservedAndStartOpening(bikeId),
+				UserAgent);
 
-        /// <summary> Returns a bike. </summary>
-        /// <param name="bikeId">Id of the bike to return.</param>
-        /// <param name="location">Geolocation of lock.</param>
-        /// <param name="smartDevice">Provides info about hard and software.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on returning request.</returns>
-        public async Task<DoReturnResponse> DoReturn(
-            string bikeId,
-            LocationDto location,
-            ISmartDevice smartDevice,
-            Uri operatorUri)
-            => await DoReturn(
-                operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
-                requestBuilder.DoReturn(bikeId, location, smartDevice),
-                UserAgent);
+		/// <summary> Returns a bike. </summary>
+		/// <param name="bikeId">Id of the bike to return.</param>
+		/// <param name="location">Geolocation of lock.</param>
+		/// <param name="smartDevice">Provides info about hard and software.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on returning request.</returns>
+		public async Task<DoReturnResponse> DoReturn(
+			string bikeId,
+			LocationDto location,
+			ISmartDevice smartDevice,
+			Uri operatorUri)
+			=> await DoReturn(
+				operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
+				requestBuilder.DoReturn(bikeId, location, smartDevice),
+				UserAgent);
 
-        /// <summary> Returns a bike and starts closing. </summary>
-        /// <param name="bikeId">Id of the bike to return.</param>
-        /// <param name="smartDevice">Provides info about hard and software.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on returning request.</returns>
-        public async Task<DoReturnResponse> ReturnAndStartClosingAsync(
-            string bikeId,
-            ISmartDevice smartDevice,
-            Uri operatorUri)
-            => await DoReturn(
-                operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
-                requestBuilder.ReturnAndStartClosing(bikeId, smartDevice),
-                UserAgent);
+		/// <summary> Returns a bike and starts closing. </summary>
+		/// <param name="bikeId">Id of the bike to return.</param>
+		/// <param name="smartDevice">Provides info about hard and software.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on returning request.</returns>
+		public async Task<DoReturnResponse> ReturnAndStartClosingAsync(
+			string bikeId,
+			ISmartDevice smartDevice,
+			Uri operatorUri)
+			=> await DoReturn(
+				operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
+				requestBuilder.ReturnAndStartClosing(bikeId, smartDevice),
+				UserAgent);
 
-        /// <summary> Submits feedback to copri server. </summary>
-        /// <param name="bikeId">Id of the bike to which the feedback is related to.</param>
-        /// <param name="currentChargeBars">Null if bike has no engine or charge is unknown. Otherwise the charge filling level of the drive battery.</param>
-        /// <param name="isBikeBroken">True if bike is broken.</param>
-        /// <param name="message">General purpose message or error description.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on submitting feedback request.</returns>
-        public async Task<SubmitFeedbackResponse> DoSubmitFeedback(
-            string bikeId,
-            int? currentChargeBars,
-            string message,
-            bool isBikeBroken,
-            Uri operatorUri) =>
-                await DoSubmitFeedback(
-                    operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
-                    requestBuilder.DoSubmitFeedback(bikeId, currentChargeBars, message, isBikeBroken),
-                    UserAgent);
+		/// <summary> Submits feedback to copri server. </summary>
+		/// <param name="bikeId">Id of the bike to which the feedback is related to.</param>
+		/// <param name="currentChargeBars">Null if bike has no engine or charge is unknown. Otherwise the charge filling level of the drive battery.</param>
+		/// <param name="isBikeBroken">True if bike is broken.</param>
+		/// <param name="message">General purpose message or error description.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on submitting feedback request.</returns>
+		public async Task<SubmitFeedbackResponse> DoSubmitFeedback(
+			string bikeId,
+			int? currentChargeBars,
+			string message,
+			bool isBikeBroken,
+			Uri operatorUri) =>
+				await DoSubmitFeedback(
+					operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
+					requestBuilder.DoSubmitFeedback(bikeId, currentChargeBars, message, isBikeBroken),
+					UserAgent);
 
-        /// <summary> Submits mini survey to copri server. </summary>
-        /// <param name="answers">Collection of answers.</param>
-        public Task<ResponseBase> DoSubmitMiniSurvey(IDictionary<string, string> answers)
-            => DoSubmitMiniSurvey(
-                    m_oCopriHost.AbsoluteUri,
-                    requestBuilder.DoSubmitMiniSurvey(answers),
-                    UserAgent);
+		/// <summary> Submits mini survey to copri server. </summary>
+		/// <param name="answers">Collection of answers.</param>
+		public Task<ResponseBase> DoSubmitMiniSurvey(IDictionary<string, string> answers)
+			=> DoSubmitMiniSurvey(
+					m_oCopriHost.AbsoluteUri,
+					requestBuilder.DoSubmitMiniSurvey(answers),
+					UserAgent);
 
-        /// <summary> Logs user in. </summary>
-        /// <param name="copriHost">Host to connect to. </param>
-        /// <param name="command">Command to log user in.</param>
-        /// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
-        public static async Task<AuthorizationResponse> DoAuthorizationAsync(
-            string copriHost,
-            string command,
-            Func<string> displayCommand,
-            string userAgent = null)
-        {
+		/// <summary> Logs user in. </summary>
+		/// <param name="copriHost">Host to connect to. </param>
+		/// <param name="command">Command to log user in.</param>
+		/// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
+		public static async Task<AuthorizationResponse> DoAuthorizationAsync(
+			string copriHost,
+			string command,
+			Func<string> displayCommand,
+			string userAgent = null)
+		{
 #if !WINDOWS_UWP
-            /// Extract session cookie from response.
-            string response = string.Empty;
-            try
-            {
-                response = await PostAsync(
-                    copriHost,
-                    command,
-                    userAgent,
-                    displayCommand); // Do not include password into exception output when an error occurres.
-            }
-            catch (System.Exception l_oException)
-            {
-                if (l_oException.GetIsConnectFailureException())
-                {
-                    throw new WebConnectFailureException("Login fehlgeschlagen aufgrund eines Netzwerkfehlers.", l_oException);
-                }
+			/// Extract session cookie from response.
+			string response = string.Empty;
+			try
+			{
+				response = await PostAsync(
+					copriHost,
+					command,
+					userAgent,
+					displayCommand); // Do not include password into exception output when an error occurres.
+			}
+			catch (System.Exception l_oException)
+			{
+				if (l_oException.GetIsConnectFailureException())
+				{
+					throw new WebConnectFailureException("Login fehlgeschlagen aufgrund eines Netzwerkfehlers.", l_oException);
+				}
 
-                if (l_oException.GetIsForbiddenException())
-                {
-                    throw new WebForbiddenException("Login fehlgeschlagen aufgrund eines Netzwerkfehlers.", l_oException);
-                }
+				if (l_oException.GetIsForbiddenException())
+				{
+					throw new WebForbiddenException("Login fehlgeschlagen aufgrund eines Netzwerkfehlers.", l_oException);
+				}
 
-                throw;
-            }
+				throw;
+			}
 
-            return CopriCallsStatic.DeserializeResponse<AuthorizationResponse>(response, (version) => new UnsupportedCopriVersionDetectedException());
+			return CopriCallsStatic.DeserializeResponse<AuthorizationResponse>(response, (version) => new UnsupportedCopriVersionDetectedException());
 #else
             return null;
 #endif
-        }
+		}
 
-        /// <summary> Logs user out. </summary>
-        /// <param name="copriHost">Host to connect to. </param>
-        /// <param name="command">Command to log user out.</param>
-        public static async Task<AuthorizationoutResponse> DoAuthoutAsync(
-            string p_strCopriHost,
-            string p_oCommand,
-            string userAgent = null)
-        {
+		/// <summary> Logs user out. </summary>
+		/// <param name="copriHost">Host to connect to. </param>
+		/// <param name="command">Command to log user out.</param>
+		public static async Task<AuthorizationoutResponse> DoAuthoutAsync(
+			string p_strCopriHost,
+			string p_oCommand,
+			string userAgent = null)
+		{
 #if !WINDOWS_UWP
-            string l_oLogoutResponse;
-            try
-            {
-                l_oLogoutResponse = await PostAsync(p_strCopriHost, p_oCommand, userAgent);
-            }
+			string l_oLogoutResponse;
+			try
+			{
+				l_oLogoutResponse = await PostAsync(p_strCopriHost, p_oCommand, userAgent);
+			}
 
-            catch (System.Exception l_oException)
-            {
-                if (l_oException.GetIsConnectFailureException())
-                {
-                    throw new WebConnectFailureException("Login fehlgeschlagen wegen Netzwerkfehler.", l_oException);
-                }
+			catch (System.Exception l_oException)
+			{
+				if (l_oException.GetIsConnectFailureException())
+				{
+					throw new WebConnectFailureException("Login fehlgeschlagen wegen Netzwerkfehler.", l_oException);
+				}
 
-                if (l_oException.GetIsForbiddenException())
-                {
-                    throw new WebForbiddenException("Login fehlgeschlagen wegen Netzwerkfehler.", l_oException);
-                }
+				if (l_oException.GetIsForbiddenException())
+				{
+					throw new WebForbiddenException("Login fehlgeschlagen wegen Netzwerkfehler.", l_oException);
+				}
 
-                throw;
-            }
+				throw;
+			}
 
-            /// Extract session cookie from response.
-            return CopriCallsStatic.DeserializeResponse<AuthorizationoutResponse>(l_oLogoutResponse, (version) => new UnsupportedCopriVersionDetectedException());
+			/// Extract session cookie from response.
+			return CopriCallsStatic.DeserializeResponse<AuthorizationoutResponse>(l_oLogoutResponse, (version) => new UnsupportedCopriVersionDetectedException());
 #else
             return null;
 #endif
-        }
+		}
 
-        /// <summary>
-        /// Get list of stations from file.
-        /// </summary>
-        /// <param name="p_strCopriHost">URL of the copri host to connect to.</param>
-        /// <param name="p_oCommand">Command to get stations.</param>
-        /// <returns>List of files.</returns>
-        public static async Task<StationsAvailableResponse> GetStationsAsync(
-        string p_strCopriHost,
-        string p_oCommand,
-        string userAgent = null)
-        {
+		/// <summary>
+		/// Get list of stations from file.
+		/// </summary>
+		/// <param name="p_strCopriHost">URL of the copri host to connect to.</param>
+		/// <param name="p_oCommand">Command to get stations.</param>
+		/// <returns>List of files.</returns>
+		public static async Task<StationsAvailableResponse> GetStationsAsync(
+		string p_strCopriHost,
+		string p_oCommand,
+		string userAgent = null)
+		{
 #if !WINDOWS_UWP
-            string response;
-            try
-            {
-                response = await PostAsync(p_strCopriHost, p_oCommand, userAgent);
-            }
-            catch (System.Exception l_oException)
-            {
-                if (l_oException.GetIsConnectFailureException())
-                {
-                    throw new WebConnectFailureException("Abfage der verfügbaren Räder fehlgeschlagen wegen Netzwerkfehler.", l_oException);
-                }
+			string response;
+			try
+			{
+				response = await PostAsync(p_strCopriHost, p_oCommand, userAgent);
+			}
+			catch (System.Exception l_oException)
+			{
+				if (l_oException.GetIsConnectFailureException())
+				{
+					throw new WebConnectFailureException("Abfage der verfügbaren Räder fehlgeschlagen wegen Netzwerkfehler.", l_oException);
+				}
 
-                if (l_oException.GetIsForbiddenException())
-                {
-                    throw new WebForbiddenException("Abfage der verfügbaren Räder fehlgeschlagen wegen Netzwerkfehler.", l_oException);
-                }
+				if (l_oException.GetIsForbiddenException())
+				{
+					throw new WebForbiddenException("Abfage der verfügbaren Räder fehlgeschlagen wegen Netzwerkfehler.", l_oException);
+				}
 
-                throw;
-            }
+				throw;
+			}
 
-            // Extract bikes from response.
-            return CopriCallsStatic.DeserializeResponse(
-                response,
-                (version) => CopriCallsMonkeyStore.GetEmptyStationsAllResponse(version));
+			// Extract bikes from response.
+			return CopriCallsStatic.DeserializeResponse(
+				response,
+				(version) => CopriCallsMonkeyStore.GetEmptyStationsAllResponse(version));
 #else
             return null;
 #endif
-        }
+		}
 
-        /// <summary> Gets a list of bikes from Copri. </summary>
-        /// <param name="copriHost">URL of the copri host to connect to.</param>
-        /// <param name="p_oCommand">Command to get bikes.</param>
-        /// <returns>Response holding list of bikes.</returns>
-        public static async Task<BikesAvailableResponse> GetBikesAvailableAsync(
-            string copriHost,
-            string command,
-            string userAgent = null)
-        {
-#if !WINDOWS_UWP           
-            string response;
-            try
-            {
-                response = await PostAsync(copriHost, command, userAgent);
-            }
-            catch (System.Exception l_oException)
-            {
-                if (l_oException.GetIsConnectFailureException())
-                {
-                    throw new WebConnectFailureException("Abfage der verfügbaren Räder fehlgeschlagen wegen Netzwerkfehler.", l_oException);
-                }
-
-                if (l_oException.GetIsForbiddenException())
-                {
-                    throw new WebForbiddenException("Abfage der verfügbaren Räder fehlgeschlagen wegen Netzwerkfehler.", l_oException);
-                }
-
-                throw;
-            }
-
-            // Extract bikes from response.
-            return CopriCallsStatic.DeserializeResponse(
-                response,
-                (version) => CopriCallsMonkeyStore.GetEmptyBikesAvailableResponse(version));
-
-#else
-            return null;
-#endif
-        }
-
-        /// <summary> Gets a list of bikes reserved/ booked by acctive user from Copri.</summary>
-        /// <param name="p_strCopriHost">URL of the copri host to connect to.</param>
-        /// <param name="p_oCommand">Command to post.</param>
-        /// <returns>Response holding list of bikes.</returns>
-        public static async Task<BikesReservedOccupiedResponse> GetBikesOccupiedAsync(
-            string p_strCopriHost,
-            string p_oCommand,
-            string userAgent = null)
-        {
-#if !WINDOWS_UWP            
-            string response;
-            try
-            {
-                response = await PostAsync(p_strCopriHost, p_oCommand, userAgent);
-            }
-            catch (System.Exception l_oException)
-            {
-                if (l_oException.GetIsConnectFailureException())
-                {
-                    throw new WebConnectFailureException("Abfage der reservierten/ gebuchten Räder fehlgeschlagen wegen Netzwerkfehler.", l_oException);
-                }
-
-                if (l_oException.GetIsForbiddenException())
-                {
-                    throw new WebForbiddenException("Abfage der reservierten/ gebuchten Räder fehlgeschlagen wegen Netzwerkfehler.", l_oException);
-                }
-
-                throw;
-            }
-
-            // Extract bikes from response.
-            return CopriCallsStatic.DeserializeResponse(
-                response,
-                (version) => CopriCallsMonkeyStore.GetEmptyBikesReservedOccupiedResponse(version));
-#else
-            return null;
-#endif
-        }
-
-        /// <summary> Get auth keys from COPRI. </summary>
-        /// <param name="copriHost">Host to connect to. </param>
-        /// <param name="command">Command to log user in.</param>
-        /// <returns>Response on booking request.</returns>
-        public static async Task<ReservationBookingResponse> GetAuthKeysAsync(
-            string copriHost,
-            string command,
-            string userAgent = null)
-        {
+		/// <summary> Gets a list of bikes from Copri. </summary>
+		/// <param name="copriHost">URL of the copri host to connect to.</param>
+		/// <param name="p_oCommand">Command to get bikes.</param>
+		/// <returns>Response holding list of bikes.</returns>
+		public static async Task<BikesAvailableResponse> GetBikesAvailableAsync(
+			string copriHost,
+			string command,
+			string userAgent = null)
+		{
 #if !WINDOWS_UWP
-            string bikesAvaialbeResponse;
-            try
-            {
-                bikesAvaialbeResponse = await PostAsync(copriHost, command, userAgent);
-            }
-            catch (System.Exception exception)
-            {
-                if (exception.GetIsConnectFailureException())
-                {
-                    throw new WebConnectFailureException("Schlosssuche wegen Netzwerkfehler fehlgeschlagen.", exception);
-                }
+			string response;
+			try
+			{
+				response = await PostAsync(copriHost, command, userAgent);
+			}
+			catch (System.Exception l_oException)
+			{
+				if (l_oException.GetIsConnectFailureException())
+				{
+					throw new WebConnectFailureException("Abfage der verfügbaren Räder fehlgeschlagen wegen Netzwerkfehler.", l_oException);
+				}
 
-                if (exception.GetIsForbiddenException())
-                {
-                    throw new WebForbiddenException("Schlosssuche wegen Netzwerkfehler fehlgeschlagen.", exception);
-                }
+				if (l_oException.GetIsForbiddenException())
+				{
+					throw new WebForbiddenException("Abfage der verfügbaren Räder fehlgeschlagen wegen Netzwerkfehler.", l_oException);
+				}
 
-                throw;
-            }
+				throw;
+			}
+
+			// Extract bikes from response.
+			return CopriCallsStatic.DeserializeResponse(
+				response,
+				(version) => CopriCallsMonkeyStore.GetEmptyBikesAvailableResponse(version));
 
-            // Extract bikes from response.
-            return JsonConvertRethrow.DeserializeObject<ResponseContainer<ReservationBookingResponse>>(bikesAvaialbeResponse)?.shareejson;
 #else
             return null;
 #endif
-        }
-        /// <summary> Gets booking request response. </summary>
-        /// <param name="copriHost">Host to connect to. </param>
-        /// <param name="command">Command to log user in.</param>
-        /// <returns>Response on booking request.</returns>
-        public static async Task<ReservationBookingResponse> DoReserveAsync(
-            string copriHost,
-            string command,
-            string userAgent = null)
-        {
+		}
+
+		/// <summary> Gets a list of bikes reserved/ booked by acctive user from Copri.</summary>
+		/// <param name="p_strCopriHost">URL of the copri host to connect to.</param>
+		/// <param name="p_oCommand">Command to post.</param>
+		/// <returns>Response holding list of bikes.</returns>
+		public static async Task<BikesReservedOccupiedResponse> GetBikesOccupiedAsync(
+			string p_strCopriHost,
+			string p_oCommand,
+			string userAgent = null)
+		{
 #if !WINDOWS_UWP
-            string bikesAvaialbeResponse;
-            try
-            {
-                bikesAvaialbeResponse = await PostAsync(copriHost, command, userAgent);
-            }
-            catch (System.Exception exception)
-            {
-                if (exception.GetIsConnectFailureException())
-                {
-                    throw new WebConnectFailureException("Reservierung des Fahrrads wegen Netzwerkfehler fehlgeschlagen.", exception);
-                }
+			string response;
+			try
+			{
+				response = await PostAsync(p_strCopriHost, p_oCommand, userAgent);
+			}
+			catch (System.Exception l_oException)
+			{
+				if (l_oException.GetIsConnectFailureException())
+				{
+					throw new WebConnectFailureException("Abfage der reservierten/ gebuchten Räder fehlgeschlagen wegen Netzwerkfehler.", l_oException);
+				}
 
-                if (exception.GetIsForbiddenException())
-                {
-                    throw new WebForbiddenException("Reservierung des Fahrrads wegen Netzwerkfehler fehlgeschlagen.", exception);
-                }
+				if (l_oException.GetIsForbiddenException())
+				{
+					throw new WebForbiddenException("Abfage der reservierten/ gebuchten Räder fehlgeschlagen wegen Netzwerkfehler.", l_oException);
+				}
 
-                throw;
-            }
+				throw;
+			}
 
-            // Extract bikes from response.
-            return JsonConvertRethrow.DeserializeObject<ResponseContainer<ReservationBookingResponse>>(bikesAvaialbeResponse)?.shareejson;
+			// Extract bikes from response.
+			return CopriCallsStatic.DeserializeResponse(
+				response,
+				(version) => CopriCallsMonkeyStore.GetEmptyBikesReservedOccupiedResponse(version));
 #else
             return null;
 #endif
-        }
+		}
 
-        /// <summary> Gets canel booking request response.</summary>
-        /// <param name="copriHost">Host to connect to. </param>
-        /// <param name="command">Command to log user in.</param>
-        /// <returns>Response on cancel booking request.</returns>
-        public static async Task<ReservationCancelReturnResponse> DoCancelReservationAsync(
-            string copriHost,
-            string command,
-            string userAgent = null)
-        {
-#if !WINDOWS_UWP            
-            string l_oBikesAvaialbeResponse;
-            try
-            {
-                l_oBikesAvaialbeResponse = await PostAsync(copriHost, command, userAgent);
-            }
-            catch (System.Exception l_oException)
-            {
-                if (l_oException.GetIsConnectFailureException())
-                {
-                    throw new WebConnectFailureException("Reservierung des Fahrrads aufgrund eines Netzwerkfehlers fehlgeschlagen.", l_oException);
-                }
-
-                if (l_oException.GetIsForbiddenException())
-                {
-                    throw new WebForbiddenException("Reservierung des Fahrrads aufgrund eines Netzwerkfehlers fehlgeschlagen.", l_oException);
-                }
-
-                throw;
-            }
-
-            // Extract bikes from response.
-            return JsonConvertRethrow.DeserializeObject<ResponseContainer<ReservationCancelReturnResponse>>(l_oBikesAvaialbeResponse)?.shareejson;
-#else
-            return null;
-#endif
-        }
-
-        public static async Task<ResponseBase> DoStartReturningBike(
-            string copriHost,
-            string command,
-            string agent = null)
-        {
+		/// <summary> Get auth keys from COPRI. </summary>
+		/// <param name="copriHost">Host to connect to. </param>
+		/// <param name="command">Command to log user in.</param>
+		/// <returns>Response on booking request.</returns>
+		public static async Task<ReservationBookingResponse> GetAuthKeysAsync(
+			string copriHost,
+			string command,
+			string userAgent = null)
+		{
 #if !WINDOWS_UWP
-            string response;
-            try
-            {
-                response = await PostAsync(copriHost, command, agent);
-            }
-            catch (System.Exception exception)
-            {
-                if (exception.GetIsConnectFailureException())
-                {
-                    throw new WebConnectFailureException("Benachrichtigung von Start der Rückgabe wegen Netzwerkfehler fehlgeschlagen.", exception);
-                }
+			string bikesAvaialbeResponse;
+			try
+			{
+				bikesAvaialbeResponse = await PostAsync(copriHost, command, userAgent);
+			}
+			catch (System.Exception exception)
+			{
+				if (exception.GetIsConnectFailureException())
+				{
+					throw new WebConnectFailureException("Schlosssuche wegen Netzwerkfehler fehlgeschlagen.", exception);
+				}
 
-                if (exception.GetIsForbiddenException())
-                {
-                    throw new WebForbiddenException("Benachrichtigung von Start der Rückgabe wegen Netzwerkfehler fehlgeschlagen.", exception);
-                }
+				if (exception.GetIsForbiddenException())
+				{
+					throw new WebForbiddenException("Schlosssuche wegen Netzwerkfehler fehlgeschlagen.", exception);
+				}
 
-                throw;
-            }
+				throw;
+			}
 
-            // Extract bikes from response.
-            return JsonConvertRethrow.DeserializeObject<ResponseContainer<ResponseBase>>(response)?.shareejson;
+			// Extract bikes from response.
+			return JsonConvertRethrow.DeserializeObject<ResponseContainer<ReservationBookingResponse>>(bikesAvaialbeResponse)?.shareejson;
 #else
             return null;
 #endif
-        }
-
-        public static async Task<ReservationBookingResponse> DoUpdateLockingStateAsync(
-            string copriHost,
-            string command,
-            string agent = null)
-        {
+		}
+		/// <summary> Gets booking request response. </summary>
+		/// <param name="copriHost">Host to connect to. </param>
+		/// <param name="command">Command to log user in.</param>
+		/// <returns>Response on booking request.</returns>
+		public static async Task<ReservationBookingResponse> DoReserveAsync(
+			string copriHost,
+			string command,
+			string userAgent = null)
+		{
 #if !WINDOWS_UWP
-            string bikesAvaialbeResponse;
-            try
-            {
-                bikesAvaialbeResponse = await PostAsync(copriHost, command, agent);
-            }
-            catch (System.Exception exception)
-            {
-                if (exception.GetIsConnectFailureException())
-                {
-                    throw new WebConnectFailureException("Aktualisierung des Schlossstatuses wegen Netzwerkfehler fehlgeschlagen.", exception);
-                }
+			string bikesAvaialbeResponse;
+			try
+			{
+				bikesAvaialbeResponse = await PostAsync(copriHost, command, userAgent);
+			}
+			catch (System.Exception exception)
+			{
+				if (exception.GetIsConnectFailureException())
+				{
+					throw new WebConnectFailureException("Reservierung des Fahrrads wegen Netzwerkfehler fehlgeschlagen.", exception);
+				}
 
-                if (exception.GetIsForbiddenException())
-                {
-                    throw new WebForbiddenException("Aktualisierung des Schlossstatuses wegen Netzwerkfehler fehlgeschlagen.", exception);
-                }
+				if (exception.GetIsForbiddenException())
+				{
+					throw new WebForbiddenException("Reservierung des Fahrrads wegen Netzwerkfehler fehlgeschlagen.", exception);
+				}
 
-                throw;
-            }
+				throw;
+			}
 
-            // Extract bikes from response.
-            return JsonConvertRethrow.DeserializeObject<ResponseContainer<ReservationBookingResponse>>(bikesAvaialbeResponse)?.shareejson;
+			// Extract bikes from response.
+			return JsonConvertRethrow.DeserializeObject<ResponseContainer<ReservationBookingResponse>>(bikesAvaialbeResponse)?.shareejson;
 #else
             return null;
 #endif
-        }
+		}
 
-        public static async Task<ReservationBookingResponse> DoBookAsync(
-            string copriHost,
-            string command,
-            string agent = null)
-        {
+		/// <summary> Gets canel booking request response.</summary>
+		/// <param name="copriHost">Host to connect to. </param>
+		/// <param name="command">Command to log user in.</param>
+		/// <returns>Response on cancel booking request.</returns>
+		public static async Task<ReservationCancelReturnResponse> DoCancelReservationAsync(
+			string copriHost,
+			string command,
+			string userAgent = null)
+		{
 #if !WINDOWS_UWP
-            string bikesAvaialbeResponse;
-            try
-            {
-                bikesAvaialbeResponse = await PostAsync(copriHost, command, agent);
-            }
-            catch (System.Exception exception)
-            {
-                if (exception.GetIsConnectFailureException())
-                {
-                    throw new WebConnectFailureException("Buchung des Fahrrads wegen Netzwerkfehler fehlgeschlagen.", exception);
-                }
+			string l_oBikesAvaialbeResponse;
+			try
+			{
+				l_oBikesAvaialbeResponse = await PostAsync(copriHost, command, userAgent);
+			}
+			catch (System.Exception l_oException)
+			{
+				if (l_oException.GetIsConnectFailureException())
+				{
+					throw new WebConnectFailureException("Reservierung des Fahrrads aufgrund eines Netzwerkfehlers fehlgeschlagen.", l_oException);
+				}
 
-                if (exception.GetIsForbiddenException())
-                {
-                    throw new WebForbiddenException("Buchung des Fahrrads wegen Netzwerkfehler fehlgeschlagen.", exception);
-                }
+				if (l_oException.GetIsForbiddenException())
+				{
+					throw new WebForbiddenException("Reservierung des Fahrrads aufgrund eines Netzwerkfehlers fehlgeschlagen.", l_oException);
+				}
 
-                throw;
-            }
+				throw;
+			}
 
-            // Extract bikes from response.
-            return JsonConvertRethrow.DeserializeObject<ResponseContainer<ReservationBookingResponse>>(bikesAvaialbeResponse)?.shareejson;
+			// Extract bikes from response.
+			return JsonConvertRethrow.DeserializeObject<ResponseContainer<ReservationCancelReturnResponse>>(l_oBikesAvaialbeResponse)?.shareejson;
 #else
             return null;
 #endif
-        }
+		}
 
-        public static async Task<DoReturnResponse> DoReturn(
-            string copriHost,
-            string command,
-            string userAgent = null)
-        {
-#if !WINDOWS_UWP            
-            string doReturnResponse;
-            try
-            {
-                doReturnResponse = await PostAsync(copriHost, command, userAgent);
-            }
-            catch (System.Exception l_oException)
-            {
-                if (l_oException.GetIsConnectFailureException())
-                {
-                    throw new WebConnectFailureException("Rückgabe des Fahrrads aufgrund eines Netzwerkfehlers fehlgeschlagen.", l_oException);
-                }
-
-                if (l_oException.GetIsForbiddenException())
-                {
-                    throw new WebForbiddenException("Rückgabe des Fahrrads aufgrund eines Netzwerkfehlers fehlgeschlagen.", l_oException);
-                }
-
-                throw;
-            }
-
-            // Extract bikes from response.
-            return JsonConvertRethrow.DeserializeObject<ResponseContainer<DoReturnResponse>>(doReturnResponse)?.shareejson;
-#else
-            return null;
-#endif
-        }
-
-        public async Task<SubmitFeedbackResponse> DoSubmitFeedback(
-            string copriHost,
-            string command,
-            string userAgent = null)
-        {
-#if !WINDOWS_UWP            
-            string userFeedbackResponse;
-            try
-            {
-                userFeedbackResponse = await PostAsync(copriHost, command, userAgent);
-            }
-            catch (System.Exception l_oException)
-            {
-                if (l_oException.GetIsConnectFailureException())
-                {
-                    throw new WebConnectFailureException("Senden der Rückmeldung aufgrund eines Netzwerkfehlers fehlgeschlagen.", l_oException);
-                }
-
-                if (l_oException.GetIsForbiddenException())
-                {
-                    throw new WebForbiddenException("Senden der Rückmeldung aufgrund eines Netzwerkfehlers fehlgeschlagen.", l_oException);
-                }
-
-                throw;
-            }
-
-            // Extract bikes from response.
-            return JsonConvertRethrow.DeserializeObject<ResponseContainer<SubmitFeedbackResponse>>(userFeedbackResponse)?.shareejson;
-#else
-            return null;
-#endif
-        }
-
-        /// <summary> Submits mini survey to copri server. </summary>
-        public async Task<ResponseBase> DoSubmitMiniSurvey(
-            string copriHost,
-            string command,
-            string userAgent = null)
-        {
-#if !WINDOWS_UWP            
-            string miniSurveyResponse;
-            try
-            {
-                miniSurveyResponse = await PostAsync(copriHost, command, userAgent);
-            }
-            catch (System.Exception l_oException)
-            {
-                if (l_oException.GetIsConnectFailureException())
-                {
-                    throw new WebConnectFailureException("Senden der Miniumfrage aufgrund eines Netzwerkfehlers fehlgeschlagen.", l_oException);
-                }
-
-                if (l_oException.GetIsForbiddenException())
-                {
-                    throw new WebForbiddenException("Senden der der Miniumfrage aufgrund eines Netzwerkfehlers fehlgeschlagen.", l_oException);
-                }
-
-                throw;
-            }
-
-            // Extract bikes from response.
-            return JsonConvertRethrow.DeserializeObject<ResponseContainer<ResponseBase>>(miniSurveyResponse)?.shareejson;
-#else
-            return null;
-#endif
-        }
-
-        /// <summary> http get- request.</summary>
-        /// <param name="Url">Ulr to get info from.</param>
-        /// <returns>response from server</returns>
-        public static async Task<string> Get(string Url)
-        {
-            string result = string.Empty;
-            HttpWebRequest myRequest = (HttpWebRequest)WebRequest.Create(Url);
-            myRequest.Method = "GET";
-            using (var myResponse = await myRequest.GetResponseAsync())
-            {
-                using (var sr = new StreamReader(myResponse.GetResponseStream(), Encoding.UTF8))
-                {
-                    result = sr.ReadToEnd();
-                }
-            }
-
-            return result;
-        }
-
-        /// <summary> http- post request.</summary>
-        /// <param name="command">Command to send.</param>
-        /// <param name="displayCommand">Command to display/ log used for error handling.</param>
-        /// <param name="uRL">Address of server to communicate with.</param>
-        /// <returns>Response as text.</returns>
-        /// <changelog> An unused member PostAsyncHttpClient using HttpClient for posting was removed 2020-04-02.</changelog>
-        private static async Task<string> PostAsync(
-            string uRL,
-            string command,
-            string userAgent = null,
-            Func<string> displayCommand = null)
-        {
-            if (string.IsNullOrEmpty(command))
-            {
-                Log.ForContext<CopriCallsHttps>().Fatal("Can not post command. Command must not be null or empty.");
-
-                throw new ArgumentException("Can not post command. Command must not be null or empty.");
-            }
-
-            if (string.IsNullOrEmpty(uRL))
-            {
-                Log.ForContext<CopriCallsHttps>().Fatal("Can not post command. Host must not be null or empty.");
-
-                throw new ArgumentException("Can not post command. Host must not be null or empty.");
-            }
-
-            // Get display version of command to used for display/ logging (password should never be included in output)
-            Func<string> displayCommandFunc = displayCommand ?? delegate () { return command; };
-
-            try
-            {
+		public static async Task<ResponseBase> DoStartReturningBike(
+			string copriHost,
+			string command,
+			string agent = null)
+		{
 #if !WINDOWS_UWP
-                var l_strHost = uRL;
+			string response;
+			try
+			{
+				response = await PostAsync(copriHost, command, agent);
+			}
+			catch (System.Exception exception)
+			{
+				if (exception.GetIsConnectFailureException())
+				{
+					throw new WebConnectFailureException("Benachrichtigung von Start der Rückgabe wegen Netzwerkfehler fehlgeschlagen.", exception);
+				}
 
-                // Returns a http request.
-                var request = WebRequest.CreateHttp(l_strHost);
+				if (exception.GetIsForbiddenException())
+				{
+					throw new WebForbiddenException("Benachrichtigung von Start der Rückgabe wegen Netzwerkfehler fehlgeschlagen.", exception);
+				}
 
-                request.Method = "POST";
-                request.ContentType = "application/x-www-form-urlencoded";
-                request.UserAgent = userAgent;
+				throw;
+			}
 
-                // Workaround for issue https://bugzilla.xamarin.com/show_bug.cgi?id=57705  
-                // If not KeepAlive is set to true Stream.Write leads arbitrarily to an object disposed exception.
-                request.KeepAlive = true;
+			// Extract bikes from response.
+			return JsonConvertRethrow.DeserializeObject<ResponseContainer<ResponseBase>>(response)?.shareejson;
+#else
+            return null;
+#endif
+		}
 
-                byte[] postData = Encoding.UTF8.GetBytes(command);
+		public static async Task<ReservationBookingResponse> DoUpdateLockingStateAsync(
+			string copriHost,
+			string command,
+			string agent = null)
+		{
+#if !WINDOWS_UWP
+			string bikesAvaialbeResponse;
+			try
+			{
+				bikesAvaialbeResponse = await PostAsync(copriHost, command, agent);
+			}
+			catch (System.Exception exception)
+			{
+				if (exception.GetIsConnectFailureException())
+				{
+					throw new WebConnectFailureException("Aktualisierung des Schlossstatuses wegen Netzwerkfehler fehlgeschlagen.", exception);
+				}
 
-                request.ContentLength = postData.Length;
+				if (exception.GetIsForbiddenException())
+				{
+					throw new WebForbiddenException("Aktualisierung des Schlossstatuses wegen Netzwerkfehler fehlgeschlagen.", exception);
+				}
 
-                // Get the request stream.
-                using (Stream dataStream = await request.GetRequestStreamAsync())
-                {
-                    // Write the data to the request stream.
-                    await dataStream.WriteAsync(postData, 0, postData.Length);
-                }
+				throw;
+			}
 
-                // Get the response.
-                var webResponse = await request.GetResponseAsync() as HttpWebResponse;
+			// Extract bikes from response.
+			return JsonConvertRethrow.DeserializeObject<ResponseContainer<ReservationBookingResponse>>(bikesAvaialbeResponse)?.shareejson;
+#else
+            return null;
+#endif
+		}
 
-                if (webResponse == null)
-                {
-                    throw new System.Exception(string.Format("Reserve request failed. Response form from server was not of expected type."));
-                }
+		public static async Task<ReservationBookingResponse> DoBookAsync(
+			string copriHost,
+			string command,
+			string agent = null)
+		{
+#if !WINDOWS_UWP
+			string bikesAvaialbeResponse;
+			try
+			{
+				bikesAvaialbeResponse = await PostAsync(copriHost, command, agent);
+			}
+			catch (System.Exception exception)
+			{
+				if (exception.GetIsConnectFailureException())
+				{
+					throw new WebConnectFailureException("Buchung des Fahrrads wegen Netzwerkfehler fehlgeschlagen.", exception);
+				}
 
-                if (webResponse.StatusCode != HttpStatusCode.OK)
-                {
-                    throw new CommunicationException(string.Format(
-                        "Posting request {0} failed. Expected status code is {1} but was {2}.",
-                        displayCommandFunc(),
-                        HttpStatusCode.OK,
-                        webResponse.StatusCode));
-                }
+				if (exception.GetIsForbiddenException())
+				{
+					throw new WebForbiddenException("Buchung des Fahrrads wegen Netzwerkfehler fehlgeschlagen.", exception);
+				}
 
-                string response = string.Empty;
+				throw;
+			}
 
-                // Get the request stream.
-                using (Stream l_oDataStream = webResponse.GetResponseStream())
-                using (StreamReader l_oReader = new StreamReader(l_oDataStream))
-                {
-                    // Read the content.
-                    response = l_oReader.ReadToEnd();
+			// Extract bikes from response.
+			return JsonConvertRethrow.DeserializeObject<ResponseContainer<ReservationBookingResponse>>(bikesAvaialbeResponse)?.shareejson;
+#else
+            return null;
+#endif
+		}
 
-                    // Display the content.
-                    Console.WriteLine(response);
+		public static async Task<DoReturnResponse> DoReturn(
+			string copriHost,
+			string command,
+			string userAgent = null)
+		{
+#if !WINDOWS_UWP
+			string doReturnResponse;
+			try
+			{
+				doReturnResponse = await PostAsync(copriHost, command, userAgent);
+			}
+			catch (System.Exception l_oException)
+			{
+				if (l_oException.GetIsConnectFailureException())
+				{
+					throw new WebConnectFailureException("Rückgabe des Fahrrads aufgrund eines Netzwerkfehlers fehlgeschlagen.", l_oException);
+				}
 
-                    // Clean up the streams.
-                    webResponse.Close();
-                }
+				if (l_oException.GetIsForbiddenException())
+				{
+					throw new WebForbiddenException("Rückgabe des Fahrrads aufgrund eines Netzwerkfehlers fehlgeschlagen.", l_oException);
+				}
 
-                Log.ForContext<CopriCallsHttps>().Verbose("Post command {DisplayCommand} to host {URL} received {ResponseText:j}.", displayCommandFunc(), uRL, response);
+				throw;
+			}
 
-                return response;
+			// Extract bikes from response.
+			return JsonConvertRethrow.DeserializeObject<ResponseContainer<DoReturnResponse>>(doReturnResponse)?.shareejson;
+#else
+            return null;
+#endif
+		}
+
+		public async Task<SubmitFeedbackResponse> DoSubmitFeedback(
+			string copriHost,
+			string command,
+			string userAgent = null)
+		{
+#if !WINDOWS_UWP
+			string userFeedbackResponse;
+			try
+			{
+				userFeedbackResponse = await PostAsync(copriHost, command, userAgent);
+			}
+			catch (System.Exception l_oException)
+			{
+				if (l_oException.GetIsConnectFailureException())
+				{
+					throw new WebConnectFailureException("Senden der Rückmeldung aufgrund eines Netzwerkfehlers fehlgeschlagen.", l_oException);
+				}
+
+				if (l_oException.GetIsForbiddenException())
+				{
+					throw new WebForbiddenException("Senden der Rückmeldung aufgrund eines Netzwerkfehlers fehlgeschlagen.", l_oException);
+				}
+
+				throw;
+			}
+
+			// Extract bikes from response.
+			return JsonConvertRethrow.DeserializeObject<ResponseContainer<SubmitFeedbackResponse>>(userFeedbackResponse)?.shareejson;
+#else
+            return null;
+#endif
+		}
+
+		/// <summary> Submits mini survey to copri server. </summary>
+		public async Task<ResponseBase> DoSubmitMiniSurvey(
+			string copriHost,
+			string command,
+			string userAgent = null)
+		{
+#if !WINDOWS_UWP
+			string miniSurveyResponse;
+			try
+			{
+				miniSurveyResponse = await PostAsync(copriHost, command, userAgent);
+			}
+			catch (System.Exception l_oException)
+			{
+				if (l_oException.GetIsConnectFailureException())
+				{
+					throw new WebConnectFailureException("Senden der Miniumfrage aufgrund eines Netzwerkfehlers fehlgeschlagen.", l_oException);
+				}
+
+				if (l_oException.GetIsForbiddenException())
+				{
+					throw new WebForbiddenException("Senden der der Miniumfrage aufgrund eines Netzwerkfehlers fehlgeschlagen.", l_oException);
+				}
+
+				throw;
+			}
+
+			// Extract bikes from response.
+			return JsonConvertRethrow.DeserializeObject<ResponseContainer<ResponseBase>>(miniSurveyResponse)?.shareejson;
+#else
+            return null;
+#endif
+		}
+
+		/// <summary> http get- request.</summary>
+		/// <param name="Url">Ulr to get info from.</param>
+		/// <returns>response from server</returns>
+		public static async Task<string> Get(string Url)
+		{
+			string result = string.Empty;
+			HttpWebRequest myRequest = (HttpWebRequest)WebRequest.Create(Url);
+			myRequest.Method = "GET";
+			using (var myResponse = await myRequest.GetResponseAsync())
+			{
+				using (var sr = new StreamReader(myResponse.GetResponseStream(), Encoding.UTF8))
+				{
+					result = sr.ReadToEnd();
+				}
+			}
+
+			return result;
+		}
+
+		/// <summary> http- post request.</summary>
+		/// <param name="command">Command to send.</param>
+		/// <param name="displayCommand">Command to display/ log used for error handling.</param>
+		/// <param name="uRL">Address of server to communicate with.</param>
+		/// <returns>Response as text.</returns>
+		/// <changelog> An unused member PostAsyncHttpClient using HttpClient for posting was removed 2020-04-02.</changelog>
+		private static async Task<string> PostAsync(
+			string uRL,
+			string command,
+			string userAgent = null,
+			Func<string> displayCommand = null)
+		{
+			if (string.IsNullOrEmpty(command))
+			{
+				Log.ForContext<CopriCallsHttps>().Fatal("Can not post command. Command must not be null or empty.");
+
+				throw new ArgumentException("Can not post command. Command must not be null or empty.");
+			}
+
+			if (string.IsNullOrEmpty(uRL))
+			{
+				Log.ForContext<CopriCallsHttps>().Fatal("Can not post command. Host must not be null or empty.");
+
+				throw new ArgumentException("Can not post command. Host must not be null or empty.");
+			}
+
+			// Get display version of command to used for display/ logging (password should never be included in output)
+			Func<string> displayCommandFunc = displayCommand ?? delegate () { return command; };
+
+			try
+			{
+#if !WINDOWS_UWP
+				var l_strHost = uRL;
+
+				// Returns a http request.
+				var request = WebRequest.CreateHttp(l_strHost);
+
+				request.Method = "POST";
+				request.ContentType = "application/x-www-form-urlencoded";
+				request.UserAgent = userAgent;
+
+				// Workaround for issue https://bugzilla.xamarin.com/show_bug.cgi?id=57705  
+				// If not KeepAlive is set to true Stream.Write leads arbitrarily to an object disposed exception.
+				request.KeepAlive = true;
+
+				byte[] postData = Encoding.UTF8.GetBytes(command);
+
+				request.ContentLength = postData.Length;
+
+				// Get the request stream.
+				using (Stream dataStream = await request.GetRequestStreamAsync())
+				{
+					// Write the data to the request stream.
+					await dataStream.WriteAsync(postData, 0, postData.Length);
+				}
+
+				// Get the response.
+				var webResponse = await request.GetResponseAsync() as HttpWebResponse;
+
+				if (webResponse == null)
+				{
+					throw new System.Exception(string.Format("Reserve request failed. Response form from server was not of expected type."));
+				}
+
+				if (webResponse.StatusCode != HttpStatusCode.OK)
+				{
+					throw new CommunicationException(string.Format(
+						"Posting request {0} failed. Expected status code is {1} but was {2}.",
+						displayCommandFunc(),
+						HttpStatusCode.OK,
+						webResponse.StatusCode));
+				}
+
+				string response = string.Empty;
+
+				// Get the request stream.
+				using (Stream l_oDataStream = webResponse.GetResponseStream())
+				using (StreamReader l_oReader = new StreamReader(l_oDataStream))
+				{
+					// Read the content.
+					response = l_oReader.ReadToEnd();
+
+					// Display the content.
+					Console.WriteLine(response);
+
+					// Clean up the streams.
+					webResponse.Close();
+				}
+
+				Log.ForContext<CopriCallsHttps>().Verbose("Post command {DisplayCommand} to host {URL} received {ResponseText:j}.", displayCommandFunc(), uRL, response);
+
+				return response;
 #else
                 return null;
 #endif
-            }
-            catch (System.Exception exception)
-            {
-                Log.ForContext<CopriCallsHttps>().InformationOrError("Posting command {DisplayCommand} to host {URL} failed. {Exception}.", displayCommandFunc(), uRL, exception);
-                throw;
-            }
-        }
-    }
+			}
+			catch (System.Exception exception)
+			{
+				Log.ForContext<CopriCallsHttps>().InformationOrError("Posting command {DisplayCommand} to host {URL} failed. {Exception}.", displayCommandFunc(), uRL, exception);
+				throw;
+			}
+		}
+	}
 }
diff --git a/TINKLib/Repository/CopriCallsMonkeyStore.cs b/TINKLib/Repository/CopriCallsMonkeyStore.cs
index 85202cb..b37aad2 100644
--- a/TINKLib/Repository/CopriCallsMonkeyStore.cs
+++ b/TINKLib/Repository/CopriCallsMonkeyStore.cs
@@ -9,15 +9,15 @@ using TINK.Repository.Response;
 
 namespace TINK.Repository
 {
-    public class CopriCallsMonkeyStore : ICopriCache
-    {
-        /// <summary> Prevents concurrent communictation. </summary>
-        private object monkeyLock = new object();
+	public class CopriCallsMonkeyStore : ICopriCache
+	{
+		/// <summary> Prevents concurrent communictation. </summary>
+		private object monkeyLock = new object();
 
-        /// <summary> Builds requests.</summary>
-        private IRequestBuilder requestBuilder;
+		/// <summary> Builds requests.</summary>
+		private IRequestBuilder requestBuilder;
 
-        public const string BIKESAVAILABLE = @"{
+		public const string BIKESAVAILABLE = @"{
               ""copri_version"" : ""4.1.0.0"",
               ""bikes"" : {},
               ""response_state"" : ""OK"",
@@ -26,14 +26,14 @@ namespace TINK.Repository
               ""response"" : ""bikes_available""
         }";
 
-        /// <summary> Gets an empty response. </summary>
-        /// <param name="copriVersion">Version of empty response.</param>
-        /// <returns>Response.</returns>
-        public static BikesAvailableResponse GetEmptyBikesAvailableResponse(string copriVersion)
-            => JsonConvertRethrow.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE.Replace("4.1.0.0", copriVersion));
+		/// <summary> Gets an empty response. </summary>
+		/// <param name="copriVersion">Version of empty response.</param>
+		/// <returns>Response.</returns>
+		public static BikesAvailableResponse GetEmptyBikesAvailableResponse(string copriVersion)
+			=> JsonConvertRethrow.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE.Replace("4.1.0.0", copriVersion));
 
 #if !COPRIVERSION41
-        public const string BIKESOCCUPIED = @"{
+		public const string BIKESOCCUPIED = @"{
               ""debuglevel"" : ""1"",
               ""user_id"" : """",
               ""response"" : ""user_bikes_occupied"",
@@ -46,15 +46,15 @@ namespace TINK.Repository
         }";
 #endif
 
-        /// <summary> Gets an empty response. </summary>
-        /// <param name="copriVersion">Version of empty response.</param>
-        /// <returns>Response.</returns>
-        public static BikesReservedOccupiedResponse GetEmptyBikesReservedOccupiedResponse(string copriVersion)
-            => JsonConvertRethrow.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED.Replace("4.1.0.0", copriVersion));
+		/// <summary> Gets an empty response. </summary>
+		/// <param name="copriVersion">Version of empty response.</param>
+		/// <returns>Response.</returns>
+		public static BikesReservedOccupiedResponse GetEmptyBikesReservedOccupiedResponse(string copriVersion)
+			=> JsonConvertRethrow.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED.Replace("4.1.0.0", copriVersion));
 
 #if !COPRIVERSION41
-        /// <summary> Version COPRI 4.0. or earlier</summary>
-        public const string STATIONSALL = @"{
+		/// <summary> Version COPRI 4.0. or earlier</summary>
+		public const string STATIONSALL = @"{
               ""apiserver"" : """",
               ""authcookie"" : """",
               ""response"" : ""stations_all"",
@@ -76,8 +76,8 @@ namespace TINK.Repository
 #endif
 
 #if !COPRIVERSION41
-        /// <summary> Version COPRI 4.0. or earlier</summary>
-        public const string AUTHORIZATION = @"{
+		/// <summary> Version COPRI 4.0. or earlier</summary>
+		public const string AUTHORIZATION = @"{
           ""user_group"" : [ """" ],
           ""response"" : ""authorization"",
           ""response_state"" : ""OK"",
@@ -93,282 +93,282 @@ namespace TINK.Repository
         }";
 #endif
 
-        /// <summary> Gets an empty response. </summary>
-        /// <param name="copriVersion">Version of empty response.</param>
-        /// <returns>Response.</returns>
-        public static StationsAvailableResponse GetEmptyStationsAllResponse(string copriVersion)
-            => JsonConvertRethrow.DeserializeObject<StationsAvailableResponse>(STATIONSALL.Replace("4.1.0.0", copriVersion));
+		/// <summary> Gets an empty response. </summary>
+		/// <param name="copriVersion">Version of empty response.</param>
+		/// <returns>Response.</returns>
+		public static StationsAvailableResponse GetEmptyStationsAllResponse(string copriVersion)
+			=> JsonConvertRethrow.DeserializeObject<StationsAvailableResponse>(STATIONSALL.Replace("4.1.0.0", copriVersion));
 
-        /// <summary>
-        /// Holds the seconds after which station and bikes info is considered to be invalid.
-        /// Default value 1s.
-        /// </summary>
-        private TimeSpan ExpiresAfter { get; }
+		/// <summary>
+		/// Holds the seconds after which station and bikes info is considered to be invalid.
+		/// Default value 1s.
+		/// </summary>
+		private TimeSpan ExpiresAfter { get; }
 
-        /// <summary> Returns false because cached values are returned. </summary>
-        public bool IsConnected => false;
+		/// <summary> Returns false because cached values are returned. </summary>
+		public bool IsConnected => false;
 
-        /// <summary> Gets the merchant id.</summary>
-        public string MerchantId => requestBuilder.MerchantId;
+		/// <summary> Gets the merchant id.</summary>
+		public string MerchantId => requestBuilder.MerchantId;
 
-        /// <summary> Gets the merchant id.</summary>
-        public string SessionCookie => requestBuilder.SessionCookie;
+		/// <summary> Gets the merchant id.</summary>
+		public string SessionCookie => requestBuilder.SessionCookie;
 
-        /// <summary> Initializes a instance of the copri monkey store object. </summary>
-        /// <param name="p_strMerchantId">Id of the merchant.</param>
-        /// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
-        /// <param name="sessionCookie">Session cookie if user is logged in, null otherwise.</param>
-        public CopriCallsMonkeyStore(
-            string merchantId,
-            string uiIsoLangugageName,
-            string sessionCookie = null,
-            TimeSpan? expiresAfter = null)
-        {
-            ExpiresAfter = expiresAfter ?? TimeSpan.FromSeconds(1);
+		/// <summary> Initializes a instance of the copri monkey store object. </summary>
+		/// <param name="p_strMerchantId">Id of the merchant.</param>
+		/// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
+		/// <param name="sessionCookie">Session cookie if user is logged in, null otherwise.</param>
+		public CopriCallsMonkeyStore(
+			string merchantId,
+			string uiIsoLangugageName,
+			string sessionCookie = null,
+			TimeSpan? expiresAfter = null)
+		{
+			ExpiresAfter = expiresAfter ?? TimeSpan.FromSeconds(1);
 
-            requestBuilder = string.IsNullOrEmpty(sessionCookie)
-                ? new RequestBuilder(merchantId, uiIsoLangugageName) as IRequestBuilder
-                : new RequestBuilderLoggedIn(merchantId, uiIsoLangugageName, sessionCookie);
+			requestBuilder = string.IsNullOrEmpty(sessionCookie)
+				? new RequestBuilder(merchantId, uiIsoLangugageName) as IRequestBuilder
+				: new RequestBuilderLoggedIn(merchantId, uiIsoLangugageName, sessionCookie);
 
-            // Ensure that store holds valid entries.
-            if (!Barrel.Current.Exists(requestBuilder.GetBikesAvailable()))
-            {
-                AddToCache(JsonConvertRethrow.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE), new TimeSpan(0));
-            }
+			// Ensure that store holds valid entries.
+			if (!Barrel.Current.Exists(requestBuilder.GetBikesAvailable()))
+			{
+				AddToCache(JsonConvertRethrow.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE), new TimeSpan(0));
+			}
 
-            // Do not query bikes occupied if no user is logged in (leads to not implemented exception)
-            if (!string.IsNullOrEmpty(sessionCookie) && !Barrel.Current.Exists(requestBuilder.GetBikesOccupied()))
-            {
-                AddToCache(JsonConvertRethrow.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED), new TimeSpan(0));
-            }
+			// Do not query bikes occupied if no user is logged in (leads to not implemented exception)
+			if (!string.IsNullOrEmpty(sessionCookie) && !Barrel.Current.Exists(requestBuilder.GetBikesOccupied()))
+			{
+				AddToCache(JsonConvertRethrow.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED), new TimeSpan(0));
+			}
 
-            if (!Barrel.Current.Exists(requestBuilder.GetStations()))
-            {
-                AddToCache(JsonConvertRethrow.DeserializeObject<StationsAvailableResponse>(STATIONSALL), new TimeSpan(0));
-            }
-        }
+			if (!Barrel.Current.Exists(requestBuilder.GetStations()))
+			{
+				AddToCache(JsonConvertRethrow.DeserializeObject<StationsAvailableResponse>(STATIONSALL), new TimeSpan(0));
+			}
+		}
 
-        public Task<ReservationBookingResponse> DoReserveAsync(string bikeId, Uri operatorUri)
-        {
-            throw new System.Exception("Reservierung im Offlinemodus nicht möglich!");
-        }
+		public Task<ReservationBookingResponse> DoReserveAsync(string bikeId, Uri operatorUri)
+		{
+			throw new System.Exception("Reservierung im Offlinemodus nicht möglich!");
+		}
 
-        public Task<ReservationCancelReturnResponse> DoCancelReservationAsync(string bikeId, Uri operatorUri)
-        {
-            throw new System.Exception("Abbrechen einer Reservierung im Offlinemodus nicht möglich!");
-        }
+		public Task<ReservationCancelReturnResponse> DoCancelReservationAsync(string bikeId, Uri operatorUri)
+		{
+			throw new System.Exception("Abbrechen einer Reservierung im Offlinemodus nicht möglich!");
+		}
 
-        public Task<ReservationBookingResponse> CalculateAuthKeysAsync(string bikeId, Uri operatorUri)
-            => throw new System.Exception("Schlosssuche im Offlinemodus nicht möglich!");
+		public Task<ReservationBookingResponse> CalculateAuthKeysAsync(string bikeId, Uri operatorUri)
+			=> throw new System.Exception("Schlosssuche im Offlinemodus nicht möglich!");
 
-        public Task<ResponseBase> StartReturningBike(
-            string bikeId,
-            Uri operatorUri)
-            => throw new System.Exception("Benachrichtigung von start der Rückgabe im Offlinemodus nicht möglich!");
+		public Task<ResponseBase> StartReturningBike(
+			string bikeId,
+			Uri operatorUri)
+			=> throw new System.Exception("Benachrichtigung von start der Rückgabe im Offlinemodus nicht möglich!");
 
-        public Task<ReservationBookingResponse> UpdateLockingStateAsync(
-            string bikeId,
-            lock_state state,
-            Uri operatorUri,
-            LocationDto geolocation,
-            double batteryLevel)
-            => throw new System.Exception("Aktualisierung des Schlossstatuses im Offlinemodus nicht möglich!");
+		public Task<ReservationBookingResponse> UpdateLockingStateAsync(
+			string bikeId,
+			lock_state state,
+			Uri operatorUri,
+			LocationDto geolocation,
+			double batteryLevel)
+			=> throw new System.Exception("Aktualisierung des Schlossstatuses im Offlinemodus nicht möglich!");
 
-        public Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
-            => throw new System.Exception("Buchung im Offlinemodus nicht möglich!");
+		public Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
+			=> throw new System.Exception("Buchung im Offlinemodus nicht möglich!");
 
-        /// <summary> Books a bike and starts opening bike. </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on booking request.</returns>
-        public Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(
-            string bikeId,
-            Uri operatorUri)
-            => throw new System.Exception("Buchung von verfügbarem Rad mit Start von Schlossöffnen ist im Offlinemodus nicht möglich!");
+		/// <summary> Books a bike and starts opening bike. </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on booking request.</returns>
+		public Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(
+			string bikeId,
+			Uri operatorUri)
+			=> throw new System.Exception("Buchung von verfügbarem Rad mit Start von Schlossöffnen ist im Offlinemodus nicht möglich!");
 
-        /// <summary> Books a bike and starts opening bike. </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on booking request.</returns>
-        public Task<ReservationBookingResponse> BookReservedAndStartOpeningAsync(
-            string bikeId,
-            Uri operatorUri)
-            => throw new System.Exception("Buchung von reserviertem Rad mit Start von Schlossöffnen ist im Offlinemodus nicht möglich!");
+		/// <summary> Books a bike and starts opening bike. </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on booking request.</returns>
+		public Task<ReservationBookingResponse> BookReservedAndStartOpeningAsync(
+			string bikeId,
+			Uri operatorUri)
+			=> throw new System.Exception("Buchung von reserviertem Rad mit Start von Schlossöffnen ist im Offlinemodus nicht möglich!");
 
-        public Task<DoReturnResponse> DoReturn(
-            string bikeId,
-            LocationDto geolocation,
-            ISmartDevice smartDevice,
-            Uri operatorUri)
-            => throw new System.Exception("Rückgabe im Offlinemodus nicht möglich!");
+		public Task<DoReturnResponse> DoReturn(
+			string bikeId,
+			LocationDto geolocation,
+			ISmartDevice smartDevice,
+			Uri operatorUri)
+			=> throw new System.Exception("Rückgabe im Offlinemodus nicht möglich!");
 
-        /// <summary> Returns a bike and starts closing. </summary>
-        /// <param name="bikeId">Id of the bike to return.</param>
-        /// <param name="smartDevice">Provides info about hard and software.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on returning request.</returns>
-        public Task<DoReturnResponse> ReturnAndStartClosingAsync(
-            string bikeId,
-            ISmartDevice smartDevice,
-            Uri operatorUri)
-            => throw new System.Exception("Rückgabe mit Schloss schließen Befehl im Offlinemodus nicht möglich!");
+		/// <summary> Returns a bike and starts closing. </summary>
+		/// <param name="bikeId">Id of the bike to return.</param>
+		/// <param name="smartDevice">Provides info about hard and software.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on returning request.</returns>
+		public Task<DoReturnResponse> ReturnAndStartClosingAsync(
+			string bikeId,
+			ISmartDevice smartDevice,
+			Uri operatorUri)
+			=> throw new System.Exception("Rückgabe mit Schloss schließen Befehl im Offlinemodus nicht möglich!");
 
-        public Task<SubmitFeedbackResponse> DoSubmitFeedback(string bikeId, int? currentChargeBars, string message, bool isBikeBroken, Uri operatorUri) =>
-            throw new System.Exception("Übermittlung von Feedback im Offlinemodus nicht möglich!");
+		public Task<SubmitFeedbackResponse> DoSubmitFeedback(string bikeId, int? currentChargeBars, string message, bool isBikeBroken, Uri operatorUri) =>
+			throw new System.Exception("Übermittlung von Feedback im Offlinemodus nicht möglich!");
 
-        /// <summary> Submits mini survey to copri server. </summary>
-        /// <param name="answers">Collection of answers.</param>
-        public Task<ResponseBase> DoSubmitMiniSurvey(IDictionary<string, string> answers)
-            => throw new System.Exception("Übermittlung von der Miniumfrage im Offlinemodus nicht möglich!");
+		/// <summary> Submits mini survey to copri server. </summary>
+		/// <param name="answers">Collection of answers.</param>
+		public Task<ResponseBase> DoSubmitMiniSurvey(IDictionary<string, string> answers)
+			=> throw new System.Exception("Übermittlung von der Miniumfrage im Offlinemodus nicht möglich!");
 
-        public Task<AuthorizationResponse> DoAuthorizationAsync(string p_strMailAddress, string p_strPassword, string p_strDeviceId)
-        {
-            throw new System.Exception("Anmelden im Offlinemodus nicht möglich!");
-        }
+		public Task<AuthorizationResponse> DoAuthorizationAsync(string p_strMailAddress, string p_strPassword, string p_strDeviceId)
+		{
+			throw new System.Exception("Anmelden im Offlinemodus nicht möglich!");
+		}
 
-        public Task<AuthorizationoutResponse> DoAuthoutAsync()
-        {
-            throw new System.Exception("Abmelden im Offlinemodus nicht möglich!");
-        }
+		public Task<AuthorizationoutResponse> DoAuthoutAsync()
+		{
+			throw new System.Exception("Abmelden im Offlinemodus nicht möglich!");
+		}
 
-        public async Task<BikesAvailableResponse> GetBikesAvailableAsync()
-        {
-            var l_oBikesAvailableTask = new TaskCompletionSource<BikesAvailableResponse>();
-            lock (monkeyLock)
-            {
-                l_oBikesAvailableTask.SetResult(Barrel.Current.Get<BikesAvailableResponse>(requestBuilder.GetBikesAvailable()));
-            }
-            return await l_oBikesAvailableTask.Task;
-        }
+		public async Task<BikesAvailableResponse> GetBikesAvailableAsync()
+		{
+			var l_oBikesAvailableTask = new TaskCompletionSource<BikesAvailableResponse>();
+			lock (monkeyLock)
+			{
+				l_oBikesAvailableTask.SetResult(Barrel.Current.Get<BikesAvailableResponse>(requestBuilder.GetBikesAvailable()));
+			}
+			return await l_oBikesAvailableTask.Task;
+		}
 
-        public async Task<BikesReservedOccupiedResponse> GetBikesOccupiedAsync()
-        {
-            try
-            {
-                var l_oBikesOccupiedTask = new TaskCompletionSource<BikesReservedOccupiedResponse>();
-                lock (monkeyLock)
-                {
-                    l_oBikesOccupiedTask.SetResult(Barrel.Current.Get<BikesReservedOccupiedResponse>(requestBuilder.GetBikesOccupied()));
-                }
+		public async Task<BikesReservedOccupiedResponse> GetBikesOccupiedAsync()
+		{
+			try
+			{
+				var l_oBikesOccupiedTask = new TaskCompletionSource<BikesReservedOccupiedResponse>();
+				lock (monkeyLock)
+				{
+					l_oBikesOccupiedTask.SetResult(Barrel.Current.Get<BikesReservedOccupiedResponse>(requestBuilder.GetBikesOccupied()));
+				}
 
-                return await l_oBikesOccupiedTask.Task;
+				return await l_oBikesOccupiedTask.Task;
 
-            }
-            catch (NotSupportedException)
-            {
-                // No user logged in.
-                await Task.CompletedTask;
-                return ResponseHelper.GetBikesOccupiedNone();
-            }
-        }
+			}
+			catch (NotSupportedException)
+			{
+				// No user logged in.
+				await Task.CompletedTask;
+				return ResponseHelper.GetBikesOccupiedNone();
+			}
+		}
 
-        public async Task<StationsAvailableResponse> GetStationsAsync()
-        {
-            var l_oStationsAllTask = new TaskCompletionSource<StationsAvailableResponse>();
-            lock (monkeyLock)
-            {
-                l_oStationsAllTask.SetResult(Barrel.Current.Get<StationsAvailableResponse>(requestBuilder.GetStations()));
-            }
-            return await l_oStationsAllTask.Task;
-        }
+		public async Task<StationsAvailableResponse> GetStationsAsync()
+		{
+			var l_oStationsAllTask = new TaskCompletionSource<StationsAvailableResponse>();
+			lock (monkeyLock)
+			{
+				l_oStationsAllTask.SetResult(Barrel.Current.Get<StationsAvailableResponse>(requestBuilder.GetStations()));
+			}
+			return await l_oStationsAllTask.Task;
+		}
 
-        /// <summary> Gets a value indicating whether stations are expired or not.</summary>
-        public bool IsStationsExpired
-        {
-            get
-            {
-                lock (monkeyLock)
-                {
-                    return Barrel.Current.IsExpired(requestBuilder.GetStations());
-                }
-            }
-        }
+		/// <summary> Gets a value indicating whether stations are expired or not.</summary>
+		public bool IsStationsExpired
+		{
+			get
+			{
+				lock (monkeyLock)
+				{
+					return Barrel.Current.IsExpired(requestBuilder.GetStations());
+				}
+			}
+		}
 
-        /// <summary> Adds a stations all response to cache.</summary>
-        /// <param name="stations">Stations to add.</param>
-        public void AddToCache(StationsAvailableResponse stations)
-        {
-            AddToCache(stations, ExpiresAfter);
-        }
+		/// <summary> Adds a stations all response to cache.</summary>
+		/// <param name="stations">Stations to add.</param>
+		public void AddToCache(StationsAvailableResponse stations)
+		{
+			AddToCache(stations, ExpiresAfter);
+		}
 
-        /// <summary> Adds a stations all response to cache.</summary>
-        /// <param name="stations">Stations to add.</param>
-        /// <param name="expiresAfter">Time after which anser is considered to be expired.</param>
-        private void AddToCache(StationsAvailableResponse stations, TimeSpan expiresAfter)
-        {
-            lock (monkeyLock)
-            {
-                Barrel.Current.Add(
-                    requestBuilder.GetStations(),
-                    JsonConvertRethrow.SerializeObject(stations),
-                    expiresAfter);
-            }
-        }
+		/// <summary> Adds a stations all response to cache.</summary>
+		/// <param name="stations">Stations to add.</param>
+		/// <param name="expiresAfter">Time after which anser is considered to be expired.</param>
+		private void AddToCache(StationsAvailableResponse stations, TimeSpan expiresAfter)
+		{
+			lock (monkeyLock)
+			{
+				Barrel.Current.Add(
+					requestBuilder.GetStations(),
+					JsonConvertRethrow.SerializeObject(stations),
+					expiresAfter);
+			}
+		}
 
-        /// <summary> Gets a value indicating whether stations are expired or not.</summary>
-        public bool IsBikesAvailableExpired
-        {
-            get
-            {
-                lock (monkeyLock)
-                {
-                    return Barrel.Current.IsExpired(requestBuilder.GetBikesAvailable());
-                }
-            }
-        }
+		/// <summary> Gets a value indicating whether stations are expired or not.</summary>
+		public bool IsBikesAvailableExpired
+		{
+			get
+			{
+				lock (monkeyLock)
+				{
+					return Barrel.Current.IsExpired(requestBuilder.GetBikesAvailable());
+				}
+			}
+		}
 
-        /// <summary> Adds a bikes response to cache.</summary>
-        /// <param name="bikes">Bikes to add.</param>
-        public void AddToCache(BikesAvailableResponse bikes)
-        {
-            AddToCache(bikes, ExpiresAfter);
-        }
+		/// <summary> Adds a bikes response to cache.</summary>
+		/// <param name="bikes">Bikes to add.</param>
+		public void AddToCache(BikesAvailableResponse bikes)
+		{
+			AddToCache(bikes, ExpiresAfter);
+		}
 
-        /// <summary> Adds a bikes response to cache.</summary>
-        /// <param name="bikes">Bikes to add.</param>
-        /// <param name="expiresAfter">Time after which anser is considered to be expired.</param>
-        private void AddToCache(BikesAvailableResponse bikes, TimeSpan expiresAfter)
-        {
-            lock (monkeyLock)
-            {
-                Barrel.Current.Add(
-                    requestBuilder.GetBikesAvailable(),
-                    JsonConvertRethrow.SerializeObject(bikes),
-                    expiresAfter);
-            }
-        }
+		/// <summary> Adds a bikes response to cache.</summary>
+		/// <param name="bikes">Bikes to add.</param>
+		/// <param name="expiresAfter">Time after which anser is considered to be expired.</param>
+		private void AddToCache(BikesAvailableResponse bikes, TimeSpan expiresAfter)
+		{
+			lock (monkeyLock)
+			{
+				Barrel.Current.Add(
+					requestBuilder.GetBikesAvailable(),
+					JsonConvertRethrow.SerializeObject(bikes),
+					expiresAfter);
+			}
+		}
 
-        /// <summary> Gets a value indicating whether stations are expired or not.</summary>
-        public bool IsBikesOccupiedExpired
-        {
-            get
-            {
-                lock (monkeyLock)
-                {
-                    return Barrel.Current.IsExpired(requestBuilder.GetBikesOccupied());
-                }
-            }
-        }
+		/// <summary> Gets a value indicating whether stations are expired or not.</summary>
+		public bool IsBikesOccupiedExpired
+		{
+			get
+			{
+				lock (monkeyLock)
+				{
+					return Barrel.Current.IsExpired(requestBuilder.GetBikesOccupied());
+				}
+			}
+		}
 
-        /// <summary> Adds a bikes response to cache.</summary>
-        /// <param name="bikes">Bikes to add.</param>
-        public void AddToCache(BikesReservedOccupiedResponse bikes)
-        {
-            AddToCache(bikes, ExpiresAfter);
+		/// <summary> Adds a bikes response to cache.</summary>
+		/// <param name="bikes">Bikes to add.</param>
+		public void AddToCache(BikesReservedOccupiedResponse bikes)
+		{
+			AddToCache(bikes, ExpiresAfter);
 
-        }
-        /// <summary> Adds a bikes response to cache.</summary>
-        /// <param name="bikes">Bikes to add.</param>
-        /// <param name="expiresAfter">Time after which anser is considered to be expired.</param>
-        private void AddToCache(BikesReservedOccupiedResponse bikes, TimeSpan expiresAfter)
-        {
-            lock (monkeyLock)
-            {
-                Barrel.Current.Add(
-                    requestBuilder.GetBikesOccupied(),
-                    JsonConvertRethrow.SerializeObject(bikes),
-                    expiresAfter);
-            }
-        }
-    }
+		}
+		/// <summary> Adds a bikes response to cache.</summary>
+		/// <param name="bikes">Bikes to add.</param>
+		/// <param name="expiresAfter">Time after which anser is considered to be expired.</param>
+		private void AddToCache(BikesReservedOccupiedResponse bikes, TimeSpan expiresAfter)
+		{
+			lock (monkeyLock)
+			{
+				Barrel.Current.Add(
+					requestBuilder.GetBikesOccupied(),
+					JsonConvertRethrow.SerializeObject(bikes),
+					expiresAfter);
+			}
+		}
+	}
 }
diff --git a/TINKLib/Repository/CopriCallsStatic.cs b/TINKLib/Repository/CopriCallsStatic.cs
index 998e267..2a5176a 100644
--- a/TINKLib/Repository/CopriCallsStatic.cs
+++ b/TINKLib/Repository/CopriCallsStatic.cs
@@ -5,61 +5,61 @@ using TINK.Repository.Response;
 
 namespace TINK.Repository
 {
-    public static class CopriCallsStatic
-    {
+	public static class CopriCallsStatic
+	{
 #if !USCSHARP9
-        private static Version UNSUPPORTEDFUTURECOPRIVERSIONLOWER = new Version(4, 1);
+		private static Version UNSUPPORTEDFUTURECOPRIVERSIONLOWER = new Version(4, 1);
 #else
         private static Version UNSUPPORTEDFUTURECOPRIVERSIONLOWER = new(4, 1);
 #endif
 
 #if !USCSHARP9
-        private static Version UNSUPPORTEDFUTURECOPRIVERSIONUPPER = new Version(4, 2);
+		private static Version UNSUPPORTEDFUTURECOPRIVERSIONUPPER = new Version(4, 2);
 #else
         private static Version UNSUPPORTEDFUTURECOPRIVERSIONUPPER = new(4, 2);
 #endif
-        public static Version UnsupportedVersionLower => UNSUPPORTEDFUTURECOPRIVERSIONLOWER;
+		public static Version UnsupportedVersionLower => UNSUPPORTEDFUTURECOPRIVERSIONLOWER;
 
-        public static Version UnsupportedVersionUpper => UNSUPPORTEDFUTURECOPRIVERSIONUPPER;
+		public static Version UnsupportedVersionUpper => UNSUPPORTEDFUTURECOPRIVERSIONUPPER;
 
-        /// <summary> Deserializes reponse JSON if response is of supported version or provides default response otherwise. </summary>
-        /// <typeparam name="T">Type of response object.</typeparam>
-        /// <param name="response">Response JSON.</param>
-        /// <param name="emptyResponseFactory">Factory providing default delegate.</param>
-        /// <returns>Response object.</returns>
-        public static T DeserializeResponse<T>(this string response, Func<string, T> emptyResponseFactory) where T : class
-        {
-            // Get COPRI version from respone.
-            var bikeInfoBase = JsonConvertRethrow.DeserializeObject<VersionindependentResponse>(response)?.shareejson;
+		/// <summary> Deserializes reponse JSON if response is of supported version or provides default response otherwise. </summary>
+		/// <typeparam name="T">Type of response object.</typeparam>
+		/// <param name="response">Response JSON.</param>
+		/// <param name="emptyResponseFactory">Factory providing default delegate.</param>
+		/// <returns>Response object.</returns>
+		public static T DeserializeResponse<T>(this string response, Func<string, T> emptyResponseFactory) where T : class
+		{
+			// Get COPRI version from respone.
+			var bikeInfoBase = JsonConvertRethrow.DeserializeObject<VersionindependentResponse>(response)?.shareejson;
 
-            if (bikeInfoBase.GetCopriVersion() < UNSUPPORTEDFUTURECOPRIVERSIONLOWER
-                || bikeInfoBase.GetCopriVersion() >= UNSUPPORTEDFUTURECOPRIVERSIONUPPER)
-            {
-                return emptyResponseFactory?.Invoke(bikeInfoBase.copri_version) ?? null;
-            }
+			if (bikeInfoBase.GetCopriVersion() < UNSUPPORTEDFUTURECOPRIVERSIONLOWER
+				|| bikeInfoBase.GetCopriVersion() >= UNSUPPORTEDFUTURECOPRIVERSIONUPPER)
+			{
+				return emptyResponseFactory?.Invoke(bikeInfoBase.copri_version) ?? null;
+			}
 
-            return JsonConvertRethrow.DeserializeObject<ResponseContainer<T>>(response)?.shareejson;
-        }
+			return JsonConvertRethrow.DeserializeObject<ResponseContainer<T>>(response)?.shareejson;
+		}
 
-        /// <summary> Deserializes reponse JSON if response is of supported version or throws an exception. </summary>
-        /// <typeparam name="T">Type of response object.</typeparam>
-        /// <param name="response">Response JSON.</param>
-        /// <param name="unsupportedVersionExectpion">Exception to fire.</param>
-        /// <returns>Response object.</returns>
-        public static T DeserializeResponse<T>(this string response, Func<string, System.Exception> unsupportedVersionExectpion = null) where T : class
-        {
+		/// <summary> Deserializes reponse JSON if response is of supported version or throws an exception. </summary>
+		/// <typeparam name="T">Type of response object.</typeparam>
+		/// <param name="response">Response JSON.</param>
+		/// <param name="unsupportedVersionExectpion">Exception to fire.</param>
+		/// <returns>Response object.</returns>
+		public static T DeserializeResponse<T>(this string response, Func<string, System.Exception> unsupportedVersionExectpion = null) where T : class
+		{
 
-            // Get COPRI version from respone.
-            var bikeInfoBase = JsonConvertRethrow.DeserializeObject<VersionindependentResponse>(response)?.shareejson;
+			// Get COPRI version from respone.
+			var bikeInfoBase = JsonConvertRethrow.DeserializeObject<VersionindependentResponse>(response)?.shareejson;
 
-            if (bikeInfoBase.GetCopriVersion() < UNSUPPORTEDFUTURECOPRIVERSIONLOWER
-                || bikeInfoBase.GetCopriVersion() >= UNSUPPORTEDFUTURECOPRIVERSIONUPPER)
-            {
-                Log.Error($"Unsupported copri version {bikeInfoBase.copri_version} detected on attempt to log in.");
-                throw unsupportedVersionExectpion?.Invoke(bikeInfoBase.copri_version) ?? new System.Exception($"Unsupported COPRI version {bikeInfoBase.copri_version} detected.");
-            }
+			if (bikeInfoBase.GetCopriVersion() < UNSUPPORTEDFUTURECOPRIVERSIONLOWER
+				|| bikeInfoBase.GetCopriVersion() >= UNSUPPORTEDFUTURECOPRIVERSIONUPPER)
+			{
+				Log.Error($"Unsupported copri version {bikeInfoBase.copri_version} detected on attempt to log in.");
+				throw unsupportedVersionExectpion?.Invoke(bikeInfoBase.copri_version) ?? new System.Exception($"Unsupported COPRI version {bikeInfoBase.copri_version} detected.");
+			}
 
-            return JsonConvertRethrow.DeserializeObject<ResponseContainer<T>>(response)?.shareejson;
-        }
-    }
+			return JsonConvertRethrow.DeserializeObject<ResponseContainer<T>>(response)?.shareejson;
+		}
+	}
 }
diff --git a/TINKLib/Repository/Exception/AuthcookieNotDefinedException.cs b/TINKLib/Repository/Exception/AuthcookieNotDefinedException.cs
index 3394d8b..542aa8e 100644
--- a/TINKLib/Repository/Exception/AuthcookieNotDefinedException.cs
+++ b/TINKLib/Repository/Exception/AuthcookieNotDefinedException.cs
@@ -1,62 +1,62 @@
 namespace TINK.Repository.Exception
 {
-    /// <summary>
-    /// Is fired with reqest used a cookie which is not defined. 
-    /// Reasons for cookie to be not defined might be
-    /// - user used more thant 8 different devices (copri invalidates cookies in this case)
-    /// - user account has been deleted?
-    /// </summary>
-    public class AuthcookieNotDefinedException : InvalidResponseException<Response.ResponseBase>
-    {
-        /// <summary>Constructs a authorization exceptions. </summary>
-        /// <param name="p_strTextOfAction">Text describing request which is shown if validation fails.</param>
-        public AuthcookieNotDefinedException(string p_strTextOfAction, Response.ResponseBase response) :
-            base($"{p_strTextOfAction}\r\nDie Sitzung ist abgelaufen. Bitte neu anmelden.", response)
-        {
-        }
+	/// <summary>
+	/// Is fired with reqest used a cookie which is not defined. 
+	/// Reasons for cookie to be not defined might be
+	/// - user used more thant 8 different devices (copri invalidates cookies in this case)
+	/// - user account has been deleted?
+	/// </summary>
+	public class AuthcookieNotDefinedException : InvalidResponseException<Response.ResponseBase>
+	{
+		/// <summary>Constructs a authorization exceptions. </summary>
+		/// <param name="p_strTextOfAction">Text describing request which is shown if validation fails.</param>
+		public AuthcookieNotDefinedException(string p_strTextOfAction, Response.ResponseBase response) :
+			base($"{p_strTextOfAction}\r\nDie Sitzung ist abgelaufen. Bitte neu anmelden.", response)
+		{
+		}
 
-        /// <summary>
-        /// Gets whether authcookie is defined or not.
-        /// </summary>
-        /// <param name="reponse">Response to check</param>
-        /// <param name="actionText">Text holding contectin in which authcookie is checked.</param>
-        /// <param name="exception">Exception thrown if cookie is not defined.</param>
-        /// <returns></returns>
-        public static bool IsAuthcookieNotDefined(
-            Response.ResponseBase reponse,
-            string actionText,
-            out AuthcookieNotDefinedException exception)
-        {
-            if (reponse == null || reponse.response_state == null)
-            {
-                // Empty response or response withoud response state is no authcookie not defined exeception.
-                exception = null;
-                return false;
-            }
+		/// <summary>
+		/// Gets whether authcookie is defined or not.
+		/// </summary>
+		/// <param name="reponse">Response to check</param>
+		/// <param name="actionText">Text holding contectin in which authcookie is checked.</param>
+		/// <param name="exception">Exception thrown if cookie is not defined.</param>
+		/// <returns></returns>
+		public static bool IsAuthcookieNotDefined(
+			Response.ResponseBase reponse,
+			string actionText,
+			out AuthcookieNotDefinedException exception)
+		{
+			if (reponse == null || reponse.response_state == null)
+			{
+				// Empty response or response withoud response state is no authcookie not defined exeception.
+				exception = null;
+				return false;
+			}
 
-            if (!reponse.response_state.ToUpper().Contains(AUTH_FAILURE_QUERY_AUTHCOOKIENOTDEFIED.ToUpper())
-                && !reponse.response_state.ToUpper().Contains(AUTH_FAILURE_BOOK_AUTICOOKIENOTDEFIED.ToUpper())
-                && !reponse.response_state.ToUpper().Contains(AUTH_FAILURE_BIKESOCCUPIED_AUTICOOKIENOTDEFIED.ToUpper())
-                && !reponse.response_state.ToUpper().Contains(AUTH_FAILURE_LOGOUT_AUTHCOOKIENOTDEFIED.ToUpper()))
-            {
-                exception = null;
-                return false;
-            }
+			if (!reponse.response_state.ToUpper().Contains(AUTH_FAILURE_QUERY_AUTHCOOKIENOTDEFIED.ToUpper())
+				&& !reponse.response_state.ToUpper().Contains(AUTH_FAILURE_BOOK_AUTICOOKIENOTDEFIED.ToUpper())
+				&& !reponse.response_state.ToUpper().Contains(AUTH_FAILURE_BIKESOCCUPIED_AUTICOOKIENOTDEFIED.ToUpper())
+				&& !reponse.response_state.ToUpper().Contains(AUTH_FAILURE_LOGOUT_AUTHCOOKIENOTDEFIED.ToUpper()))
+			{
+				exception = null;
+				return false;
+			}
 
-            exception = new AuthcookieNotDefinedException(actionText, reponse);
-            return true;
-        }
+			exception = new AuthcookieNotDefinedException(actionText, reponse);
+			return true;
+		}
 
-        /// <summary> Holds error description if session expired. From COPRI 4.0.0.0 1001 is the only authcookie not defined error. </summary>
-        private const string AUTH_FAILURE_QUERY_AUTHCOOKIENOTDEFIED = "Failure 1001: authcookie not defined";
+		/// <summary> Holds error description if session expired. From COPRI 4.0.0.0 1001 is the only authcookie not defined error. </summary>
+		private const string AUTH_FAILURE_QUERY_AUTHCOOKIENOTDEFIED = "Failure 1001: authcookie not defined";
 
-        /// <summary> Holds error description if session expired (Applies to COPRI < 4.0.0.0) </summary>
-        private const string AUTH_FAILURE_BOOK_AUTICOOKIENOTDEFIED = "Failure 1002: authcookie not defined";
+		/// <summary> Holds error description if session expired (Applies to COPRI < 4.0.0.0) </summary>
+		private const string AUTH_FAILURE_BOOK_AUTICOOKIENOTDEFIED = "Failure 1002: authcookie not defined";
 
-        /// <summary> Holds error description if session expired (Applies to COPRI < 4.0.0.0) </summary>
-        private const string AUTH_FAILURE_BIKESOCCUPIED_AUTICOOKIENOTDEFIED = "Failure 1003: authcookie not defined";
+		/// <summary> Holds error description if session expired (Applies to COPRI < 4.0.0.0) </summary>
+		private const string AUTH_FAILURE_BIKESOCCUPIED_AUTICOOKIENOTDEFIED = "Failure 1003: authcookie not defined";
 
-        /// <summary> Holds error description if session expired. (Applies to COPRI < 4.0.0.0)</summary>
-        private const string AUTH_FAILURE_LOGOUT_AUTHCOOKIENOTDEFIED = "Failure 1004: authcookie not defined";
-    }
+		/// <summary> Holds error description if session expired. (Applies to COPRI < 4.0.0.0)</summary>
+		private const string AUTH_FAILURE_LOGOUT_AUTHCOOKIENOTDEFIED = "Failure 1004: authcookie not defined";
+	}
 }
diff --git a/TINKLib/Repository/Exception/AuthorizationResponseException.cs b/TINKLib/Repository/Exception/AuthorizationResponseException.cs
index 959024b..5269206 100644
--- a/TINKLib/Repository/Exception/AuthorizationResponseException.cs
+++ b/TINKLib/Repository/Exception/AuthorizationResponseException.cs
@@ -2,16 +2,16 @@
 
 namespace TINK.Repository.Exception
 {
-    public class InvalidAuthorizationResponseException : InvalidResponseException<Response.ResponseBase>
-    {
-        /// <summary>Constructs a authorization exceptions. </summary>
-        /// <param name="mail">Mail address to create a detailed error message.</param>
-        public InvalidAuthorizationResponseException(string mail, Response.ResponseBase response) :
-            base(string.Format(AppResources.ErrorMessageInvalidAuthorizationResponseException, mail), response)
-        {
-        }
+	public class InvalidAuthorizationResponseException : InvalidResponseException<Response.ResponseBase>
+	{
+		/// <summary>Constructs a authorization exceptions. </summary>
+		/// <param name="mail">Mail address to create a detailed error message.</param>
+		public InvalidAuthorizationResponseException(string mail, Response.ResponseBase response) :
+			base(string.Format(AppResources.ErrorMessageInvalidAuthorizationResponseException, mail), response)
+		{
+		}
 
-        /// <summary> Holds error description if user/ password combination is not valid. </summary>
-        public const string AUTH_FAILURE_STATUS_MESSAGE_UPPERCASE = "FAILURE: CANNOT GENERATE AUTHCOOKIE";
-    }
+		/// <summary> Holds error description if user/ password combination is not valid. </summary>
+		public const string AUTH_FAILURE_STATUS_MESSAGE_UPPERCASE = "FAILURE: CANNOT GENERATE AUTHCOOKIE";
+	}
 }
diff --git a/TINKLib/Repository/Exception/BookingDeclinedException.cs b/TINKLib/Repository/Exception/BookingDeclinedException.cs
index 87af58f..d90aa47 100644
--- a/TINKLib/Repository/Exception/BookingDeclinedException.cs
+++ b/TINKLib/Repository/Exception/BookingDeclinedException.cs
@@ -2,41 +2,41 @@
 
 namespace TINK.Repository.Exception
 {
-    /// <summary> Handles booking request which fail due to too many bikes requested/ booked.</summary>
-    public class BookingDeclinedException : InvalidResponseException
-    {
-        /// <summary> Holds error description if user/ password combination is not valid. </summary>
-        public const string BOOKING_FAILURE_STATUS_MESSAGE_UPPERCASE = "(OK: BOOKING_REQUEST DECLINED\\. MAX COUNT OF )([0-9]+)( OCCUPIED BIKES HAS BEEN REACHED)";
+	/// <summary> Handles booking request which fail due to too many bikes requested/ booked.</summary>
+	public class BookingDeclinedException : InvalidResponseException
+	{
+		/// <summary> Holds error description if user/ password combination is not valid. </summary>
+		public const string BOOKING_FAILURE_STATUS_MESSAGE_UPPERCASE = "(OK: BOOKING_REQUEST DECLINED\\. MAX COUNT OF )([0-9]+)( OCCUPIED BIKES HAS BEEN REACHED)";
 
-        /// <summary> Prevents invalid use of exception. </summary>
-        private BookingDeclinedException() : base(typeof(BookingDeclinedException).Name)
-        {
-        }
+		/// <summary> Prevents invalid use of exception. </summary>
+		private BookingDeclinedException() : base(typeof(BookingDeclinedException).Name)
+		{
+		}
 
-        /// <summary> Prevents invalid use of exception. </summary>
-        public BookingDeclinedException(int maxBikesCount) : base(typeof(BookingDeclinedException).Name)
-        {
-            MaxBikesCount = maxBikesCount;
-        }
+		/// <summary> Prevents invalid use of exception. </summary>
+		public BookingDeclinedException(int maxBikesCount) : base(typeof(BookingDeclinedException).Name)
+		{
+			MaxBikesCount = maxBikesCount;
+		}
 
-        public static bool IsBookingDeclined(string responseState, out BookingDeclinedException exception)
-        {
-            // Check if there are too many bikes requested/ booked.
-            var match = Regex.Match(
-                responseState.ToUpper(),
-                BOOKING_FAILURE_STATUS_MESSAGE_UPPERCASE);
-            if (match.Groups.Count != 4
-                || !int.TryParse(match.Groups[2].ToString(), out int maxBikesCount))
-            {
-                exception = null;
-                return false;
-            }
+		public static bool IsBookingDeclined(string responseState, out BookingDeclinedException exception)
+		{
+			// Check if there are too many bikes requested/ booked.
+			var match = Regex.Match(
+				responseState.ToUpper(),
+				BOOKING_FAILURE_STATUS_MESSAGE_UPPERCASE);
+			if (match.Groups.Count != 4
+				|| !int.TryParse(match.Groups[2].ToString(), out int maxBikesCount))
+			{
+				exception = null;
+				return false;
+			}
 
-            exception = new BookingDeclinedException(maxBikesCount);
-            return true;
-        }
+			exception = new BookingDeclinedException(maxBikesCount);
+			return true;
+		}
 
-        /// <summary> Holds the maximum count of bikes allowed to reserve/ book.</summary>
-        public int MaxBikesCount { get; private set; }
-    }
+		/// <summary> Holds the maximum count of bikes allowed to reserve/ book.</summary>
+		public int MaxBikesCount { get; private set; }
+	}
 }
diff --git a/TINKLib/Repository/Exception/CallNotRequiredException.cs b/TINKLib/Repository/Exception/CallNotRequiredException.cs
index 3ecef61..79d5405 100644
--- a/TINKLib/Repository/Exception/CallNotRequiredException.cs
+++ b/TINKLib/Repository/Exception/CallNotRequiredException.cs
@@ -1,6 +1,6 @@
 namespace TINK.Repository.Exception
 {
-    public class CallNotRequiredException : System.Exception
-    {
-    }
+	public class CallNotRequiredException : System.Exception
+	{
+	}
 }
diff --git a/TINKLib/Repository/Exception/CommunicationException.cs b/TINKLib/Repository/Exception/CommunicationException.cs
index 77ef542..83228f8 100644
--- a/TINKLib/Repository/Exception/CommunicationException.cs
+++ b/TINKLib/Repository/Exception/CommunicationException.cs
@@ -1,28 +1,28 @@
 namespace TINK.Repository.Exception
 {
-    public class CommunicationException : System.Exception
-    {
-        /// <summary>
-        /// Constructs a communication exception object.
-        /// </summary>
-        public CommunicationException()
-        { }
+	public class CommunicationException : System.Exception
+	{
+		/// <summary>
+		/// Constructs a communication exception object.
+		/// </summary>
+		public CommunicationException()
+		{ }
 
-        /// <summary>
-        /// Constructs a communication exeption object.
-        /// </summary>
-        /// <param name="p_strMessage">Error message.</param>
-        public CommunicationException(string p_strMessage) : base(p_strMessage)
-        {
-        }
+		/// <summary>
+		/// Constructs a communication exeption object.
+		/// </summary>
+		/// <param name="p_strMessage">Error message.</param>
+		public CommunicationException(string p_strMessage) : base(p_strMessage)
+		{
+		}
 
-        /// <summary>
-        /// Constructs a communication exeption object.
-        /// </summary>
-        /// <param name="p_strMessage">Error message.</param>
-        /// <param name="p_oException">Inner exceptions.</param>
-        public CommunicationException(string p_strMessage, System.Exception p_oException) : base(p_strMessage, p_oException)
-        {
-        }
-    }
+		/// <summary>
+		/// Constructs a communication exeption object.
+		/// </summary>
+		/// <param name="p_strMessage">Error message.</param>
+		/// <param name="p_oException">Inner exceptions.</param>
+		public CommunicationException(string p_strMessage, System.Exception p_oException) : base(p_strMessage, p_oException)
+		{
+		}
+	}
 }
diff --git a/TINKLib/Repository/Exception/DeserializationException.cs b/TINKLib/Repository/Exception/DeserializationException.cs
index 658256b..bcc9756 100644
--- a/TINKLib/Repository/Exception/DeserializationException.cs
+++ b/TINKLib/Repository/Exception/DeserializationException.cs
@@ -1,9 +1,9 @@
 namespace TINK.Repository.Exception
 {
-    public class DeserializationException : CommunicationException
-    {
-        public DeserializationException(System.Exception ex) : base(ex.Message, ex)
-        {
-        }
-    }
+	public class DeserializationException : CommunicationException
+	{
+		public DeserializationException(System.Exception ex) : base(ex.Message, ex)
+		{
+		}
+	}
 }
diff --git a/TINKLib/Repository/Exception/InvalidResponseException.cs b/TINKLib/Repository/Exception/InvalidResponseException.cs
index a639fd1..2cf2676 100644
--- a/TINKLib/Repository/Exception/InvalidResponseException.cs
+++ b/TINKLib/Repository/Exception/InvalidResponseException.cs
@@ -1,34 +1,34 @@
 namespace TINK.Repository.Exception
 {
-    public class InvalidResponseException<T> : InvalidResponseException
-    {
-        /// <summary> Constructs an invalid response Exception. </summary>
-        /// <param name="actionWhichFailed">Describes the action which failed.</param>
-        /// <param name="response">Response from copri.</param>
-        public InvalidResponseException(string actionWhichFailed, T response)
-            : base(string.Format(
-                "{0}{1}",
-                actionWhichFailed,
-                response == null ? string.Format(" Response of type {0} is null.", typeof(T).Name.ToString()) : string.Empty))
-        {
-            Response = response;
-        }
+	public class InvalidResponseException<T> : InvalidResponseException
+	{
+		/// <summary> Constructs an invalid response Exception. </summary>
+		/// <param name="actionWhichFailed">Describes the action which failed.</param>
+		/// <param name="response">Response from copri.</param>
+		public InvalidResponseException(string actionWhichFailed, T response)
+			: base(string.Format(
+				"{0}{1}",
+				actionWhichFailed,
+				response == null ? string.Format(" Response of type {0} is null.", typeof(T).Name.ToString()) : string.Empty))
+		{
+			Response = response;
+		}
 
-        public T Response { get; private set; }
-    }
+		public T Response { get; private set; }
+	}
 
-    /// <summary>
-    /// Base exception for all generic invalid response exceptions.
-    /// </summary>
-    public class InvalidResponseException : CommunicationException
-    {
-        /// <summary> Prevents an invalid instance to be created. </summary>
-        private InvalidResponseException()
-        { }
+	/// <summary>
+	/// Base exception for all generic invalid response exceptions.
+	/// </summary>
+	public class InvalidResponseException : CommunicationException
+	{
+		/// <summary> Prevents an invalid instance to be created. </summary>
+		private InvalidResponseException()
+		{ }
 
-        /// <summary> Constructs a invalid response execption.</summary>
-        /// <param name="message">Exception.</param>
-        public InvalidResponseException(string message) : base(message)
-        { }
-    }
+		/// <summary> Constructs a invalid response execption.</summary>
+		/// <param name="message">Exception.</param>
+		public InvalidResponseException(string message) : base(message)
+		{ }
+	}
 }
diff --git a/TINKLib/Repository/Exception/NoGPSDataException.cs b/TINKLib/Repository/Exception/NoGPSDataException.cs
index 5e44a29..f2e4129 100644
--- a/TINKLib/Repository/Exception/NoGPSDataException.cs
+++ b/TINKLib/Repository/Exception/NoGPSDataException.cs
@@ -1,27 +1,27 @@
 
 namespace TINK.Repository.Exception
 {
-    public class NoGPSDataException : InvalidResponseException
-    {
-        /// <summary> COPRI response status. </summary>
-        public const string RETURNBIKE_FAILURE_STATUS_MESSAGE_UPPERCASE = "FAILURE 2245: NO GPS DATA, STATE CHANGE FORBIDDEN.";
+	public class NoGPSDataException : InvalidResponseException
+	{
+		/// <summary> COPRI response status. </summary>
+		public const string RETURNBIKE_FAILURE_STATUS_MESSAGE_UPPERCASE = "FAILURE 2245: NO GPS DATA, STATE CHANGE FORBIDDEN.";
 
-        /// <summary> Prevents invalid use of exception. </summary>
-        private NoGPSDataException() : base(typeof(NoGPSDataException).Name)
-        {
-        }
+		/// <summary> Prevents invalid use of exception. </summary>
+		private NoGPSDataException() : base(typeof(NoGPSDataException).Name)
+		{
+		}
 
-        public static bool IsNoGPSData(string responseState, out NoGPSDataException exception)
-        {
-            // Check if there are too many bikes requested/ booked.
-            if (!responseState.Trim().ToUpper().StartsWith(RETURNBIKE_FAILURE_STATUS_MESSAGE_UPPERCASE))
-            {
-                exception = null;
-                return false;
-            }
+		public static bool IsNoGPSData(string responseState, out NoGPSDataException exception)
+		{
+			// Check if there are too many bikes requested/ booked.
+			if (!responseState.Trim().ToUpper().StartsWith(RETURNBIKE_FAILURE_STATUS_MESSAGE_UPPERCASE))
+			{
+				exception = null;
+				return false;
+			}
 
-            exception = new NoGPSDataException();
-            return true;
-        }
-    }
+			exception = new NoGPSDataException();
+			return true;
+		}
+	}
 }
diff --git a/TINKLib/Repository/Exception/NotAtStationException.cs b/TINKLib/Repository/Exception/NotAtStationException.cs
index 5157727..d6b615b 100644
--- a/TINKLib/Repository/Exception/NotAtStationException.cs
+++ b/TINKLib/Repository/Exception/NotAtStationException.cs
@@ -2,38 +2,38 @@
 
 namespace TINK.Repository.Exception
 {
-    public class NotAtStationException : InvalidResponseException
-    {
-        /// <summary> COPRI response status regular expression. </summary>
-        public const string RETURNBIKE_FAILURE_STATUS_MESSAGE_UPPERCASE = "(FAILURE 2178: BIKE [0-9]+ OUT OF GEO FENCING\\. )([0-9]+)( METER DISTANCE TO NEXT STATION )([0-9]+)";
+	public class NotAtStationException : InvalidResponseException
+	{
+		/// <summary> COPRI response status regular expression. </summary>
+		public const string RETURNBIKE_FAILURE_STATUS_MESSAGE_UPPERCASE = "(FAILURE 2178: BIKE [0-9]+ OUT OF GEO FENCING\\. )([0-9]+)( METER DISTANCE TO NEXT STATION )([0-9]+)";
 
-        /// <summary> Prevents invalid use of exception. </summary>
-        private NotAtStationException() : base(typeof(NotAtStationException).Name)
-        {
-        }
+		/// <summary> Prevents invalid use of exception. </summary>
+		private NotAtStationException() : base(typeof(NotAtStationException).Name)
+		{
+		}
 
-        public static bool IsNotAtStation(string responseState, out NotAtStationException exception)
-        {
-            // Check if there are too many bikes requested/ booked.
-            var match = Regex.Match(
-                responseState.ToUpper(),
-                RETURNBIKE_FAILURE_STATUS_MESSAGE_UPPERCASE);
-            if (match.Groups.Count != 5
-                || !int.TryParse(match.Groups[2].ToString(), out int meters)
-                || !int.TryParse(match.Groups[4].ToString(), out int stationNr))
-            {
-                exception = null;
-                return false;
-            }
+		public static bool IsNotAtStation(string responseState, out NotAtStationException exception)
+		{
+			// Check if there are too many bikes requested/ booked.
+			var match = Regex.Match(
+				responseState.ToUpper(),
+				RETURNBIKE_FAILURE_STATUS_MESSAGE_UPPERCASE);
+			if (match.Groups.Count != 5
+				|| !int.TryParse(match.Groups[2].ToString(), out int meters)
+				|| !int.TryParse(match.Groups[4].ToString(), out int stationNr))
+			{
+				exception = null;
+				return false;
+			}
 
-            exception = new NotAtStationException { Distance = meters, StationNr = stationNr };
-            return true;
-        }
+			exception = new NotAtStationException { Distance = meters, StationNr = stationNr };
+			return true;
+		}
 
-        /// <summary> Holds the maximum count of bikes allowed to reserve/ book.</summary>
-        public int Distance { get; private set; }
+		/// <summary> Holds the maximum count of bikes allowed to reserve/ book.</summary>
+		public int Distance { get; private set; }
 
-        /// <summary> Holds the maximum count of bikes allowed to reserve/ book.</summary>
-        public int StationNr { get; private set; }
-    }
+		/// <summary> Holds the maximum count of bikes allowed to reserve/ book.</summary>
+		public int StationNr { get; private set; }
+	}
 }
diff --git a/TINKLib/Repository/Exception/ResponseException.cs b/TINKLib/Repository/Exception/ResponseException.cs
index 1c00ac8..e1aed12 100644
--- a/TINKLib/Repository/Exception/ResponseException.cs
+++ b/TINKLib/Repository/Exception/ResponseException.cs
@@ -2,14 +2,14 @@
 
 namespace TINK.Repository.Exception
 {
-    public class ResponseException : System.Exception
-    {
-        private readonly ResponseBase _response;
-        public ResponseException(ResponseBase response, string message) : base(message)
-        {
-            _response = response;
-        }
+	public class ResponseException : System.Exception
+	{
+		private readonly ResponseBase _response;
+		public ResponseException(ResponseBase response, string message) : base(message)
+		{
+			_response = response;
+		}
 
-        public string Response => _response.response_text;
-    }
+		public string Response => _response.response_text;
+	}
 }
diff --git a/TINKLib/Repository/Exception/ReturnBikeException.cs b/TINKLib/Repository/Exception/ReturnBikeException.cs
index 5a9eb57..954e108 100644
--- a/TINKLib/Repository/Exception/ReturnBikeException.cs
+++ b/TINKLib/Repository/Exception/ReturnBikeException.cs
@@ -2,9 +2,9 @@
 
 namespace TINK.Repository.Exception
 {
-    public class ReturnBikeException : ResponseException
-    {
-        public ReturnBikeException(BikesReservedOccupiedResponse response, string message) : base(response, message)
-        { }
-    }
+	public class ReturnBikeException : ResponseException
+	{
+		public ReturnBikeException(BikesReservedOccupiedResponse response, string message) : base(response, message)
+		{ }
+	}
 }
diff --git a/TINKLib/Repository/Exception/UnsupportedCopriVersionDetectedException.cs b/TINKLib/Repository/Exception/UnsupportedCopriVersionDetectedException.cs
index a6d13be..dd29990 100644
--- a/TINKLib/Repository/Exception/UnsupportedCopriVersionDetectedException.cs
+++ b/TINKLib/Repository/Exception/UnsupportedCopriVersionDetectedException.cs
@@ -1,8 +1,8 @@
 namespace TINK.Repository.Exception
 {
-    public class UnsupportedCopriVersionDetectedException : System.Exception
-    {
-        public UnsupportedCopriVersionDetectedException() : base("Unsupported app version detected.")
-        { }
-    }
+	public class UnsupportedCopriVersionDetectedException : System.Exception
+	{
+		public UnsupportedCopriVersionDetectedException() : base("Unsupported app version detected.")
+		{ }
+	}
 }
diff --git a/TINKLib/Repository/Exception/WebConnectFailureException.cs b/TINKLib/Repository/Exception/WebConnectFailureException.cs
index b530603..8ce5f3e 100644
--- a/TINKLib/Repository/Exception/WebConnectFailureException.cs
+++ b/TINKLib/Repository/Exception/WebConnectFailureException.cs
@@ -2,21 +2,21 @@
 
 namespace TINK.Repository.Exception
 {
-    public class WebConnectFailureException : CommunicationException
-    {
-        /// <summary>
-        /// Returns a hint to fix communication problem.
-        /// </summary>
-        public static string GetHintToPossibleExceptionsReasons
-            => AppResources.ExceptionTextWebConnectFailureException;
+	public class WebConnectFailureException : CommunicationException
+	{
+		/// <summary>
+		/// Returns a hint to fix communication problem.
+		/// </summary>
+		public static string GetHintToPossibleExceptionsReasons
+			=> AppResources.ExceptionTextWebConnectFailureException;
 
-        /// <summary>
-        /// Constructs a communication exeption object.
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="exception"></param>
-        public WebConnectFailureException(string message, System.Exception exception) : base(message, exception)
-        {
-        }
-    }
+		/// <summary>
+		/// Constructs a communication exeption object.
+		/// </summary>
+		/// <param name="message"></param>
+		/// <param name="exception"></param>
+		public WebConnectFailureException(string message, System.Exception exception) : base(message, exception)
+		{
+		}
+	}
 }
diff --git a/TINKLib/Repository/Exception/WebExceptionHelper.cs b/TINKLib/Repository/Exception/WebExceptionHelper.cs
index dab5613..9fe019c 100644
--- a/TINKLib/Repository/Exception/WebExceptionHelper.cs
+++ b/TINKLib/Repository/Exception/WebExceptionHelper.cs
@@ -2,52 +2,52 @@
 
 namespace TINK.Repository.Exception
 {
-    public static class WebExceptionHelper
-    {
-        /// <summary> Gets if a exception is caused by an error connecting to copri (LAN or mobile data off/ not reachable, proxy, ...).</summary>
-        /// <param name="exception">Expection to check.</param>
-        /// <returns>True if exception if caused by an connection error. </returns>
-        public static bool GetIsConnectFailureException(this System.Exception exception)
-        {
+	public static class WebExceptionHelper
+	{
+		/// <summary> Gets if a exception is caused by an error connecting to copri (LAN or mobile data off/ not reachable, proxy, ...).</summary>
+		/// <param name="exception">Expection to check.</param>
+		/// <returns>True if exception if caused by an connection error. </returns>
+		public static bool GetIsConnectFailureException(this System.Exception exception)
+		{
 #if !USCSHARP9
-            if (!(exception is WebException webException))
+			if (!(exception is WebException webException))
 #else
             if (exception is not WebException webException)
 #endif
-            {
-                return false;
-            }
+			{
+				return false;
+			}
 
-            return webException.Status == WebExceptionStatus.ConnectFailure // Happens if WLAN and mobile data is off/ Router denies internet access/ ...
-                || webException.Status == WebExceptionStatus.NameResolutionFailure // Happens sometimes when not WLAN and no mobil connection are available (bad connection in lift).
-                || webException.Status == WebExceptionStatus.ReceiveFailure; // Happened when mobile was connected to WLAN
-        }
+			return webException.Status == WebExceptionStatus.ConnectFailure // Happens if WLAN and mobile data is off/ Router denies internet access/ ...
+				|| webException.Status == WebExceptionStatus.NameResolutionFailure // Happens sometimes when not WLAN and no mobil connection are available (bad connection in lift).
+				|| webException.Status == WebExceptionStatus.ReceiveFailure; // Happened when mobile was connected to WLAN
+		}
 
-        /// <summary> Gets if a exception is caused by clicking too fast.</summary>
-        /// <param name="exception">Expection to check.</param>
-        /// <returns>True if exception if caused by a fast click sequence. </returns>
-        public static bool GetIsForbiddenException(this System.Exception exception)
-        {
+		/// <summary> Gets if a exception is caused by clicking too fast.</summary>
+		/// <param name="exception">Expection to check.</param>
+		/// <returns>True if exception if caused by a fast click sequence. </returns>
+		public static bool GetIsForbiddenException(this System.Exception exception)
+		{
 #if !USCSHARP9
-            if (!(exception is WebException webException))
+			if (!(exception is WebException webException))
 #else
             if (exception is not WebException webException)
 #endif
-            {
-                return false;
-            }
+			{
+				return false;
+			}
 
 #if !USCSHARP9
-            if (!(webException?.Response is HttpWebResponse response))
+			if (!(webException?.Response is HttpWebResponse response))
 #else
             if (webException?.Response is not HttpWebResponse response)
 #endif
-            {
-                return false;
-            }
+			{
+				return false;
+			}
 
-            return webException.Status == WebExceptionStatus.ProtocolError
-                && response.StatusCode == HttpStatusCode.Forbidden;
-        }
-    }
+			return webException.Status == WebExceptionStatus.ProtocolError
+				&& response.StatusCode == HttpStatusCode.Forbidden;
+		}
+	}
 }
diff --git a/TINKLib/Repository/Exception/WebForbiddenException.cs b/TINKLib/Repository/Exception/WebForbiddenException.cs
index 408da74..9b31a96 100644
--- a/TINKLib/Repository/Exception/WebForbiddenException.cs
+++ b/TINKLib/Repository/Exception/WebForbiddenException.cs
@@ -1,14 +1,14 @@
 namespace TINK.Repository.Exception
 {
-    public class WebForbiddenException : CommunicationException
-    {
-        /// <summary>
-        /// Constructs a communication exeption object.
-        /// </summary>
-        /// <param name="p_strMessage"></param>
-        /// <param name="p_oException"></param>
-        public WebForbiddenException(string p_strMessage, System.Exception p_oException) : base($"{p_strMessage}\r\nSchnell getippt?\r\nBitte die App etwas langsamer bedienen...", p_oException)
-        {
-        }
-    }
+	public class WebForbiddenException : CommunicationException
+	{
+		/// <summary>
+		/// Constructs a communication exeption object.
+		/// </summary>
+		/// <param name="p_strMessage"></param>
+		/// <param name="p_oException"></param>
+		public WebForbiddenException(string p_strMessage, System.Exception p_oException) : base($"{p_strMessage}\r\nSchnell getippt?\r\nBitte die App etwas langsamer bedienen...", p_oException)
+		{
+		}
+	}
 }
diff --git a/TINKLib/Repository/ICopriServer.cs b/TINKLib/Repository/ICopriServer.cs
index c3e3b4d..95136de 100644
--- a/TINKLib/Repository/ICopriServer.cs
+++ b/TINKLib/Repository/ICopriServer.cs
@@ -7,161 +7,161 @@ using TINK.Repository.Response;
 
 namespace TINK.Repository
 {
-    /// <summary> Interface to communicate with copri server.</summary>
-    public interface ICopriServerBase
-    {
-        /// <summary> Logs user in. </summary>
-        /// <param name="mailAddress">Mailaddress of user to log in.</param>
-        /// <param name="password">Password to log in.</param>
-        /// <param name="deviceId">Id specifying user and hardware.</param>
-        /// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
-        Task<AuthorizationResponse> DoAuthorizationAsync(
-            string mailAddress,
-            string password,
-            string deviceId);
+	/// <summary> Interface to communicate with copri server.</summary>
+	public interface ICopriServerBase
+	{
+		/// <summary> Logs user in. </summary>
+		/// <param name="mailAddress">Mailaddress of user to log in.</param>
+		/// <param name="password">Password to log in.</param>
+		/// <param name="deviceId">Id specifying user and hardware.</param>
+		/// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
+		Task<AuthorizationResponse> DoAuthorizationAsync(
+			string mailAddress,
+			string password,
+			string deviceId);
 
-        /// <summary> Logs user out. </summary>
-        /// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
-        Task<AuthorizationoutResponse> DoAuthoutAsync();
+		/// <summary> Logs user out. </summary>
+		/// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
+		Task<AuthorizationoutResponse> DoAuthoutAsync();
 
-        /// <summary> Reserves bike. </summary>
-        /// <param name="bikeId">Id of the bike to reserve.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on reserving request.</returns>
-        Task<ReservationBookingResponse> DoReserveAsync(
-            string bikeId,
-            Uri operatorUri);
+		/// <summary> Reserves bike. </summary>
+		/// <param name="bikeId">Id of the bike to reserve.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on reserving request.</returns>
+		Task<ReservationBookingResponse> DoReserveAsync(
+			string bikeId,
+			Uri operatorUri);
 
-        /// <summary> Cancels reservation of bik. </summary>
-        /// <param name="bikeId">Id of the bike to reserve.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on cancel reservation request.</returns>
-        Task<ReservationCancelReturnResponse> DoCancelReservationAsync(
-            string bikeId,
-            Uri operatorUri);
+		/// <summary> Cancels reservation of bik. </summary>
+		/// <param name="bikeId">Id of the bike to reserve.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on cancel reservation request.</returns>
+		Task<ReservationCancelReturnResponse> DoCancelReservationAsync(
+			string bikeId,
+			Uri operatorUri);
 
-        /// <summary> Get authentication keys. </summary>
-        /// <param name="bikeId">Id of the bike to get keys for.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response holding authentication keys.</returns>
-        Task<ReservationBookingResponse> CalculateAuthKeysAsync(
-            string bikeId,
-            Uri operatorUri);
+		/// <summary> Get authentication keys. </summary>
+		/// <param name="bikeId">Id of the bike to get keys for.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response holding authentication keys.</returns>
+		Task<ReservationBookingResponse> CalculateAuthKeysAsync(
+			string bikeId,
+			Uri operatorUri);
 
-        /// <summary> Notifies COPRI about start of returning sequence. </summary>
-        /// <remarks> Operator specific call.</remarks>
-        /// <param name="bikeId">Id of the bike to return.</param>+
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on notification about start of returning sequence.</returns>
-        Task<ResponseBase> StartReturningBike(
-            string bikeId,
-            Uri operatorUri);
+		/// <summary> Notifies COPRI about start of returning sequence. </summary>
+		/// <remarks> Operator specific call.</remarks>
+		/// <param name="bikeId">Id of the bike to return.</param>+
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on notification about start of returning sequence.</returns>
+		Task<ResponseBase> StartReturningBike(
+			string bikeId,
+			Uri operatorUri);
 
-        /// <summary> Updates COPRI lock state for a booked bike. </summary>
-        /// <param name="bikeId">Id of the bike to update locking state for.</param>
-        /// <param name="location">Geolocation of lock.</param>
-        /// <param name="state">New locking state.</param>
-        /// <param name="batteryPercentage">Holds the filling level percentage of the battery.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on updating locking state.</returns>
-        Task<ReservationBookingResponse> UpdateLockingStateAsync(
-            string bikeId,
-            lock_state state,
-            Uri operatorUri,
-            LocationDto location = null,
-            double batteryPercentage = double.NaN);
+		/// <summary> Updates COPRI lock state for a booked bike. </summary>
+		/// <param name="bikeId">Id of the bike to update locking state for.</param>
+		/// <param name="location">Geolocation of lock.</param>
+		/// <param name="state">New locking state.</param>
+		/// <param name="batteryPercentage">Holds the filling level percentage of the battery.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on updating locking state.</returns>
+		Task<ReservationBookingResponse> UpdateLockingStateAsync(
+			string bikeId,
+			lock_state state,
+			Uri operatorUri,
+			LocationDto location = null,
+			double batteryPercentage = double.NaN);
 
-        /// <summary> Books a bluetooth bike. </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <param name="guid">Used to publish GUID from app to copri. Used for initial setup of bike in copri.</param>
-        /// <param name="batteryPercentage">Holds the filling level percentage of the battery.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on booking request.</returns>
-        Task<ReservationBookingResponse> DoBookAsync(
-            string bikeId,
-            Guid guid,
-            double batteryPercentage,
-            Uri operatorUri);
+		/// <summary> Books a bluetooth bike. </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <param name="guid">Used to publish GUID from app to copri. Used for initial setup of bike in copri.</param>
+		/// <param name="batteryPercentage">Holds the filling level percentage of the battery.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on booking request.</returns>
+		Task<ReservationBookingResponse> DoBookAsync(
+			string bikeId,
+			Guid guid,
+			double batteryPercentage,
+			Uri operatorUri);
 
-        /// <summary> Books a bike and starts opening bike. </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on booking request.</returns>
-        Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(
-            string bikeId,
-            Uri operatorUri);
+		/// <summary> Books a bike and starts opening bike. </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on booking request.</returns>
+		Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(
+			string bikeId,
+			Uri operatorUri);
 
-        /// <summary> Books a bike and starts opening bike. </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on booking request.</returns>
-        Task<ReservationBookingResponse> BookReservedAndStartOpeningAsync(
-            string bikeId,
-            Uri operatorUri);
+		/// <summary> Books a bike and starts opening bike. </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on booking request.</returns>
+		Task<ReservationBookingResponse> BookReservedAndStartOpeningAsync(
+			string bikeId,
+			Uri operatorUri);
 
-        /// <summary> Returns a bike. </summary>
-        /// <param name="bikeId">Id of the bike to return.</param>
-        /// <param name="location">Geolocation of lock.</param>
-        /// <param name="smartDevice">Provides info about hard and software.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on returning request.</returns>
-        Task<DoReturnResponse> DoReturn(
-            string bikeId,
-            LocationDto location,
-            ISmartDevice smartDevice,
-            Uri operatorUri);
+		/// <summary> Returns a bike. </summary>
+		/// <param name="bikeId">Id of the bike to return.</param>
+		/// <param name="location">Geolocation of lock.</param>
+		/// <param name="smartDevice">Provides info about hard and software.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on returning request.</returns>
+		Task<DoReturnResponse> DoReturn(
+			string bikeId,
+			LocationDto location,
+			ISmartDevice smartDevice,
+			Uri operatorUri);
 
-        /// <summary> Returns a bike and starts closing. </summary>
-        /// <param name="bikeId">Id of the bike to return.</param>
-        /// <param name="smartDevice">Provides info about hard and software.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on returning request.</returns>
-        Task<DoReturnResponse> ReturnAndStartClosingAsync(
-            string bikeId,
-            ISmartDevice smartDevice,
-            Uri operatorUri);
+		/// <summary> Returns a bike and starts closing. </summary>
+		/// <param name="bikeId">Id of the bike to return.</param>
+		/// <param name="smartDevice">Provides info about hard and software.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on returning request.</returns>
+		Task<DoReturnResponse> ReturnAndStartClosingAsync(
+			string bikeId,
+			ISmartDevice smartDevice,
+			Uri operatorUri);
 
-        /// <summary>
-        /// Submits feedback to copri server.
-        /// </summary>
-        /// <param name="bikeId">Id of the bike to submit feedback for.</param>
-        /// <param name="currentChargeBars">Null if bike has no engine or charge is unknown. Otherwise the charge filling level of the drive battery.</param>
-        /// <param name="isBikeBroken">True if bike is broken.</param>
-        /// <param name="message">General purpose message or error description.</param>
-        Task<SubmitFeedbackResponse> DoSubmitFeedback(
-            string bikeId,
-            int? currentChargeBars,
-            string message,
-            bool isBikeBroken,
-            Uri operatorUri);
+		/// <summary>
+		/// Submits feedback to copri server.
+		/// </summary>
+		/// <param name="bikeId">Id of the bike to submit feedback for.</param>
+		/// <param name="currentChargeBars">Null if bike has no engine or charge is unknown. Otherwise the charge filling level of the drive battery.</param>
+		/// <param name="isBikeBroken">True if bike is broken.</param>
+		/// <param name="message">General purpose message or error description.</param>
+		Task<SubmitFeedbackResponse> DoSubmitFeedback(
+			string bikeId,
+			int? currentChargeBars,
+			string message,
+			bool isBikeBroken,
+			Uri operatorUri);
 
-        /// <summary> Submits mini survey to copri server. </summary>
-        /// <param name="answers">Collection of answers.</param>
-        Task<ResponseBase> DoSubmitMiniSurvey(IDictionary<string, string> answers);
+		/// <summary> Submits mini survey to copri server. </summary>
+		/// <param name="answers">Collection of answers.</param>
+		Task<ResponseBase> DoSubmitMiniSurvey(IDictionary<string, string> answers);
 
-        /// <summary> True if connector has access to copri server, false if cached values are used. </summary>
-        bool IsConnected { get; }
+		/// <summary> True if connector has access to copri server, false if cached values are used. </summary>
+		bool IsConnected { get; }
 
-        /// <summary> Gets the session cookie if user is logged in, an empty string otherwise. </summary>
-        string SessionCookie { get; }
+		/// <summary> Gets the session cookie if user is logged in, an empty string otherwise. </summary>
+		string SessionCookie { get; }
 
-        /// <summary> Holds the id of the merchant. </summary>
-        string MerchantId { get; }
-    }
+		/// <summary> Holds the id of the merchant. </summary>
+		string MerchantId { get; }
+	}
 
-    /// <summary> Interface to communicate with copri server.</summary>
-    public interface ICopriServer : ICopriServerBase
-    {
-        /// <summary> Get list of stations. </summary>
-        /// <returns>List of all stations.</returns>
-        Task<StationsAvailableResponse> GetStationsAsync();
+	/// <summary> Interface to communicate with copri server.</summary>
+	public interface ICopriServer : ICopriServerBase
+	{
+		/// <summary> Get list of stations. </summary>
+		/// <returns>List of all stations.</returns>
+		Task<StationsAvailableResponse> GetStationsAsync();
 
-        /// <summary> Gets a list of bikes from Copri. </summary>
-        /// <returns>Response holding list of bikes.</returns>
-        Task<BikesAvailableResponse> GetBikesAvailableAsync();
+		/// <summary> Gets a list of bikes from Copri. </summary>
+		/// <returns>Response holding list of bikes.</returns>
+		Task<BikesAvailableResponse> GetBikesAvailableAsync();
 
-        /// <summary> Gets a list of bikes reserved/ booked by acctive user from Copri.</summary>
-        /// <returns>Response holding list of bikes.</returns>
-        Task<BikesReservedOccupiedResponse> GetBikesOccupiedAsync();
-    }
+		/// <summary> Gets a list of bikes reserved/ booked by acctive user from Copri.</summary>
+		/// <returns>Response holding list of bikes.</returns>
+		Task<BikesReservedOccupiedResponse> GetBikesOccupiedAsync();
+	}
 }
diff --git a/TINKLib/Repository/Request/IRequestBuilder.cs b/TINKLib/Repository/Request/IRequestBuilder.cs
index e8dce40..fa679f0 100644
--- a/TINKLib/Repository/Request/IRequestBuilder.cs
+++ b/TINKLib/Repository/Request/IRequestBuilder.cs
@@ -4,158 +4,158 @@ using TINK.Model.Device;
 
 namespace TINK.Repository.Request
 {
-    /// <summary> Defines members to create requests.</summary>
-    public interface IRequestBuilder
-    {
-        /// <summary> Holds the id denoting the merchant (TINK app). </summary>
-        string MerchantId { get; }
+	/// <summary> Defines members to create requests.</summary>
+	public interface IRequestBuilder
+	{
+		/// <summary> Holds the id denoting the merchant (TINK app). </summary>
+		string MerchantId { get; }
 
-        /// <summary> Gets the session cookie if user is logged in, an empty string otherwise. </summary>
-        string SessionCookie { get; }
+		/// <summary> Gets the session cookie if user is logged in, an empty string otherwise. </summary>
+		string SessionCookie { get; }
 
-        /// <summary> Gets request to log user in. </summary>
-        /// <param name="mailAddress">Mailaddress of user to log in.</param>
-        /// <param name="password">Password to log in.</param>
-        /// <param name="deviceId">Id specifying user and hardware.</param>
-        /// <remarks>Requst which holds auth cookie <see cref="RequstBase.authcookie"/></remarks>
-        string DoAuthorization(
-            string mailAddress,
-            string password,
-            string deviceId);
+		/// <summary> Gets request to log user in. </summary>
+		/// <param name="mailAddress">Mailaddress of user to log in.</param>
+		/// <param name="password">Password to log in.</param>
+		/// <param name="deviceId">Id specifying user and hardware.</param>
+		/// <remarks>Requst which holds auth cookie <see cref="RequstBase.authcookie"/></remarks>
+		string DoAuthorization(
+			string mailAddress,
+			string password,
+			string deviceId);
 
-        /// <summary> Logs user out. </summary>
-        /// <param name="p_strMerchantId">Id of the merchant.</param>
-        /// <param name="p_strSessionCookie"> Cookie which identifies user.</param>
-        string DoAuthout();
+		/// <summary> Logs user out. </summary>
+		/// <param name="p_strMerchantId">Id of the merchant.</param>
+		/// <param name="p_strSessionCookie"> Cookie which identifies user.</param>
+		string DoAuthout();
 
-        /// <summary> Get list of stations from file. </summary>
-        /// <returns>Request to query list of station.</returns>
-        string GetStations();
+		/// <summary> Get list of stations from file. </summary>
+		/// <returns>Request to query list of station.</returns>
+		string GetStations();
 
-        /// <summary>Gets bikes available.</summary>
-        /// <returns>Request to query list of bikes available.</returns>
-        string GetBikesAvailable();
+		/// <summary>Gets bikes available.</summary>
+		/// <returns>Request to query list of bikes available.</returns>
+		string GetBikesAvailable();
 
-        /// <summary> Gets a list of bikes reserved/ booked by acctive user from Copri.</summary>
-        /// <returns>Request to query list of bikes occupied.</returns>
-        string GetBikesOccupied();
+		/// <summary> Gets a list of bikes reserved/ booked by acctive user from Copri.</summary>
+		/// <returns>Request to query list of bikes occupied.</returns>
+		string GetBikesOccupied();
 
-        /// <summary> Gets reservation request (synonym: reservation == request == reservieren). </summary>
-        /// <param name="bikeId">Id of the bike to reserve.</param>
-        /// <returns>Requst to reserve bike.</returns>
-        string DoReserve(string bikeId);
+		/// <summary> Gets reservation request (synonym: reservation == request == reservieren). </summary>
+		/// <param name="bikeId">Id of the bike to reserve.</param>
+		/// <returns>Requst to reserve bike.</returns>
+		string DoReserve(string bikeId);
 
-        /// <summary> Gets request to cancel reservation. </summary>
-        /// <param name="bikeId">Id of the bike to cancel reservation for.</param>
-        /// <returns>Requst on cancel booking request.</returns>
-        string DoCancelReservation(string bikeId);
+		/// <summary> Gets request to cancel reservation. </summary>
+		/// <param name="bikeId">Id of the bike to cancel reservation for.</param>
+		/// <returns>Requst on cancel booking request.</returns>
+		string DoCancelReservation(string bikeId);
 
-        /// <summary> Request to get keys. </summary>
-        /// <param name="bikeId">Id of the bike to get keys for.</param>
-        /// <returns>Request to get keys.</returns>
-        string CalculateAuthParameters(string bikeId);
+		/// <summary> Request to get keys. </summary>
+		/// <param name="bikeId">Id of the bike to get keys for.</param>
+		/// <returns>Request to get keys.</returns>
+		string CalculateAuthParameters(string bikeId);
 
-        /// <summary> Gets the request for notifying about start of returning sequence. </summary>
-        /// <remarks> Operator specific call.</remarks>
-        /// <param name="bikeId">Id of the bike to return.</param>
-        /// <returns>Request to notify about start of returning sequence.</returns>
-        string StartReturningBike(string bikeId);
+		/// <summary> Gets the request for notifying about start of returning sequence. </summary>
+		/// <remarks> Operator specific call.</remarks>
+		/// <param name="bikeId">Id of the bike to return.</param>
+		/// <returns>Request to notify about start of returning sequence.</returns>
+		string StartReturningBike(string bikeId);
 
-        /// <summary> Gets the request for updating lock state for a booked bike. </summary>
-        /// <param name="bikeId">Id of the bike to update locking state for.</param>
-        /// <param name="location">Geolocation of lock when state change occurred.</param>
-        /// <param name="state">New locking state.</param>
-        /// <returns>Request to update locking state.</returns>
-        string UpateLockingState(
-            string bikeId,
-            lock_state state,
-            LocationDto location = null,
-            double batteryPercentage = double.NaN);
+		/// <summary> Gets the request for updating lock state for a booked bike. </summary>
+		/// <param name="bikeId">Id of the bike to update locking state for.</param>
+		/// <param name="location">Geolocation of lock when state change occurred.</param>
+		/// <param name="state">New locking state.</param>
+		/// <returns>Request to update locking state.</returns>
+		string UpateLockingState(
+			string bikeId,
+			lock_state state,
+			LocationDto location = null,
+			double batteryPercentage = double.NaN);
 
-        /// <summary> Gets the booking request (synonym: booking == renting == mieten). </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <param name="guid">Used to publish GUID from app to copri. Used for initial setup of bike in copri.</param>
-        /// <param name="batteryPercentage">Holds the filling level percentage of the battery.</param>
-        /// <returns>Request to booking bike.</returns>
-        string DoBook(string bikeId, Guid guid, double batteryPercentage);
+		/// <summary> Gets the booking request (synonym: booking == renting == mieten). </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <param name="guid">Used to publish GUID from app to copri. Used for initial setup of bike in copri.</param>
+		/// <param name="batteryPercentage">Holds the filling level percentage of the battery.</param>
+		/// <returns>Request to booking bike.</returns>
+		string DoBook(string bikeId, Guid guid, double batteryPercentage);
 
-        /// <summary> Gets the request to book and start opening the bike (synonym: booking == renting == mieten). </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <returns>Request to booking bike.</returns>
-        string BookAvailableAndStartOpening(string bikeId);
+		/// <summary> Gets the request to book and start opening the bike (synonym: booking == renting == mieten). </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <returns>Request to booking bike.</returns>
+		string BookAvailableAndStartOpening(string bikeId);
 
-        /// <summary> Gets the request to book and start opening the bike (synonym: booking == renting == mieten). </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <returns>Request to booking bike.</returns>
-        string BookReservedAndStartOpening(string bikeId);
+		/// <summary> Gets the request to book and start opening the bike (synonym: booking == renting == mieten). </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <returns>Request to booking bike.</returns>
+		string BookReservedAndStartOpening(string bikeId);
 
-        /// <summary> Gets request for returning the bike. </summary>
-        /// <param name="bikeId">Id of the bike to return.</param>
-        /// <param name="location">Geolocation of lock when returning bike.</param>
-        /// <returns>Requst on returning request.</returns>
-        string DoReturn(string bikeId, LocationDto location, ISmartDevice smartDevice);
+		/// <summary> Gets request for returning the bike. </summary>
+		/// <param name="bikeId">Id of the bike to return.</param>
+		/// <param name="location">Geolocation of lock when returning bike.</param>
+		/// <returns>Requst on returning request.</returns>
+		string DoReturn(string bikeId, LocationDto location, ISmartDevice smartDevice);
 
-        /// <summary> Returns a bike and starts closing. </summary>
-        /// <param name="bikeId">Id of the bike to return.</param>
-        /// <param name="smartDevice">Provides info about hard and software.</param>
-        /// <returns>Response to send to corpi.</returns>
-        string ReturnAndStartClosing(string bikeId, ISmartDevice smartDevice);
+		/// <summary> Returns a bike and starts closing. </summary>
+		/// <param name="bikeId">Id of the bike to return.</param>
+		/// <param name="smartDevice">Provides info about hard and software.</param>
+		/// <returns>Response to send to corpi.</returns>
+		string ReturnAndStartClosing(string bikeId, ISmartDevice smartDevice);
 
-        /// <summary>
-        /// Gets request for submiting feedback to copri server.
-        /// </summary>
-        /// <param name="bikeId">Id of the bike to which the feedback is related to.</param>
-        /// <param name="currentChargeBars">Null if bike has no engine or charge is unknown. Otherwise the charge filling level of the drive battery.</param>
-        /// <param name="message">General purpose message or error description.</param>
-        /// <param name="isBikeBroken">True if bike is broken.</param>
-        string DoSubmitFeedback(
-            string bikeId,
-            int? currentChargeBars,
-            string message = null,
-            bool isBikeBroken = false);
+		/// <summary>
+		/// Gets request for submiting feedback to copri server.
+		/// </summary>
+		/// <param name="bikeId">Id of the bike to which the feedback is related to.</param>
+		/// <param name="currentChargeBars">Null if bike has no engine or charge is unknown. Otherwise the charge filling level of the drive battery.</param>
+		/// <param name="message">General purpose message or error description.</param>
+		/// <param name="isBikeBroken">True if bike is broken.</param>
+		string DoSubmitFeedback(
+			string bikeId,
+			int? currentChargeBars,
+			string message = null,
+			bool isBikeBroken = false);
 
-        /// <summary>
-        /// Gets request for submiting mini survey to copri server.
-        /// </summary>
-        /// <param name="answers">Collection of answers.</param>
-        string DoSubmitMiniSurvey(IDictionary<string, string> answers);
-    }
+		/// <summary>
+		/// Gets request for submiting mini survey to copri server.
+		/// </summary>
+		/// <param name="answers">Collection of answers.</param>
+		string DoSubmitMiniSurvey(IDictionary<string, string> answers);
+	}
 
-    /// <summary> Copri locking states</summary>
-    public enum lock_state
-    {
-        locking,
-        locked,
-        unlocking,
-        unlocked,
-    }
+	/// <summary> Copri locking states</summary>
+	public enum lock_state
+	{
+		locking,
+		locked,
+		unlocking,
+		unlocked,
+	}
 
-    /// <summary> Holds lockation info.</summary>
-    public class LocationDto
-    {
-        public double Latitude { get; private set; }
+	/// <summary> Holds lockation info.</summary>
+	public class LocationDto
+	{
+		public double Latitude { get; private set; }
 
-        public double Longitude { get; private set; }
+		public double Longitude { get; private set; }
 
-        /// <summary> Accuracy of location in meters.</summary>
-        public double? Accuracy { get; private set; }
+		/// <summary> Accuracy of location in meters.</summary>
+		public double? Accuracy { get; private set; }
 
-        public TimeSpan Age { get; private set; }
+		public TimeSpan Age { get; private set; }
 
-        public class Builder
-        {
-            public double Latitude { get; set; }
+		public class Builder
+		{
+			public double Latitude { get; set; }
 
-            public double Longitude { get; set; }
+			public double Longitude { get; set; }
 
-            public double? Accuracy { get; set; }
+			public double? Accuracy { get; set; }
 
-            public TimeSpan Age { get; set; }
+			public TimeSpan Age { get; set; }
 
-            public LocationDto Build()
-            {
-                return new LocationDto { Latitude = Latitude, Longitude = Longitude, Accuracy = Accuracy, Age = Age };
-            }
-        }
-    }
+			public LocationDto Build()
+			{
+				return new LocationDto { Latitude = Latitude, Longitude = Longitude, Accuracy = Accuracy, Age = Age };
+			}
+		}
+	}
 }
diff --git a/TINKLib/Repository/Request/QueryBuilderHelper.cs b/TINKLib/Repository/Request/QueryBuilderHelper.cs
index 34ef66e..2ae42d0 100644
--- a/TINKLib/Repository/Request/QueryBuilderHelper.cs
+++ b/TINKLib/Repository/Request/QueryBuilderHelper.cs
@@ -1,28 +1,28 @@
 
 namespace TINK.Repository.Request
 {
-    public static class QueryBuilderHelper
-    {
-        /// <summary>
-        /// Gets the htlm query string element for session id.
-        /// </summary>
-        /// <returns>Query string.</returns>
-        public static string GetSessionIdQueryElement(
-            string op,
-            string merchantId,
-            string sessionCookie = null)
-            => !string.IsNullOrEmpty(merchantId) || !string.IsNullOrEmpty(sessionCookie)
-                ? $"{op}sessionid={(!string.IsNullOrEmpty(sessionCookie) ? sessionCookie : string.Empty)}{(!string.IsNullOrEmpty(merchantId) ? merchantId : string.Empty)}"
-                : string.Empty;
+	public static class QueryBuilderHelper
+	{
+		/// <summary>
+		/// Gets the htlm query string element for session id.
+		/// </summary>
+		/// <returns>Query string.</returns>
+		public static string GetSessionIdQueryElement(
+			string op,
+			string merchantId,
+			string sessionCookie = null)
+			=> !string.IsNullOrEmpty(merchantId) || !string.IsNullOrEmpty(sessionCookie)
+				? $"{op}sessionid={(!string.IsNullOrEmpty(sessionCookie) ? sessionCookie : string.Empty)}{(!string.IsNullOrEmpty(merchantId) ? merchantId : string.Empty)}"
+				: string.Empty;
 
-        /// <summary>
-        /// Gets the htlm query string element for the language.
-        /// </summary>
-        /// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
-        /// <returns>Query string.</returns>
-        public static string GetLanguageQueryElement(string op, string uiIsoLangugageName)
-            => !string.IsNullOrEmpty(uiIsoLangugageName)
-                ? $"{op}lang={uiIsoLangugageName}"
-                : string.Empty;
-    }
+		/// <summary>
+		/// Gets the htlm query string element for the language.
+		/// </summary>
+		/// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
+		/// <returns>Query string.</returns>
+		public static string GetLanguageQueryElement(string op, string uiIsoLangugageName)
+			=> !string.IsNullOrEmpty(uiIsoLangugageName)
+				? $"{op}lang={uiIsoLangugageName}"
+				: string.Empty;
+	}
 }
diff --git a/TINKLib/Repository/Request/RequestBuilder.cs b/TINKLib/Repository/Request/RequestBuilder.cs
index 78fd02f..022167d 100644
--- a/TINKLib/Repository/Request/RequestBuilder.cs
+++ b/TINKLib/Repository/Request/RequestBuilder.cs
@@ -6,142 +6,142 @@ using TINK.Repository.Exception;
 
 namespace TINK.Repository.Request
 {
-    /// <summary> Creates requests if no user is logged in.</summary>
-    public class RequestBuilder : IRequestBuilder
-    {
-        /// <summary> Constructs a object for building requests. </summary>
-        /// <param name="merchantId"></param>
-        /// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
-        public RequestBuilder(
-            string merchantId,
-            string uiIsoLangugageName)
-        {
-            MerchantId = !string.IsNullOrEmpty(merchantId)
-                ? merchantId
-                : throw new ArgumentException("Merchant id must not be null.", nameof(merchantId));
+	/// <summary> Creates requests if no user is logged in.</summary>
+	public class RequestBuilder : IRequestBuilder
+	{
+		/// <summary> Constructs a object for building requests. </summary>
+		/// <param name="merchantId"></param>
+		/// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
+		public RequestBuilder(
+			string merchantId,
+			string uiIsoLangugageName)
+		{
+			MerchantId = !string.IsNullOrEmpty(merchantId)
+				? merchantId
+				: throw new ArgumentException("Merchant id must not be null.", nameof(merchantId));
 
-            UiIsoLanguageNameParameter = RequestBuilderHelper.GetLanguageParameter(uiIsoLangugageName);
+			UiIsoLanguageNameParameter = RequestBuilderHelper.GetLanguageParameter(uiIsoLangugageName);
 
-            AuthCookieParameter = $"&authcookie={MerchantId}";
-        }
+			AuthCookieParameter = $"&authcookie={MerchantId}";
+		}
 
-        /// <summary> Parameter specifying current ui language. </summary>
-        public string MerchantId { get; }
+		/// <summary> Parameter specifying current ui language. </summary>
+		public string MerchantId { get; }
 
-        /// <summary> Holds the session cookie if a user is logged in. </summary>
-        public string SessionCookie => string.Empty;
+		/// <summary> Holds the session cookie if a user is logged in. </summary>
+		public string SessionCookie => string.Empty;
 
-        /// <summary> Holds the current ui two letter ISO language name. </summary>
-        private string UiIsoLanguageNameParameter { get; }
+		/// <summary> Holds the current ui two letter ISO language name. </summary>
+		private string UiIsoLanguageNameParameter { get; }
 
-        /// <summary> Auth cookie parameter. </summary>
-        private string AuthCookieParameter { get; }
+		/// <summary> Auth cookie parameter. </summary>
+		private string AuthCookieParameter { get; }
 
-        /// <summary> Gets request to log user in. </summary>
-        /// <param name="mailAddress">Mailaddress of user to log in.</param>
-        /// <param name="password">Password to log in.</param>
-        /// <param name="deviceId">Id specifying user and hardware.</param>
-        /// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
-        public string DoAuthorization(
-            string mailAddress,
-            string password,
-            string deviceId)
-            => "request=authorization" +
-                $"&merchant_id={MerchantId}" +
-                $"&user_id={WebUtility.UrlEncode(mailAddress)}" +
-                $"&user_pw={WebUtility.UrlEncode(password)}" +
-                $"&hw_id={deviceId}" +
-                UiIsoLanguageNameParameter;
+		/// <summary> Gets request to log user in. </summary>
+		/// <param name="mailAddress">Mailaddress of user to log in.</param>
+		/// <param name="password">Password to log in.</param>
+		/// <param name="deviceId">Id specifying user and hardware.</param>
+		/// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
+		public string DoAuthorization(
+			string mailAddress,
+			string password,
+			string deviceId)
+			=> "request=authorization" +
+				$"&merchant_id={MerchantId}" +
+				$"&user_id={WebUtility.UrlEncode(mailAddress)}" +
+				$"&user_pw={WebUtility.UrlEncode(password)}" +
+				$"&hw_id={deviceId}" +
+				UiIsoLanguageNameParameter;
 
-        /// <summary> Logs user out. </summary>
-        public string DoAuthout()
-            => throw new CallNotRequiredException();
+		/// <summary> Logs user out. </summary>
+		public string DoAuthout()
+			=> throw new CallNotRequiredException();
 
-        /// <summary>Gets bikes available.</summary>
-        /// <returns>Request to query list of bikes available.</returns>
-        public string GetBikesAvailable()
-            => "request=bikes_available&system=all" +
-            AuthCookieParameter +
-            UiIsoLanguageNameParameter;
+		/// <summary>Gets bikes available.</summary>
+		/// <returns>Request to query list of bikes available.</returns>
+		public string GetBikesAvailable()
+			=> "request=bikes_available&system=all" +
+			AuthCookieParameter +
+			UiIsoLanguageNameParameter;
 
-        /// <summary> Get list of stations from file. </summary>
-        /// <returns>Request to query list of station.</returns>
-        public string GetStations()
-            => "request=stations_available" +
-            AuthCookieParameter +
-            UiIsoLanguageNameParameter;
+		/// <summary> Get list of stations from file. </summary>
+		/// <returns>Request to query list of station.</returns>
+		public string GetStations()
+			=> "request=stations_available" +
+			AuthCookieParameter +
+			UiIsoLanguageNameParameter;
 
-        /// <summary> Gets a list of bikes reserved/ booked by acctive user from Copri.</summary>
-        /// <returns>Request to query list of bikes occupied.</returns>
-        public string GetBikesOccupied()
-            => throw new NotSupportedException();
+		/// <summary> Gets a list of bikes reserved/ booked by acctive user from Copri.</summary>
+		/// <returns>Request to query list of bikes occupied.</returns>
+		public string GetBikesOccupied()
+			=> throw new NotSupportedException();
 
-        /// <summary> Gets booking request response. </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <returns>Response on booking request.</returns>
-        public string DoReserve(string bikeId)
-            => throw new NotSupportedException();
+		/// <summary> Gets booking request response. </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <returns>Response on booking request.</returns>
+		public string DoReserve(string bikeId)
+			=> throw new NotSupportedException();
 
-        /// <summary> Gets cancel booking request response. </summary>
-        /// <param name="p_iBikeId">Id of the bike to book.</param>
-        /// <returns>Response on cancel booking request.</returns>
-        public string DoCancelReservation(string p_iBikeId)
-            => throw new NotSupportedException();
+		/// <summary> Gets cancel booking request response. </summary>
+		/// <param name="p_iBikeId">Id of the bike to book.</param>
+		/// <returns>Response on cancel booking request.</returns>
+		public string DoCancelReservation(string p_iBikeId)
+			=> throw new NotSupportedException();
 
-        /// <summary> Request to calculate authentication keys. </summary>
-        /// <param name="bikeId">Id of the bike to get keys for.</param>
-        /// <returns>Response on request.</returns>
-        public string CalculateAuthParameters(string bikeId)
-            => throw new NotSupportedException();
+		/// <summary> Request to calculate authentication keys. </summary>
+		/// <param name="bikeId">Id of the bike to get keys for.</param>
+		/// <returns>Response on request.</returns>
+		public string CalculateAuthParameters(string bikeId)
+			=> throw new NotSupportedException();
 
-        /// <summary> Gets the request for notifying about start of returning sequence. </summary>
-        /// <remarks> Operator specific call.</remarks>
-        /// <param name="bikeId">Id of the bike to return.</param>
-        /// <returns>Request to notify about start of returning sequence.</returns>
-        public string StartReturningBike(string bikeId)
-            => throw new NotSupportedException();
+		/// <summary> Gets the request for notifying about start of returning sequence. </summary>
+		/// <remarks> Operator specific call.</remarks>
+		/// <param name="bikeId">Id of the bike to return.</param>
+		/// <returns>Request to notify about start of returning sequence.</returns>
+		public string StartReturningBike(string bikeId)
+			=> throw new NotSupportedException();
 
-        public string UpateLockingState(string bikeId, lock_state state, LocationDto geolocation, double batteryPercentage)
-            => throw new NotSupportedException();
+		public string UpateLockingState(string bikeId, lock_state state, LocationDto geolocation, double batteryPercentage)
+			=> throw new NotSupportedException();
 
-        public string DoBook(string bikeId, Guid guid, double batteryPercentage)
-            => throw new NotSupportedException();
+		public string DoBook(string bikeId, Guid guid, double batteryPercentage)
+			=> throw new NotSupportedException();
 
-        /// <summary> Gets the request to book and start opening the bike (synonym: booking == renting == mieten). </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <returns>Request to booking bike.</returns>
-        public string BookAvailableAndStartOpening(string bikeId)
-            => throw new NotSupportedException();
+		/// <summary> Gets the request to book and start opening the bike (synonym: booking == renting == mieten). </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <returns>Request to booking bike.</returns>
+		public string BookAvailableAndStartOpening(string bikeId)
+			=> throw new NotSupportedException();
 
-        /// <summary> Gets the request to book and start opening the bike (synonym: booking == renting == mieten). </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <returns>Request to booking bike.</returns>
-        public string BookReservedAndStartOpening(string bikeId)
-            => throw new NotSupportedException();
+		/// <summary> Gets the request to book and start opening the bike (synonym: booking == renting == mieten). </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <returns>Request to booking bike.</returns>
+		public string BookReservedAndStartOpening(string bikeId)
+			=> throw new NotSupportedException();
 
-        public string DoReturn(string bikeId, LocationDto geolocation, ISmartDevice smartDevice)
-            => throw new NotSupportedException();
+		public string DoReturn(string bikeId, LocationDto geolocation, ISmartDevice smartDevice)
+			=> throw new NotSupportedException();
 
-        /// <summary> Returns a bike and starts closing. </summary>
-        /// <param name="bikeId">Id of the bike to return.</param>
-        /// <param name="smartDevice">Provides info about hard and software.</param>
-        /// <returns>Response to send to corpi.</returns>
-        public string ReturnAndStartClosing(string bikeId, ISmartDevice smartDevice)
-            => throw new NotSupportedException();
+		/// <summary> Returns a bike and starts closing. </summary>
+		/// <param name="bikeId">Id of the bike to return.</param>
+		/// <param name="smartDevice">Provides info about hard and software.</param>
+		/// <returns>Response to send to corpi.</returns>
+		public string ReturnAndStartClosing(string bikeId, ISmartDevice smartDevice)
+			=> throw new NotSupportedException();
 
-        /// <summary> Gets submit feedback request. </summary>
-        /// <param name="bikeId">Id of the bike to which the feedback is related to.</param>
-        /// <param name="message">General purpose message or error description.</param>
-        /// <param name="isBikeBroken">True if bike is broken.</param>
-        /// <returns>Submit feedback request.</returns>
-        public string DoSubmitFeedback(string bikeId, int? currentChargeBars, string message = null, bool isBikeBroken = false)
-            => throw new NotSupportedException();
+		/// <summary> Gets submit feedback request. </summary>
+		/// <param name="bikeId">Id of the bike to which the feedback is related to.</param>
+		/// <param name="message">General purpose message or error description.</param>
+		/// <param name="isBikeBroken">True if bike is broken.</param>
+		/// <returns>Submit feedback request.</returns>
+		public string DoSubmitFeedback(string bikeId, int? currentChargeBars, string message = null, bool isBikeBroken = false)
+			=> throw new NotSupportedException();
 
-        /// <summary>
-        /// Gets request for submiting mini survey to copri server.
-        /// </summary>
-        /// <param name="answers">Collection of answers.</param>
-        public string DoSubmitMiniSurvey(IDictionary<string, string> answers) =>
-            throw new NotSupportedException();
-    }
+		/// <summary>
+		/// Gets request for submiting mini survey to copri server.
+		/// </summary>
+		/// <param name="answers">Collection of answers.</param>
+		public string DoSubmitMiniSurvey(IDictionary<string, string> answers) =>
+			throw new NotSupportedException();
+	}
 }
diff --git a/TINKLib/Repository/Request/RequestBuilderHelper.cs b/TINKLib/Repository/Request/RequestBuilderHelper.cs
index bcd74b2..3a94700 100644
--- a/TINKLib/Repository/Request/RequestBuilderHelper.cs
+++ b/TINKLib/Repository/Request/RequestBuilderHelper.cs
@@ -1,16 +1,16 @@
 
 namespace TINK.Repository.Request
 {
-    public static class RequestBuilderHelper
-    {
-        /// <summary>
-        /// Gets the REST language parameter.
-        /// </summary>
-        /// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
-        /// <returns></returns>
-        public static string GetLanguageParameter(string uiIsoLangugageName)
-            => !string.IsNullOrEmpty(uiIsoLangugageName)
-                ? $"&lang={uiIsoLangugageName}"
-                : string.Empty;
-    }
+	public static class RequestBuilderHelper
+	{
+		/// <summary>
+		/// Gets the REST language parameter.
+		/// </summary>
+		/// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
+		/// <returns></returns>
+		public static string GetLanguageParameter(string uiIsoLangugageName)
+			=> !string.IsNullOrEmpty(uiIsoLangugageName)
+				? $"&lang={uiIsoLangugageName}"
+				: string.Empty;
+	}
 }
diff --git a/TINKLib/Repository/Request/RequestBuilderLoggedIn.cs b/TINKLib/Repository/Request/RequestBuilderLoggedIn.cs
index 915071b..56f8246 100644
--- a/TINKLib/Repository/Request/RequestBuilderLoggedIn.cs
+++ b/TINKLib/Repository/Request/RequestBuilderLoggedIn.cs
@@ -9,303 +9,303 @@ using TINK.Services.Logging;
 
 namespace TINK.Repository.Request
 {
-    /// <summary> Creates requests if a user is logged in.</summary>
-    public class RequestBuilderLoggedIn : IRequestBuilder
-    {
-        /// <summary> Constructs a object for building requests. </summary>
-        /// <param name="merchantId"></param>
-        /// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
-        public RequestBuilderLoggedIn(
-            string merchantId,
-            string uiIsoLangugageName,
-            string sessionCookie)
-        {
-            MerchantId = !string.IsNullOrEmpty(merchantId)
-                ? merchantId
-                : throw new ArgumentException("Merchant id must not be null.", nameof(merchantId));
+	/// <summary> Creates requests if a user is logged in.</summary>
+	public class RequestBuilderLoggedIn : IRequestBuilder
+	{
+		/// <summary> Constructs a object for building requests. </summary>
+		/// <param name="merchantId"></param>
+		/// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
+		public RequestBuilderLoggedIn(
+			string merchantId,
+			string uiIsoLangugageName,
+			string sessionCookie)
+		{
+			MerchantId = !string.IsNullOrEmpty(merchantId)
+				? merchantId
+				: throw new ArgumentException("Merchant id must not be null.", nameof(merchantId));
 
-            SessionCookie = !string.IsNullOrEmpty(sessionCookie)
-                ? sessionCookie
-                : throw new ArgumentException("Session cookie must not be null.", nameof(sessionCookie));
+			SessionCookie = !string.IsNullOrEmpty(sessionCookie)
+				? sessionCookie
+				: throw new ArgumentException("Session cookie must not be null.", nameof(sessionCookie));
 
-            UiIsoLanguageNameParameter = RequestBuilderHelper.GetLanguageParameter(uiIsoLangugageName);
+			UiIsoLanguageNameParameter = RequestBuilderHelper.GetLanguageParameter(uiIsoLangugageName);
 
-            AuthCookieParameter = $"&authcookie={SessionCookie}{MerchantId}";
-        }
+			AuthCookieParameter = $"&authcookie={SessionCookie}{MerchantId}";
+		}
 
-        /// <summary> Holds the id denoting the merchant (TINK app). </summary>
-        public string MerchantId { get; }
+		/// <summary> Holds the id denoting the merchant (TINK app). </summary>
+		public string MerchantId { get; }
 
-        /// <summary> Holds the session cookie if a user is logged in. </summary>
-        public string SessionCookie { get; }
+		/// <summary> Holds the session cookie if a user is logged in. </summary>
+		public string SessionCookie { get; }
 
-        /// <summary> Holds the current ui two letter ISO language name. </summary>
-        public string UiIsoLanguageNameParameter { get; }
+		/// <summary> Holds the current ui two letter ISO language name. </summary>
+		public string UiIsoLanguageNameParameter { get; }
 
-        /// <summary> Auth cookie parameter. </summary>
-        private string AuthCookieParameter { get; }
+		/// <summary> Auth cookie parameter. </summary>
+		private string AuthCookieParameter { get; }
 
-        /// <summary> Gets request to log user in. </summary>
-        /// <param name="mailAddress">Mailaddress of user to log in.</param>
-        /// <param name="password">Password to log in.</param>
-        /// <param name="deviceId">Id specifying user and hardware.</param>
-        /// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
-        public string DoAuthorization(
-            string mailAddress,
-            string password,
-            string deviceId)
-            => throw new CallNotRequiredException();
+		/// <summary> Gets request to log user in. </summary>
+		/// <param name="mailAddress">Mailaddress of user to log in.</param>
+		/// <param name="password">Password to log in.</param>
+		/// <param name="deviceId">Id specifying user and hardware.</param>
+		/// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
+		public string DoAuthorization(
+			string mailAddress,
+			string password,
+			string deviceId)
+			=> throw new CallNotRequiredException();
 
-        /// <summary> Logs user out. </summary>
-        public string DoAuthout()
-            => "request=authout" +
-                AuthCookieParameter +
-                UiIsoLanguageNameParameter;
+		/// <summary> Logs user out. </summary>
+		public string DoAuthout()
+			=> "request=authout" +
+				AuthCookieParameter +
+				UiIsoLanguageNameParameter;
 
-        /// <summary>Gets bikes available.</summary>
-        /// <returns>Request to query list of bikes available.</returns>
-        public string GetBikesAvailable()
-            => "request=bikes_available&system=all" +
-                AuthCookieParameter +
-                UiIsoLanguageNameParameter;
+		/// <summary>Gets bikes available.</summary>
+		/// <returns>Request to query list of bikes available.</returns>
+		public string GetBikesAvailable()
+			=> "request=bikes_available&system=all" +
+				AuthCookieParameter +
+				UiIsoLanguageNameParameter;
 
-        /// <summary> Gets a list of bikes reserved/ booked by acctive user from Copri.</summary>
-        /// <returns>Request to query list of bikes occupied.</returns>
-        public string GetBikesOccupied()
-            => "request=user_bikes_occupied&system=all&genkey=1" +
-                AuthCookieParameter +
-                UiIsoLanguageNameParameter;
+		/// <summary> Gets a list of bikes reserved/ booked by acctive user from Copri.</summary>
+		/// <returns>Request to query list of bikes occupied.</returns>
+		public string GetBikesOccupied()
+			=> "request=user_bikes_occupied&system=all&genkey=1" +
+				AuthCookieParameter +
+				UiIsoLanguageNameParameter;
 
-        /// <summary> Get list of stations from file. </summary>
-        /// <returns>Request to query list of station.</returns>
-        public string GetStations()
-            => "request=stations_available" +
-                AuthCookieParameter +
-                UiIsoLanguageNameParameter;
+		/// <summary> Get list of stations from file. </summary>
+		/// <returns>Request to query list of station.</returns>
+		public string GetStations()
+			=> "request=stations_available" +
+				AuthCookieParameter +
+				UiIsoLanguageNameParameter;
 
-        /// <summary> Gets reservation request (synonym: reservation == request == reservieren). </summary>
-        /// <remarks> Operator specific call.</remarks>
-        /// <param name="bikeId">Id of the bike to reserve.</param>
-        /// <returns>Requst to reserve bike.</returns>
-        public string DoReserve(string bikeId)
-            => "request=booking_request" +
-                GetBikeIdParameter(bikeId) +
-                AuthCookieParameter +
-                UiIsoLanguageNameParameter;
+		/// <summary> Gets reservation request (synonym: reservation == request == reservieren). </summary>
+		/// <remarks> Operator specific call.</remarks>
+		/// <param name="bikeId">Id of the bike to reserve.</param>
+		/// <returns>Requst to reserve bike.</returns>
+		public string DoReserve(string bikeId)
+			=> "request=booking_request" +
+				GetBikeIdParameter(bikeId) +
+				AuthCookieParameter +
+				UiIsoLanguageNameParameter;
 
-        /// <summary> Gets request to cancel reservation. </summary>
-        /// <remarks> Operator specific call.</remarks>
-        /// <param name="bikeId">Id of the bike to cancel reservation for.</param>
-        /// <returns>Requst on cancel booking request.</returns>
-        public string DoCancelReservation(string bikeId)
-            => "request=booking_cancel" +
-                GetBikeIdParameter(bikeId) +
-                AuthCookieParameter +
-                UiIsoLanguageNameParameter;
+		/// <summary> Gets request to cancel reservation. </summary>
+		/// <remarks> Operator specific call.</remarks>
+		/// <param name="bikeId">Id of the bike to cancel reservation for.</param>
+		/// <returns>Requst on cancel booking request.</returns>
+		public string DoCancelReservation(string bikeId)
+			=> "request=booking_cancel" +
+				GetBikeIdParameter(bikeId) +
+				AuthCookieParameter +
+				UiIsoLanguageNameParameter;
 
-        /// <summary> Request to get keys. </summary>
-        /// <remarks> Operator specific call.</remarks>
-        /// <param name="bikeId">Id of the bike to get keys for.</param>
-        /// <returns>Request to get keys.</returns>
-        public string CalculateAuthParameters(string bikeId)
-            => "request=booking_update" +
-                GetBikeIdParameter(bikeId) +
-                AuthCookieParameter +
-                "&genkey=1" +
-                UiIsoLanguageNameParameter;
+		/// <summary> Request to get keys. </summary>
+		/// <remarks> Operator specific call.</remarks>
+		/// <param name="bikeId">Id of the bike to get keys for.</param>
+		/// <returns>Request to get keys.</returns>
+		public string CalculateAuthParameters(string bikeId)
+			=> "request=booking_update" +
+				GetBikeIdParameter(bikeId) +
+				AuthCookieParameter +
+				"&genkey=1" +
+				UiIsoLanguageNameParameter;
 
-        /// <summary> Gets the request for notifying about start of returning sequence. </summary>
-        /// <remarks> Operator specific call.</remarks>
-        /// <param name="bikeId">Id of the bike to return.</param>
-        /// <returns>Request to notify about start of returning sequence.</returns>
-        public string StartReturningBike(string bikeId)
-            => "request=booking_update" +
-                GetBikeIdParameter(bikeId) +
-                GetLockStateParameter(lock_state.locking) +
-                AuthCookieParameter +
-                UiIsoLanguageNameParameter;
+		/// <summary> Gets the request for notifying about start of returning sequence. </summary>
+		/// <remarks> Operator specific call.</remarks>
+		/// <param name="bikeId">Id of the bike to return.</param>
+		/// <returns>Request to notify about start of returning sequence.</returns>
+		public string StartReturningBike(string bikeId)
+			=> "request=booking_update" +
+				GetBikeIdParameter(bikeId) +
+				GetLockStateParameter(lock_state.locking) +
+				AuthCookieParameter +
+				UiIsoLanguageNameParameter;
 
-        /// <summary> Gets the request for updating lock state for a booked bike. </summary>
-        /// <remarks> Operator specific call.</remarks>
-        /// <param name="bikeId">Id of the bike to update locking state for.</param>
-        /// <param name="state">New locking state.</param>
-        /// <returns>Request to update locking state.</returns>
-        public string UpateLockingState(
-            string bikeId,
-            lock_state state,
-            LocationDto geolocation,
-            double batteryPercentage)
-            => "request=booking_update" +
-                GetBikeIdParameter(bikeId) +
-                GetLocationParameters(geolocation) +
-                GetLockStateParameter(state) +
-                GetBatteryPercentageParameters(batteryPercentage) +
-                AuthCookieParameter +
-                UiIsoLanguageNameParameter;
+		/// <summary> Gets the request for updating lock state for a booked bike. </summary>
+		/// <remarks> Operator specific call.</remarks>
+		/// <param name="bikeId">Id of the bike to update locking state for.</param>
+		/// <param name="state">New locking state.</param>
+		/// <returns>Request to update locking state.</returns>
+		public string UpateLockingState(
+			string bikeId,
+			lock_state state,
+			LocationDto geolocation,
+			double batteryPercentage)
+			=> "request=booking_update" +
+				GetBikeIdParameter(bikeId) +
+				GetLocationParameters(geolocation) +
+				GetLockStateParameter(state) +
+				GetBatteryPercentageParameters(batteryPercentage) +
+				AuthCookieParameter +
+				UiIsoLanguageNameParameter;
 
 
-        /// <summary> Gets booking request request (synonym: booking == renting == mieten). </summary>
-        /// <remarks> Operator specific call.</remarks>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <param name="guid">Used to publish GUID from app to copri. Used for initial setup of bike in copri.</param>
-        /// <param name="batteryPercentage">Holds the filling level percentage of the battery.</param>
-        /// <returns>Request to booking bike.</returns>
-        public string DoBook(string bikeId, Guid guid, double batteryPercentage)
-            => "request=booking_update" +
-                GetBikeIdParameter(bikeId) +
-                AuthCookieParameter +
-                $"&Ilockit_GUID={guid}" +
-                "&state=occupied" +
-                GetLockStateParameter(lock_state.unlocked) +
-                GetBatteryPercentageParameters(batteryPercentage) +
-                UiIsoLanguageNameParameter;
+		/// <summary> Gets booking request request (synonym: booking == renting == mieten). </summary>
+		/// <remarks> Operator specific call.</remarks>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <param name="guid">Used to publish GUID from app to copri. Used for initial setup of bike in copri.</param>
+		/// <param name="batteryPercentage">Holds the filling level percentage of the battery.</param>
+		/// <returns>Request to booking bike.</returns>
+		public string DoBook(string bikeId, Guid guid, double batteryPercentage)
+			=> "request=booking_update" +
+				GetBikeIdParameter(bikeId) +
+				AuthCookieParameter +
+				$"&Ilockit_GUID={guid}" +
+				"&state=occupied" +
+				GetLockStateParameter(lock_state.unlocked) +
+				GetBatteryPercentageParameters(batteryPercentage) +
+				UiIsoLanguageNameParameter;
 
-        /// <summary> Gets the request to book and start opening the bike (synonym: booking == renting == mieten). </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <returns>Request to booking bike.</returns>
-        public string BookAvailableAndStartOpening(string bikeId)
-            => "request=booking_request" +
-                GetBikeIdParameter(bikeId) +
-                AuthCookieParameter +
-                "&state=occupied" +
-                GetLockStateParameter(lock_state.unlocking) +
-                UiIsoLanguageNameParameter;
+		/// <summary> Gets the request to book and start opening the bike (synonym: booking == renting == mieten). </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <returns>Request to booking bike.</returns>
+		public string BookAvailableAndStartOpening(string bikeId)
+			=> "request=booking_request" +
+				GetBikeIdParameter(bikeId) +
+				AuthCookieParameter +
+				"&state=occupied" +
+				GetLockStateParameter(lock_state.unlocking) +
+				UiIsoLanguageNameParameter;
 
-        /// <summary> Gets the request to book and start opening the bike (synonym: booking == renting == mieten). </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <returns>Request to booking bike.</returns>
-        public string BookReservedAndStartOpening(string bikeId)
-            => "request=booking_update" +
-                GetBikeIdParameter(bikeId) +
-                AuthCookieParameter +
-                "&state=occupied" +
-                GetLockStateParameter(lock_state.unlocking) +
-                UiIsoLanguageNameParameter;
+		/// <summary> Gets the request to book and start opening the bike (synonym: booking == renting == mieten). </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <returns>Request to booking bike.</returns>
+		public string BookReservedAndStartOpening(string bikeId)
+			=> "request=booking_update" +
+				GetBikeIdParameter(bikeId) +
+				AuthCookieParameter +
+				"&state=occupied" +
+				GetLockStateParameter(lock_state.unlocking) +
+				UiIsoLanguageNameParameter;
 
-        /// <summary> Gets request for returning the bike. </summary>
-        /// <remarks> Operator specific call.</remarks>
-        /// <param name="bikeId">Id of bike to return.</param>
-        /// <param name="geolocation">Geolocation of lock when returning bike.</param>
-        /// <returns>Requst on returning request.</returns>
-        public string DoReturn(string bikeId, LocationDto geolocation, ISmartDevice smartDevice)
-            => "request=booking_update" +
-                GetBikeIdParameter(bikeId) +
-                AuthCookieParameter +
-                "&state=available" +
-                GetLocationParameters(geolocation) +
-                GetLockStateParameter(lock_state.locked) +
-                GetSmartDeviceParameters(smartDevice) +
-                GetLog() +
-                UiIsoLanguageNameParameter;
+		/// <summary> Gets request for returning the bike. </summary>
+		/// <remarks> Operator specific call.</remarks>
+		/// <param name="bikeId">Id of bike to return.</param>
+		/// <param name="geolocation">Geolocation of lock when returning bike.</param>
+		/// <returns>Requst on returning request.</returns>
+		public string DoReturn(string bikeId, LocationDto geolocation, ISmartDevice smartDevice)
+			=> "request=booking_update" +
+				GetBikeIdParameter(bikeId) +
+				AuthCookieParameter +
+				"&state=available" +
+				GetLocationParameters(geolocation) +
+				GetLockStateParameter(lock_state.locked) +
+				GetSmartDeviceParameters(smartDevice) +
+				GetLog() +
+				UiIsoLanguageNameParameter;
 
 
-        /// <summary> Returns a bike and starts closing. </summary>
-        /// <param name="bikeId">Id of the bike to return.</param>
-        /// <param name="smartDevice">Provides info about hard and software.</param>
-        /// <returns>Response to send to corpi.</returns>
-        public string ReturnAndStartClosing(string bikeId, ISmartDevice smartDevice)
-            => "request=booking_update" +
-                GetBikeIdParameter(bikeId) +
-                AuthCookieParameter +
-                "&state=available" +
-                GetLockStateParameter(lock_state.locking) +
-                GetSmartDeviceParameters(smartDevice) +
-                UiIsoLanguageNameParameter;
+		/// <summary> Returns a bike and starts closing. </summary>
+		/// <param name="bikeId">Id of the bike to return.</param>
+		/// <param name="smartDevice">Provides info about hard and software.</param>
+		/// <returns>Response to send to corpi.</returns>
+		public string ReturnAndStartClosing(string bikeId, ISmartDevice smartDevice)
+			=> "request=booking_update" +
+				GetBikeIdParameter(bikeId) +
+				AuthCookieParameter +
+				"&state=available" +
+				GetLockStateParameter(lock_state.locking) +
+				GetSmartDeviceParameters(smartDevice) +
+				UiIsoLanguageNameParameter;
 
-        /// <summary> Gets submit feedback request. </summary>
-        /// <param name="bikeId">Id of the bike to return.</param>
-        /// <param name="message">General purpose message or error description.</param>
-        /// <param name="isBikeBroken">True if bike is broken.</param>
-        /// <returns>Submit feedback request.</returns>
-        public string DoSubmitFeedback(
-            string bikeId,
-            int? currentChargeBars = null,
-            string message = null,
-            bool isBikeBroken = false)
-        {
-            string GetIsBikeBroken()
-                => isBikeBroken ? "&bike_broken=1" : string.Empty;
+		/// <summary> Gets submit feedback request. </summary>
+		/// <param name="bikeId">Id of the bike to return.</param>
+		/// <param name="message">General purpose message or error description.</param>
+		/// <param name="isBikeBroken">True if bike is broken.</param>
+		/// <returns>Submit feedback request.</returns>
+		public string DoSubmitFeedback(
+			string bikeId,
+			int? currentChargeBars = null,
+			string message = null,
+			bool isBikeBroken = false)
+		{
+			string GetIsBikeBroken()
+				=> isBikeBroken ? "&bike_broken=1" : string.Empty;
 
-            string GetMessage()
-                => !string.IsNullOrEmpty(message) ? $"&message={WebUtility.UrlEncode(message)}" : string.Empty;
+			string GetMessage()
+				=> !string.IsNullOrEmpty(message) ? $"&message={WebUtility.UrlEncode(message)}" : string.Empty;
 
-            string GetCurrentChargeBars()
-                => currentChargeBars != null ? $"&charge_current_bars={currentChargeBars.Value}" : string.Empty;
+			string GetCurrentChargeBars()
+				=> currentChargeBars != null ? $"&charge_current_bars={currentChargeBars.Value}" : string.Empty;
 
-            return "request=user_feedback" +
-                GetBikeIdParameter(bikeId) +
-                GetCurrentChargeBars() +
-                GetIsBikeBroken() +
-                GetMessage() +
-                AuthCookieParameter +
-                UiIsoLanguageNameParameter;
-        }
+			return "request=user_feedback" +
+				GetBikeIdParameter(bikeId) +
+				GetCurrentChargeBars() +
+				GetIsBikeBroken() +
+				GetMessage() +
+				AuthCookieParameter +
+				UiIsoLanguageNameParameter;
+		}
 
-        /// <summary>
-        /// Gets request for submiting mini survey to copri server.
-        /// </summary>
-        /// <param name="answers">Collection of answers.</param>
-        public string DoSubmitMiniSurvey(IDictionary<string, string> answers)
-        {
-            // Remove entires which invalid keys or values.
-            var validAnsers = answers?.Where(x => !string.IsNullOrEmpty(x.Key?.Trim()) && !string.IsNullOrEmpty(x.Value?.Trim()));
+		/// <summary>
+		/// Gets request for submiting mini survey to copri server.
+		/// </summary>
+		/// <param name="answers">Collection of answers.</param>
+		public string DoSubmitMiniSurvey(IDictionary<string, string> answers)
+		{
+			// Remove entires which invalid keys or values.
+			var validAnsers = answers?.Where(x => !string.IsNullOrEmpty(x.Key?.Trim()) && !string.IsNullOrEmpty(x.Value?.Trim()));
 
-            // Create quersy
-            if (validAnsers == null || validAnsers.Count() <= 0)
-                return "request=user_minianswer" +
-                    AuthCookieParameter +
-                    UiIsoLanguageNameParameter;
+			// Create quersy
+			if (validAnsers == null || validAnsers.Count() <= 0)
+				return "request=user_minianswer" +
+					AuthCookieParameter +
+					UiIsoLanguageNameParameter;
 
-            return "request=user_minianswer" +
-                $"&{string.Join("&", validAnsers.Select(x => $"{x.Key}={WebUtility.UrlEncode(x.Value)}"))}" +
-                AuthCookieParameter +
-                UiIsoLanguageNameParameter;
-        }
+			return "request=user_minianswer" +
+				$"&{string.Join("&", validAnsers.Select(x => $"{x.Key}={WebUtility.UrlEncode(x.Value)}"))}" +
+				AuthCookieParameter +
+				UiIsoLanguageNameParameter;
+		}
 
-        private static string GetBikeIdParameter(string bikeId)
-            => $"&bike={bikeId}";
+		private static string GetBikeIdParameter(string bikeId)
+			=> $"&bike={bikeId}";
 
-        private static string GetLockStateParameter(lock_state lockState)
-            => $"&lock_state={lockState}";
+		private static string GetLockStateParameter(lock_state lockState)
+			=> $"&lock_state={lockState}";
 
-        private static string GetBatteryPercentageParameters(double batteryPercentage) => !double.IsNaN(batteryPercentage)
-            ? $"&voltage={batteryPercentage.ToString(CultureInfo.InvariantCulture)}"
-            : string.Empty;
+		private static string GetBatteryPercentageParameters(double batteryPercentage) => !double.IsNaN(batteryPercentage)
+			? $"&voltage={batteryPercentage.ToString(CultureInfo.InvariantCulture)}"
+			: string.Empty;
 
-        /// <summary> Gets the geolocation parameter. </summary>
-        /// <param name="geolocation">Geolocation or null.</param>
-        private static string GetLocationParameters(LocationDto geolocation)
-        {
-            if (geolocation == null)
-                return string.Empty;
+		/// <summary> Gets the geolocation parameter. </summary>
+		/// <param name="geolocation">Geolocation or null.</param>
+		private static string GetLocationParameters(LocationDto geolocation)
+		{
+			if (geolocation == null)
+				return string.Empty;
 
-            if (geolocation.Accuracy == null)
-                return $"&gps={geolocation.Latitude.ToString(CultureInfo.InvariantCulture)},{geolocation.Longitude.ToString(CultureInfo.InvariantCulture)}&gps_age={geolocation.Age.TotalSeconds}";
+			if (geolocation.Accuracy == null)
+				return $"&gps={geolocation.Latitude.ToString(CultureInfo.InvariantCulture)},{geolocation.Longitude.ToString(CultureInfo.InvariantCulture)}&gps_age={geolocation.Age.TotalSeconds}";
 
-            return $"&gps={geolocation.Latitude.ToString(CultureInfo.InvariantCulture)},{geolocation.Longitude.ToString(CultureInfo.InvariantCulture)}&gps_accuracy={geolocation.Accuracy.Value.ToString(CultureInfo.InvariantCulture)}&gps_age={geolocation.Age.TotalSeconds}";
-        }
+			return $"&gps={geolocation.Latitude.ToString(CultureInfo.InvariantCulture)},{geolocation.Longitude.ToString(CultureInfo.InvariantCulture)}&gps_accuracy={geolocation.Accuracy.Value.ToString(CultureInfo.InvariantCulture)}&gps_age={geolocation.Age.TotalSeconds}";
+		}
 
-        /// <summary> Gets the geolocation parameter. </summary>
-        /// <param name="geolocation">Geolocation or null.</param>
-        private static string GetSmartDeviceParameters(ISmartDevice smartDevice)
-            => smartDevice != null
-                ? $"{(!string.IsNullOrEmpty(smartDevice.Manufacturer) ? $"&user_device_manufaturer={smartDevice.Manufacturer})" : string.Empty)}" +
-                    $"{(!string.IsNullOrEmpty(smartDevice.Model) ? $"&user_device_model={smartDevice.Model}" : string.Empty)}" +
-                    $"{(!string.IsNullOrEmpty(smartDevice.Platform.ToString()) ? $"&user_device_platform={smartDevice.Platform.ToString()}" : string.Empty)}" +
-                    $"{(!string.IsNullOrEmpty(smartDevice.VersionText) ? $"&user_device_version={smartDevice.VersionText}" : string.Empty)}" +
-                    $"{(!string.IsNullOrEmpty(smartDevice.Identifier) ? $"&user_device_id={smartDevice.Identifier}" : string.Empty)}"
-                : string.Empty;
+		/// <summary> Gets the geolocation parameter. </summary>
+		/// <param name="geolocation">Geolocation or null.</param>
+		private static string GetSmartDeviceParameters(ISmartDevice smartDevice)
+			=> smartDevice != null
+				? $"{(!string.IsNullOrEmpty(smartDevice.Manufacturer) ? $"&user_device_manufaturer={smartDevice.Manufacturer})" : string.Empty)}" +
+					$"{(!string.IsNullOrEmpty(smartDevice.Model) ? $"&user_device_model={smartDevice.Model}" : string.Empty)}" +
+					$"{(!string.IsNullOrEmpty(smartDevice.Platform.ToString()) ? $"&user_device_platform={smartDevice.Platform.ToString()}" : string.Empty)}" +
+					$"{(!string.IsNullOrEmpty(smartDevice.VersionText) ? $"&user_device_version={smartDevice.VersionText}" : string.Empty)}" +
+					$"{(!string.IsNullOrEmpty(smartDevice.Identifier) ? $"&user_device_id={smartDevice.Identifier}" : string.Empty)}"
+				: string.Empty;
 
-        /// <summary>
-        /// Gets logging entries from serilog.
-        /// </summary>
-        /// <returns></returns>
-        private static string GetLog()
-        {
-            var messages = string.Join("\n", MemoryStackSink.PopAllMessages());
-            return !string.IsNullOrEmpty(messages)
-                ? "&app_debug=" + WebUtility.UrlEncode(string.Join("\n", messages))
-                : string.Empty;
-        }
-    }
+		/// <summary>
+		/// Gets logging entries from serilog.
+		/// </summary>
+		/// <returns></returns>
+		private static string GetLog()
+		{
+			var messages = string.Join("\n", MemoryStackSink.PopAllMessages());
+			return !string.IsNullOrEmpty(messages)
+				? "&app_debug=" + WebUtility.UrlEncode(string.Join("\n", messages))
+				: string.Empty;
+		}
+	}
 }
diff --git a/TINKLib/Repository/Response/AuthorizationResponse.cs b/TINKLib/Repository/Response/AuthorizationResponse.cs
index 146eecc..3f00a49 100644
--- a/TINKLib/Repository/Response/AuthorizationResponse.cs
+++ b/TINKLib/Repository/Response/AuthorizationResponse.cs
@@ -2,18 +2,18 @@
 
 namespace TINK.Repository.Response
 {
-    [DataContract]
-    public class AuthorizationResponse : ResponseBase
-    {
-        [DataMember]
-        public int debuglevel { get; private set; }
+	[DataContract]
+	public class AuthorizationResponse : ResponseBase
+	{
+		[DataMember]
+		public int debuglevel { get; private set; }
 
-        /// <summary> Holds the group of the bike (TINK, Konrad, ...).</summary>
-        [DataMember]
-        public string[] user_group { get; private set; }
+		/// <summary> Holds the group of the bike (TINK, Konrad, ...).</summary>
+		[DataMember]
+		public string[] user_group { get; private set; }
 
-        /// <summary> Holds value of 0 if agb were not acknowledged.</summary>
-        [DataMember]
-        public string agb_checked { get; private set; }
-    }
+		/// <summary> Holds value of 0 if agb were not acknowledged.</summary>
+		[DataMember]
+		public string agb_checked { get; private set; }
+	}
 }
diff --git a/TINKLib/Repository/Response/AuthorizationoutResponse.cs b/TINKLib/Repository/Response/AuthorizationoutResponse.cs
index 66ceff8..58d5aab 100644
--- a/TINKLib/Repository/Response/AuthorizationoutResponse.cs
+++ b/TINKLib/Repository/Response/AuthorizationoutResponse.cs
@@ -2,8 +2,8 @@
 
 namespace TINK.Repository.Response
 {
-    [DataContract]
-    public class AuthorizationoutResponse : ResponseBase
-    {
-    }
+	[DataContract]
+	public class AuthorizationoutResponse : ResponseBase
+	{
+	}
 }
diff --git a/TINKLib/Repository/Response/BikeInfoAvailable.cs b/TINKLib/Repository/Response/BikeInfoAvailable.cs
index 0ba24b9..6038a57 100644
--- a/TINKLib/Repository/Response/BikeInfoAvailable.cs
+++ b/TINKLib/Repository/Response/BikeInfoAvailable.cs
@@ -2,15 +2,15 @@
 
 namespace TINK.Repository.Response
 {
-    [DataContract]
-    public class BikeInfoAvailable : BikeInfoBase
-    {
-        /// <summary>Mini survey for bikes which were rented before and for which feedback is pending.</summary>
-        [DataMember]
-        public MiniSurveyResponse user_miniquery { get; private set; }
+	[DataContract]
+	public class BikeInfoAvailable : BikeInfoBase
+	{
+		/// <summary>Mini survey for bikes which were rented before and for which feedback is pending.</summary>
+		[DataMember]
+		public MiniSurveyResponse user_miniquery { get; private set; }
 
-        /// <summary> Information about Co2- saving for bikes which were rented before and for which feedback is pending.</summary>
-        [DataMember]
-        public string co2saving { get; private set; }
-    }
+		/// <summary> Information about Co2- saving for bikes which were rented before and for which feedback is pending.</summary>
+		[DataMember]
+		public string co2saving { get; private set; }
+	}
 }
diff --git a/TINKLib/Repository/Response/BikeInfoBase.cs b/TINKLib/Repository/Response/BikeInfoBase.cs
index ac2c8fd..745cf56 100644
--- a/TINKLib/Repository/Response/BikeInfoBase.cs
+++ b/TINKLib/Repository/Response/BikeInfoBase.cs
@@ -2,105 +2,105 @@
 
 namespace TINK.Repository.Response
 {
-    /// <summary>
-    /// Holds info about a single bike.
-    /// </summary>
-    [DataContract]
-    public class BikeInfoBase
-    {
-        /// <summary>
-        /// Id of the bike.
-        /// </summary>
-        [DataMember]
-        public string bike { get; private set; }
+	/// <summary>
+	/// Holds info about a single bike.
+	/// </summary>
+	[DataContract]
+	public class BikeInfoBase
+	{
+		/// <summary>
+		/// Id of the bike.
+		/// </summary>
+		[DataMember]
+		public string bike { get; private set; }
 
-        /// <summary>
-        /// Position of the bike.
-        /// </summary>
-        [DataMember]
-        public Position gps { get; private set; }
+		/// <summary>
+		/// Position of the bike.
+		/// </summary>
+		[DataMember]
+		public Position gps { get; private set; }
 
-        /// <summary>
-        /// Id of the station.
-        /// </summary>
-        [DataMember]
-        public string station { get; private set; }
+		/// <summary>
+		/// Id of the station.
+		/// </summary>
+		[DataMember]
+		public string station { get; private set; }
 
-        /// <summary>
-        /// Holds the localized (german) description of the bike.
-        /// </summary>
-        [DataMember]
-        public string description { get; private set; }
+		/// <summary>
+		/// Holds the localized (german) description of the bike.
+		/// </summary>
+		[DataMember]
+		public string description { get; private set; }
 
-        /// <summary> Holds the group of the bike.</summary>
-        /// <remarks> 
-        /// Copri returns values "TINK", "Konrad".
-        /// </remarks>
-        [DataMember]
-        public string[] bike_group { get; private set; }
+		/// <summary> Holds the group of the bike.</summary>
+		/// <remarks> 
+		/// Copri returns values "TINK", "Konrad".
+		/// </remarks>
+		[DataMember]
+		public string[] bike_group { get; private set; }
 
-        /// <summary>
-        /// Rental state.
-        /// </summary>
-        [DataMember]
-        public string state { get; private set; }
+		/// <summary>
+		/// Rental state.
+		/// </summary>
+		[DataMember]
+		public string state { get; private set; }
 
-        /// <summary>
-        /// Holds the uri where to reserve/ rent the bike.
-        /// </summary>
-        [DataMember]
-        public string uri_operator { get; private set; }
+		/// <summary>
+		/// Holds the uri where to reserve/ rent the bike.
+		/// </summary>
+		[DataMember]
+		public string uri_operator { get; private set; }
 
-        /// <summary> Holds whether bike is equipped with computer or if bike is a lock bike.</summary>
-        /// <remarks> 
-        /// <table>
-        /// <tr><th>Value   </th><th>Type of bike               </th><th>Member to extract info.</th></tr>
-        /// <tr><td>LOCK    </td><td>Bike with manual lock.     </td><td>TextToTypeHelper.GetIsNonBikeComputerBike</td></tr>
-        /// <tr><td>BC      </td><td>Bike with a bord computer. </td><td></td></tr>
-        /// <tr><td>Ilockit </td><td>Bike with a bluetooth lock.</td><td></td></tr>
-        /// <tr><td>sigo    </td><td>Sigo bike.</td><td></td></tr>
-        /// </table>
-        /// </remarks>
-        [DataMember]
-        public string system { get; private set; }
+		/// <summary> Holds whether bike is equipped with computer or if bike is a lock bike.</summary>
+		/// <remarks> 
+		/// <table>
+		/// <tr><th>Value   </th><th>Type of bike               </th><th>Member to extract info.</th></tr>
+		/// <tr><td>LOCK    </td><td>Bike with manual lock.     </td><td>TextToTypeHelper.GetIsNonBikeComputerBike</td></tr>
+		/// <tr><td>BC      </td><td>Bike with a bord computer. </td><td></td></tr>
+		/// <tr><td>Ilockit </td><td>Bike with a bluetooth lock.</td><td></td></tr>
+		/// <tr><td>sigo    </td><td>Sigo bike.</td><td></td></tr>
+		/// </table>
+		/// </remarks>
+		[DataMember]
+		public string system { get; private set; }
 
 #if !NOTARIFFDESCRIPTION
-        /// <summary> Holds the tariff information for a bike. </summary>
-        /// <remarks> This member is obsolete. Use <cref="rental_description"> instead.</cref></remarks>
-        [DataMember]
-        public TariffDescription tariff_description { get; private set; }
+		/// <summary> Holds the tariff information for a bike. </summary>
+		/// <remarks> This member is obsolete. Use <cref="rental_description"> instead.</cref></remarks>
+		[DataMember]
+		public TariffDescription tariff_description { get; private set; }
 
-        /// <summary> Holds the rental information for a bike. </summary>
-        [DataMember]
-        public RentalDescription rental_description { get; private set; }
+		/// <summary> Holds the rental information for a bike. </summary>
+		[DataMember]
+		public RentalDescription rental_description { get; private set; }
 #endif
-        [DataMember]
-        /// <summary> Describes type of the bike.</summary>
-        public BikeType bike_type { get; private set; }
+		[DataMember]
+		/// <summary> Describes type of the bike.</summary>
+		public BikeType bike_type { get; private set; }
 
-        /// <summary> Loading state of motor battery in % ]0..100[. </summary>
-        [DataMember]
-        public string bike_charge { get; private set; }
+		/// <summary> Loading state of motor battery in % ]0..100[. </summary>
+		[DataMember]
+		public string bike_charge { get; private set; }
 
-        /// <summary> Locking state of the bike. </summary>
-        [DataMember]
-        public string lock_state { get; private set; }
+		/// <summary> Locking state of the bike. </summary>
+		[DataMember]
+		public string lock_state { get; private set; }
 
-        [DataMember]
-        /// <summary> Full advertisement name.</summary>
-        public string Ilockit_ID { get; private set; }
+		[DataMember]
+		/// <summary> Full advertisement name.</summary>
+		public string Ilockit_ID { get; private set; }
 
-        [DataMember]
-        /// <summary> Full advertisement name.</summary>
-        public string Ilockit_GUID { get; private set; }
+		[DataMember]
+		/// <summary> Full advertisement name.</summary>
+		public string Ilockit_GUID { get; private set; }
 
-        /// <summary>
-        /// Textual description of response.
-        /// </summary>
-        /// <returns>Object as text.</returns>
-        public new string ToString()
-        {
-            return $"Bike {bike}{(station != null ? $", at station {station}" : string.Empty)}{(!string.IsNullOrEmpty(description) ? $", {description}" : string.Empty)}{(!string.IsNullOrEmpty(state) ? $", status={state}" : string.Empty)}.";
-        }
-    }
+		/// <summary>
+		/// Textual description of response.
+		/// </summary>
+		/// <returns>Object as text.</returns>
+		public new string ToString()
+		{
+			return $"Bike {bike}{(station != null ? $", at station {station}" : string.Empty)}{(!string.IsNullOrEmpty(description) ? $", {description}" : string.Empty)}{(!string.IsNullOrEmpty(state) ? $", status={state}" : string.Empty)}.";
+		}
+	}
 }
diff --git a/TINKLib/Repository/Response/BikeInfoReservedBooked.cs b/TINKLib/Repository/Response/BikeInfoReservedBooked.cs
index 08ab4ff..116f7dc 100644
--- a/TINKLib/Repository/Response/BikeInfoReservedBooked.cs
+++ b/TINKLib/Repository/Response/BikeInfoReservedBooked.cs
@@ -2,31 +2,31 @@
 
 namespace TINK.Repository.Response
 {
-    [DataContract]
-    public class BikeInfoReservedOrBooked : BikeInfoBase
-    {
-        /// <summary>
-        /// Date from when bike was reserved from/ booked from. 
-        /// Format: 2017-11-28 11:01:51.637747+01
-        /// </summary>
-        [DataMember]
-        public string start_time { get; private set; }
+	[DataContract]
+	public class BikeInfoReservedOrBooked : BikeInfoBase
+	{
+		/// <summary>
+		/// Date from when bike was reserved from/ booked from. 
+		/// Format: 2017-11-28 11:01:51.637747+01
+		/// </summary>
+		[DataMember]
+		public string start_time { get; private set; }
 
-        /// <summary> Booking code if bike is BC-bike.</summary>
-        [DataMember]
-        public string timeCode { get; private set; }
+		/// <summary> Booking code if bike is BC-bike.</summary>
+		[DataMember]
+		public string timeCode { get; private set; }
 
-        [DataMember]
-        /// <summary> Seed used to generate key for connecting to bluetooth lock.</summary>
-        public string K_seed { get; private set; }
+		[DataMember]
+		/// <summary> Seed used to generate key for connecting to bluetooth lock.</summary>
+		public string K_seed { get; private set; }
 
-        [DataMember]
-        /// <summary> Key for connect to bluetooth lock as user.</summary>
-        public string K_u { get; private set; }
+		[DataMember]
+		/// <summary> Key for connect to bluetooth lock as user.</summary>
+		public string K_u { get; private set; }
 
-        [DataMember]
-        /// <summary> Key for connect to bluetooth lock as admin.</summary>
-        public string K_a { get; private set; }
+		[DataMember]
+		/// <summary> Key for connect to bluetooth lock as admin.</summary>
+		public string K_a { get; private set; }
 
-    }
+	}
 }
diff --git a/TINKLib/Repository/Response/BikeType.cs b/TINKLib/Repository/Response/BikeType.cs
index cb0c55b..4bef5b2 100644
--- a/TINKLib/Repository/Response/BikeType.cs
+++ b/TINKLib/Repository/Response/BikeType.cs
@@ -2,84 +2,84 @@
 
 namespace TINK.Repository.Response
 {
-    /// <summary>
-    /// Holds info about a single bike.
-    /// </summary>
-    [DataContract]
-    public class BikeType
-    {
-        /// <summary>
-        /// Holds the engine.
-        /// </summary>
-        [DataContract]
-        public class Engine
-        {
-            /// <summary>
-            /// Manufacturer: ...
-            /// </summary>
-            [DataMember]
-            public string manufacturer { get; private set; }
-        }
+	/// <summary>
+	/// Holds info about a single bike.
+	/// </summary>
+	[DataContract]
+	public class BikeType
+	{
+		/// <summary>
+		/// Holds the engine.
+		/// </summary>
+		[DataContract]
+		public class Engine
+		{
+			/// <summary>
+			/// Manufacturer: ...
+			/// </summary>
+			[DataMember]
+			public string manufacturer { get; private set; }
+		}
 
-        /// <summary>
-        /// Holds the engine.
-        /// </summary>
-        [DataContract]
-        public class Battery
-        {
-            /// <summary>
-            /// Holds the current charging level in bars.
-            /// </summary>
-            [DataMember]
-            public string charge_current_bars { get; private set; }
+		/// <summary>
+		/// Holds the engine.
+		/// </summary>
+		[DataContract]
+		public class Battery
+		{
+			/// <summary>
+			/// Holds the current charging level in bars.
+			/// </summary>
+			[DataMember]
+			public string charge_current_bars { get; private set; }
 
-            /// <summary>
-            /// Holds the current charging level of the battery in percent.
-            /// </summary>
-            [DataMember]
-            public string charge_current_percent { get; private set; }
+			/// <summary>
+			/// Holds the current charging level of the battery in percent.
+			/// </summary>
+			[DataMember]
+			public string charge_current_percent { get; private set; }
 
-            /// <summary>
-            /// Holds the maximum chargeing level of the battery in bars.
-            /// </summary>
-            [DataMember]
-            public string charge_max_bars { get; private set; }
+			/// <summary>
+			/// Holds the maximum chargeing level of the battery in bars.
+			/// </summary>
+			[DataMember]
+			public string charge_max_bars { get; private set; }
 
-            /// <summary>
-            /// Holds whether backend is aware of battery charging level.
-            /// </summary>
-            [DataMember]
-            public string backend_accessible { get; private set; }
+			/// <summary>
+			/// Holds whether backend is aware of battery charging level.
+			/// </summary>
+			[DataMember]
+			public string backend_accessible { get; private set; }
 
-            /// <summary>
-            /// Holds whether to display battery level or not.
-            /// </summary>
-            [DataMember]
-            public string hidden { get; private set; }
-        }
+			/// <summary>
+			/// Holds whether to display battery level or not.
+			/// </summary>
+			[DataMember]
+			public string hidden { get; private set; }
+		}
 
-        /// <summary>
-        /// Category of the bike. Possible entries: "city", "cargo", ...
-        /// </summary>
-        [DataMember]
-        public string category { get; private set; }
+		/// <summary>
+		/// Category of the bike. Possible entries: "city", "cargo", ...
+		/// </summary>
+		[DataMember]
+		public string category { get; private set; }
 
-        /// <summary>
-        /// Count of wheels. There are trikes (3 wheels) and two wheeled bikes. 
-        /// </summary>
-        [DataMember]
-        public string wheels { get; private set; }
+		/// <summary>
+		/// Count of wheels. There are trikes (3 wheels) and two wheeled bikes. 
+		/// </summary>
+		[DataMember]
+		public string wheels { get; private set; }
 
-        /// <summary>
-        /// Holds engine information. . 
-        /// </summary>
-        [DataMember]
-        public Engine engine { get; private set; }
+		/// <summary>
+		/// Holds engine information. . 
+		/// </summary>
+		[DataMember]
+		public Engine engine { get; private set; }
 
-        /// <summary>
-        /// Holds battery information . 
-        /// </summary>
-        [DataMember]
-        public Battery battery { get; private set; }
-    }
+		/// <summary>
+		/// Holds battery information . 
+		/// </summary>
+		[DataMember]
+		public Battery battery { get; private set; }
+	}
 }
diff --git a/TINKLib/Repository/Response/BikesAvailableResponse.cs b/TINKLib/Repository/Response/BikesAvailableResponse.cs
index ed5fcb3..9eb502f 100644
--- a/TINKLib/Repository/Response/BikesAvailableResponse.cs
+++ b/TINKLib/Repository/Response/BikesAvailableResponse.cs
@@ -3,16 +3,16 @@ using System.Runtime.Serialization;
 
 namespace TINK.Repository.Response
 {
-    /// <summary>
-    /// Holds the information about all bikes and is used for deserialization of copri answer.
-    /// </summary>
-    [DataContract]
-    public class BikesAvailableResponse : ResponseBase
-    {
-        /// <summary>
-        /// Dictionary of bikes.
-        /// </summary>
-        [DataMember]
-        public Dictionary<string, BikeInfoAvailable> bikes { get; private set; }
-    }
+	/// <summary>
+	/// Holds the information about all bikes and is used for deserialization of copri answer.
+	/// </summary>
+	[DataContract]
+	public class BikesAvailableResponse : ResponseBase
+	{
+		/// <summary>
+		/// Dictionary of bikes.
+		/// </summary>
+		[DataMember]
+		public Dictionary<string, BikeInfoAvailable> bikes { get; private set; }
+	}
 }
diff --git a/TINKLib/Repository/Response/BikesReservedOccupiedResponse.cs b/TINKLib/Repository/Response/BikesReservedOccupiedResponse.cs
index 4802031..215af68 100644
--- a/TINKLib/Repository/Response/BikesReservedOccupiedResponse.cs
+++ b/TINKLib/Repository/Response/BikesReservedOccupiedResponse.cs
@@ -3,12 +3,12 @@ using System.Runtime.Serialization;
 
 namespace TINK.Repository.Response
 {
-    public class BikesReservedOccupiedResponse : ResponseBase
-    {
-        /// <summary>
-        /// Dictionary of bikes.
-        /// </summary>
-        [DataMember]
-        public Dictionary<string, BikeInfoReservedOrBooked> bikes_occupied { get; private set; }
-    }
+	public class BikesReservedOccupiedResponse : ResponseBase
+	{
+		/// <summary>
+		/// Dictionary of bikes.
+		/// </summary>
+		[DataMember]
+		public Dictionary<string, BikeInfoReservedOrBooked> bikes_occupied { get; private set; }
+	}
 }
diff --git a/TINKLib/Repository/Response/CopriVersion.cs b/TINKLib/Repository/Response/CopriVersion.cs
index 785b6f4..ea4adf7 100644
--- a/TINKLib/Repository/Response/CopriVersion.cs
+++ b/TINKLib/Repository/Response/CopriVersion.cs
@@ -2,10 +2,10 @@
 
 namespace TINK.Repository.Response
 {
-    [DataContract]
-    public class CopriVersion
-    {
-        [DataMember]
-        public string copri_version { get; private set; }
-    }
+	[DataContract]
+	public class CopriVersion
+	{
+		[DataMember]
+		public string copri_version { get; private set; }
+	}
 }
diff --git a/TINKLib/Repository/Response/DoReturnResponse.cs b/TINKLib/Repository/Response/DoReturnResponse.cs
index da43468..8f0e3c5 100644
--- a/TINKLib/Repository/Response/DoReturnResponse.cs
+++ b/TINKLib/Repository/Response/DoReturnResponse.cs
@@ -2,13 +2,13 @@
 
 namespace TINK.Repository.Response
 {
-    public class DoReturnResponse : BikesReservedOccupiedResponse
-    {
-        /// <summary> Mini survey.</summary>
-        [DataMember]
-        public MiniSurveyResponse user_miniquery { get; private set; }
+	public class DoReturnResponse : BikesReservedOccupiedResponse
+	{
+		/// <summary> Mini survey.</summary>
+		[DataMember]
+		public MiniSurveyResponse user_miniquery { get; private set; }
 
-        [DataMember]
-        public string co2saving { get; private set; }
-    }
+		[DataMember]
+		public string co2saving { get; private set; }
+	}
 }
diff --git a/TINKLib/Repository/Response/JsonConvertRethrow.cs b/TINKLib/Repository/Response/JsonConvertRethrow.cs
index d675203..98e2816 100644
--- a/TINKLib/Repository/Response/JsonConvertRethrow.cs
+++ b/TINKLib/Repository/Response/JsonConvertRethrow.cs
@@ -2,26 +2,26 @@
 
 namespace TINK.Repository.Response
 {
-    public static class JsonConvertRethrow
-    {
-        /// <summary>
-        /// Deserializes COPRI responses in a consitent way for entire app.
-        /// </summary>
-        /// <typeparam name="T">Type of object to serialize to.</typeparam>
-        /// <param name="response">JSON to deserialize.</param>
-        /// <returns>Deserialized object.</returns>
-        public static T DeserializeObject<T>(string response)
-        {
-            try
-            {
-                return Newtonsoft.Json.JsonConvert.DeserializeObject<T>(response);
-            }
-            catch (System.Exception ex)
-            {
-                throw new DeserializationException(ex);
-            }
-        }
+	public static class JsonConvertRethrow
+	{
+		/// <summary>
+		/// Deserializes COPRI responses in a consitent way for entire app.
+		/// </summary>
+		/// <typeparam name="T">Type of object to serialize to.</typeparam>
+		/// <param name="response">JSON to deserialize.</param>
+		/// <returns>Deserialized object.</returns>
+		public static T DeserializeObject<T>(string response)
+		{
+			try
+			{
+				return Newtonsoft.Json.JsonConvert.DeserializeObject<T>(response);
+			}
+			catch (System.Exception ex)
+			{
+				throw new DeserializationException(ex);
+			}
+		}
 
-        public static string SerializeObject(object value) => Newtonsoft.Json.JsonConvert.SerializeObject(value);
-    }
+		public static string SerializeObject(object value) => Newtonsoft.Json.JsonConvert.SerializeObject(value);
+	}
 }
diff --git a/TINKLib/Repository/Response/MapSpan.cs b/TINKLib/Repository/Response/MapSpan.cs
index cda9ad1..fa53aba 100644
--- a/TINKLib/Repository/Response/MapSpan.cs
+++ b/TINKLib/Repository/Response/MapSpan.cs
@@ -2,16 +2,16 @@
 
 namespace TINK.Repository.Response
 {
-    /// <summary> Holds information about map area to display.</summary>
-    [DataContract]
-    public class MapSpan
-    {
-        /// <summary> Center position of the map. </summary>
-        [DataMember]
-        public Position center { get; private set; }
+	/// <summary> Holds information about map area to display.</summary>
+	[DataContract]
+	public class MapSpan
+	{
+		/// <summary> Center position of the map. </summary>
+		[DataMember]
+		public Position center { get; private set; }
 
-        /// <summary> Radius to the map area. </summary>
-        [DataMember]
-        public string radius { get; private set; }
-    }
+		/// <summary> Radius to the map area. </summary>
+		[DataMember]
+		public string radius { get; private set; }
+	}
 }
diff --git a/TINKLib/Repository/Response/MiniSurvey.cs b/TINKLib/Repository/Response/MiniSurvey.cs
index 67dd718..6e54f1a 100644
--- a/TINKLib/Repository/Response/MiniSurvey.cs
+++ b/TINKLib/Repository/Response/MiniSurvey.cs
@@ -3,32 +3,32 @@ using System.Runtime.Serialization;
 
 namespace TINK.Repository.Response
 {
-    [DataContract]
-    public class MiniSurveyResponse
-    {
-        [DataContract]
-        public class Question
-        {
-            [DataMember]
-            public string quest_text { get; private set; }
+	[DataContract]
+	public class MiniSurveyResponse
+	{
+		[DataContract]
+		public class Question
+		{
+			[DataMember]
+			public string quest_text { get; private set; }
 
-            [DataMember]
-            public string type { get; private set; }
+			[DataMember]
+			public string type { get; private set; }
 
-            [DataMember]
-            public Dictionary<string, string> query { get; private set; }
-        }
+			[DataMember]
+			public Dictionary<string, string> query { get; private set; }
+		}
 
-        [DataMember]
-        public string title { get; private set; }
+		[DataMember]
+		public string title { get; private set; }
 
-        [DataMember]
-        public string subtitle { get; private set; }
+		[DataMember]
+		public string subtitle { get; private set; }
 
-        [DataMember]
-        public string footer { get; private set; }
+		[DataMember]
+		public string footer { get; private set; }
 
-        [DataMember]
-        public Dictionary<string, Question> questions { get; private set; }
-    }
+		[DataMember]
+		public Dictionary<string, Question> questions { get; private set; }
+	}
 }
diff --git a/TINKLib/Repository/Response/Position.cs b/TINKLib/Repository/Response/Position.cs
index f60bb09..9673984 100644
--- a/TINKLib/Repository/Response/Position.cs
+++ b/TINKLib/Repository/Response/Position.cs
@@ -2,16 +2,16 @@
 
 namespace TINK.Repository.Response
 {
-    /// <summary> Holds position info. </summary>
-    [DataContract]
-    public class Position
-    {
-        /// <summary> Latitude position (bike, station, map center...). </summary>
-        [DataMember]
-        public string latitude { get; private set; }
+	/// <summary> Holds position info. </summary>
+	[DataContract]
+	public class Position
+	{
+		/// <summary> Latitude position (bike, station, map center...). </summary>
+		[DataMember]
+		public string latitude { get; private set; }
 
-        /// <summary> Longitude position (bike, station, map center...). </summary>
-        [DataMember]
-        public string longitude { get; private set; }
-    }
+		/// <summary> Longitude position (bike, station, map center...). </summary>
+		[DataMember]
+		public string longitude { get; private set; }
+	}
 }
diff --git a/TINKLib/Repository/Response/RentalDescription.cs b/TINKLib/Repository/Response/RentalDescription.cs
index d23c48b..7f1fc20 100644
--- a/TINKLib/Repository/Response/RentalDescription.cs
+++ b/TINKLib/Repository/Response/RentalDescription.cs
@@ -3,39 +3,39 @@ using System.Runtime.Serialization;
 
 namespace TINK.Repository.Response
 {
-    /// <summary>
-    /// Successor of TarifDescription- object.
-    /// Manages tariff- and rental info.
-    /// </summary>
-    [DataContract]
-    public class RentalDescription
-    {
-        /// <summary>
-        /// Name of the tariff.
-        /// </summary>
-        [DataMember]
-        public string name { get; private set; }
+	/// <summary>
+	/// Successor of TarifDescription- object.
+	/// Manages tariff- and rental info.
+	/// </summary>
+	[DataContract]
+	public class RentalDescription
+	{
+		/// <summary>
+		/// Name of the tariff.
+		/// </summary>
+		[DataMember]
+		public string name { get; private set; }
 
-        /// <summary>
-        /// Id of the tariff.
-        /// </summary>
-        [DataMember]
-        public string id { get; private set; }
+		/// <summary>
+		/// Id of the tariff.
+		/// </summary>
+		[DataMember]
+		public string id { get; private set; }
 
-        /// <summary> Holds tariff entires to show to user.</summary>
-        [DataMember]
-        public Dictionary<
-                string /* Key of tariff object for sorting purposes*/,
-                string[] /* Holds two Elements: first element is the description of the element (example: "Max Gebühr"), second is the value (example: "9.00 € / Tag")*/>
-                tarif_elements
-        { get; private set; }
+		/// <summary> Holds tariff entires to show to user.</summary>
+		[DataMember]
+		public Dictionary<
+				string /* Key of tariff object for sorting purposes*/,
+				string[] /* Holds two Elements: first element is the description of the element (example: "Max Gebühr"), second is the value (example: "9.00 € / Tag")*/>
+				tarif_elements
+		{ get; private set; }
 
-        /// <summary> Holds tariff entires to show to user.</summary>
-        [DataMember]
-        public Dictionary<
-            string /* Key of info object for sorting purposes*/,
-            string[] /* Holds two Elements: first element is the key of the element (example: "Tracking"), second is the value (example: "Ich stimme der Speicherung (Tracking) meiner Fahrstrecke ....")*/>
-                rental_info
-        { get; private set; }
-    }
+		/// <summary> Holds tariff entires to show to user.</summary>
+		[DataMember]
+		public Dictionary<
+			string /* Key of info object for sorting purposes*/,
+			string[] /* Holds two Elements: first element is the key of the element (example: "Tracking"), second is the value (example: "Ich stimme der Speicherung (Tracking) meiner Fahrstrecke ....")*/>
+				rental_info
+		{ get; private set; }
+	}
 }
diff --git a/TINKLib/Repository/Response/ReservationBookingResponse.cs b/TINKLib/Repository/Response/ReservationBookingResponse.cs
index 06556a0..c3373e4 100644
--- a/TINKLib/Repository/Response/ReservationBookingResponse.cs
+++ b/TINKLib/Repository/Response/ReservationBookingResponse.cs
@@ -2,14 +2,14 @@
 
 namespace TINK.Repository.Response
 {
-    /// <summary>
-    /// Holds the information about a booking request and is used for deserialization of copri answer.
-    /// </summary>
-    [DataContract]
-    public class ReservationBookingResponse : BikesReservedOccupiedResponse
-    {
-        /// <summary> Booking code for BC- bikes. </summary>
-        [DataMember]
-        public string timeCode { get; private set; }
-    }
+	/// <summary>
+	/// Holds the information about a booking request and is used for deserialization of copri answer.
+	/// </summary>
+	[DataContract]
+	public class ReservationBookingResponse : BikesReservedOccupiedResponse
+	{
+		/// <summary> Booking code for BC- bikes. </summary>
+		[DataMember]
+		public string timeCode { get; private set; }
+	}
 }
diff --git a/TINKLib/Repository/Response/ReservationCancelReturnResponse.cs b/TINKLib/Repository/Response/ReservationCancelReturnResponse.cs
index 3471dbe..8afcffa 100644
--- a/TINKLib/Repository/Response/ReservationCancelReturnResponse.cs
+++ b/TINKLib/Repository/Response/ReservationCancelReturnResponse.cs
@@ -2,10 +2,10 @@
 
 namespace TINK.Repository.Response
 {
-    /// <summary>
-    /// Holds the information about a cancel booking request and is used for deserialization of copri answer.
-    /// </summary>
-    public class ReservationCancelReturnResponse : BikesReservedOccupiedResponse
-    {
-    }
+	/// <summary>
+	/// Holds the information about a cancel booking request and is used for deserialization of copri answer.
+	/// </summary>
+	public class ReservationCancelReturnResponse : BikesReservedOccupiedResponse
+	{
+	}
 }
diff --git a/TINKLib/Repository/Response/ResponseBase.cs b/TINKLib/Repository/Response/ResponseBase.cs
index 06ff18a..56f7467 100644
--- a/TINKLib/Repository/Response/ResponseBase.cs
+++ b/TINKLib/Repository/Response/ResponseBase.cs
@@ -2,56 +2,56 @@
 
 namespace TINK.Repository.Response
 {
-    [DataContract]
-    public class ResponseBase : CopriVersion
-    {
-        [DataMember]
-        public string response_state { get; private set; }
+	[DataContract]
+	public class ResponseBase : CopriVersion
+	{
+		[DataMember]
+		public string response_state { get; private set; }
 
-        [DataMember]
-        public string response { get; private set; }
+		[DataMember]
+		public string response { get; private set; }
 
-        [DataMember]
-        public string response_text { get; private set; }
+		[DataMember]
+		public string response_text { get; private set; }
 
-        [DataMember]
-        public string authcookie { get; private set; }
+		[DataMember]
+		public string authcookie { get; private set; }
 
-        /// <summary> Message shown to user.</summary>
-        [DataMember]
-        public string merchant_message { get; private set; }
+		/// <summary> Message shown to user.</summary>
+		[DataMember]
+		public string merchant_message { get; private set; }
 
-        /// <summary> Initial map display area.</summary>
-        [DataMember]
-        public MapSpan init_map { get; private set; }
+		/// <summary> Initial map display area.</summary>
+		[DataMember]
+		public MapSpan init_map { get; private set; }
 
-        /// <summary> Url of page holding agb info. </summary>
-        [DataMember]
-        public string agb_html { get; private set; }
+		/// <summary> Url of page holding agb info. </summary>
+		[DataMember]
+		public string agb_html { get; private set; }
 
-        /// <summary> Url of page holding instructions how to rent bikes. </summary>
-        [DataMember]
-        public string bike_info_html { get; private set; }
+		/// <summary> Url of page holding instructions how to rent bikes. </summary>
+		[DataMember]
+		public string bike_info_html { get; private set; }
 
-        /// <summary> Url of page holding privacy info. </summary>
-        [DataMember]
-        public string privacy_html { get; private set; }
+		/// <summary> Url of page holding privacy info. </summary>
+		[DataMember]
+		public string privacy_html { get; private set; }
 
-        /// <summary> Url of page holding impress info. </summary>
-        [DataMember]
-        public string impress_html { get; private set; }
+		/// <summary> Url of page holding impress info. </summary>
+		[DataMember]
+		public string impress_html { get; private set; }
 
-        /// <summary> Url of page holding tariff info. </summary>
-        [DataMember]
-        public string tariff_info_html { get; private set; }
+		/// <summary> Url of page holding tariff info. </summary>
+		[DataMember]
+		public string tariff_info_html { get; private set; }
 
-        /// <summary> Textual description of response. </summary>
-        public new string ToString()
-        {
-            return $"Response state is \"{response_state ?? string.Empty}\", " +
-                $"auth cookie is \"{authcookie ?? string.Empty}\" and response is \"{response_text ?? string.Empty}\", " +
-                $"code \"{response ?? string.Empty}\"" +
-                $"response text \"{response_text ?? string.Empty}\".";
-        }
-    }
+		/// <summary> Textual description of response. </summary>
+		public new string ToString()
+		{
+			return $"Response state is \"{response_state ?? string.Empty}\", " +
+				$"auth cookie is \"{authcookie ?? string.Empty}\" and response is \"{response_text ?? string.Empty}\", " +
+				$"code \"{response ?? string.Empty}\"" +
+				$"response text \"{response_text ?? string.Empty}\".";
+		}
+	}
 }
diff --git a/TINKLib/Repository/Response/ResponseContainer.cs b/TINKLib/Repository/Response/ResponseContainer.cs
index 537faee..b2fc98f 100644
--- a/TINKLib/Repository/Response/ResponseContainer.cs
+++ b/TINKLib/Repository/Response/ResponseContainer.cs
@@ -2,24 +2,24 @@
 
 namespace TINK.Repository.Response
 {
-    [DataContract]
-    public class ResponseContainer<T>
-    {
-        [DataMember]
-        public T shareejson { get; private set; }
+	[DataContract]
+	public class ResponseContainer<T>
+	{
+		[DataMember]
+		public T shareejson { get; private set; }
 
-        /// <summary>
-        /// Serializes object to string.
-        /// </summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            if (shareejson == null)
-            {
-                return "Response container does not hold no entry.";
-            }
+		/// <summary>
+		/// Serializes object to string.
+		/// </summary>
+		/// <returns></returns>
+		public override string ToString()
+		{
+			if (shareejson == null)
+			{
+				return "Response container does not hold no entry.";
+			}
 
-            return shareejson.ToString();
-        }
-    }
+			return shareejson.ToString();
+		}
+	}
 }
diff --git a/TINKLib/Repository/Response/ResponseHelper.cs b/TINKLib/Repository/Response/ResponseHelper.cs
index 6c78ff0..b9071a9 100644
--- a/TINKLib/Repository/Response/ResponseHelper.cs
+++ b/TINKLib/Repository/Response/ResponseHelper.cs
@@ -4,253 +4,253 @@ using TINK.Repository.Exception;
 
 namespace TINK.Repository.Response
 {
-    public static class ResponseHelper
-    {
-        public const string RESPONSE_OK = "OK";
+	public static class ResponseHelper
+	{
+		public const string RESPONSE_OK = "OK";
 
-        /// <summary> Holds the description of the action return bike. </summary>
-        public const string RESPONSE_AUTHCOOKIE_EXPRIED = "Failure 1001:";
+		/// <summary> Holds the description of the action return bike. </summary>
+		public const string RESPONSE_AUTHCOOKIE_EXPRIED = "Failure 1001:";
 
-        /// <summary> Holds the description of the action logout. </summary>
-        public const string BIKES_LOGOUT_ACTIONTEXT = "Abmeldung fehlgeschlagen.";
+		/// <summary> Holds the description of the action logout. </summary>
+		public const string BIKES_LOGOUT_ACTIONTEXT = "Abmeldung fehlgeschlagen.";
 
-        /// <summary> Holds the description of the action get stations available. </summary>
-        public const string STATIONS_AVAILABLE_ACTIONTEXT = "Abfrage der verfügbaren Stationen fehlgeschlagen.";
+		/// <summary> Holds the description of the action get stations available. </summary>
+		public const string STATIONS_AVAILABLE_ACTIONTEXT = "Abfrage der verfügbaren Stationen fehlgeschlagen.";
 
-        /// <summary> Holds the description of the action get bikes available. </summary>
-        public const string BIKES_AVAILABLE_ACTIONTEXT = "Abfrage der verfügbaren Fahrräder fehlgeschlagen.";
+		/// <summary> Holds the description of the action get bikes available. </summary>
+		public const string BIKES_AVAILABLE_ACTIONTEXT = "Abfrage der verfügbaren Fahrräder fehlgeschlagen.";
 
-        /// <summary> Holds the description of the action get bikes occupied. </summary>
-        public const string BIKES_OCCUPIED_ACTIONTEXT = "Abfrage der reservierten/ gebuchten Fahrräder fehlgeschlagen.";
+		/// <summary> Holds the description of the action get bikes occupied. </summary>
+		public const string BIKES_OCCUPIED_ACTIONTEXT = "Abfrage der reservierten/ gebuchten Fahrräder fehlgeschlagen.";
 
-        /// <summary> Holds the description of the action cancel reservation. </summary>
-        public const string BIKES_CANCELREQUEST_ACTIONTEXT = "Aufheben der Reservierung fehlgeschlagen.";
+		/// <summary> Holds the description of the action cancel reservation. </summary>
+		public const string BIKES_CANCELREQUEST_ACTIONTEXT = "Aufheben der Reservierung fehlgeschlagen.";
 
-        /// <summary> Holds the description of the action return bike. </summary>
-        public const string BIKES_RETURNBIKE_ACTIONTEXT = "Rückgabe des Rads fehlgeschlagen.";
+		/// <summary> Holds the description of the action return bike. </summary>
+		public const string BIKES_RETURNBIKE_ACTIONTEXT = "Rückgabe des Rads fehlgeschlagen.";
 
-        /// <summary>
-        /// Checks if log in response is ok.
-        /// </summary>
-        /// <param name="response">Response to check whether it is valid.</param>
-        /// <param name="mail">Mail addess used to create details error message in case log in response is invalid.</param>
-        /// <returns></returns>
-        public static AuthorizationResponse GetIsResponseOk(this AuthorizationResponse response, string mail)
-        {
-            if (response == null)
-            {
-                throw new InvalidResponseException<AuthorizationResponse>("Anmeldung fehlgeschlagen.", null);
-            }
+		/// <summary>
+		/// Checks if log in response is ok.
+		/// </summary>
+		/// <param name="response">Response to check whether it is valid.</param>
+		/// <param name="mail">Mail addess used to create details error message in case log in response is invalid.</param>
+		/// <returns></returns>
+		public static AuthorizationResponse GetIsResponseOk(this AuthorizationResponse response, string mail)
+		{
+			if (response == null)
+			{
+				throw new InvalidResponseException<AuthorizationResponse>("Anmeldung fehlgeschlagen.", null);
+			}
 
-            if (response.response_state.ToUpper() == InvalidAuthorizationResponseException.AUTH_FAILURE_STATUS_MESSAGE_UPPERCASE)
-            {
-                throw new InvalidAuthorizationResponseException(mail, response);
-            }
-            else if (!response.response_state.Trim().ToUpper().StartsWith(RESPONSE_OK))
-            {
-                throw new InvalidResponseException<AuthorizationResponse>($"Anmeldung {mail} fehlgeschlagen.\r\nServer Antwort: {response.response_text}", response);
-            }
+			if (response.response_state.ToUpper() == InvalidAuthorizationResponseException.AUTH_FAILURE_STATUS_MESSAGE_UPPERCASE)
+			{
+				throw new InvalidAuthorizationResponseException(mail, response);
+			}
+			else if (!response.response_state.Trim().ToUpper().StartsWith(RESPONSE_OK))
+			{
+				throw new InvalidResponseException<AuthorizationResponse>($"Anmeldung {mail} fehlgeschlagen.\r\nServer Antwort: {response.response_text}", response);
+			}
 
-            return response;
-        }
+			return response;
+		}
 
-        /// <summary>
-        /// Checks if log out response is ok.
-        /// </summary>
-        /// <param name="p_oResponse">Response to check whether it is valid.</param>
-        /// <returns></returns>
-        public static AuthorizationoutResponse GetIsResponseOk(this AuthorizationoutResponse p_oResponse)
-        {
-            if (AuthcookieNotDefinedException.IsAuthcookieNotDefined(p_oResponse, BIKES_LOGOUT_ACTIONTEXT, out AuthcookieNotDefinedException exception))
-            {
-                throw exception;
-            }
+		/// <summary>
+		/// Checks if log out response is ok.
+		/// </summary>
+		/// <param name="p_oResponse">Response to check whether it is valid.</param>
+		/// <returns></returns>
+		public static AuthorizationoutResponse GetIsResponseOk(this AuthorizationoutResponse p_oResponse)
+		{
+			if (AuthcookieNotDefinedException.IsAuthcookieNotDefined(p_oResponse, BIKES_LOGOUT_ACTIONTEXT, out AuthcookieNotDefinedException exception))
+			{
+				throw exception;
+			}
 
-            GetIsResponseOk(p_oResponse, BIKES_LOGOUT_ACTIONTEXT);
+			GetIsResponseOk(p_oResponse, BIKES_LOGOUT_ACTIONTEXT);
 
-            if (p_oResponse.authcookie != "1")
-            {
-                throw new InvalidResponseException<AuthorizationoutResponse>(
-                    BIKES_LOGOUT_ACTIONTEXT,
-                    p_oResponse);
-            }
+			if (p_oResponse.authcookie != "1")
+			{
+				throw new InvalidResponseException<AuthorizationoutResponse>(
+					BIKES_LOGOUT_ACTIONTEXT,
+					p_oResponse);
+			}
 
-            return p_oResponse;
-        }
+			return p_oResponse;
+		}
 
-        /// <summary>Gets if a call to reserve bike succeeded or not by checking a booking response.</summary>
-        /// <param name="bikeId">Id of bike which should be booked.</param>
-        /// <param name="sessionCookie">Sessiong cookie of logged in user.</param>
-        /// <param name="bookingResponse">Response to check.</param>
-        /// <returns></returns>
-        public static BikeInfoReservedOrBooked GetIsReserveResponseOk(
-            this ReservationBookingResponse bookingResponse,
-            string bikeId)
-        {
-            GetIsResponseOk(bookingResponse, string.Format(AppResources.ExceptionTextReservationBikeFailedGeneral, bikeId));
+		/// <summary>Gets if a call to reserve bike succeeded or not by checking a booking response.</summary>
+		/// <param name="bikeId">Id of bike which should be booked.</param>
+		/// <param name="sessionCookie">Sessiong cookie of logged in user.</param>
+		/// <param name="bookingResponse">Response to check.</param>
+		/// <returns></returns>
+		public static BikeInfoReservedOrBooked GetIsReserveResponseOk(
+			this ReservationBookingResponse bookingResponse,
+			string bikeId)
+		{
+			GetIsResponseOk(bookingResponse, string.Format(AppResources.ExceptionTextReservationBikeFailedGeneral, bikeId));
 
-            if (BookingDeclinedException.IsBookingDeclined(bookingResponse.response_state, out BookingDeclinedException exception))
-            {
-                throw exception;
-            }
+			if (BookingDeclinedException.IsBookingDeclined(bookingResponse.response_state, out BookingDeclinedException exception))
+			{
+				throw exception;
+			}
 
-            // Get bike which has to be booked.
-            var bikeInfoRequestedOccupied = bookingResponse?.bikes_occupied?.Values?.FirstOrDefault(x => x.bike == bikeId);
-            if (bikeInfoRequestedOccupied == null)
-            {
-                throw new System.Exception(string.Format(
-                    AppResources.ExceptionTextReservationBikeFailedUnavailalbe,
-                    bikeId,
-                    !string.IsNullOrWhiteSpace(bookingResponse?.response_text) ? $"\r\n{bookingResponse.response_text}" : string.Empty));
-            }
+			// Get bike which has to be booked.
+			var bikeInfoRequestedOccupied = bookingResponse?.bikes_occupied?.Values?.FirstOrDefault(x => x.bike == bikeId);
+			if (bikeInfoRequestedOccupied == null)
+			{
+				throw new System.Exception(string.Format(
+					AppResources.ExceptionTextReservationBikeFailedUnavailalbe,
+					bikeId,
+					!string.IsNullOrWhiteSpace(bookingResponse?.response_text) ? $"\r\n{bookingResponse.response_text}" : string.Empty));
+			}
 
-            return bikeInfoRequestedOccupied;
-        }
+			return bikeInfoRequestedOccupied;
+		}
 
-        /// <summary> Gets if a booking call succeeded or not by checking a booking response. </summary>
-        /// <param name="bikeId">Id of bike which should be booked.</param>
-        /// <param name="bookingResponse">Response to check.</param>
-        /// <returns></returns>
-        public static BikeInfoReservedOrBooked GetIsBookingResponseOk(
-            this ReservationBookingResponse bookingResponse,
-            string bikeId)
-        {
-            GetIsResponseOk(bookingResponse, string.Format(AppResources.ExceptionTextRentingBikeFailedGeneral, bikeId));
+		/// <summary> Gets if a booking call succeeded or not by checking a booking response. </summary>
+		/// <param name="bikeId">Id of bike which should be booked.</param>
+		/// <param name="bookingResponse">Response to check.</param>
+		/// <returns></returns>
+		public static BikeInfoReservedOrBooked GetIsBookingResponseOk(
+			this ReservationBookingResponse bookingResponse,
+			string bikeId)
+		{
+			GetIsResponseOk(bookingResponse, string.Format(AppResources.ExceptionTextRentingBikeFailedGeneral, bikeId));
 
-            // Get bike which has to be booked.
-            var bikeInfoRequestedOccupied = bookingResponse?.bikes_occupied?.Values?.FirstOrDefault(x => x.bike == bikeId);
-            if (bikeInfoRequestedOccupied == null)
-            {
-                throw new System.Exception(string.Format(
-                    AppResources.ExceptionTextRentingBikeFailedUnavailalbe,
-                    bikeId,
-                    !string.IsNullOrWhiteSpace(bookingResponse?.response_text) ? $"\r\n{bookingResponse.response_text}" : string.Empty));
-            }
+			// Get bike which has to be booked.
+			var bikeInfoRequestedOccupied = bookingResponse?.bikes_occupied?.Values?.FirstOrDefault(x => x.bike == bikeId);
+			if (bikeInfoRequestedOccupied == null)
+			{
+				throw new System.Exception(string.Format(
+					AppResources.ExceptionTextRentingBikeFailedUnavailalbe,
+					bikeId,
+					!string.IsNullOrWhiteSpace(bookingResponse?.response_text) ? $"\r\n{bookingResponse.response_text}" : string.Empty));
+			}
 
-            return bikeInfoRequestedOccupied;
-        }
+			return bikeInfoRequestedOccupied;
+		}
 
-        /// <summary> Gets if request is ok.</summary>
-        /// <param name="response">Response to verify.</param>
-        /// <param name="textOfAction">Text describing request which is shown if validation fails.</param>
-        /// <returns>Verified response.</returns>
-        public static BikesReservedOccupiedResponse GetIsResponseOk(this BikesReservedOccupiedResponse response, string textOfAction)
-        {
-            if (response == null || response.response_state == null)
-            {
-                throw new InvalidResponseException<BikesReservedOccupiedResponse>(textOfAction, null);
-            }
+		/// <summary> Gets if request is ok.</summary>
+		/// <param name="response">Response to verify.</param>
+		/// <param name="textOfAction">Text describing request which is shown if validation fails.</param>
+		/// <returns>Verified response.</returns>
+		public static BikesReservedOccupiedResponse GetIsResponseOk(this BikesReservedOccupiedResponse response, string textOfAction)
+		{
+			if (response == null || response.response_state == null)
+			{
+				throw new InvalidResponseException<BikesReservedOccupiedResponse>(textOfAction, null);
+			}
 
-            if (AuthcookieNotDefinedException.IsAuthcookieNotDefined(response, textOfAction, out AuthcookieNotDefinedException exception))
-            {
-                throw exception;
-            }
+			if (AuthcookieNotDefinedException.IsAuthcookieNotDefined(response, textOfAction, out AuthcookieNotDefinedException exception))
+			{
+				throw exception;
+			}
 
-            if (response.response_state.Trim().ToUpper().StartsWith(RESPONSE_AUTHCOOKIE_EXPRIED.ToUpper()))
-            {
-                throw new AuthcookieNotDefinedException(
-                    $"{textOfAction}\r\n{AppResources.ExceptionTextSessionExpired}",
-                    response);
-            }
+			if (response.response_state.Trim().ToUpper().StartsWith(RESPONSE_AUTHCOOKIE_EXPRIED.ToUpper()))
+			{
+				throw new AuthcookieNotDefinedException(
+					$"{textOfAction}\r\n{AppResources.ExceptionTextSessionExpired}",
+					response);
+			}
 
-            GetIsResponseOk((ResponseBase)response, textOfAction);
+			GetIsResponseOk((ResponseBase)response, textOfAction);
 
-            return response;
-        }
+			return response;
+		}
 
-        /// <summary> Gets if request is ok.</summary>
-        /// <param name="response">Response to verify.</param>
-        /// <param name="textOfAction">Text describing request which is shown if validation fails.</param>
-        /// <returns>Verified response.</returns>
-        public static T GetIsResponseOk<T>(this T response, string textOfAction) where T : ResponseBase
-        {
-            if (response == null || response.response_state == null)
-            {
-                throw new InvalidResponseException<T>(textOfAction, null);
-            }
+		/// <summary> Gets if request is ok.</summary>
+		/// <param name="response">Response to verify.</param>
+		/// <param name="textOfAction">Text describing request which is shown if validation fails.</param>
+		/// <returns>Verified response.</returns>
+		public static T GetIsResponseOk<T>(this T response, string textOfAction) where T : ResponseBase
+		{
+			if (response == null || response.response_state == null)
+			{
+				throw new InvalidResponseException<T>(textOfAction, null);
+			}
 
-            if (AuthcookieNotDefinedException.IsAuthcookieNotDefined(response, textOfAction, out AuthcookieNotDefinedException exception))
-            {
-                throw exception;
-            }
+			if (AuthcookieNotDefinedException.IsAuthcookieNotDefined(response, textOfAction, out AuthcookieNotDefinedException exception))
+			{
+				throw exception;
+			}
 
-            if (!response.response_state.Trim().ToUpper().StartsWith(RESPONSE_OK))
-            {
-                throw new InvalidResponseException<T>(
-                    $"{textOfAction}\r\nServer Antwort: {response.response_text}",
-                    response);
-            }
+			if (!response.response_state.Trim().ToUpper().StartsWith(RESPONSE_OK))
+			{
+				throw new InvalidResponseException<T>(
+					$"{textOfAction}\r\nServer Antwort: {response.response_text}",
+					response);
+			}
 
-            return response;
-        }
+			return response;
+		}
 
-        /// <summary> Gets if cancel or booking request is ok.</summary>
-        /// <param name="cancelBookingResponse">Response to verify.</param>
-        /// <param name="textOfAction">Text describing request which is shown if validation fails.</param>
-        /// <param name="bikeId">Id of bike.</param>
-        /// <returns>Verified response.</returns>
-        public static ReservationCancelReturnResponse GetIsCancelReservationResponseOk(
-            this ReservationCancelReturnResponse cancelBookingResponse,
-            string bikeId)
-        {
-            GetIsResponseOk<ResponseBase>(cancelBookingResponse, BIKES_CANCELREQUEST_ACTIONTEXT);
+		/// <summary> Gets if cancel or booking request is ok.</summary>
+		/// <param name="cancelBookingResponse">Response to verify.</param>
+		/// <param name="textOfAction">Text describing request which is shown if validation fails.</param>
+		/// <param name="bikeId">Id of bike.</param>
+		/// <returns>Verified response.</returns>
+		public static ReservationCancelReturnResponse GetIsCancelReservationResponseOk(
+			this ReservationCancelReturnResponse cancelBookingResponse,
+			string bikeId)
+		{
+			GetIsResponseOk<ResponseBase>(cancelBookingResponse, BIKES_CANCELREQUEST_ACTIONTEXT);
 
-            // Get bike which has to be booked.
-            var l_oBikeInfo = cancelBookingResponse?.bikes_occupied?.Values?.FirstOrDefault(x => x.bike == bikeId);
-            if (l_oBikeInfo != null)
-            {
-                throw new ReturnBikeException(
-                    cancelBookingResponse,
-                    $"{BIKES_CANCELREQUEST_ACTIONTEXT} Aufruf wurde erfolgreich ausgeführt, aber Rad ist noch in Liste der reservierten Räder enthalten.");
-            }
+			// Get bike which has to be booked.
+			var l_oBikeInfo = cancelBookingResponse?.bikes_occupied?.Values?.FirstOrDefault(x => x.bike == bikeId);
+			if (l_oBikeInfo != null)
+			{
+				throw new ReturnBikeException(
+					cancelBookingResponse,
+					$"{BIKES_CANCELREQUEST_ACTIONTEXT} Aufruf wurde erfolgreich ausgeführt, aber Rad ist noch in Liste der reservierten Räder enthalten.");
+			}
 
-            return cancelBookingResponse;
-        }
+			return cancelBookingResponse;
+		}
 
-        /// <summary> Gets if return bike request is ok.</summary>
-        /// <param name="returnBikeResponse">Response to verify.</param>
-        /// <param name="textOfAction">Text describing request which is shown if validation fails.</param>
-        /// <param name="bikeId">Id of bike.</param>
-        /// <returns>Verified response.</returns>
-        public static DoReturnResponse GetIsReturnBikeResponseOk(
-            this DoReturnResponse returnBikeResponse,
-            string bikeId)
-        {
-            // Check if bike is at station.
-            if (NotAtStationException.IsNotAtStation(returnBikeResponse.response_state.ToUpper(), out NotAtStationException notAtStationException))
-            {
-                throw notAtStationException;
-            }
+		/// <summary> Gets if return bike request is ok.</summary>
+		/// <param name="returnBikeResponse">Response to verify.</param>
+		/// <param name="textOfAction">Text describing request which is shown if validation fails.</param>
+		/// <param name="bikeId">Id of bike.</param>
+		/// <returns>Verified response.</returns>
+		public static DoReturnResponse GetIsReturnBikeResponseOk(
+			this DoReturnResponse returnBikeResponse,
+			string bikeId)
+		{
+			// Check if bike is at station.
+			if (NotAtStationException.IsNotAtStation(returnBikeResponse.response_state.ToUpper(), out NotAtStationException notAtStationException))
+			{
+				throw notAtStationException;
+			}
 
-            // Check if GPS data was send to copri.
-            if (NoGPSDataException.IsNoGPSData(returnBikeResponse.response_state.ToUpper(), out NoGPSDataException noGPSDataException))
-            {
-                throw noGPSDataException;
-            }
+			// Check if GPS data was send to copri.
+			if (NoGPSDataException.IsNoGPSData(returnBikeResponse.response_state.ToUpper(), out NoGPSDataException noGPSDataException))
+			{
+				throw noGPSDataException;
+			}
 
-            GetIsResponseOk<ResponseBase>(returnBikeResponse, BIKES_RETURNBIKE_ACTIONTEXT);
+			GetIsResponseOk<ResponseBase>(returnBikeResponse, BIKES_RETURNBIKE_ACTIONTEXT);
 
-            // Get bike which has to be booked.
-            var l_oBikeInfo = returnBikeResponse?.bikes_occupied?.Values?.FirstOrDefault(x => x.bike == bikeId);
-            if (l_oBikeInfo != null)
-            {
-                throw new ReturnBikeException(
-                    returnBikeResponse,
-                    $"{BIKES_RETURNBIKE_ACTIONTEXT} Aufruf wurde erfolgreich ausgeführt, aber Rad ist noch in Liste der gemieteten Räder enthalten.");
-            }
+			// Get bike which has to be booked.
+			var l_oBikeInfo = returnBikeResponse?.bikes_occupied?.Values?.FirstOrDefault(x => x.bike == bikeId);
+			if (l_oBikeInfo != null)
+			{
+				throw new ReturnBikeException(
+					returnBikeResponse,
+					$"{BIKES_RETURNBIKE_ACTIONTEXT} Aufruf wurde erfolgreich ausgeführt, aber Rad ist noch in Liste der gemieteten Räder enthalten.");
+			}
 
-            return returnBikeResponse;
-        }
+			return returnBikeResponse;
+		}
 
-        /// <summary>
-        /// Gets the response for bikes occupied request with no bikes reserved.
-        /// </summary>
-        /// <param name="p_strSesstionCookie"></param>
-        /// <returns></returns>
-        public static BikesReservedOccupiedResponse GetBikesOccupiedNone(string p_strSesstionCookie = null)
-        {
-            var l_oJson = CopriCallsMonkeyStore.BIKESOCCUPIED.Replace(@"""authcookie"": """"", @"""authcookie"": """ + (p_strSesstionCookie ?? string.Empty) + @"""");
-            return CopriCallsStatic.DeserializeResponse(@"{ ""shareejson"" : " + l_oJson + "}", (version) => new BikesReservedOccupiedResponse());
-        }
-    }
+		/// <summary>
+		/// Gets the response for bikes occupied request with no bikes reserved.
+		/// </summary>
+		/// <param name="p_strSesstionCookie"></param>
+		/// <returns></returns>
+		public static BikesReservedOccupiedResponse GetBikesOccupiedNone(string p_strSesstionCookie = null)
+		{
+			var l_oJson = CopriCallsMonkeyStore.BIKESOCCUPIED.Replace(@"""authcookie"": """"", @"""authcookie"": """ + (p_strSesstionCookie ?? string.Empty) + @"""");
+			return CopriCallsStatic.DeserializeResponse(@"{ ""shareejson"" : " + l_oJson + "}", (version) => new BikesReservedOccupiedResponse());
+		}
+	}
 }
diff --git a/TINKLib/Repository/Response/StationsAvailableResponse.cs b/TINKLib/Repository/Response/StationsAvailableResponse.cs
index 837e05a..18db861 100644
--- a/TINKLib/Repository/Response/StationsAvailableResponse.cs
+++ b/TINKLib/Repository/Response/StationsAvailableResponse.cs
@@ -3,67 +3,67 @@ using System.Runtime.Serialization;
 
 namespace TINK.Repository.Response
 {
-    /// <summary>
-    /// Holds the information about all stations and is used for deserialization of copri answer.
-    /// </summary>
-    [DataContract]
-    public class StationsAvailableResponse : ResponseBase
-    {
-        /// <summary>
-        /// Holds info about a single station.
-        /// </summary>
-        [DataContract]
-        public class StationInfo
-        {
-            /// <summary>
-            /// Holds info about opertor data.
-            /// </summary>
-            [DataContract]
-            public class OperatorData
-            {
-                [DataMember]
-                public string operator_name { get; private set; }
+	/// <summary>
+	/// Holds the information about all stations and is used for deserialization of copri answer.
+	/// </summary>
+	[DataContract]
+	public class StationsAvailableResponse : ResponseBase
+	{
+		/// <summary>
+		/// Holds info about a single station.
+		/// </summary>
+		[DataContract]
+		public class StationInfo
+		{
+			/// <summary>
+			/// Holds info about opertor data.
+			/// </summary>
+			[DataContract]
+			public class OperatorData
+			{
+				[DataMember]
+				public string operator_name { get; private set; }
 
-                [DataMember]
-                public string operator_phone { get; private set; }
+				[DataMember]
+				public string operator_phone { get; private set; }
 
-                [DataMember]
-                public string operator_hours { get; private set; }
+				[DataMember]
+				public string operator_hours { get; private set; }
 
-                [DataMember]
-                public string operator_email { get; private set; }
+				[DataMember]
+				public string operator_email { get; private set; }
 
 
-                [DataMember]
-                public string operator_color { get; private set; }
-            }
+				[DataMember]
+				public string operator_color { get; private set; }
+			}
 
-            /// <summary>
-            /// Unique id of the station.
-            /// </summary>
-            [DataMember]
-            public string station { get; private set; }
+			/// <summary>
+			/// Unique id of the station.
+			/// </summary>
+			[DataMember]
+			public string station { get; private set; }
 
-            [DataMember]
-            public string[] station_group { get; private set; }
+			[DataMember]
+			public string[] station_group { get; private set; }
 
-            [DataMember]
-            public string description { get; private set; }
+			[DataMember]
+			public string description { get; private set; }
 
-            /// <summary>
-            /// Position of the station.
-            /// </summary>
-            [DataMember]
-            public Position gps { get; private set; }
+			/// <summary>
+			/// Position of the station.
+			/// </summary>
+			[DataMember]
+			public Position gps { get; private set; }
 
-            [DataMember]
-            public OperatorData operator_data { get; private set; }
-        }
+			[DataMember]
+			public OperatorData operator_data { get; private set; }
+		}
 
-        /// <summary>
-        /// Dictionary of bikes.
-        /// </summary>
-        [DataMember]
-        public Dictionary<string, StationInfo> stations { get; private set; }
-    }
+		/// <summary>
+		/// Dictionary of bikes.
+		/// </summary>
+		[DataMember]
+		public Dictionary<string, StationInfo> stations { get; private set; }
+	}
 }
diff --git a/TINKLib/Repository/Response/SubmitFeedbackResponse.cs b/TINKLib/Repository/Response/SubmitFeedbackResponse.cs
index 4c79035..63cdc47 100644
--- a/TINKLib/Repository/Response/SubmitFeedbackResponse.cs
+++ b/TINKLib/Repository/Response/SubmitFeedbackResponse.cs
@@ -1,6 +1,6 @@
 namespace TINK.Repository.Response
 {
-    public class SubmitFeedbackResponse : ResponseBase
-    {
-    }
+	public class SubmitFeedbackResponse : ResponseBase
+	{
+	}
 }
diff --git a/TINKLib/Repository/Response/TariffDescription.cs b/TINKLib/Repository/Response/TariffDescription.cs
index e6fd690..9ef2944 100644
--- a/TINKLib/Repository/Response/TariffDescription.cs
+++ b/TINKLib/Repository/Response/TariffDescription.cs
@@ -2,58 +2,58 @@
 
 namespace TINK.Repository.Response
 {
-    /// <summary>
-    /// Holds tariff info for a single bike.
-    /// </summary>
-    [DataContract]
+	/// <summary>
+	/// Holds tariff info for a single bike.
+	/// </summary>
+	[DataContract]
 #if USCSHARP9
     public record TariffDescription
 #else
-    public class TariffDescription
+	public class TariffDescription
 #endif
-    {
-        /// <summary>
-        /// Name of the tariff.
-        /// </summary>
-        [DataMember]
-        public string name { get; private set; }
+	{
+		/// <summary>
+		/// Name of the tariff.
+		/// </summary>
+		[DataMember]
+		public string name { get; private set; }
 
-        /// <summary>
-        /// Number of the tariff.
-        /// </summary>
-        [DataMember]
-        public string number { get; private set; }
+		/// <summary>
+		/// Number of the tariff.
+		/// </summary>
+		[DataMember]
+		public string number { get; private set; }
 
-        /// <summary>
-        /// Costs per hour in euro.
-        /// </summary>
-        [DataMember]
-        public string eur_per_hour { get; private set; }
+		/// <summary>
+		/// Costs per hour in euro.
+		/// </summary>
+		[DataMember]
+		public string eur_per_hour { get; private set; }
 
-        /// <summary>
-        /// Costs of the abo per month.
-        /// </summary>
-        [DataMember]
-        public string abo_eur_per_month { get; private set; }
+		/// <summary>
+		/// Costs of the abo per month.
+		/// </summary>
+		[DataMember]
+		public string abo_eur_per_month { get; private set; }
 
-        /// <summary>
-        /// Costs per hour in euro.
-        /// </summary>
-        [DataMember]
-        public string free_hours { get; private set; }
+		/// <summary>
+		/// Costs per hour in euro.
+		/// </summary>
+		[DataMember]
+		public string free_hours { get; private set; }
 
-        /// <summary>
-        /// Maximum fee per day.
-        /// </summary>
-        [DataMember]
-        public string max_eur_per_day { get; private set; }
+		/// <summary>
+		/// Maximum fee per day.
+		/// </summary>
+		[DataMember]
+		public string max_eur_per_day { get; private set; }
 
-        /// <summary> Info about operator agb as HTML (i.g. text and hyperlink). </summary>
-        [DataMember]
-        public string operator_agb { get; private set; }
+		/// <summary> Info about operator agb as HTML (i.g. text and hyperlink). </summary>
+		[DataMember]
+		public string operator_agb { get; private set; }
 
-        /// <summary> Text which informs users about GPS tracking if tracking is on. </summary>
-        [DataMember]
-        public string track_info { get; private set; }
-    }
+		/// <summary> Text which informs users about GPS tracking if tracking is on. </summary>
+		[DataMember]
+		public string track_info { get; private set; }
+	}
 }
diff --git a/TINKLib/Repository/Response/VersionindependentResponse.cs b/TINKLib/Repository/Response/VersionindependentResponse.cs
index 1c79f7e..c52df5c 100644
--- a/TINKLib/Repository/Response/VersionindependentResponse.cs
+++ b/TINKLib/Repository/Response/VersionindependentResponse.cs
@@ -2,21 +2,21 @@
 
 namespace TINK.Repository.Response
 {
-    [DataContract]
-    public class VersionindependentResponse
-    {
-        private CopriVersion _shareejson;
+	[DataContract]
+	public class VersionindependentResponse
+	{
+		private CopriVersion _shareejson;
 
-        /// <summary> Root element for versions 4.0 and older. </summary>
-        [DataMember]
-        public CopriVersion tinkjson { get; private set; }
+		/// <summary> Root element for versions 4.0 and older. </summary>
+		[DataMember]
+		public CopriVersion tinkjson { get; private set; }
 
-        /// <summary> Root element from 4.1 and later. </summary>
-        [DataMember]
-        public CopriVersion shareejson
-        {
-            get => _shareejson ?? tinkjson;
-            private set { _shareejson = value; }
-        }
-    }
+		/// <summary> Root element from 4.1 and later. </summary>
+		[DataMember]
+		public CopriVersion shareejson
+		{
+			get => _shareejson ?? tinkjson;
+			private set { _shareejson = value; }
+		}
+	}
 }
diff --git a/TINKLib/Services/BluetoothLock/ILocksServiceFake.cs b/TINKLib/Services/BluetoothLock/ILocksServiceFake.cs
index 90ee387..620914d 100644
--- a/TINKLib/Services/BluetoothLock/ILocksServiceFake.cs
+++ b/TINKLib/Services/BluetoothLock/ILocksServiceFake.cs
@@ -2,8 +2,8 @@
 
 namespace TINK.Services.BluetoothLock
 {
-    public interface ILocksServiceFake : ILocksService
-    {
-        void UpdateSimulation(BikeCollection bikes);
-    }
+	public interface ILocksServiceFake : ILocksService
+	{
+		void UpdateSimulation(BikeCollection bikes);
+	}
 }
diff --git a/TINKLib/Services/BluetoothLock/LocksServiceInReach.cs b/TINKLib/Services/BluetoothLock/LocksServiceInReach.cs
index 9c451b6..173732b 100644
--- a/TINKLib/Services/BluetoothLock/LocksServiceInReach.cs
+++ b/TINKLib/Services/BluetoothLock/LocksServiceInReach.cs
@@ -9,150 +9,150 @@ using TINK.Services.BluetoothLock.Tdo;
 
 namespace TINK.Services.BluetoothLock
 {
-    /// <summary>
-    /// Facke locks service implementation which simulates locks which are in reach.
-    /// </summary>
-    public class LocksServiceInReach : ILocksServiceFake
-    {
-        private IEnumerable<LockInfoTdo> LocksInfo { get; set; } = new List<LockInfoTdo>();
+	/// <summary>
+	/// Facke locks service implementation which simulates locks which are in reach.
+	/// </summary>
+	public class LocksServiceInReach : ILocksServiceFake
+	{
+		private IEnumerable<LockInfoTdo> LocksInfo { get; set; } = new List<LockInfoTdo>();
 
-        /// <summary> Holds timeout values for series of connecting attemps to a lock or multiple locks. </summary>
-        public ITimeOutProvider TimeOut { get; set; }
+		/// <summary> Holds timeout values for series of connecting attemps to a lock or multiple locks. </summary>
+		public ITimeOutProvider TimeOut { get; set; }
 
-        /// <summary> Connects to lock.</summary>
-        /// <param name="authInfo"> Info required to connect to lock.</param>
-        /// <param name="connectTimeout">Timeout for connect operation.</param>
-        public async Task<LockInfoTdo> ConnectAsync(LockInfoAuthTdo authInfo, TimeSpan connectTimeout)
-        {
-            return await Task.FromResult(new LockInfoTdo.Builder { Id = authInfo.Id, Guid = authInfo.Guid, State = LockitLockingState.Closed }.Build());
-        }
+		/// <summary> Connects to lock.</summary>
+		/// <param name="authInfo"> Info required to connect to lock.</param>
+		/// <param name="connectTimeout">Timeout for connect operation.</param>
+		public async Task<LockInfoTdo> ConnectAsync(LockInfoAuthTdo authInfo, TimeSpan connectTimeout)
+		{
+			return await Task.FromResult(new LockInfoTdo.Builder { Id = authInfo.Id, Guid = authInfo.Guid, State = LockitLockingState.Closed }.Build());
+		}
 
-        /// <param name="connectTimeout">Timeout for connect operation of a single lock.</param>
-        public async Task<IEnumerable<LockInfoTdo>> GetLocksStateAsync(IEnumerable<LockInfoAuthTdo> locksInfo, TimeSpan connectTimeout)
-        {
-            return await Task.FromResult(LocksInfo);
-        }
+		/// <param name="connectTimeout">Timeout for connect operation of a single lock.</param>
+		public async Task<IEnumerable<LockInfoTdo>> GetLocksStateAsync(IEnumerable<LockInfoAuthTdo> locksInfo, TimeSpan connectTimeout)
+		{
+			return await Task.FromResult(LocksInfo);
+		}
 
-        public void UpdateSimulation(BikeCollection bikes)
-        {
-            var locksInfo = new List<LockInfoTdo>();
+		public void UpdateSimulation(BikeCollection bikes)
+		{
+			var locksInfo = new List<LockInfoTdo>();
 
-            // Add and process locks info object
-            foreach (var bikeInfo in bikes.OfType<Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo>())
-            {
-                var lockInfo = bikeInfo.LockInfo;
+			// Add and process locks info object
+			foreach (var bikeInfo in bikes.OfType<Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo>())
+			{
+				var lockInfo = bikeInfo.LockInfo;
 
-                switch (bikeInfo.State.Value)
-                {
-                    case InUseStateEnum.Disposable:
-                    case InUseStateEnum.FeedbackPending:    // State feedback pending does not exist for bluetooth locks but maches from bluetooth perspective state disposable.
-                        switch (lockInfo.State)
-                        {
-                            case LockingState.Open:
-                            case LockingState.UnknownDisconnected:
-                            case LockingState.UnknownFromHardwareError:
-                                // Open bikes are never disposable because as soon as a they are open they get booked.
-                                if (LocksInfo.FirstOrDefault(x => x.Id == lockInfo.Id) != null)
-                                {
-                                    continue; // Lock was already added.
-                                }
-                                locksInfo.Add(new LockInfoTdo.Builder { Id = lockInfo.Id, State = LockitLockingState.Closed }.Build());
-                                break;
-                        }
-                        break;
+				switch (bikeInfo.State.Value)
+				{
+					case InUseStateEnum.Disposable:
+					case InUseStateEnum.FeedbackPending:    // State feedback pending does not exist for bluetooth locks but maches from bluetooth perspective state disposable.
+						switch (lockInfo.State)
+						{
+							case LockingState.Open:
+							case LockingState.UnknownDisconnected:
+							case LockingState.UnknownFromHardwareError:
+								// Open bikes are never disposable because as soon as a they are open they get booked.
+								if (LocksInfo.FirstOrDefault(x => x.Id == lockInfo.Id) != null)
+								{
+									continue; // Lock was already added.
+								}
+								locksInfo.Add(new LockInfoTdo.Builder { Id = lockInfo.Id, State = LockitLockingState.Closed }.Build());
+								break;
+						}
+						break;
 
-                    case InUseStateEnum.Reserved:
-                        switch (lockInfo.State)
-                        {
-                            case LockingState.Open:
-                            case LockingState.UnknownDisconnected:
-                            case LockingState.UnknownFromHardwareError:
-                                // Closed bikes are never reserved because as soon as they are open they get booked.
-                                if (LocksInfo.FirstOrDefault(x => x.Id == lockInfo.Id) != null)
-                                {
-                                    continue; // Lock was already added.
-                                }
-                                locksInfo.Add(new LockInfoTdo.Builder { Id = lockInfo.Id, State = LockitLockingState.Closed }.Build());
-                                break;
-                        }
-                        break;
+					case InUseStateEnum.Reserved:
+						switch (lockInfo.State)
+						{
+							case LockingState.Open:
+							case LockingState.UnknownDisconnected:
+							case LockingState.UnknownFromHardwareError:
+								// Closed bikes are never reserved because as soon as they are open they get booked.
+								if (LocksInfo.FirstOrDefault(x => x.Id == lockInfo.Id) != null)
+								{
+									continue; // Lock was already added.
+								}
+								locksInfo.Add(new LockInfoTdo.Builder { Id = lockInfo.Id, State = LockitLockingState.Closed }.Build());
+								break;
+						}
+						break;
 
-                    case InUseStateEnum.Booked:
-                        switch (lockInfo.State)
-                        {
-                            case LockingState.UnknownDisconnected:
-                            case LockingState.UnknownFromHardwareError:
-                                if (LocksInfo.FirstOrDefault(x => x.Id == lockInfo.Id) != null)
-                                {
-                                    continue; // Lock was already added.
-                                }
-                                locksInfo.Add(new LockInfoTdo.Builder { Id = lockInfo.Id, State = LockitLockingState.Closed }.Build());
-                                break;
-                        }
-                        break;
-                }
+					case InUseStateEnum.Booked:
+						switch (lockInfo.State)
+						{
+							case LockingState.UnknownDisconnected:
+							case LockingState.UnknownFromHardwareError:
+								if (LocksInfo.FirstOrDefault(x => x.Id == lockInfo.Id) != null)
+								{
+									continue; // Lock was already added.
+								}
+								locksInfo.Add(new LockInfoTdo.Builder { Id = lockInfo.Id, State = LockitLockingState.Closed }.Build());
+								break;
+						}
+						break;
+				}
 
-                LocksInfo = locksInfo;
-            }
-        }
+				LocksInfo = locksInfo;
+			}
+		}
 
-        /// <summary> Opens a lock.</summary>
-        /// <param name="lockId">Id of lock to open.</param>
-        public async Task<LockitLockingState?> OpenAsync(int bikeId, byte[] copriKey)
-        {
-            return await Task.FromResult(LockitLockingState.Open);
-        }
+		/// <summary> Opens a lock.</summary>
+		/// <param name="lockId">Id of lock to open.</param>
+		public async Task<LockitLockingState?> OpenAsync(int bikeId, byte[] copriKey)
+		{
+			return await Task.FromResult(LockitLockingState.Open);
+		}
 
-        /// <summary> Closes a lock.</summary>
-        /// <param name="lockId">Id of lock to close.</param>
-        public async Task<LockitLockingState?> CloseAsync(int bikeId, byte[] copriKey)
-        {
-            return await Task.FromResult(LockitLockingState.Closed);
-        }
+		/// <summary> Closes a lock.</summary>
+		/// <param name="lockId">Id of lock to close.</param>
+		public async Task<LockitLockingState?> CloseAsync(int bikeId, byte[] copriKey)
+		{
+			return await Task.FromResult(LockitLockingState.Closed);
+		}
 
-        /// <summary> Set sound settings.</summary>
-        /// <param name="lockId">Id of lock to set sound settings.</param>
-        public async Task<bool> SetSoundAsync(int lockId, SoundSettings settings)
-        {
-            return await Task.FromResult(true);
-        }
+		/// <summary> Set sound settings.</summary>
+		/// <param name="lockId">Id of lock to set sound settings.</param>
+		public async Task<bool> SetSoundAsync(int lockId, SoundSettings settings)
+		{
+			return await Task.FromResult(true);
+		}
 
-        /// <summary> Sets whether alarm is on or off.</summary>
-        /// <param name="lockId">Id of lock to get info from.</param>
-        public async Task SetIsAlarmOffAsync(int lockId, bool activated)
-        {
-            await Task.FromResult(true);
-        }
+		/// <summary> Sets whether alarm is on or off.</summary>
+		/// <param name="lockId">Id of lock to get info from.</param>
+		public async Task SetIsAlarmOffAsync(int lockId, bool activated)
+		{
+			await Task.FromResult(true);
+		}
 
-        /// <summary> Gets battery percentage.</summary>
-        /// <param name="lockId">Id of lock to get info for.</param>
-        public Task<double> GetBatteryPercentageAsync(int lockId)
-        {
-            throw new NotSupportedException();
-        }
+		/// <summary> Gets battery percentage.</summary>
+		/// <param name="lockId">Id of lock to get info for.</param>
+		public Task<double> GetBatteryPercentageAsync(int lockId)
+		{
+			throw new NotSupportedException();
+		}
 
-        /// <summary> Gets whether alarm is on or off.</summary>
-        /// <param name="lockId">Id of lock to get info for.</param>
-        public async Task<bool> GetIsAlarmOffAsync(int lockId)
-        {
-            return await Task.FromResult(true);
-        }
+		/// <summary> Gets whether alarm is on or off.</summary>
+		/// <param name="lockId">Id of lock to get info for.</param>
+		public async Task<bool> GetIsAlarmOffAsync(int lockId)
+		{
+			return await Task.FromResult(true);
+		}
 
-        /// <summary>Gets a lock by bike Id.</summary>
-        /// <param name="bikeId"></param>
-        /// <returns>Lock object</returns>
-        public ILockService this[int bikeId]
-        {
-            get
-            {
-                return null;
-            }
-        }
+		/// <summary>Gets a lock by bike Id.</summary>
+		/// <param name="bikeId"></param>
+		/// <returns>Lock object</returns>
+		public ILockService this[int bikeId]
+		{
+			get
+			{
+				return null;
+			}
+		}
 
 
-        /// <summary> Disconnects lock.</summary>
-        /// <param name="bikeId"> Id of lock to disconnect.</param>
-        /// <param name="bikeGuid"> Guid of lock to disconnect.</param>
-        public async Task<LockingState> DisconnectAsync(int bikeId, Guid bikeGuid) => await Task.FromResult(LockingState.UnknownDisconnected);
-    }
+		/// <summary> Disconnects lock.</summary>
+		/// <param name="bikeId"> Id of lock to disconnect.</param>
+		/// <param name="bikeGuid"> Guid of lock to disconnect.</param>
+		public async Task<LockingState> DisconnectAsync(int bikeId, Guid bikeGuid) => await Task.FromResult(LockingState.UnknownDisconnected);
+	}
 }
diff --git a/TINKLib/Services/BluetoothLock/LocksServiceOutOfReach.cs b/TINKLib/Services/BluetoothLock/LocksServiceOutOfReach.cs
index cc88736..4461180 100644
--- a/TINKLib/Services/BluetoothLock/LocksServiceOutOfReach.cs
+++ b/TINKLib/Services/BluetoothLock/LocksServiceOutOfReach.cs
@@ -8,58 +8,58 @@ using TINK.Services.BluetoothLock.Tdo;
 
 namespace TINK.Services.BluetoothLock
 {
-    /// <summary>
-    /// Facke locks service implementation which simulates locks which are out of reach.
-    /// </summary>
-    public class LocksServiceOutOfReach : ILocksServiceFake
-    {
-        private IEnumerable<LockInfoTdo> LocksInfo { get; set; } = new List<LockInfoTdo>();
+	/// <summary>
+	/// Facke locks service implementation which simulates locks which are out of reach.
+	/// </summary>
+	public class LocksServiceOutOfReach : ILocksServiceFake
+	{
+		private IEnumerable<LockInfoTdo> LocksInfo { get; set; } = new List<LockInfoTdo>();
 
-        /// <summary> Holds timeout values for series of connecting attemps to a lock or multiple locks. </summary>
-        public ITimeOutProvider TimeOut { get; set; }
+		/// <summary> Holds timeout values for series of connecting attemps to a lock or multiple locks. </summary>
+		public ITimeOutProvider TimeOut { get; set; }
 
-        /// <summary> Connects to lock.</summary>
-        /// <param name="authInfo"> Info required to connect to lock.</param>
-        /// <param name="connectTimeout">Timeout for connect operation.</param>
-        public async Task<LockInfoTdo> ConnectAsync(LockInfoAuthTdo authInfo, TimeSpan connectTimeout)
-        {
-            return await Task.FromResult(new LockInfoTdo.Builder { Id = authInfo.Id, Guid = authInfo.Guid, State = null }.Build());
-        }
+		/// <summary> Connects to lock.</summary>
+		/// <param name="authInfo"> Info required to connect to lock.</param>
+		/// <param name="connectTimeout">Timeout for connect operation.</param>
+		public async Task<LockInfoTdo> ConnectAsync(LockInfoAuthTdo authInfo, TimeSpan connectTimeout)
+		{
+			return await Task.FromResult(new LockInfoTdo.Builder { Id = authInfo.Id, Guid = authInfo.Guid, State = null }.Build());
+		}
 
-        /// <summary> No info availalbe because no lock is in reach.</summary>
-        /// <param name="connectTimeout">Timeout for connect operation of a single lock.</param>
-        /// <returns>Empty collection.</returns>
-        public async Task<IEnumerable<LockInfoTdo>> GetLocksStateAsync(IEnumerable<LockInfoAuthTdo> locksInfo, TimeSpan connectTimeout) => await Task.FromResult(LocksInfo);
+		/// <summary> No info availalbe because no lock is in reach.</summary>
+		/// <param name="connectTimeout">Timeout for connect operation of a single lock.</param>
+		/// <returns>Empty collection.</returns>
+		public async Task<IEnumerable<LockInfoTdo>> GetLocksStateAsync(IEnumerable<LockInfoAuthTdo> locksInfo, TimeSpan connectTimeout) => await Task.FromResult(LocksInfo);
 
 
-        /// <summary> No changes required because lock state is unknown.</summary>
-        public void UpdateSimulation(BikeCollection bikes)
-        {
-            var locksInfo = new List<LockInfoTdo>();
+		/// <summary> No changes required because lock state is unknown.</summary>
+		public void UpdateSimulation(BikeCollection bikes)
+		{
+			var locksInfo = new List<LockInfoTdo>();
 
-            // Add and process locks info object
-            foreach (var bikeInfo in bikes.OfType<Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo>())
-            {
-                locksInfo.Add(new LockInfoTdo.Builder { Id = bikeInfo.LockInfo.Id, State = null }.Build());
-            }
+			// Add and process locks info object
+			foreach (var bikeInfo in bikes.OfType<Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo>())
+			{
+				locksInfo.Add(new LockInfoTdo.Builder { Id = bikeInfo.LockInfo.Id, State = null }.Build());
+			}
 
-            LocksInfo = locksInfo;
-        }
+			LocksInfo = locksInfo;
+		}
 
-        /// <summary>Gets a lock by bike Id.</summary>
-        /// <param name="bikeId"></param>
-        /// <returns>Lock object</returns>
-        public ILockService this[int bikeId]
-        {
-            get
-            {
-                return null;
-            }
-        }
+		/// <summary>Gets a lock by bike Id.</summary>
+		/// <param name="bikeId"></param>
+		/// <returns>Lock object</returns>
+		public ILockService this[int bikeId]
+		{
+			get
+			{
+				return null;
+			}
+		}
 
-        /// <summary> Disconnects lock.</summary>
-        /// <param name="bikeId"> Id of lock to disconnect.</param>
-        /// <param name="bikeGuid"> Guid of lock to disconnect.</param>
-        public async Task<LockingState> DisconnectAsync(int bikeId, Guid bikeGuid) => await Task.FromResult(LockingState.UnknownDisconnected);
-    }
+		/// <summary> Disconnects lock.</summary>
+		/// <param name="bikeId"> Id of lock to disconnect.</param>
+		/// <param name="bikeGuid"> Guid of lock to disconnect.</param>
+		public async Task<LockingState> DisconnectAsync(int bikeId, Guid bikeGuid) => await Task.FromResult(LockingState.UnknownDisconnected);
+	}
 }
diff --git a/TINKLib/Services/BluetoothLock/LocksServicesContainerMutable.cs b/TINKLib/Services/BluetoothLock/LocksServicesContainerMutable.cs
index 4a5819d..46241e8 100644
--- a/TINKLib/Services/BluetoothLock/LocksServicesContainerMutable.cs
+++ b/TINKLib/Services/BluetoothLock/LocksServicesContainerMutable.cs
@@ -5,45 +5,45 @@ using System.Linq;
 
 namespace TINK.Services.BluetoothLock
 {
-    /// <summary> Manages Locks services and related configuration parameter. </summary>
-    public class LocksServicesContainerMutable : IEnumerable<string>
-    {
-        /// <summary> Manages the different types of LocksService objects.</summary>
-        private ServicesContainerMutableT<ILocksService> LocksServices { get; }
+	/// <summary> Manages Locks services and related configuration parameter. </summary>
+	public class LocksServicesContainerMutable : IEnumerable<string>
+	{
+		/// <summary> Manages the different types of LocksService objects.</summary>
+		private ServicesContainerMutableT<ILocksService> LocksServices { get; }
 
-        /// <summary> Holds the name of the default locks service to use. </summary>
-        public static string DefaultLocksservice => typeof(BLE.LockItByScanServicePolling).FullName;
+		/// <summary> Holds the name of the default locks service to use. </summary>
+		public static string DefaultLocksservice => typeof(BLE.LockItByScanServicePolling).FullName;
 
-        /// <summary></summary>
-        /// <param name="activeLockService">Name of active lock service implementation to use.</param>
-        /// <param name="locksServices">Null for production (set of lock service implentations and some fake implementation will created) hash set of services for testing purposes. </param>
-        public LocksServicesContainerMutable(
-           string activeLockService,
-            HashSet<ILocksService> locksServices)
-        {
-            LocksServices = new ServicesContainerMutableT<ILocksService>(
-                locksServices,
-                activeLockService);
-        }
+		/// <summary></summary>
+		/// <param name="activeLockService">Name of active lock service implementation to use.</param>
+		/// <param name="locksServices">Null for production (set of lock service implentations and some fake implementation will created) hash set of services for testing purposes. </param>
+		public LocksServicesContainerMutable(
+		   string activeLockService,
+			HashSet<ILocksService> locksServices)
+		{
+			LocksServices = new ServicesContainerMutableT<ILocksService>(
+				locksServices,
+				activeLockService);
+		}
 
-        /// <summary> Active locks service.</summary>
-        public ILocksService Active => LocksServices.Active;
+		/// <summary> Active locks service.</summary>
+		public ILocksService Active => LocksServices.Active;
 
-        /// <summary> Sets a lock service as active locks service by name. </summary>
-        /// <param name="active">Name of the new locks service.</param>
-        public void SetActive(string active) => LocksServices.SetActive(active);
+		/// <summary> Sets a lock service as active locks service by name. </summary>
+		/// <param name="active">Name of the new locks service.</param>
+		public void SetActive(string active) => LocksServices.SetActive(active);
 
-        IEnumerator<string> IEnumerable<string>.GetEnumerator()
-            => LocksServices.Select(x => x.GetType().FullName).GetEnumerator();
-        IEnumerator IEnumerable.GetEnumerator()
-            => LocksServices.GetEnumerator();
+		IEnumerator<string> IEnumerable<string>.GetEnumerator()
+			=> LocksServices.Select(x => x.GetType().FullName).GetEnumerator();
+		IEnumerator IEnumerable.GetEnumerator()
+			=> LocksServices.GetEnumerator();
 
-        public void SetTimeOut(TimeSpan connectTimeout)
-        {
-            foreach (var locksService in LocksServices)
-            {
-                locksService.TimeOut = new TimeOutProvider(new List<TimeSpan> { connectTimeout });
-            }
-        }
-    }
+		public void SetTimeOut(TimeSpan connectTimeout)
+		{
+			foreach (var locksService in LocksServices)
+			{
+				locksService.TimeOut = new TimeOutProvider(new List<TimeSpan> { connectTimeout });
+			}
+		}
+	}
 }
diff --git a/TINKLib/Services/CopriApi/CopriProviderHttps.cs b/TINKLib/Services/CopriApi/CopriProviderHttps.cs
index 045f107..4e18f8b 100644
--- a/TINKLib/Services/CopriApi/CopriProviderHttps.cs
+++ b/TINKLib/Services/CopriApi/CopriProviderHttps.cs
@@ -10,297 +10,297 @@ using TINK.Repository.Response;
 
 namespace TINK.Model.Services.CopriApi
 {
-    /// <summary> Object which manages calls to copri in a thread safe way inclding cache functionality. </summary>
-    public class CopriProviderHttps : ICachedCopriServer
-    {
-        /// <summary> Object which manages stored copri answers. </summary>
-        private ICopriCache CacheServer { get; }
+	/// <summary> Object which manages calls to copri in a thread safe way inclding cache functionality. </summary>
+	public class CopriProviderHttps : ICachedCopriServer
+	{
+		/// <summary> Object which manages stored copri answers. </summary>
+		private ICopriCache CacheServer { get; }
 
-        /// <summary> Communicates whith copri server. </summary>
-        private ICopriServer HttpsServer { get; }
+		/// <summary> Communicates whith copri server. </summary>
+		private ICopriServer HttpsServer { get; }
 
-        /// <summary> True if connector has access to copri server, false if cached values are used. </summary>
-        public bool IsConnected => HttpsServer.IsConnected;
+		/// <summary> True if connector has access to copri server, false if cached values are used. </summary>
+		public bool IsConnected => HttpsServer.IsConnected;
 
-        /// <summary> Gets the session cookie if user is logged in, an empty string otherwise. </summary>
-        public string SessionCookie => HttpsServer.SessionCookie;
+		/// <summary> Gets the session cookie if user is logged in, an empty string otherwise. </summary>
+		public string SessionCookie => HttpsServer.SessionCookie;
 
-        /// <summary> Gets the merchant id.</summary>
-        public string MerchantId => HttpsServer.MerchantId;
+		/// <summary> Gets the merchant id.</summary>
+		public string MerchantId => HttpsServer.MerchantId;
 
-        /// <summary> Constructs copri provider object to connet to https using a cache objet. </summary>
-        /// <param name="copriHost"></param>
-        /// <param name="appContextInfo">Provides app related info (app name and version, merchantid) to pass to COPRI.</param>
-        /// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
-        /// <param name="sessionCookie">Cookie of user if a user is logged in, false otherwise.</param>
-        /// <param name="expiresAfter">Timespan which holds value after which cache expires.</param>
-        public CopriProviderHttps(
-            Uri copriHost,
-            string merchantId,
-            AppContextInfo appContextInfo,
-            string uiIsoLangugageName,
-            string sessionCookie = null,
-            TimeSpan? expiresAfter = null,
-            ICopriCache cacheServer = null,
-            ICopriServer httpsServer = null)
-        {
-            CacheServer = cacheServer ?? new CopriCallsMonkeyStore(merchantId, uiIsoLangugageName, sessionCookie, expiresAfter);
-            HttpsServer = httpsServer ?? new CopriCallsHttps(copriHost, appContextInfo, uiIsoLangugageName, sessionCookie);
-        }
+		/// <summary> Constructs copri provider object to connet to https using a cache objet. </summary>
+		/// <param name="copriHost"></param>
+		/// <param name="appContextInfo">Provides app related info (app name and version, merchantid) to pass to COPRI.</param>
+		/// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
+		/// <param name="sessionCookie">Cookie of user if a user is logged in, false otherwise.</param>
+		/// <param name="expiresAfter">Timespan which holds value after which cache expires.</param>
+		public CopriProviderHttps(
+			Uri copriHost,
+			string merchantId,
+			AppContextInfo appContextInfo,
+			string uiIsoLangugageName,
+			string sessionCookie = null,
+			TimeSpan? expiresAfter = null,
+			ICopriCache cacheServer = null,
+			ICopriServer httpsServer = null)
+		{
+			CacheServer = cacheServer ?? new CopriCallsMonkeyStore(merchantId, uiIsoLangugageName, sessionCookie, expiresAfter);
+			HttpsServer = httpsServer ?? new CopriCallsHttps(copriHost, appContextInfo, uiIsoLangugageName, sessionCookie);
+		}
 
-        /// <summary>Gets bikes available.</summary>
-        /// <returns>Response holding list of bikes.</returns>
-        public async Task<Result<BikesAvailableResponse>> GetBikesAvailable(bool fromCache = false)
-        {
-            Log.ForContext<CopriProviderHttps>().Debug($"Request to get bikes available{(fromCache ? " from cache" : "")}...");
-            if (!CacheServer.IsBikesAvailableExpired
-                || fromCache)
-            {
-                // No need to query because previous answer is not yet outdated.
-                Log.ForContext<CopriProviderHttps>().Debug($"Returning bikes available from cache.");
-                var bikesAvailableResponse = await CacheServer.GetBikesAvailableAsync();
-                return new Result<BikesAvailableResponse>(typeof(CopriCallsMonkeyStore), bikesAvailableResponse, bikesAvailableResponse.GetGeneralData());
-            }
+		/// <summary>Gets bikes available.</summary>
+		/// <returns>Response holding list of bikes.</returns>
+		public async Task<Result<BikesAvailableResponse>> GetBikesAvailable(bool fromCache = false)
+		{
+			Log.ForContext<CopriProviderHttps>().Debug($"Request to get bikes available{(fromCache ? " from cache" : "")}...");
+			if (!CacheServer.IsBikesAvailableExpired
+				|| fromCache)
+			{
+				// No need to query because previous answer is not yet outdated.
+				Log.ForContext<CopriProviderHttps>().Debug($"Returning bikes available from cache.");
+				var bikesAvailableResponse = await CacheServer.GetBikesAvailableAsync();
+				return new Result<BikesAvailableResponse>(typeof(CopriCallsMonkeyStore), bikesAvailableResponse, bikesAvailableResponse.GetGeneralData());
+			}
 
-            try
-            {
-                Log.ForContext<CopriProviderHttps>().Debug($"Querrying bikes available from copri.");
-                var bikesAvailableResponse = await HttpsServer.GetBikesAvailableAsync();
-                return new Result<BikesAvailableResponse>(
-                    typeof(CopriCallsHttps),
-                    bikesAvailableResponse.GetIsResponseOk(MultilingualResources.AppResources.ErrorBikesAvailableResponseNotOk),
-                    bikesAvailableResponse.GetGeneralData());
-            }
-            catch (Exception exception)
-            {
-                // Return response from cache.
-                Log.ForContext<CopriProviderHttps>().Debug("An error occurred querrying bikes available. {Exception}.", exception);
-                var bikesAvailableResponse = await CacheServer.GetBikesAvailableAsync();
-                return new Result<BikesAvailableResponse>(typeof(CopriCallsMonkeyStore), bikesAvailableResponse, bikesAvailableResponse.GetGeneralData(), exception);
-            }
-        }
+			try
+			{
+				Log.ForContext<CopriProviderHttps>().Debug($"Querrying bikes available from copri.");
+				var bikesAvailableResponse = await HttpsServer.GetBikesAvailableAsync();
+				return new Result<BikesAvailableResponse>(
+					typeof(CopriCallsHttps),
+					bikesAvailableResponse.GetIsResponseOk(MultilingualResources.AppResources.ErrorBikesAvailableResponseNotOk),
+					bikesAvailableResponse.GetGeneralData());
+			}
+			catch (Exception exception)
+			{
+				// Return response from cache.
+				Log.ForContext<CopriProviderHttps>().Debug("An error occurred querrying bikes available. {Exception}.", exception);
+				var bikesAvailableResponse = await CacheServer.GetBikesAvailableAsync();
+				return new Result<BikesAvailableResponse>(typeof(CopriCallsMonkeyStore), bikesAvailableResponse, bikesAvailableResponse.GetGeneralData(), exception);
+			}
+		}
 
-        /// <summary> Gets a list of bikes reserved/ booked by acctive user. </summary>
-        /// <param name="sessionCookie">Cookie to authenticate user.</param>
-        /// <returns>Response holding list of bikes.</returns>
-        public async Task<Result<BikesReservedOccupiedResponse>> GetBikesOccupied(bool fromCache = false)
-        {
-            Log.ForContext<CopriProviderHttps>().Debug($"Request to get bikes occupied{(fromCache ? " from cache" : "")}...");
-            if (!CacheServer.IsBikesOccupiedExpired
-            || fromCache)
-            {
-                // No need to query because previous answer is not yet outdated.
-                var bikesOccupiedResponse = await CacheServer.GetBikesOccupiedAsync();
-                Log.ForContext<CopriProviderHttps>().Debug($"Returning bikes occupied from cache.");
-                return new Result<BikesReservedOccupiedResponse>(typeof(CopriCallsMonkeyStore), bikesOccupiedResponse, bikesOccupiedResponse.GetGeneralData());
-            }
+		/// <summary> Gets a list of bikes reserved/ booked by acctive user. </summary>
+		/// <param name="sessionCookie">Cookie to authenticate user.</param>
+		/// <returns>Response holding list of bikes.</returns>
+		public async Task<Result<BikesReservedOccupiedResponse>> GetBikesOccupied(bool fromCache = false)
+		{
+			Log.ForContext<CopriProviderHttps>().Debug($"Request to get bikes occupied{(fromCache ? " from cache" : "")}...");
+			if (!CacheServer.IsBikesOccupiedExpired
+			|| fromCache)
+			{
+				// No need to query because previous answer is not yet outdated.
+				var bikesOccupiedResponse = await CacheServer.GetBikesOccupiedAsync();
+				Log.ForContext<CopriProviderHttps>().Debug($"Returning bikes occupied from cache.");
+				return new Result<BikesReservedOccupiedResponse>(typeof(CopriCallsMonkeyStore), bikesOccupiedResponse, bikesOccupiedResponse.GetGeneralData());
+			}
 
-            try
-            {
-                Log.ForContext<CopriProviderHttps>().Debug($"Querrying bikes occupied from copri.");
-                var bikesOccupiedResponse = await HttpsServer.GetBikesOccupiedAsync();
-                return new Result<BikesReservedOccupiedResponse>(
-                    typeof(CopriCallsHttps),
-                    bikesOccupiedResponse.GetIsResponseOk("Abfrage der reservierten/ gebuchten Räder fehlgeschlagen."),
-                    bikesOccupiedResponse.GetGeneralData());
+			try
+			{
+				Log.ForContext<CopriProviderHttps>().Debug($"Querrying bikes occupied from copri.");
+				var bikesOccupiedResponse = await HttpsServer.GetBikesOccupiedAsync();
+				return new Result<BikesReservedOccupiedResponse>(
+					typeof(CopriCallsHttps),
+					bikesOccupiedResponse.GetIsResponseOk("Abfrage der reservierten/ gebuchten Räder fehlgeschlagen."),
+					bikesOccupiedResponse.GetGeneralData());
 
-            }
-            catch (Exception exception)
-            {
-                // Return response from cache.
-                Log.ForContext<CopriProviderHttps>().Debug("An error occurred querrying bikes occupied. {Exception}.", exception);
-                var bikesOccupiedResponse = await CacheServer.GetBikesOccupiedAsync();
-                return new Result<BikesReservedOccupiedResponse>(typeof(CopriCallsMonkeyStore), bikesOccupiedResponse, bikesOccupiedResponse.GetGeneralData(), exception);
-            }
-        }
+			}
+			catch (Exception exception)
+			{
+				// Return response from cache.
+				Log.ForContext<CopriProviderHttps>().Debug("An error occurred querrying bikes occupied. {Exception}.", exception);
+				var bikesOccupiedResponse = await CacheServer.GetBikesOccupiedAsync();
+				return new Result<BikesReservedOccupiedResponse>(typeof(CopriCallsMonkeyStore), bikesOccupiedResponse, bikesOccupiedResponse.GetGeneralData(), exception);
+			}
+		}
 
-        /// <summary> Get list of stations. </summary>
-        /// <returns>List of files.</returns>
-        public async Task<Result<StationsAvailableResponse>> GetStations(bool fromCache = false)
-        {
-            Log.ForContext<CopriProviderHttps>().Debug($"Request to get stations{(fromCache ? " from cache" : "")}...");
-            if (!CacheServer.IsStationsExpired
-                || fromCache)
-            {
-                // No need to query because previous answer is not yet outdated.
-                Log.ForContext<CopriProviderHttps>().Debug($"Returning stations from cache.");
-                var stationsResponse = await CacheServer.GetStationsAsync();
-                return new Result<StationsAvailableResponse>(typeof(CopriCallsMonkeyStore), stationsResponse, stationsResponse.GetGeneralData());
-            }
+		/// <summary> Get list of stations. </summary>
+		/// <returns>List of files.</returns>
+		public async Task<Result<StationsAvailableResponse>> GetStations(bool fromCache = false)
+		{
+			Log.ForContext<CopriProviderHttps>().Debug($"Request to get stations{(fromCache ? " from cache" : "")}...");
+			if (!CacheServer.IsStationsExpired
+				|| fromCache)
+			{
+				// No need to query because previous answer is not yet outdated.
+				Log.ForContext<CopriProviderHttps>().Debug($"Returning stations from cache.");
+				var stationsResponse = await CacheServer.GetStationsAsync();
+				return new Result<StationsAvailableResponse>(typeof(CopriCallsMonkeyStore), stationsResponse, stationsResponse.GetGeneralData());
+			}
 
-            try
-            {
-                Log.ForContext<CopriProviderHttps>().Debug($"Querrying stations from copri.");
+			try
+			{
+				Log.ForContext<CopriProviderHttps>().Debug($"Querrying stations from copri.");
 
-                var stations = await HttpsServer.GetStationsAsync();
+				var stations = await HttpsServer.GetStationsAsync();
 
-                return new Result<StationsAvailableResponse>(
-                    typeof(CopriCallsHttps),
-                    stations.GetIsResponseOk("Abfrage der Stationen fehlsgeschlagen."),
-                    stations.GetGeneralData());
-            }
-            catch (Exception exception)
-            {
-                // Return response from cache.
-                Log.ForContext<CopriProviderHttps>().Debug("An error occurred querrying stations. {Exception}.", exception);
-                var stationsResponse = await CacheServer.GetStationsAsync();
-                return new Result<StationsAvailableResponse>(typeof(CopriCallsMonkeyStore), stationsResponse, stationsResponse.GetGeneralData(), exception);
-            }
-        }
+				return new Result<StationsAvailableResponse>(
+					typeof(CopriCallsHttps),
+					stations.GetIsResponseOk("Abfrage der Stationen fehlsgeschlagen."),
+					stations.GetGeneralData());
+			}
+			catch (Exception exception)
+			{
+				// Return response from cache.
+				Log.ForContext<CopriProviderHttps>().Debug("An error occurred querrying stations. {Exception}.", exception);
+				var stationsResponse = await CacheServer.GetStationsAsync();
+				return new Result<StationsAvailableResponse>(typeof(CopriCallsMonkeyStore), stationsResponse, stationsResponse.GetGeneralData(), exception);
+			}
+		}
 
-        /// <summary>Adds https--response to cache if response is ok. </summary>
-        /// <param name="response">Response to add to cache.</param>
-        /// <returns></returns>
-        public void AddToCache(Result<StationsAvailableResponse> result)
-        {
-            Log.ForContext<CopriProviderHttps>().Debug($"Request to add stations all response to cache...");
-            if (result.Source == typeof(CopriCallsMonkeyStore)
-                || result.Exception != null)
-            {
-                // Do not add responses form cache or invalid responses to cache.
-                return;
-            }
+		/// <summary>Adds https--response to cache if response is ok. </summary>
+		/// <param name="response">Response to add to cache.</param>
+		/// <returns></returns>
+		public void AddToCache(Result<StationsAvailableResponse> result)
+		{
+			Log.ForContext<CopriProviderHttps>().Debug($"Request to add stations all response to cache...");
+			if (result.Source == typeof(CopriCallsMonkeyStore)
+				|| result.Exception != null)
+			{
+				// Do not add responses form cache or invalid responses to cache.
+				return;
+			}
 
-            Log.ForContext<CopriProviderHttps>().Debug($"Add bikes available response to cache.");
-            CacheServer.AddToCache(result.Response);
-        }
+			Log.ForContext<CopriProviderHttps>().Debug($"Add bikes available response to cache.");
+			CacheServer.AddToCache(result.Response);
+		}
 
-        /// <summary>Adds https--response to cache if response is ok. </summary>
-        /// <param name="response">Response to add to cache.</param>
-        /// <returns></returns>
-        public void AddToCache(Result<BikesAvailableResponse> result)
-        {
-            Log.ForContext<CopriProviderHttps>().Debug($"Request to add bikes available response to cache...");
-            if (result.Source == typeof(CopriCallsMonkeyStore)
-                || result.Exception != null)
-            {
-                // Do not add responses form cache or invalid responses to cache.
-                return;
-            }
+		/// <summary>Adds https--response to cache if response is ok. </summary>
+		/// <param name="response">Response to add to cache.</param>
+		/// <returns></returns>
+		public void AddToCache(Result<BikesAvailableResponse> result)
+		{
+			Log.ForContext<CopriProviderHttps>().Debug($"Request to add bikes available response to cache...");
+			if (result.Source == typeof(CopriCallsMonkeyStore)
+				|| result.Exception != null)
+			{
+				// Do not add responses form cache or invalid responses to cache.
+				return;
+			}
 
-            Log.ForContext<CopriProviderHttps>().Debug($"Add bikes available response to cache.");
-            CacheServer.AddToCache(result.Response);
+			Log.ForContext<CopriProviderHttps>().Debug($"Add bikes available response to cache.");
+			CacheServer.AddToCache(result.Response);
 
-        }
+		}
 
-        /// <summary>Adds https--response to cache if response is ok. </summary>
-        /// <param name="response">Response to add to cache.</param>
-        /// <returns></returns>
-        public void AddToCache(Result<BikesReservedOccupiedResponse> result)
-        {
-            Log.ForContext<CopriProviderHttps>().Debug($"Request to add bikes occupied response to cache...");
-            if (result.Source == typeof(CopriCallsMonkeyStore)
-                || result.Exception != null)
-            {
-                // Do not add responses form cache or invalid responses to cache.
-                return;
-            }
+		/// <summary>Adds https--response to cache if response is ok. </summary>
+		/// <param name="response">Response to add to cache.</param>
+		/// <returns></returns>
+		public void AddToCache(Result<BikesReservedOccupiedResponse> result)
+		{
+			Log.ForContext<CopriProviderHttps>().Debug($"Request to add bikes occupied response to cache...");
+			if (result.Source == typeof(CopriCallsMonkeyStore)
+				|| result.Exception != null)
+			{
+				// Do not add responses form cache or invalid responses to cache.
+				return;
+			}
 
-            Log.ForContext<CopriProviderHttps>().Debug($"Add bikes occupied response to cache.");
-            CacheServer.AddToCache(result.Response);
-        }
+			Log.ForContext<CopriProviderHttps>().Debug($"Add bikes occupied response to cache.");
+			CacheServer.AddToCache(result.Response);
+		}
 
-        public async Task<AuthorizationResponse> DoAuthorizationAsync(string p_strMailAddress, string p_strPassword, string p_strDeviceId)
-        {
-            return await HttpsServer.DoAuthorizationAsync(p_strMailAddress, p_strPassword, p_strDeviceId);
-        }
+		public async Task<AuthorizationResponse> DoAuthorizationAsync(string p_strMailAddress, string p_strPassword, string p_strDeviceId)
+		{
+			return await HttpsServer.DoAuthorizationAsync(p_strMailAddress, p_strPassword, p_strDeviceId);
+		}
 
-        public async Task<AuthorizationoutResponse> DoAuthoutAsync()
-        {
-            return await HttpsServer.DoAuthoutAsync();
-        }
+		public async Task<AuthorizationoutResponse> DoAuthoutAsync()
+		{
+			return await HttpsServer.DoAuthoutAsync();
+		}
 
-        public async Task<ReservationBookingResponse> DoReserveAsync(string bikeId, Uri operatorUri)
-        {
-            return await HttpsServer.DoReserveAsync(bikeId, operatorUri);
-        }
+		public async Task<ReservationBookingResponse> DoReserveAsync(string bikeId, Uri operatorUri)
+		{
+			return await HttpsServer.DoReserveAsync(bikeId, operatorUri);
+		}
 
-        public async Task<ReservationCancelReturnResponse> DoCancelReservationAsync(string bikeId, Uri operatorUri)
-        {
-            return await HttpsServer.DoCancelReservationAsync(bikeId, operatorUri);
-        }
+		public async Task<ReservationCancelReturnResponse> DoCancelReservationAsync(string bikeId, Uri operatorUri)
+		{
+			return await HttpsServer.DoCancelReservationAsync(bikeId, operatorUri);
+		}
 
-        public async Task<ReservationBookingResponse> CalculateAuthKeysAsync(string bikeId, Uri operatorUri)
-        {
-            return await HttpsServer.CalculateAuthKeysAsync(bikeId, operatorUri);
-        }
+		public async Task<ReservationBookingResponse> CalculateAuthKeysAsync(string bikeId, Uri operatorUri)
+		{
+			return await HttpsServer.CalculateAuthKeysAsync(bikeId, operatorUri);
+		}
 
-        public async Task<ResponseBase> StartReturningBike(
-            string bikeId,
-            Uri operatorUri)
-                => await HttpsServer.StartReturningBike(bikeId, operatorUri);
+		public async Task<ResponseBase> StartReturningBike(
+			string bikeId,
+			Uri operatorUri)
+				=> await HttpsServer.StartReturningBike(bikeId, operatorUri);
 
-        public async Task<ReservationBookingResponse> UpdateLockingStateAsync(
-            string bikeId,
-            lock_state state,
-            Uri operatorUri,
-            LocationDto location,
-            double batteryLevel)
-                => await HttpsServer.UpdateLockingStateAsync(
-                    bikeId,
-                    state,
-                    operatorUri,
-                    location,
-                    batteryLevel);
+		public async Task<ReservationBookingResponse> UpdateLockingStateAsync(
+			string bikeId,
+			lock_state state,
+			Uri operatorUri,
+			LocationDto location,
+			double batteryLevel)
+				=> await HttpsServer.UpdateLockingStateAsync(
+					bikeId,
+					state,
+					operatorUri,
+					location,
+					batteryLevel);
 
-        /// <summary> Books a bike. </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <param name="guid">Used to publish GUID from app to copri. Used for initial setup of bike in copri.</param>
-        /// <param name="batteryPercentage">Holds the filling level percentage of the battery.</param>
-        /// <returns>Response on booking request.</returns>
-        public async Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
-            => await HttpsServer.DoBookAsync(bikeId, guid, batteryPercentage, operatorUri);
+		/// <summary> Books a bike. </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <param name="guid">Used to publish GUID from app to copri. Used for initial setup of bike in copri.</param>
+		/// <param name="batteryPercentage">Holds the filling level percentage of the battery.</param>
+		/// <returns>Response on booking request.</returns>
+		public async Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
+			=> await HttpsServer.DoBookAsync(bikeId, guid, batteryPercentage, operatorUri);
 
-        /// <summary> Books a bike and starts opening bike. </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on booking request.</returns>
-        public async Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(
-            string bikeId,
-            Uri operatorUri)
-            => await HttpsServer.BookAvailableAndStartOpeningAsync(bikeId, operatorUri);
+		/// <summary> Books a bike and starts opening bike. </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on booking request.</returns>
+		public async Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(
+			string bikeId,
+			Uri operatorUri)
+			=> await HttpsServer.BookAvailableAndStartOpeningAsync(bikeId, operatorUri);
 
-        /// <summary> Books a bike and starts opening bike. </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on booking request.</returns>
-        public async Task<ReservationBookingResponse> BookReservedAndStartOpeningAsync(
-            string bikeId,
-            Uri operatorUri)
-            => await HttpsServer.BookReservedAndStartOpeningAsync(bikeId, operatorUri);
+		/// <summary> Books a bike and starts opening bike. </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on booking request.</returns>
+		public async Task<ReservationBookingResponse> BookReservedAndStartOpeningAsync(
+			string bikeId,
+			Uri operatorUri)
+			=> await HttpsServer.BookReservedAndStartOpeningAsync(bikeId, operatorUri);
 
 
-        public async Task<DoReturnResponse> DoReturn(
-            string bikeId,
-            LocationDto location,
-            ISmartDevice smartDevice,
-            Uri operatorUri)
-            => await HttpsServer.DoReturn(bikeId, location, smartDevice, operatorUri);
+		public async Task<DoReturnResponse> DoReturn(
+			string bikeId,
+			LocationDto location,
+			ISmartDevice smartDevice,
+			Uri operatorUri)
+			=> await HttpsServer.DoReturn(bikeId, location, smartDevice, operatorUri);
 
-        /// <summary> Returns a bike and starts closing. </summary>
-        /// <param name="bikeId">Id of the bike to return.</param>
-        /// <param name="smartDevice">Provides info about hard and software.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on returning request.</returns>
-        public async Task<DoReturnResponse> ReturnAndStartClosingAsync(
-            string bikeId,
-            ISmartDevice smartDevice,
-            Uri operatorUri)
-            => await HttpsServer.ReturnAndStartClosingAsync(bikeId, smartDevice, operatorUri);
+		/// <summary> Returns a bike and starts closing. </summary>
+		/// <param name="bikeId">Id of the bike to return.</param>
+		/// <param name="smartDevice">Provides info about hard and software.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on returning request.</returns>
+		public async Task<DoReturnResponse> ReturnAndStartClosingAsync(
+			string bikeId,
+			ISmartDevice smartDevice,
+			Uri operatorUri)
+			=> await HttpsServer.ReturnAndStartClosingAsync(bikeId, smartDevice, operatorUri);
 
-        /// <summary>
-        /// Submits feedback to copri server.
-        /// </summary>
-        /// <param name="bikeId">Id of the bike to submit feedback for.</param>
-        /// <param name="message">General purpose message or error description.</param>
-        /// <param name="isBikeBroken">True if bike is broken.</param>
-        public async Task<SubmitFeedbackResponse> DoSubmitFeedback(string bikeId, int? currentChargeBars, string message, bool isBikeBroken, Uri opertorUri) =>
-             await HttpsServer.DoSubmitFeedback(bikeId, currentChargeBars, message, isBikeBroken, opertorUri);
+		/// <summary>
+		/// Submits feedback to copri server.
+		/// </summary>
+		/// <param name="bikeId">Id of the bike to submit feedback for.</param>
+		/// <param name="message">General purpose message or error description.</param>
+		/// <param name="isBikeBroken">True if bike is broken.</param>
+		public async Task<SubmitFeedbackResponse> DoSubmitFeedback(string bikeId, int? currentChargeBars, string message, bool isBikeBroken, Uri opertorUri) =>
+			 await HttpsServer.DoSubmitFeedback(bikeId, currentChargeBars, message, isBikeBroken, opertorUri);
 
-        /// <summary> Submits mini survey to copri server. </summary>
-        /// <param name="answers">Collection of answers.</param>
-        public async Task<ResponseBase> DoSubmitMiniSurvey(IDictionary<string, string> answers)
-            => await HttpsServer.DoSubmitMiniSurvey(answers);
+		/// <summary> Submits mini survey to copri server. </summary>
+		/// <param name="answers">Collection of answers.</param>
+		public async Task<ResponseBase> DoSubmitMiniSurvey(IDictionary<string, string> answers)
+			=> await HttpsServer.DoSubmitMiniSurvey(answers);
 
-    }
+	}
 }
\ No newline at end of file
diff --git a/TINKLib/Services/CopriApi/CopriProviderMonkeyStore.cs b/TINKLib/Services/CopriApi/CopriProviderMonkeyStore.cs
index 883952a..c7fee11 100644
--- a/TINKLib/Services/CopriApi/CopriProviderMonkeyStore.cs
+++ b/TINKLib/Services/CopriApi/CopriProviderMonkeyStore.cs
@@ -8,119 +8,119 @@ using TINK.Repository.Response;
 
 namespace TINK.Model.Services.CopriApi
 {
-    public class CopriProviderMonkeyStore : ICopriServer
-    {
-        /// <summary> Object which manages stored copri answers. </summary>
-        private readonly CopriCallsMonkeyStore monkeyStore;
+	public class CopriProviderMonkeyStore : ICopriServer
+	{
+		/// <summary> Object which manages stored copri answers. </summary>
+		private readonly CopriCallsMonkeyStore monkeyStore;
 
-        /// <summary> True if connector has access to copri server, false if cached values are used. </summary>
-        public bool IsConnected => monkeyStore.IsConnected;
+		/// <summary> True if connector has access to copri server, false if cached values are used. </summary>
+		public bool IsConnected => monkeyStore.IsConnected;
 
-        /// <summary> Gets the session cookie if user is logged in, an empty string otherwise. </summary>
-        public string SessionCookie => monkeyStore.SessionCookie;
+		/// <summary> Gets the session cookie if user is logged in, an empty string otherwise. </summary>
+		public string SessionCookie => monkeyStore.SessionCookie;
 
-        /// <summary> Constructs object which Object which manages stored copri answers in a thread save way. </summary>
-        /// <param name="merchantId">Id of the merchant TINK-App.</param>
-        /// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
-        public CopriProviderMonkeyStore(
-            string merchantId,
-            string uiIsoLangugageName,
-            string sessionCookie)
-        {
-            monkeyStore = new CopriCallsMonkeyStore(merchantId, uiIsoLangugageName, sessionCookie);
-        }
+		/// <summary> Constructs object which Object which manages stored copri answers in a thread save way. </summary>
+		/// <param name="merchantId">Id of the merchant TINK-App.</param>
+		/// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
+		public CopriProviderMonkeyStore(
+			string merchantId,
+			string uiIsoLangugageName,
+			string sessionCookie)
+		{
+			monkeyStore = new CopriCallsMonkeyStore(merchantId, uiIsoLangugageName, sessionCookie);
+		}
 
-        /// <summary> Gets the merchant id.</summary>
-        public string MerchantId => monkeyStore.MerchantId;
+		/// <summary> Gets the merchant id.</summary>
+		public string MerchantId => monkeyStore.MerchantId;
 
-        public Task<ReservationBookingResponse> DoReserveAsync(string bikeId, Uri operatorUri)
-            => throw new NotSupportedException($"{nameof(DoReserveAsync)} is not cachable.");
+		public Task<ReservationBookingResponse> DoReserveAsync(string bikeId, Uri operatorUri)
+			=> throw new NotSupportedException($"{nameof(DoReserveAsync)} is not cachable.");
 
-        public Task<ReservationCancelReturnResponse> DoCancelReservationAsync(string bikeId, Uri operatorUri)
-            => throw new NotSupportedException($"{nameof(DoCancelReservationAsync)} is not cachable.");
+		public Task<ReservationCancelReturnResponse> DoCancelReservationAsync(string bikeId, Uri operatorUri)
+			=> throw new NotSupportedException($"{nameof(DoCancelReservationAsync)} is not cachable.");
 
-        public Task<ReservationBookingResponse> CalculateAuthKeysAsync(string bikeId, Uri operatorUri)
-            => throw new NotSupportedException($"{nameof(CalculateAuthKeysAsync)} is not cachable.");
+		public Task<ReservationBookingResponse> CalculateAuthKeysAsync(string bikeId, Uri operatorUri)
+			=> throw new NotSupportedException($"{nameof(CalculateAuthKeysAsync)} is not cachable.");
 
-        public async Task<ResponseBase> StartReturningBike(
-            string bikeId,
-            Uri operatorUri)
-            => await monkeyStore.StartReturningBike(bikeId, operatorUri);
+		public async Task<ResponseBase> StartReturningBike(
+			string bikeId,
+			Uri operatorUri)
+			=> await monkeyStore.StartReturningBike(bikeId, operatorUri);
 
 
-        public async Task<ReservationBookingResponse> UpdateLockingStateAsync(
-            string bikeId,
-            lock_state state,
-            Uri operatorUri,
-            LocationDto geolocation,
-            double batteryLevel)
-            => await monkeyStore.UpdateLockingStateAsync(
-                bikeId,
-                state,
-                operatorUri,
-                geolocation,
-                batteryLevel);
+		public async Task<ReservationBookingResponse> UpdateLockingStateAsync(
+			string bikeId,
+			lock_state state,
+			Uri operatorUri,
+			LocationDto geolocation,
+			double batteryLevel)
+			=> await monkeyStore.UpdateLockingStateAsync(
+				bikeId,
+				state,
+				operatorUri,
+				geolocation,
+				batteryLevel);
 
-        public async Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
-        {
-            return await monkeyStore.DoBookAsync(bikeId, guid, batteryPercentage, operatorUri);
-        }
+		public async Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
+		{
+			return await monkeyStore.DoBookAsync(bikeId, guid, batteryPercentage, operatorUri);
+		}
 
-        public async Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(
-            string bikeId,
-            Uri operatorUri)
-            => await monkeyStore.BookAvailableAndStartOpeningAsync(bikeId, operatorUri);
+		public async Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(
+			string bikeId,
+			Uri operatorUri)
+			=> await monkeyStore.BookAvailableAndStartOpeningAsync(bikeId, operatorUri);
 
-        public async Task<ReservationBookingResponse> BookReservedAndStartOpeningAsync(
-            string bikeId,
-            Uri operatorUri)
-            => await monkeyStore.BookReservedAndStartOpeningAsync(bikeId, operatorUri);
+		public async Task<ReservationBookingResponse> BookReservedAndStartOpeningAsync(
+			string bikeId,
+			Uri operatorUri)
+			=> await monkeyStore.BookReservedAndStartOpeningAsync(bikeId, operatorUri);
 
-        public async Task<DoReturnResponse> DoReturn(
-            string bikeId,
-            LocationDto geolocation,
-            ISmartDevice smartDevice,
-            Uri operatorUri)
-            => await monkeyStore.DoReturn(bikeId, geolocation, smartDevice, operatorUri);
+		public async Task<DoReturnResponse> DoReturn(
+			string bikeId,
+			LocationDto geolocation,
+			ISmartDevice smartDevice,
+			Uri operatorUri)
+			=> await monkeyStore.DoReturn(bikeId, geolocation, smartDevice, operatorUri);
 
-        public async Task<DoReturnResponse> ReturnAndStartClosingAsync(
-            string bikeId,
-            ISmartDevice smartDevice,
-            Uri operatorUri)
-            => await monkeyStore.ReturnAndStartClosingAsync(bikeId, smartDevice, operatorUri);
+		public async Task<DoReturnResponse> ReturnAndStartClosingAsync(
+			string bikeId,
+			ISmartDevice smartDevice,
+			Uri operatorUri)
+			=> await monkeyStore.ReturnAndStartClosingAsync(bikeId, smartDevice, operatorUri);
 
-        public Task<SubmitFeedbackResponse> DoSubmitFeedback(string bikeId, int? currentChargeBars, string messge, bool bIsBikeBroke, Uri operatorUri)
-            => throw new NotImplementedException();
+		public Task<SubmitFeedbackResponse> DoSubmitFeedback(string bikeId, int? currentChargeBars, string messge, bool bIsBikeBroke, Uri operatorUri)
+			=> throw new NotImplementedException();
 
-        /// <summary> Submits mini survey to copri server. </summary>
-        /// <param name="answers">Collection of answers.</param>
-        public Task<ResponseBase> DoSubmitMiniSurvey(IDictionary<string, string> answers)
-            => throw new NotSupportedException();
+		/// <summary> Submits mini survey to copri server. </summary>
+		/// <param name="answers">Collection of answers.</param>
+		public Task<ResponseBase> DoSubmitMiniSurvey(IDictionary<string, string> answers)
+			=> throw new NotSupportedException();
 
 
-        public async Task<AuthorizationResponse> DoAuthorizationAsync(string p_strMailAddress, string p_strPassword, string p_strDeviceId)
-        {
-            return await monkeyStore.DoAuthorizationAsync(p_strMailAddress, p_strPassword, p_strDeviceId);
-        }
+		public async Task<AuthorizationResponse> DoAuthorizationAsync(string p_strMailAddress, string p_strPassword, string p_strDeviceId)
+		{
+			return await monkeyStore.DoAuthorizationAsync(p_strMailAddress, p_strPassword, p_strDeviceId);
+		}
 
-        public async Task<AuthorizationoutResponse> DoAuthoutAsync()
-        {
-            return await monkeyStore.DoAuthoutAsync();
-        }
+		public async Task<AuthorizationoutResponse> DoAuthoutAsync()
+		{
+			return await monkeyStore.DoAuthoutAsync();
+		}
 
-        public async Task<BikesAvailableResponse> GetBikesAvailableAsync()
-        {
-            return await monkeyStore.GetBikesAvailableAsync();
-        }
+		public async Task<BikesAvailableResponse> GetBikesAvailableAsync()
+		{
+			return await monkeyStore.GetBikesAvailableAsync();
+		}
 
-        public async Task<BikesReservedOccupiedResponse> GetBikesOccupiedAsync()
-        {
-            return await monkeyStore.GetBikesOccupiedAsync();
-        }
+		public async Task<BikesReservedOccupiedResponse> GetBikesOccupiedAsync()
+		{
+			return await monkeyStore.GetBikesOccupiedAsync();
+		}
 
-        public async Task<StationsAvailableResponse> GetStationsAsync()
-        {
-            return await monkeyStore.GetStationsAsync();
-        }
-    }
+		public async Task<StationsAvailableResponse> GetStationsAsync()
+		{
+			return await monkeyStore.GetStationsAsync();
+		}
+	}
 }
diff --git a/TINKLib/Services/CopriApi/Exception/BikeStillInStationException.cs b/TINKLib/Services/CopriApi/Exception/BikeStillInStationException.cs
index b945696..74ddd16 100644
--- a/TINKLib/Services/CopriApi/Exception/BikeStillInStationException.cs
+++ b/TINKLib/Services/CopriApi/Exception/BikeStillInStationException.cs
@@ -1,8 +1,8 @@
 
 namespace TINK.Services.CopriApi.Exception
 {
-    public class BikeStillInStationException : System.Exception
-    {
-        public BikeStillInStationException(string message) : base(message) { }
-    }
+	public class BikeStillInStationException : System.Exception
+	{
+		public BikeStillInStationException(string message) : base(message) { }
+	}
 }
diff --git a/TINKLib/Services/CopriApi/GeneralData.cs b/TINKLib/Services/CopriApi/GeneralData.cs
index 7eefafb..d6ed5ca 100644
--- a/TINKLib/Services/CopriApi/GeneralData.cs
+++ b/TINKLib/Services/CopriApi/GeneralData.cs
@@ -4,34 +4,34 @@ using TINK.Model.Map;
 
 namespace TINK.Services.CopriApi
 {
-    /// <summary> Holds general purpose data returned from COPRI. </summary>
-    public class GeneralData
-    {
-        /// <summary> Constructs an empty general data object. </summary>
-        public GeneralData() : this(null, null, null, null) { }
+	/// <summary> Holds general purpose data returned from COPRI. </summary>
+	public class GeneralData
+	{
+		/// <summary> Constructs an empty general data object. </summary>
+		public GeneralData() : this(null, null, null, null) { }
 
-        public GeneralData(
-            IMapSpan initialMapSpan,
-            string merachantMessage,
-            Version apiVersion,
-            ResourceUrls resourceUrls)
-        {
-            InitialMapSpan = initialMapSpan ?? MapSpanFactory.Create();
-            MerchantMessage = merachantMessage ?? string.Empty;
-            ApiVersion = apiVersion ?? new Version(0, 0);
-            ResourceUrls = resourceUrls ?? new ResourceUrls();
-        }
+		public GeneralData(
+			IMapSpan initialMapSpan,
+			string merachantMessage,
+			Version apiVersion,
+			ResourceUrls resourceUrls)
+		{
+			InitialMapSpan = initialMapSpan ?? MapSpanFactory.Create();
+			MerchantMessage = merachantMessage ?? string.Empty;
+			ApiVersion = apiVersion ?? new Version(0, 0);
+			ResourceUrls = resourceUrls ?? new ResourceUrls();
+		}
 
-        /// <summary> Initial map display area.</summary>
-        public IMapSpan InitialMapSpan { get; private set; }
+		/// <summary> Initial map display area.</summary>
+		public IMapSpan InitialMapSpan { get; private set; }
 
-        /// <summary> Message to be shown to user.</summary>
-        public string MerchantMessage { get; private set; }
+		/// <summary> Message to be shown to user.</summary>
+		public string MerchantMessage { get; private set; }
 
-        /// <summary> Version of COPRI api. 0.0 if version is not set</summary>
-        public Version ApiVersion { get; private set; }
+		/// <summary> Version of COPRI api. 0.0 if version is not set</summary>
+		public Version ApiVersion { get; private set; }
 
-        /// <summary> Resources (html pages) to be displayed provided by COPRI.</summary>
-        public IResourceUrls ResourceUrls { get; private set; }
-    }
+		/// <summary> Resources (html pages) to be displayed provided by COPRI.</summary>
+		public IResourceUrls ResourceUrls { get; private set; }
+	}
 }
diff --git a/TINKLib/Services/CopriApi/ICachedCopriServer.cs b/TINKLib/Services/CopriApi/ICachedCopriServer.cs
index f5cc843..8659714 100644
--- a/TINKLib/Services/CopriApi/ICachedCopriServer.cs
+++ b/TINKLib/Services/CopriApi/ICachedCopriServer.cs
@@ -5,32 +5,32 @@ using TINK.Repository.Response;
 
 namespace TINK.Model.Services.CopriApi
 {
-    /// <summary> Manages cache which holds copri data.</summary>
-    public interface ICachedCopriServer : ICopriServerBase
-    {
-        /// <summary> Get list of stations. </summary>
-        /// <returns>List of all stations.</returns>
-        Task<Result<StationsAvailableResponse>> GetStations(bool fromCache = false);
+	/// <summary> Manages cache which holds copri data.</summary>
+	public interface ICachedCopriServer : ICopriServerBase
+	{
+		/// <summary> Get list of stations. </summary>
+		/// <returns>List of all stations.</returns>
+		Task<Result<StationsAvailableResponse>> GetStations(bool fromCache = false);
 
-        /// <summary> Gets a list of bikes from Copri. </summary>
-        /// <returns>Response holding list of bikes.</returns>
-        Task<Result<BikesAvailableResponse>> GetBikesAvailable(bool fromCache = false);
+		/// <summary> Gets a list of bikes from Copri. </summary>
+		/// <returns>Response holding list of bikes.</returns>
+		Task<Result<BikesAvailableResponse>> GetBikesAvailable(bool fromCache = false);
 
-        /// <summary> Gets a list of bikes reserved/ booked by acctive user from Copri.</summary>
-        /// <returns>Response holding list of bikes.</returns>
-        Task<Result<BikesReservedOccupiedResponse>> GetBikesOccupied(bool fromCache = false);
+		/// <summary> Gets a list of bikes reserved/ booked by acctive user from Copri.</summary>
+		/// <returns>Response holding list of bikes.</returns>
+		Task<Result<BikesReservedOccupiedResponse>> GetBikesOccupied(bool fromCache = false);
 
-        /// <summary>Adds https--response to cache if response is ok. </summary>
-        /// <param name="response">Response to add to cache.</param>
-        void AddToCache(Result<StationsAvailableResponse> result);
+		/// <summary>Adds https--response to cache if response is ok. </summary>
+		/// <param name="response">Response to add to cache.</param>
+		void AddToCache(Result<StationsAvailableResponse> result);
 
-        /// <summary>Adds https--response to cache if response is ok. </summary>
-        /// <param name="response">Response to add to cache.</param>
-        void AddToCache(Result<BikesAvailableResponse> result);
+		/// <summary>Adds https--response to cache if response is ok. </summary>
+		/// <param name="response">Response to add to cache.</param>
+		void AddToCache(Result<BikesAvailableResponse> result);
 
-        /// <summary>Adds https--response to cache if response is ok. </summary>
-        /// <param name="response">Response to add to cache.</param>
-        /// <returns></returns>
-        void AddToCache(Result<BikesReservedOccupiedResponse> result);
-    }
+		/// <summary>Adds https--response to cache if response is ok. </summary>
+		/// <param name="response">Response to add to cache.</param>
+		/// <returns></returns>
+		void AddToCache(Result<BikesReservedOccupiedResponse> result);
+	}
 }
diff --git a/TINKLib/Services/CopriApi/ICopriCache.cs b/TINKLib/Services/CopriApi/ICopriCache.cs
index 8c3c0df..fcaa471 100644
--- a/TINKLib/Services/CopriApi/ICopriCache.cs
+++ b/TINKLib/Services/CopriApi/ICopriCache.cs
@@ -3,27 +3,27 @@ using TINK.Repository.Response;
 
 namespace TINK.Model.Services.CopriApi
 {
-    public interface ICopriCache : ICopriServer
-    {
-        /// <summary> Gets a value indicating whether stations are expired or not.</summary>
-        bool IsStationsExpired { get; }
+	public interface ICopriCache : ICopriServer
+	{
+		/// <summary> Gets a value indicating whether stations are expired or not.</summary>
+		bool IsStationsExpired { get; }
 
-        /// <summary> Adds a stations all response to cache.</summary>
-        /// <param name="stations">Stations to add.</param>
-        void AddToCache(StationsAvailableResponse stations);
+		/// <summary> Adds a stations all response to cache.</summary>
+		/// <param name="stations">Stations to add.</param>
+		void AddToCache(StationsAvailableResponse stations);
 
-        /// <summary> Gets a value indicating whether stations are expired or not.</summary>
-        bool IsBikesAvailableExpired { get; }
+		/// <summary> Gets a value indicating whether stations are expired or not.</summary>
+		bool IsBikesAvailableExpired { get; }
 
-        /// <summary> Adds a bikes response to cache.</summary>
-        /// <param name="bikes">Bikes to add.</param>
-        void AddToCache(BikesAvailableResponse bikes);
+		/// <summary> Adds a bikes response to cache.</summary>
+		/// <param name="bikes">Bikes to add.</param>
+		void AddToCache(BikesAvailableResponse bikes);
 
-        /// <summary> Gets a value indicating whether stations are expired or not.</summary>
-        bool IsBikesOccupiedExpired { get; }
+		/// <summary> Gets a value indicating whether stations are expired or not.</summary>
+		bool IsBikesOccupiedExpired { get; }
 
-        /// <summary> Adds a bikes response to cache.</summary>
-        /// <param name="bikes">Bikes to add.</param>
-        void AddToCache(BikesReservedOccupiedResponse bikes);
-    }
+		/// <summary> Adds a bikes response to cache.</summary>
+		/// <param name="bikes">Bikes to add.</param>
+		void AddToCache(BikesReservedOccupiedResponse bikes);
+	}
 }
diff --git a/TINKLib/Services/CopriApi/Polling.cs b/TINKLib/Services/CopriApi/Polling.cs
index f3410ae..73c4f1c 100644
--- a/TINKLib/Services/CopriApi/Polling.cs
+++ b/TINKLib/Services/CopriApi/Polling.cs
@@ -15,230 +15,230 @@ using TINK.Services.CopriApi.Exception;
 
 namespace TINK.Services.CopriApi
 {
-    public static class Polling
-    {
-        /// <summary> Timeout for open/ close operations.</summary>
-        private const int OPEN_CLOSE_TIMEOUT_MS = 50000;
+	public static class Polling
+	{
+		/// <summary> Timeout for open/ close operations.</summary>
+		private const int OPEN_CLOSE_TIMEOUT_MS = 50000;
 
-        /// <summary> Opens lock.</summary>
-        /// <param name="corpiServer"> Instance to communicate with backend.</param>
-        /// <param name="bike">Bike object holding id of bike to open. Lock state of object is updated after open request.</param>
-        public static async Task OpenAync(
-            this ICopriServerBase corpiServer,
-            IBikeInfoMutable bike)
-        {
-            if (!(corpiServer is ICachedCopriServer cachedServer))
-                throw new ArgumentNullException(nameof(corpiServer));
+		/// <summary> Opens lock.</summary>
+		/// <param name="corpiServer"> Instance to communicate with backend.</param>
+		/// <param name="bike">Bike object holding id of bike to open. Lock state of object is updated after open request.</param>
+		public static async Task OpenAync(
+			this ICopriServerBase corpiServer,
+			IBikeInfoMutable bike)
+		{
+			if (!(corpiServer is ICachedCopriServer cachedServer))
+				throw new ArgumentNullException(nameof(corpiServer));
 
-            // Send command to close lock
-            await corpiServer.UpdateLockingStateAsync(
-                bike.Id,
-                Repository.Request.lock_state.unlocking,
-                bike.OperatorUri);
+			// Send command to close lock
+			await corpiServer.UpdateLockingStateAsync(
+				bike.Id,
+				Repository.Request.lock_state.unlocking,
+				bike.OperatorUri);
 
-            var lockingState = await cachedServer.GetLockStateAsync(bike.Id);
+			var lockingState = await cachedServer.GetLockStateAsync(bike.Id);
 
-            var watch = new Stopwatch();
-            watch.Start();
+			var watch = new Stopwatch();
+			watch.Start();
 
-            while (lockingState != LockingState.Open
-                && lockingState != LockingState.UnknownDisconnected
-                && watch.Elapsed < TimeSpan.FromMilliseconds(OPEN_CLOSE_TIMEOUT_MS))
-            {
-                // Delay a litte to reduce load on backend.
-                await Task.Delay(3000);
+			while (lockingState != LockingState.Open
+				&& lockingState != LockingState.UnknownDisconnected
+				&& watch.Elapsed < TimeSpan.FromMilliseconds(OPEN_CLOSE_TIMEOUT_MS))
+			{
+				// Delay a litte to reduce load on backend.
+				await Task.Delay(3000);
 
-                lockingState = await cachedServer.GetLockStateAsync(bike.Id);
-                Log.Information($"Current lock state is {lockingState}.");
-            }
+				lockingState = await cachedServer.GetLockStateAsync(bike.Id);
+				Log.Information($"Current lock state is {lockingState}.");
+			}
 
-            // Update locking state.
-            bike.LockInfo.State = lockingState;
-        }
+			// Update locking state.
+			bike.LockInfo.State = lockingState;
+		}
 
 
-        /// <summary>
-        /// Books a bike and opens the lock.
-        /// </summary>
-        /// <param name="corpiServer"> Instance to communicate with backend.</param>
-        /// <param name="bike">Bike to book and open.</param>
-        /// <param name="mailAddress">Mail address of user which books bike.</param>
-        public static async Task BookAndOpenAync(
-            this ICopriServerBase corpiServer,
-            IBikeInfoMutable bike,
-            string mailAddress)
-        {
-            if (bike == null)
-            {
-                throw new ArgumentNullException(nameof(bike), "Can not book bike and open lock. No bike object available.");
-            }
+		/// <summary>
+		/// Books a bike and opens the lock.
+		/// </summary>
+		/// <param name="corpiServer"> Instance to communicate with backend.</param>
+		/// <param name="bike">Bike to book and open.</param>
+		/// <param name="mailAddress">Mail address of user which books bike.</param>
+		public static async Task BookAndOpenAync(
+			this ICopriServerBase corpiServer,
+			IBikeInfoMutable bike,
+			string mailAddress)
+		{
+			if (bike == null)
+			{
+				throw new ArgumentNullException(nameof(bike), "Can not book bike and open lock. No bike object available.");
+			}
 
-            if (!(corpiServer is ICachedCopriServer cachedServer))
-                throw new ArgumentNullException(nameof(corpiServer));
+			if (!(corpiServer is ICachedCopriServer cachedServer))
+				throw new ArgumentNullException(nameof(corpiServer));
 
-            // Send command to open lock
-            var response = bike.State.Value == Model.State.InUseStateEnum.Disposable
-                ? (await corpiServer.BookAvailableAndStartOpeningAsync(bike.Id, bike.OperatorUri)).GetIsBookingResponseOk(bike.Id)
-                : (await corpiServer.BookReservedAndStartOpeningAsync(bike.Id, bike.OperatorUri)).GetIsBookingResponseOk(bike.Id);
+			// Send command to open lock
+			var response = bike.State.Value == Model.State.InUseStateEnum.Disposable
+				? (await corpiServer.BookAvailableAndStartOpeningAsync(bike.Id, bike.OperatorUri)).GetIsBookingResponseOk(bike.Id)
+				: (await corpiServer.BookReservedAndStartOpeningAsync(bike.Id, bike.OperatorUri)).GetIsBookingResponseOk(bike.Id);
 
-            // Upated locking state.
-            var lockingState = await cachedServer.GetOccupiedBikeLockStateAsync(bike.Id);
+			// Upated locking state.
+			var lockingState = await cachedServer.GetOccupiedBikeLockStateAsync(bike.Id);
 
-            var watch = new Stopwatch();
-            watch.Start();
+			var watch = new Stopwatch();
+			watch.Start();
 
-            while (lockingState.HasValue /* if null bike is no more occupied*/ &&
-                lockingState.Value != LockingState.Open
-                && watch.Elapsed < TimeSpan.FromMilliseconds(OPEN_CLOSE_TIMEOUT_MS))
-            {
-                // Delay a litte to reduce load on backend.
-                await Task.Delay(3000);
+			while (lockingState.HasValue /* if null bike is no more occupied*/ &&
+				lockingState.Value != LockingState.Open
+				&& watch.Elapsed < TimeSpan.FromMilliseconds(OPEN_CLOSE_TIMEOUT_MS))
+			{
+				// Delay a litte to reduce load on backend.
+				await Task.Delay(3000);
 
-                lockingState = await cachedServer.GetOccupiedBikeLockStateAsync(bike.Id);
-                Log.Debug($"Current lock state of bike {bike.Id} is {(lockingState.HasValue ? lockingState.Value.ToString() : "-")}.");
-            }
+				lockingState = await cachedServer.GetOccupiedBikeLockStateAsync(bike.Id);
+				Log.Debug($"Current lock state of bike {bike.Id} is {(lockingState.HasValue ? lockingState.Value.ToString() : "-")}.");
+			}
 
-            // Check if bike is still occupied.
-            if (lockingState == null)
-            {
-                // User did not take bike out of the station
-                throw new BikeStillInStationException("Booking was cancelled because bike is still in station.");
-            }
+			// Check if bike is still occupied.
+			if (lockingState == null)
+			{
+				// User did not take bike out of the station
+				throw new BikeStillInStationException("Booking was cancelled because bike is still in station.");
+			}
 
-            // Upate booking state.
-            bike.Load(
-                response,
-                mailAddress,
-                Model.Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.None);
+			// Upate booking state.
+			bike.Load(
+				response,
+				mailAddress,
+				Model.Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.None);
 
-            // Update locking state.
-            bike.LockInfo.State = lockingState.Value;
-        }
+			// Update locking state.
+			bike.LockInfo.State = lockingState.Value;
+		}
 
-        /// <summary>
-        /// Returns a bike and closes the lock.
-        /// </summary>
-        /// <param name="corpiServer"> Instance to communicate with backend.</param>
-        /// <param name="bike">Bike to close.</param>
-        public static async Task CloseAync(
-            this ICopriServerBase corpiServer,
-            IBikeInfoMutable bike)
-        {
-            if (!(corpiServer is ICachedCopriServer cachedServer))
-                throw new ArgumentNullException(nameof(corpiServer));
+		/// <summary>
+		/// Returns a bike and closes the lock.
+		/// </summary>
+		/// <param name="corpiServer"> Instance to communicate with backend.</param>
+		/// <param name="bike">Bike to close.</param>
+		public static async Task CloseAync(
+			this ICopriServerBase corpiServer,
+			IBikeInfoMutable bike)
+		{
+			if (!(corpiServer is ICachedCopriServer cachedServer))
+				throw new ArgumentNullException(nameof(corpiServer));
 
-            // Send command to close lock
-            await corpiServer.UpdateLockingStateAsync(
-                bike.Id,
-                Repository.Request.lock_state.locking,
-                bike.OperatorUri);
+			// Send command to close lock
+			await corpiServer.UpdateLockingStateAsync(
+				bike.Id,
+				Repository.Request.lock_state.locking,
+				bike.OperatorUri);
 
-            var lockingState = await cachedServer.GetLockStateAsync(bike.Id);
+			var lockingState = await cachedServer.GetLockStateAsync(bike.Id);
 
-            var watch = new Stopwatch();
-            watch.Start();
+			var watch = new Stopwatch();
+			watch.Start();
 
-            while (lockingState != LockingState.Closed
-                && lockingState != LockingState.UnknownDisconnected
-                && watch.Elapsed < TimeSpan.FromMilliseconds(OPEN_CLOSE_TIMEOUT_MS))
-            {
-                // Delay a litte to reduce load on backend.
-                await Task.Delay(3000);
+			while (lockingState != LockingState.Closed
+				&& lockingState != LockingState.UnknownDisconnected
+				&& watch.Elapsed < TimeSpan.FromMilliseconds(OPEN_CLOSE_TIMEOUT_MS))
+			{
+				// Delay a litte to reduce load on backend.
+				await Task.Delay(3000);
 
-                lockingState = await cachedServer.GetLockStateAsync(bike.Id);
-                Log.Information($"Current lock state is {lockingState}.");
-            }
+				lockingState = await cachedServer.GetLockStateAsync(bike.Id);
+				Log.Information($"Current lock state is {lockingState}.");
+			}
 
-            // Update locking state.
-            bike.LockInfo.State = lockingState;
-        }
+			// Update locking state.
+			bike.LockInfo.State = lockingState;
+		}
 
-        /// <summary>
-        /// Returns a bike and closes the lock.
-        /// </summary>
-        /// <param name="corpiServer"> Instance to communicate with backend.</param>
-        /// <param name="smartDevice">Smart device on which app runs on.</param>
-        /// <param name="mailAddress">Mail address of user which books bike.</param>
-        public static async Task<BookingFinishedModel> ReturnAndCloseAync(
-            this ICopriServerBase corpiServer,
-            ISmartDevice smartDevice,
-            IBikeInfoMutable bike)
-        {
-            if (!(corpiServer is ICachedCopriServer cachedServer))
-                throw new ArgumentNullException(nameof(corpiServer));
+		/// <summary>
+		/// Returns a bike and closes the lock.
+		/// </summary>
+		/// <param name="corpiServer"> Instance to communicate with backend.</param>
+		/// <param name="smartDevice">Smart device on which app runs on.</param>
+		/// <param name="mailAddress">Mail address of user which books bike.</param>
+		public static async Task<BookingFinishedModel> ReturnAndCloseAync(
+			this ICopriServerBase corpiServer,
+			ISmartDevice smartDevice,
+			IBikeInfoMutable bike)
+		{
+			if (!(corpiServer is ICachedCopriServer cachedServer))
+				throw new ArgumentNullException(nameof(corpiServer));
 
-            // Send command to open lock
-            DoReturnResponse response =
-                await corpiServer.ReturnAndStartClosingAsync(bike.Id, smartDevice, bike.OperatorUri);
+			// Send command to open lock
+			DoReturnResponse response =
+				await corpiServer.ReturnAndStartClosingAsync(bike.Id, smartDevice, bike.OperatorUri);
 
-            // Upate booking state
-            bike.Load(Model.Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.None);
+			// Upate booking state
+			bike.Load(Model.Bikes.BikeInfoNS.BC.NotifyPropertyChangedLevel.None);
 
-            var lockingState = await cachedServer.GetLockStateAsync(bike.Id);
+			var lockingState = await cachedServer.GetLockStateAsync(bike.Id);
 
-            var watch = new Stopwatch();
-            watch.Start();
+			var watch = new Stopwatch();
+			watch.Start();
 
-            while (lockingState != LockingState.Closed
-                && lockingState != LockingState.UnknownDisconnected
-                && watch.Elapsed < TimeSpan.FromMilliseconds(OPEN_CLOSE_TIMEOUT_MS))
-            {
-                // Delay a litte to reduce load on backend.
-                await Task.Delay(3000);
+			while (lockingState != LockingState.Closed
+				&& lockingState != LockingState.UnknownDisconnected
+				&& watch.Elapsed < TimeSpan.FromMilliseconds(OPEN_CLOSE_TIMEOUT_MS))
+			{
+				// Delay a litte to reduce load on backend.
+				await Task.Delay(3000);
 
-                lockingState = await cachedServer.GetLockStateAsync(bike.Id);
-                Log.Information($"Current lock state is {lockingState}.");
-            }
+				lockingState = await cachedServer.GetLockStateAsync(bike.Id);
+				Log.Information($"Current lock state is {lockingState}.");
+			}
 
-            // Update locking state.
-            bike.LockInfo.State = lockingState;
+			// Update locking state.
+			bike.LockInfo.State = lockingState;
 
-            return response?.Create() ?? new BookingFinishedModel();
-        }
+			return response?.Create() ?? new BookingFinishedModel();
+		}
 
-        /// <summary>
-        /// Queries the locking state from copri.
-        /// </summary>
-        /// <param name="corpiServer">Service to use.</param>
-        /// <param name="bikeId">Bike id to query lock state for.</param>
-        /// <returns>Locking state</returns>
-        private static async Task<LockingState> GetLockStateAsync(
-            this ICachedCopriServer corpiServer,
-            string bikeId)
-        {
-            // Querry reserved or booked bikes first for performance reasons.
-            var bikeReservedOrBooked = (await corpiServer.GetBikesOccupied(false))?.Response.bikes_occupied?.Values?.FirstOrDefault(x => x.bike == bikeId);
-            if (bikeReservedOrBooked != null)
-            {
-                return bikeReservedOrBooked.GetCopriLockingState();
-            }
+		/// <summary>
+		/// Queries the locking state from copri.
+		/// </summary>
+		/// <param name="corpiServer">Service to use.</param>
+		/// <param name="bikeId">Bike id to query lock state for.</param>
+		/// <returns>Locking state</returns>
+		private static async Task<LockingState> GetLockStateAsync(
+			this ICachedCopriServer corpiServer,
+			string bikeId)
+		{
+			// Querry reserved or booked bikes first for performance reasons.
+			var bikeReservedOrBooked = (await corpiServer.GetBikesOccupied(false))?.Response.bikes_occupied?.Values?.FirstOrDefault(x => x.bike == bikeId);
+			if (bikeReservedOrBooked != null)
+			{
+				return bikeReservedOrBooked.GetCopriLockingState();
+			}
 
-            var bikeAvailable = (await corpiServer.GetBikesAvailable(false))?.Response.bikes?.Values?.FirstOrDefault(x => x.bike == bikeId);
-            if (bikeAvailable != null)
-            {
-                return bikeAvailable.GetCopriLockingState();
-            }
+			var bikeAvailable = (await corpiServer.GetBikesAvailable(false))?.Response.bikes?.Values?.FirstOrDefault(x => x.bike == bikeId);
+			if (bikeAvailable != null)
+			{
+				return bikeAvailable.GetCopriLockingState();
+			}
 
-            return LockingState.UnknownDisconnected;
-        }
+			return LockingState.UnknownDisconnected;
+		}
 
-        /// <summary>
-        /// Queries the locking state of a occupied bike from copri.
-        /// </summary>
-        /// <param name="corpiServer">Service to use.</param>
-        /// <param name="bikeId">Bike id to query lock state for.</param>
-        /// <returns>Locking state if bike is still occupied, null otherwise.</returns>
-        private static async Task<LockingState?> GetOccupiedBikeLockStateAsync(
-            this ICachedCopriServer corpiServer,
-            string bikeId)
-        {
-            var bikeReservedOrBooked = (await corpiServer.GetBikesOccupied(false))?.Response.bikes_occupied?.Values?.FirstOrDefault(x => x.bike == bikeId);
-            if (bikeReservedOrBooked != null)
-            {
-                return bikeReservedOrBooked.GetCopriLockingState();
-            }
+		/// <summary>
+		/// Queries the locking state of a occupied bike from copri.
+		/// </summary>
+		/// <param name="corpiServer">Service to use.</param>
+		/// <param name="bikeId">Bike id to query lock state for.</param>
+		/// <returns>Locking state if bike is still occupied, null otherwise.</returns>
+		private static async Task<LockingState?> GetOccupiedBikeLockStateAsync(
+			this ICachedCopriServer corpiServer,
+			string bikeId)
+		{
+			var bikeReservedOrBooked = (await corpiServer.GetBikesOccupied(false))?.Response.bikes_occupied?.Values?.FirstOrDefault(x => x.bike == bikeId);
+			if (bikeReservedOrBooked != null)
+			{
+				return bikeReservedOrBooked.GetCopriLockingState();
+			}
 
-            return null;
-        }
-    }
+			return null;
+		}
+	}
 }
diff --git a/TINKLib/Services/CopriApi/Result.cs b/TINKLib/Services/CopriApi/Result.cs
index 17840f4..dd53699 100644
--- a/TINKLib/Services/CopriApi/Result.cs
+++ b/TINKLib/Services/CopriApi/Result.cs
@@ -3,36 +3,36 @@ using TINK.Services.CopriApi;
 
 namespace TINK.Model.Services.CopriApi
 {
-    public class Result<T> where T : class
-    {
-        /// <summary>
-        /// Constructs a result object.
-        /// </summary>
-        /// <param name="source">Type of source (data provider).</param>
-        /// <param name="response">Requested data (bikes, station).</param>
-        /// <param name="generalData">General data (common to all respones).</param>
-        public Result(
-            Type source,
-            T response,
-            GeneralData generalData,
-            Exception exception = null)
-        {
-            Source = source ?? throw new ArgumentException(nameof(source));
-            Response = response ?? throw new ArgumentException(nameof(response));
-            GeneralData = generalData ?? new GeneralData();
-            Exception = exception;
-        }
+	public class Result<T> where T : class
+	{
+		/// <summary>
+		/// Constructs a result object.
+		/// </summary>
+		/// <param name="source">Type of source (data provider).</param>
+		/// <param name="response">Requested data (bikes, station).</param>
+		/// <param name="generalData">General data (common to all respones).</param>
+		public Result(
+			Type source,
+			T response,
+			GeneralData generalData,
+			Exception exception = null)
+		{
+			Source = source ?? throw new ArgumentException(nameof(source));
+			Response = response ?? throw new ArgumentException(nameof(response));
+			GeneralData = generalData ?? new GeneralData();
+			Exception = exception;
+		}
 
-        /// <summary> Holds the requested data (bikes, stations and bikes).</summary>
-        public T Response { get; }
+		/// <summary> Holds the requested data (bikes, stations and bikes).</summary>
+		public T Response { get; }
 
-        /// <summary> Holds the general purpose data (common to all responses).</summary>
-        public GeneralData GeneralData { get; }
+		/// <summary> Holds the general purpose data (common to all responses).</summary>
+		public GeneralData GeneralData { get; }
 
-        /// <summary> Specifies the source (type of provider) of the copri response.</summary>
-        public Type Source { get; }
+		/// <summary> Specifies the source (type of provider) of the copri response.</summary>
+		public Type Source { get; }
 
-        /// <summary> Holds the exception if a communication error occurred.</summary>
-        public Exception Exception { get; private set; }
-    }
+		/// <summary> Holds the exception if a communication error occurred.</summary>
+		public Exception Exception { get; private set; }
+	}
 }
diff --git a/TINKLib/Services/CopriApi/ServerUris/CopriHelper.cs b/TINKLib/Services/CopriApi/ServerUris/CopriHelper.cs
index 956df11..2a60dca 100644
--- a/TINKLib/Services/CopriApi/ServerUris/CopriHelper.cs
+++ b/TINKLib/Services/CopriApi/ServerUris/CopriHelper.cs
@@ -3,15 +3,15 @@ using TINK.Model.Services.CopriApi.ServerUris;
 
 namespace TINK.Services.CopriApi.ServerUris
 {
-    public static class CopriHelper
-    {
-        public const string SHAREE_SILTEFOLDERNAME = "site";
+	public static class CopriHelper
+	{
+		public const string SHAREE_SILTEFOLDERNAME = "site";
 
-        /// <summary> Gets a value indicating whether a host is copri or not. </summary>
-        /// <param name="hostName">Host name.</param>
-        /// <returns>True if server is copri, fals if not.</returns>
-        public static bool GetIsCopri(this string hostName)
-            => new Uri(CopriServerUriList.TINK_DEVEL).Host == hostName
-                    || new Uri(CopriServerUriList.TINK_LIVE).Host == hostName;
-    }
+		/// <summary> Gets a value indicating whether a host is copri or not. </summary>
+		/// <param name="hostName">Host name.</param>
+		/// <returns>True if server is copri, fals if not.</returns>
+		public static bool GetIsCopri(this string hostName)
+			=> new Uri(CopriServerUriList.TINK_DEVEL).Host == hostName
+					|| new Uri(CopriServerUriList.TINK_LIVE).Host == hostName;
+	}
 }
diff --git a/TINKLib/Services/CopriApi/ServerUris/CopriServerUriList.cs b/TINKLib/Services/CopriApi/ServerUris/CopriServerUriList.cs
index 889334b..bc6f454 100644
--- a/TINKLib/Services/CopriApi/ServerUris/CopriServerUriList.cs
+++ b/TINKLib/Services/CopriApi/ServerUris/CopriServerUriList.cs
@@ -5,88 +5,88 @@ using Newtonsoft.Json;
 
 namespace TINK.Model.Services.CopriApi.ServerUris
 {
-    [JsonObject(MemberSerialization.OptIn)]
-    sealed public class CopriServerUriList
-    {
-        /// <summary>
-        /// Holds the rest resource root name.
-        /// </summary>
-        public const string REST_RESOURCE_ROOT = "APIjsonserver";
+	[JsonObject(MemberSerialization.OptIn)]
+	sealed public class CopriServerUriList
+	{
+		/// <summary>
+		/// Holds the rest resource root name.
+		/// </summary>
+		public const string REST_RESOURCE_ROOT = "APIjsonserver";
 
-        /// <summary> Holds the URL of the TINK/Konrad test server.</summary>
-        public const string TINK_DEVEL = @"https://tinkwwp.copri-bike.de/APIjsonserver";
+		/// <summary> Holds the URL of the TINK/Konrad test server.</summary>
+		public const string TINK_DEVEL = @"https://tinkwwp.copri-bike.de/APIjsonserver";
 
-        /// <summary> Holds the URL the TINK/Konrad productive server.</summary>
-        public const string TINK_LIVE = @"https://app.tink-konstanz.de/APIjsonserver";
+		/// <summary> Holds the URL the TINK/Konrad productive server.</summary>
+		public const string TINK_LIVE = @"https://app.tink-konstanz.de/APIjsonserver";
 
-        /// <summary> Holds the URL the Sharee server.</summary>
-        public const string SHAREE_DEVEL = @"https://shareeapp-primary.copri-bike.de/APIjsonserver";
+		/// <summary> Holds the URL the Sharee server.</summary>
+		public const string SHAREE_DEVEL = @"https://shareeapp-primary.copri-bike.de/APIjsonserver";
 
-        /// <summary> Holds the URL the Sharee server.</summary>
-        public const string SHAREE_LIVE = @"https://shareeapp-primary.copri.eu/APIjsonserver";
+		/// <summary> Holds the URL the Sharee server.</summary>
+		public const string SHAREE_LIVE = @"https://shareeapp-primary.copri.eu/APIjsonserver";
 
-        /// <summary>Constructs default uri list.</summary>
-        public CopriServerUriList(Uri activeUri = null) : this(
-            new List<Uri>
-                {
-                    new Uri(SHAREE_LIVE),
-                    new Uri(TINK_LIVE),
-                    new Uri(SHAREE_DEVEL),
-                    new Uri(TINK_DEVEL)
-                }.ToArray(),
-            activeUri ?? new Uri(SHAREE_LIVE)) // Default URi which is used after install of app
-        {
-        }
+		/// <summary>Constructs default uri list.</summary>
+		public CopriServerUriList(Uri activeUri = null) : this(
+			new List<Uri>
+				{
+					new Uri(SHAREE_LIVE),
+					new Uri(TINK_LIVE),
+					new Uri(SHAREE_DEVEL),
+					new Uri(TINK_DEVEL)
+				}.ToArray(),
+			activeUri ?? new Uri(SHAREE_LIVE)) // Default URi which is used after install of app
+		{
+		}
 
-        /// <summary> Constructs uris object. </summary>
-        /// <param name="p_oSource">Object to copy from.</param>
-        public CopriServerUriList(CopriServerUriList p_oSource) : this(
-            p_oSource.Uris.ToArray(),
-            p_oSource.ActiveUri)
-        {
-        }
+		/// <summary> Constructs uris object. </summary>
+		/// <param name="p_oSource">Object to copy from.</param>
+		public CopriServerUriList(CopriServerUriList p_oSource) : this(
+			p_oSource.Uris.ToArray(),
+			p_oSource.ActiveUri)
+		{
+		}
 
-        /// <summary> Constructs a valid uris object. </summary>
-        /// <param name="uris">Known uris.</param>
-        /// <param name="p_oActiveUri">Zero based index of active uri.</param>
-        /// <param name="p_oDevelUri">Uri of the development server.</param>
-        public CopriServerUriList(
-            Uri[] uris,
-            Uri p_oActiveUri)
-        {
-            if (uris == null || uris.Length < 1)
-            {
-                throw new ArgumentException($"Can not construct {typeof(CopriServerUriList)}- object. Array of uris must not be null and contain at least one element.");
-            }
+		/// <summary> Constructs a valid uris object. </summary>
+		/// <param name="uris">Known uris.</param>
+		/// <param name="p_oActiveUri">Zero based index of active uri.</param>
+		/// <param name="p_oDevelUri">Uri of the development server.</param>
+		public CopriServerUriList(
+			Uri[] uris,
+			Uri p_oActiveUri)
+		{
+			if (uris == null || uris.Length < 1)
+			{
+				throw new ArgumentException($"Can not construct {typeof(CopriServerUriList)}- object. Array of uris must not be null and contain at least one element.");
+			}
 
-            if (!uris.Contains(p_oActiveUri))
-            {
-                throw new ArgumentException($"Active uri {p_oActiveUri} not contained in ({string.Join("; ", uris.Select(x => x.AbsoluteUri))}).");
-            }
+			if (!uris.Contains(p_oActiveUri))
+			{
+				throw new ArgumentException($"Active uri {p_oActiveUri} not contained in ({string.Join("; ", uris.Select(x => x.AbsoluteUri))}).");
+			}
 
-            Uris = new List<Uri>(uris);
-            ActiveUri = p_oActiveUri;
-        }
+			Uris = new List<Uri>(uris);
+			ActiveUri = p_oActiveUri;
+		}
 
-        /// <summary> Gets the active uri. </summary>
-        [JsonProperty]
-        public Uri ActiveUri { get; }
+		/// <summary> Gets the active uri. </summary>
+		[JsonProperty]
+		public Uri ActiveUri { get; }
 
-        /// <summary> Gets the active uri. </summary>
+		/// <summary> Gets the active uri. </summary>
 #if USCSHARP9
         public static Uri DevelopUri => new (TINK_DEVEL);
 #else
-        public static Uri DevelopUri => new Uri(TINK_DEVEL);
+		public static Uri DevelopUri => new Uri(TINK_DEVEL);
 #endif
 
-        /// <summary> Gets the known uris. </summary>
-        [JsonProperty]
-        public IList<Uri> Uris { get; }
+		/// <summary> Gets the known uris. </summary>
+		[JsonProperty]
+		public IList<Uri> Uris { get; }
 
-        /// <summary> Gets the default uri which is active after first installation. </summary>
-        public static Uri DefaultActiveUri
-        {
-            get { return new CopriServerUriList().ActiveUri; }
-        }
-    }
+		/// <summary> Gets the default uri which is active after first installation. </summary>
+		public static Uri DefaultActiveUri
+		{
+			get { return new CopriServerUriList().ActiveUri; }
+		}
+	}
 }
diff --git a/TINKLib/Services/CopriApi/StationsAndBikesContainer.cs b/TINKLib/Services/CopriApi/StationsAndBikesContainer.cs
index 398884b..0a9bf8f 100644
--- a/TINKLib/Services/CopriApi/StationsAndBikesContainer.cs
+++ b/TINKLib/Services/CopriApi/StationsAndBikesContainer.cs
@@ -3,15 +3,15 @@ using TINK.Model.Station;
 
 namespace TINK.Model.Services.CopriApi
 {
-    public class StationsAndBikesContainer
-    {
-        public StationsAndBikesContainer(StationDictionary stations, BikeCollection bikes)
-        {
-            StationsAll = stations;
-            Bikes = bikes;
-        }
-        public StationDictionary StationsAll { get; }
+	public class StationsAndBikesContainer
+	{
+		public StationsAndBikesContainer(StationDictionary stations, BikeCollection bikes)
+		{
+			StationsAll = stations;
+			Bikes = bikes;
+		}
+		public StationDictionary StationsAll { get; }
 
-        public BikeCollection Bikes { get; }
-    }
+		public BikeCollection Bikes { get; }
+	}
 }
diff --git a/TINKLib/Services/Geolocation/GeolocationAccuracyBestService.cs b/TINKLib/Services/Geolocation/GeolocationAccuracyBestService.cs
index 6b62efc..72a0e67 100644
--- a/TINKLib/Services/Geolocation/GeolocationAccuracyBestService.cs
+++ b/TINKLib/Services/Geolocation/GeolocationAccuracyBestService.cs
@@ -3,11 +3,11 @@ using Xamarin.Essentials;
 
 namespace TINK.Services.Geolocation
 {
-    public class GeolocationAccuracyBestService : GeolocationService
-    {
-        public GeolocationAccuracyBestService(IGeolodationDependent dependent) : base(
-            dependent, GeolocationAccuracy.Best)
-        {
-        }
-    }
+	public class GeolocationAccuracyBestService : GeolocationService
+	{
+		public GeolocationAccuracyBestService(IGeolodationDependent dependent) : base(
+			dependent, GeolocationAccuracy.Best)
+		{
+		}
+	}
 }
diff --git a/TINKLib/Services/Geolocation/GeolocationAccuracyHighService.cs b/TINKLib/Services/Geolocation/GeolocationAccuracyHighService.cs
index b4fd6ce..4fa735a 100644
--- a/TINKLib/Services/Geolocation/GeolocationAccuracyHighService.cs
+++ b/TINKLib/Services/Geolocation/GeolocationAccuracyHighService.cs
@@ -3,11 +3,11 @@ using Xamarin.Essentials;
 
 namespace TINK.Services.Geolocation
 {
-    public class GeolocationAccuracyHighService : GeolocationService
-    {
-        public GeolocationAccuracyHighService(IGeolodationDependent dependent) : base(
-            dependent, GeolocationAccuracy.High)
-        {
-        }
-    }
+	public class GeolocationAccuracyHighService : GeolocationService
+	{
+		public GeolocationAccuracyHighService(IGeolodationDependent dependent) : base(
+			dependent, GeolocationAccuracy.High)
+		{
+		}
+	}
 }
diff --git a/TINKLib/Services/Geolocation/GeolocationAccuracyMediumService.cs b/TINKLib/Services/Geolocation/GeolocationAccuracyMediumService.cs
index e17323a..1a2a425 100644
--- a/TINKLib/Services/Geolocation/GeolocationAccuracyMediumService.cs
+++ b/TINKLib/Services/Geolocation/GeolocationAccuracyMediumService.cs
@@ -3,11 +3,11 @@ using Xamarin.Essentials;
 
 namespace TINK.Services.Geolocation
 {
-    public class GeolocationAccuracyMediumService : GeolocationService
-    {
-        public GeolocationAccuracyMediumService(IGeolodationDependent dependent) : base(
-            dependent, GeolocationAccuracy.Medium)
-        {
-        }
-    }
+	public class GeolocationAccuracyMediumService : GeolocationService
+	{
+		public GeolocationAccuracyMediumService(IGeolodationDependent dependent) : base(
+			dependent, GeolocationAccuracy.Medium)
+		{
+		}
+	}
 }
diff --git a/TINKLib/Services/Geolocation/GeolocationService.cs b/TINKLib/Services/Geolocation/GeolocationService.cs
index e1d88ab..11f6304 100644
--- a/TINKLib/Services/Geolocation/GeolocationService.cs
+++ b/TINKLib/Services/Geolocation/GeolocationService.cs
@@ -7,63 +7,63 @@ using Xamarin.Essentials;
 
 namespace TINK.Services.Geolocation
 {
-    public abstract class GeolocationService : IGeolocation
-    {
-        /// <summary> Timeout for geolocation request operations.</summary>
-        private const int GEOLOCATIONREQUEST_TIMEOUT_MS = 5000;
+	public abstract class GeolocationService : IGeolocation
+	{
+		/// <summary> Timeout for geolocation request operations.</summary>
+		private const int GEOLOCATIONREQUEST_TIMEOUT_MS = 5000;
 
-        private IGeolodationDependent Dependent { get; }
+		private IGeolodationDependent Dependent { get; }
 
-        private GeolocationAccuracy Accuracy { get; }
+		private GeolocationAccuracy Accuracy { get; }
 
-        public GeolocationService(
-            IGeolodationDependent dependent,
-            GeolocationAccuracy accuracy = GeolocationAccuracy.Default)
-        {
-            Dependent = dependent;
-            Accuracy = accuracy;
-        }
+		public GeolocationService(
+			IGeolodationDependent dependent,
+			GeolocationAccuracy accuracy = GeolocationAccuracy.Default)
+		{
+			Dependent = dependent;
+			Accuracy = accuracy;
+		}
 
-        public bool IsSimulation => false;
+		public bool IsSimulation => false;
 
-        public bool IsGeolcationEnabled => Dependent.IsGeolcationEnabled;
+		public bool IsGeolcationEnabled => Dependent.IsGeolcationEnabled;
 
-        /// <summary> Gets the current location.</summary>
-        /// <param name="cancellationToken">Token to cancel request for geolocation.</param>
-        /// <param name="timeStamp">Time when geolocation is of interest. Is used to determine whether cached geoloation can be used or not.</param>
-        public async Task<Location> GetAsync(CancellationToken? cancellationToken = null, DateTime? timeStamp = null)
-        {
-            try
-            {
-                var request = new GeolocationRequest(Accuracy, TimeSpan.FromMilliseconds(GEOLOCATIONREQUEST_TIMEOUT_MS));
-                return cancellationToken.HasValue
-                    ? await Xamarin.Essentials.Geolocation.GetLocationAsync(request, cancellationToken.Value)
-                    : await Xamarin.Essentials.Geolocation.GetLocationAsync(request);
-            }
-            catch (FeatureNotSupportedException fnsEx)
-            {
-                // Handle not supported on device exception
-                Log.ForContext<GeolocationService>().Error("Retrieving Geolocation not supported on device. {Exception}", fnsEx);
-                throw new Exception("Abfrage Standort nicht möglich auf Gerät.", fnsEx);
-            }
-            catch (FeatureNotEnabledException fneEx)
-            {
-                // Handle not enabled on device exception
-                Log.ForContext<GeolocationService>().Error("Retrieving Geolocation not enabled on device. {Exception}", fneEx);
-                throw new Exception("Abfrage Standort nicht aktiviert auf Gerät.", fneEx);
-            }
-            catch (PermissionException pEx)
-            {
-                // Handle permission exception
-                Log.ForContext<GeolocationService>().Error("Retrieving Geolocation not permitted on device. {Exception}", pEx);
-                throw new Exception("Berechtiung für Abfrage Standort nicht erteilt für App.", pEx);
-            }
-            catch (Exception ex)
-            {
-                // Unable to get location
-                Log.ForContext<GeolocationService>().Error("Retrieving Geolocation failed. {Exception}", ex);
-                throw new Exception("Abfrage Standort fehlgeschlagen.", ex);
-            }
-        }
-    }
+		/// <summary> Gets the current location.</summary>
+		/// <param name="cancellationToken">Token to cancel request for geolocation.</param>
+		/// <param name="timeStamp">Time when geolocation is of interest. Is used to determine whether cached geoloation can be used or not.</param>
+		public async Task<Location> GetAsync(CancellationToken? cancellationToken = null, DateTime? timeStamp = null)
+		{
+			try
+			{
+				var request = new GeolocationRequest(Accuracy, TimeSpan.FromMilliseconds(GEOLOCATIONREQUEST_TIMEOUT_MS));
+				return cancellationToken.HasValue
+					? await Xamarin.Essentials.Geolocation.GetLocationAsync(request, cancellationToken.Value)
+					: await Xamarin.Essentials.Geolocation.GetLocationAsync(request);
+			}
+			catch (FeatureNotSupportedException fnsEx)
+			{
+				// Handle not supported on device exception
+				Log.ForContext<GeolocationService>().Error("Retrieving Geolocation not supported on device. {Exception}", fnsEx);
+				throw new Exception("Abfrage Standort nicht möglich auf Gerät.", fnsEx);
+			}
+			catch (FeatureNotEnabledException fneEx)
+			{
+				// Handle not enabled on device exception
+				Log.ForContext<GeolocationService>().Error("Retrieving Geolocation not enabled on device. {Exception}", fneEx);
+				throw new Exception("Abfrage Standort nicht aktiviert auf Gerät.", fneEx);
+			}
+			catch (PermissionException pEx)
+			{
+				// Handle permission exception
+				Log.ForContext<GeolocationService>().Error("Retrieving Geolocation not permitted on device. {Exception}", pEx);
+				throw new Exception("Berechtiung für Abfrage Standort nicht erteilt für App.", pEx);
+			}
+			catch (Exception ex)
+			{
+				// Unable to get location
+				Log.ForContext<GeolocationService>().Error("Retrieving Geolocation failed. {Exception}", ex);
+				throw new Exception("Abfrage Standort fehlgeschlagen.", ex);
+			}
+		}
+	}
 }
diff --git a/TINKLib/Services/Geolocation/IGeolocation.cs b/TINKLib/Services/Geolocation/IGeolocation.cs
index 9b5e8c0..938ea03 100644
--- a/TINKLib/Services/Geolocation/IGeolocation.cs
+++ b/TINKLib/Services/Geolocation/IGeolocation.cs
@@ -6,16 +6,16 @@ using Xamarin.Essentials;
 
 namespace TINK.Services.Geolocation
 {
-    /// <summary> Query geolocation. </summary>
-    public interface IGeolocation : IGeolodationDependent
-    {
-        /// <summary> Gets the current location.</summary>
-        /// <param name="cancellationToken">Token to cancel request for geolocation. If null request can not be cancels and times out after GeolocationService.GEOLOCATIONREQUEST_TIMEOUT_MS if geolocation is not available.</param>
-        /// <param name="timeStamp">Time when geolocation is of interest. Is used to determine for some implementations whether cached geoloation can be used or not.</param>
-        /// <returns></returns>
-        Task<Location> GetAsync(CancellationToken? cancellationToken = null, DateTime? timeStamp = null);
+	/// <summary> Query geolocation. </summary>
+	public interface IGeolocation : IGeolodationDependent
+	{
+		/// <summary> Gets the current location.</summary>
+		/// <param name="cancellationToken">Token to cancel request for geolocation. If null request can not be cancels and times out after GeolocationService.GEOLOCATIONREQUEST_TIMEOUT_MS if geolocation is not available.</param>
+		/// <param name="timeStamp">Time when geolocation is of interest. Is used to determine for some implementations whether cached geoloation can be used or not.</param>
+		/// <returns></returns>
+		Task<Location> GetAsync(CancellationToken? cancellationToken = null, DateTime? timeStamp = null);
 
-        /// <summary> If true location data returned is simulated.</summary>
-        bool IsSimulation { get; }
-    }
+		/// <summary> If true location data returned is simulated.</summary>
+		bool IsSimulation { get; }
+	}
 }
diff --git a/TINKLib/Services/Geolocation/LastKnownGeolocationService.cs b/TINKLib/Services/Geolocation/LastKnownGeolocationService.cs
index 8cbaec9..ea4ddf8 100644
--- a/TINKLib/Services/Geolocation/LastKnownGeolocationService.cs
+++ b/TINKLib/Services/Geolocation/LastKnownGeolocationService.cs
@@ -7,66 +7,66 @@ using Xamarin.Essentials;
 
 namespace TINK.Services.Geolocation
 {
-    public class LastKnownGeolocationService : IGeolocation
-    {
-        private IGeolodationDependent Dependent { get; }
+	public class LastKnownGeolocationService : IGeolocation
+	{
+		private IGeolodationDependent Dependent { get; }
 
-        public LastKnownGeolocationService(IGeolodationDependent dependent)
-        {
-            Dependent = dependent;
-        }
+		public LastKnownGeolocationService(IGeolodationDependent dependent)
+		{
+			Dependent = dependent;
+		}
 
-        /// <summary> Gets the current location.</summary>
-        /// <param name="cancelationToken">Token to cancel request for geolocation.</param>
-        /// <param name="timeStamp">Time when geolocation is of interest. Is used to determine whether cached geoloation can be used or not.</param>
-        public async Task<Location> GetAsync(CancellationToken? cancelationToken = null, DateTime? timeStamp = null)
-        {
-            Location location;
-            try
-            {
-                location = await Xamarin.Essentials.Geolocation.GetLastKnownLocationAsync();
-            }
-            catch (FeatureNotSupportedException fnsEx)
-            {
-                // Handle not supported on device exception
-                Log.ForContext<LastKnownGeolocationService>().Error("Retrieving Geolocation not supported on device. {Exception}", fnsEx);
-                throw new Exception("Abfrage Standort nicht möglich auf Gerät.", fnsEx);
-            }
-            catch (FeatureNotEnabledException fneEx)
-            {
-                // Handle not enabled on device exception
-                Log.ForContext<LastKnownGeolocationService>().Error("Retrieving Geolocation not enabled on device. {Exception}", fneEx);
-                throw new Exception("Abfrage Standort nicht aktiviert auf Gerät.", fneEx);
-            }
-            catch (PermissionException pEx)
-            {
-                // Handle permission exception
-                Log.ForContext<LastKnownGeolocationService>().Error("Retrieving Geolocation not permitted on device. {Exception}", pEx);
-                throw new Exception("Berechtiung für Abfrage Standort nicht erteilt für App.", pEx);
-            }
-            catch (Exception ex)
-            {
-                // Unable to get location
-                Log.ForContext<LastKnownGeolocationService>().Error("Retrieving Geolocation failed. {Exception}", ex);
-                throw new Exception("Abfrage Standort fehlgeschlagen.", ex);
-            }
+		/// <summary> Gets the current location.</summary>
+		/// <param name="cancelationToken">Token to cancel request for geolocation.</param>
+		/// <param name="timeStamp">Time when geolocation is of interest. Is used to determine whether cached geoloation can be used or not.</param>
+		public async Task<Location> GetAsync(CancellationToken? cancelationToken = null, DateTime? timeStamp = null)
+		{
+			Location location;
+			try
+			{
+				location = await Xamarin.Essentials.Geolocation.GetLastKnownLocationAsync();
+			}
+			catch (FeatureNotSupportedException fnsEx)
+			{
+				// Handle not supported on device exception
+				Log.ForContext<LastKnownGeolocationService>().Error("Retrieving Geolocation not supported on device. {Exception}", fnsEx);
+				throw new Exception("Abfrage Standort nicht möglich auf Gerät.", fnsEx);
+			}
+			catch (FeatureNotEnabledException fneEx)
+			{
+				// Handle not enabled on device exception
+				Log.ForContext<LastKnownGeolocationService>().Error("Retrieving Geolocation not enabled on device. {Exception}", fneEx);
+				throw new Exception("Abfrage Standort nicht aktiviert auf Gerät.", fneEx);
+			}
+			catch (PermissionException pEx)
+			{
+				// Handle permission exception
+				Log.ForContext<LastKnownGeolocationService>().Error("Retrieving Geolocation not permitted on device. {Exception}", pEx);
+				throw new Exception("Berechtiung für Abfrage Standort nicht erteilt für App.", pEx);
+			}
+			catch (Exception ex)
+			{
+				// Unable to get location
+				Log.ForContext<LastKnownGeolocationService>().Error("Retrieving Geolocation failed. {Exception}", ex);
+				throw new Exception("Abfrage Standort fehlgeschlagen.", ex);
+			}
 
-            if (location != null // Cached location is available.
-                && (timeStamp == null || timeStamp.Value.Subtract(location.Timestamp.DateTime) < MaxAge))
-            {
-                // No time stamp available or location not too old.
-                return location;
-            }
+			if (location != null // Cached location is available.
+				&& (timeStamp == null || timeStamp.Value.Subtract(location.Timestamp.DateTime) < MaxAge))
+			{
+				// No time stamp available or location not too old.
+				return location;
+			}
 
-            return await new GeolocationAccuracyMediumService(Dependent).GetAsync(cancelationToken, timeStamp);
-        }
+			return await new GeolocationAccuracyMediumService(Dependent).GetAsync(cancelationToken, timeStamp);
+		}
 
-        /// <summary> If true location data returned is simulated.</summary>
-        public bool IsSimulation { get => false; }
+		/// <summary> If true location data returned is simulated.</summary>
+		public bool IsSimulation { get => false; }
 
-        /// <summary> Maximum age allowed for location info. </summary>
-        public TimeSpan MaxAge => new TimeSpan(0, 3 /*minutes*/, 0);
+		/// <summary> Maximum age allowed for location info. </summary>
+		public TimeSpan MaxAge => new TimeSpan(0, 3 /*minutes*/, 0);
 
-        public bool IsGeolcationEnabled => Dependent.IsGeolcationEnabled;
-    }
+		public bool IsGeolcationEnabled => Dependent.IsGeolcationEnabled;
+	}
 }
diff --git a/TINKLib/Services/Geolocation/SimulatedGeolocationService.cs b/TINKLib/Services/Geolocation/SimulatedGeolocationService.cs
index 880d5c7..a937a4f 100644
--- a/TINKLib/Services/Geolocation/SimulatedGeolocationService.cs
+++ b/TINKLib/Services/Geolocation/SimulatedGeolocationService.cs
@@ -6,26 +6,26 @@ using Xamarin.Essentials;
 
 namespace TINK.Services.Geolocation
 {
-    public class SimulatedGeolocationService : IGeolocation
-    {
-        private IGeolodationDependent Dependent { get; }
+	public class SimulatedGeolocationService : IGeolocation
+	{
+		private IGeolodationDependent Dependent { get; }
 
-        public SimulatedGeolocationService(IGeolodationDependent dependent)
-        {
-            Dependent = dependent;
-        }
+		public SimulatedGeolocationService(IGeolodationDependent dependent)
+		{
+			Dependent = dependent;
+		}
 
-        /// <summary> Gets the current location.</summary>
-        /// <param name="cancelToken">Token to cancel request for geolocation.</param>
-        /// <param name="timeStamp">Time when geolocation is of interest. Is used to determine whether cached geoloation can be used or not.</param>
-        public async Task<Location> GetAsync(CancellationToken? cancelToken = null, DateTime? timeStamp = null)
-        {
-            return await Task.FromResult(new Location(47.976634, 7.825490) { Accuracy = 0, Timestamp = timeStamp ?? DateTime.Now }); ;
-        }
+		/// <summary> Gets the current location.</summary>
+		/// <param name="cancelToken">Token to cancel request for geolocation.</param>
+		/// <param name="timeStamp">Time when geolocation is of interest. Is used to determine whether cached geoloation can be used or not.</param>
+		public async Task<Location> GetAsync(CancellationToken? cancelToken = null, DateTime? timeStamp = null)
+		{
+			return await Task.FromResult(new Location(47.976634, 7.825490) { Accuracy = 0, Timestamp = timeStamp ?? DateTime.Now }); ;
+		}
 
-        /// <summary> If true location data returned is simulated.</summary>
-        public bool IsSimulation { get => true; }
+		/// <summary> If true location data returned is simulated.</summary>
+		public bool IsSimulation { get => true; }
 
-        public bool IsGeolcationEnabled => Dependent.IsGeolcationEnabled;
-    }
+		public bool IsGeolcationEnabled => Dependent.IsGeolcationEnabled;
+	}
 }
diff --git a/TINKLib/Services/IServicesContainer.cs b/TINKLib/Services/IServicesContainer.cs
index 5c5daa1..cde1410 100644
--- a/TINKLib/Services/IServicesContainer.cs
+++ b/TINKLib/Services/IServicesContainer.cs
@@ -2,13 +2,13 @@
 
 namespace TINK.Services
 {
-    public interface IServicesContainer<T> : IEnumerable<T>
-    {
-        /// <summary> Get the active service.</summary>
-        T Active { get; }
+	public interface IServicesContainer<T> : IEnumerable<T>
+	{
+		/// <summary> Get the active service.</summary>
+		T Active { get; }
 
-        /// <summary> Sets service as active service by name. </summary>
-        /// <param name="active">Name of the new service obecs.</param>
-        void SetActive(string active);
-    }
+		/// <summary> Sets service as active service by name. </summary>
+		/// <param name="active">Name of the new service obecs.</param>
+		void SetActive(string active);
+	}
 }
diff --git a/TINKLib/Services/Logging/MemoryStackSink.cs b/TINKLib/Services/Logging/MemoryStackSink.cs
index e2fc382..0f606c0 100644
--- a/TINKLib/Services/Logging/MemoryStackSink.cs
+++ b/TINKLib/Services/Logging/MemoryStackSink.cs
@@ -5,43 +5,43 @@ using Serilog.Events;
 
 namespace TINK.Services.Logging
 {
-    public class MemoryStackSink : ILogEventSink
-    {
-        private readonly IFormatProvider _formatProvider;
+	public class MemoryStackSink : ILogEventSink
+	{
+		private readonly IFormatProvider _formatProvider;
 
-        private static ConcurrentStack<string> _MessageStack = new ConcurrentStack<string>();
+		private static ConcurrentStack<string> _MessageStack = new ConcurrentStack<string>();
 
-        /// <summary>
-        /// Reads all messages an clears memory stack.
-        /// </summary>
-        /// <returns>Array of messages.</returns>
-        public static string[] PopAllMessages()
-        {
-            int countOfMessages = _MessageStack.Count;
-            if (countOfMessages <= 0)
-                return new string[0];
+		/// <summary>
+		/// Reads all messages an clears memory stack.
+		/// </summary>
+		/// <returns>Array of messages.</returns>
+		public static string[] PopAllMessages()
+		{
+			int countOfMessages = _MessageStack.Count;
+			if (countOfMessages <= 0)
+				return new string[0];
 
-            string[] messages = new string[countOfMessages];
-            if (_MessageStack.TryPopRange(messages) <= 0)
-                return new string[0];
+			string[] messages = new string[countOfMessages];
+			if (_MessageStack.TryPopRange(messages) <= 0)
+				return new string[0];
 
-            return messages;
-        }
+			return messages;
+		}
 
-        /// <summary>
-        /// Clears the message stack.
-        /// </summary>
-        public static void ClearMessages() => _MessageStack.Clear();
+		/// <summary>
+		/// Clears the message stack.
+		/// </summary>
+		public static void ClearMessages() => _MessageStack.Clear();
 
-        public MemoryStackSink(IFormatProvider formatProvider)
-        {
-            _formatProvider = formatProvider;
-        }
+		public MemoryStackSink(IFormatProvider formatProvider)
+		{
+			_formatProvider = formatProvider;
+		}
 
-        public void Emit(LogEvent logEvent)
-        {
-            var message = logEvent.RenderMessage(_formatProvider);
-            _MessageStack.Push(DateTimeOffset.Now.ToString() + " " + message);
-        }
-    }
+		public void Emit(LogEvent logEvent)
+		{
+			var message = logEvent.RenderMessage(_formatProvider);
+			_MessageStack.Push(DateTimeOffset.Now.ToString() + " " + message);
+		}
+	}
 }
diff --git a/TINKLib/Services/Logging/MemoryStackSinkExtensions.cs b/TINKLib/Services/Logging/MemoryStackSinkExtensions.cs
index 56e5497..9062d17 100644
--- a/TINKLib/Services/Logging/MemoryStackSinkExtensions.cs
+++ b/TINKLib/Services/Logging/MemoryStackSinkExtensions.cs
@@ -4,13 +4,13 @@ using Serilog.Configuration;
 
 namespace TINK.Services.Logging
 {
-    public static class MemoryStackSinkExtensions
-    {
-        public static LoggerConfiguration MemoryQueueSink(
-          this LoggerSinkConfiguration loggerConfiguration,
-          IFormatProvider formatProvider = null)
-        {
-            return loggerConfiguration.Sink(new MemoryStackSink(formatProvider));
-        }
-    }
+	public static class MemoryStackSinkExtensions
+	{
+		public static LoggerConfiguration MemoryQueueSink(
+		  this LoggerSinkConfiguration loggerConfiguration,
+		  IFormatProvider formatProvider = null)
+		{
+			return loggerConfiguration.Sink(new MemoryStackSink(formatProvider));
+		}
+	}
 }
diff --git a/TINKLib/Services/Permissions/Essentials/Permissions.cs b/TINKLib/Services/Permissions/Essentials/Permissions.cs
index 173a541..3dc3b5e 100644
--- a/TINKLib/Services/Permissions/Essentials/Permissions.cs
+++ b/TINKLib/Services/Permissions/Essentials/Permissions.cs
@@ -3,78 +3,78 @@ using Xamarin.Essentials;
 
 namespace TINK.Services.Permissions.Essentials
 {
-    using XamPermission = Xamarin.Essentials.Permissions;
-    using XamPermissionStatus = PermissionStatus;
+	using XamPermission = Xamarin.Essentials.Permissions;
+	using XamPermissionStatus = PermissionStatus;
 
-    public class Permissions : ILocationPermission
-    {
-        /// <summary> Checks the permission status.</summary>
-        /// <returns>Current permission status.</returns>
-        public async Task<Status> CheckStatusAsync()
-        {
-            var status = await XamPermission.CheckStatusAsync<XamPermission.LocationWhenInUse>();
-            if (status == XamPermissionStatus.Granted)
-            {
-                return Status.Granted;
-            }
+	public class Permissions : ILocationPermission
+	{
+		/// <summary> Checks the permission status.</summary>
+		/// <returns>Current permission status.</returns>
+		public async Task<Status> CheckStatusAsync()
+		{
+			var status = await XamPermission.CheckStatusAsync<XamPermission.LocationWhenInUse>();
+			if (status == XamPermissionStatus.Granted)
+			{
+				return Status.Granted;
+			}
 
-            if (status == XamPermissionStatus.Denied
-                && DeviceInfo.Platform == DevicePlatform.iOS)
-            {
-                // Prompt the user to turn on in settings
-                // On iOS once a permission has been denied it may not be requested again from the application
-                return Status.DeniedRequiresSettingsUI;
-            }
+			if (status == XamPermissionStatus.Denied
+				&& DeviceInfo.Platform == DevicePlatform.iOS)
+			{
+				// Prompt the user to turn on in settings
+				// On iOS once a permission has been denied it may not be requested again from the application
+				return Status.DeniedRequiresSettingsUI;
+			}
 
-            if (XamPermission.ShouldShowRationale<XamPermission.LocationWhenInUse>())
-            {
-                // Prompt the user with additional information as to why the permission is needed
-                return Status.Denied;
-            }
+			if (XamPermission.ShouldShowRationale<XamPermission.LocationWhenInUse>())
+			{
+				// Prompt the user with additional information as to why the permission is needed
+				return Status.Denied;
+			}
 
-            switch (status)
-            {
-                case XamPermissionStatus.Unknown:
-                case XamPermissionStatus.Denied: // Map Denied to unknown because "denied means user did not allow access to location".
-                    return Status.Unknown;
+			switch (status)
+			{
+				case XamPermissionStatus.Unknown:
+				case XamPermissionStatus.Denied: // Map Denied to unknown because "denied means user did not allow access to location".
+					return Status.Unknown;
 
-                default:
-                    // Comprises: 
-                    // - XamPermissionStatus.Restricted:
-                    // - XamPermissionStatus.Disabled
-                    // Perission XamPermissionStatus.Granted is handled above.
-                    return Status.DeniedRequiresSettingsUI;
-            }
-        }
+				default:
+					// Comprises: 
+					// - XamPermissionStatus.Restricted:
+					// - XamPermissionStatus.Disabled
+					// Perission XamPermissionStatus.Granted is handled above.
+					return Status.DeniedRequiresSettingsUI;
+			}
+		}
 
-        /// <summary> Requests location permission.</summary>
-        /// <returns>Permission status after request.</returns>
-        public async Task<Status> RequestAsync()
-        {
-            switch (await XamPermission.RequestAsync<XamPermission.LocationWhenInUse>())
-            {
-                case XamPermissionStatus.Unknown:
-                    return Status.Unknown;
+		/// <summary> Requests location permission.</summary>
+		/// <returns>Permission status after request.</returns>
+		public async Task<Status> RequestAsync()
+		{
+			switch (await XamPermission.RequestAsync<XamPermission.LocationWhenInUse>())
+			{
+				case XamPermissionStatus.Unknown:
+					return Status.Unknown;
 
-                case XamPermissionStatus.Denied:
-                    return Status.Denied;
+				case XamPermissionStatus.Denied:
+					return Status.Denied;
 
-                case XamPermissionStatus.Granted:
-                    return Status.Granted;
+				case XamPermissionStatus.Granted:
+					return Status.Granted;
 
-                default:
-                    // Comprises: 
-                    // - XamPermissionStatus.Restricted:
-                    // - XamPermissionStatus.Disabled
-                    return Status.DeniedRequiresSettingsUI;
-            }
-        }
+				default:
+					// Comprises: 
+					// - XamPermissionStatus.Restricted:
+					// - XamPermissionStatus.Disabled
+					return Status.DeniedRequiresSettingsUI;
+			}
+		}
 
-        /// <summary> Opens app settings dialog.</summary>
-        public bool OpenAppSettings()
-        {
-            AppInfo.ShowSettingsUI();
-            return true;
-        }
-    }
+		/// <summary> Opens app settings dialog.</summary>
+		public bool OpenAppSettings()
+		{
+			AppInfo.ShowSettingsUI();
+			return true;
+		}
+	}
 }
diff --git a/TINKLib/Services/Permissions/ILocationPermission.cs b/TINKLib/Services/Permissions/ILocationPermission.cs
index 93512b8..246d2fb 100644
--- a/TINKLib/Services/Permissions/ILocationPermission.cs
+++ b/TINKLib/Services/Permissions/ILocationPermission.cs
@@ -2,42 +2,42 @@
 
 namespace TINK.Services.Permissions
 {
-    public interface ILocationPermission
-    {
-        /// <summary> Checks the permission status.</summary>
-        /// <returns>Current permission status.</returns>
-        Task<Status> CheckStatusAsync();
+	public interface ILocationPermission
+	{
+		/// <summary> Checks the permission status.</summary>
+		/// <returns>Current permission status.</returns>
+		Task<Status> CheckStatusAsync();
 
-        /// <summary> Requests location permission.</summary>
-        /// <returns>Permission status after request.</returns>
-        Task<Status> RequestAsync();
+		/// <summary> Requests location permission.</summary>
+		/// <returns>Permission status after request.</returns>
+		Task<Status> RequestAsync();
 
-        bool OpenAppSettings();
-    }
+		bool OpenAppSettings();
+	}
 
-    /// <summary>
-    /// Holds the permission status.
-    /// </summary>
-    public enum Status
-    {
-        //
-        // Summary:
-        //     The permission hasn't been granted or requested and is in an unknown state.
-        Unknown = 0,
-        //
-        // Summary:
-        //     The user has denied the permission.
-        Denied = 1,
+	/// <summary>
+	/// Holds the permission status.
+	/// </summary>
+	public enum Status
+	{
+		//
+		// Summary:
+		//     The permission hasn't been granted or requested and is in an unknown state.
+		Unknown = 0,
+		//
+		// Summary:
+		//     The user has denied the permission.
+		Denied = 1,
 
-        //
-        // Summary:
-        //     The user has denied the permission and .
-        DeniedRequiresSettingsUI = 8,
+		//
+		// Summary:
+		//     The user has denied the permission and .
+		DeniedRequiresSettingsUI = 8,
 
-        //
-        // Summary:
-        //     The user has granted permission.
-        Granted = 3,
+		//
+		// Summary:
+		//     The user has granted permission.
+		Granted = 3,
 
-    }
+	}
 }
diff --git a/TINKLib/Services/Permissions/Plugin/Permissions.cs b/TINKLib/Services/Permissions/Plugin/Permissions.cs
index 11c4182..1a4b9b0 100644
--- a/TINKLib/Services/Permissions/Plugin/Permissions.cs
+++ b/TINKLib/Services/Permissions/Plugin/Permissions.cs
@@ -3,57 +3,57 @@
 
 namespace TINK.Services.Permissions.Plugin
 {
-    using global::Plugin.Permissions;
+	using global::Plugin.Permissions;
 
-    public class Permissions : ILocationPermission
-    {
-        /// <summary> Checks the permission status.</summary>
-        public async Task<Status> CheckStatusAsync()
-        {
-            switch (await CrossPermissions.Current.CheckPermissionStatusAsync<LocationPermission>())
-            {
-                case global::Plugin.Permissions.Abstractions.PermissionStatus.Denied:
-                    return Status.Denied;
+	public class Permissions : ILocationPermission
+	{
+		/// <summary> Checks the permission status.</summary>
+		public async Task<Status> CheckStatusAsync()
+		{
+			switch (await CrossPermissions.Current.CheckPermissionStatusAsync<LocationPermission>())
+			{
+				case global::Plugin.Permissions.Abstractions.PermissionStatus.Denied:
+					return Status.Denied;
 
-                case global::Plugin.Permissions.Abstractions.PermissionStatus.Granted:
-                    return Status.Granted;
+				case global::Plugin.Permissions.Abstractions.PermissionStatus.Granted:
+					return Status.Granted;
 
-                case global::Plugin.Permissions.Abstractions.PermissionStatus.Unknown:
-                    return Status.Unknown;
+				case global::Plugin.Permissions.Abstractions.PermissionStatus.Unknown:
+					return Status.Unknown;
 
-                default:
-                    // Comprises
-                    // - PermissionStatus.Disabled and
-                    // - PermissionStatus.Restricted.
-                    return Status.DeniedRequiresSettingsUI;
-            }
-        }
+				default:
+					// Comprises
+					// - PermissionStatus.Disabled and
+					// - PermissionStatus.Restricted.
+					return Status.DeniedRequiresSettingsUI;
+			}
+		}
 
-        /// <summary> Requests location permission.</summary>
-        /// <returns>Permission status after request.</returns>
-        public async Task<Status> RequestAsync()
-        {
-            switch (await CrossPermissions.Current.RequestPermissionAsync<LocationPermission>())
-            {
-                case global::Plugin.Permissions.Abstractions.PermissionStatus.Denied:
-                    return Status.Denied;
+		/// <summary> Requests location permission.</summary>
+		/// <returns>Permission status after request.</returns>
+		public async Task<Status> RequestAsync()
+		{
+			switch (await CrossPermissions.Current.RequestPermissionAsync<LocationPermission>())
+			{
+				case global::Plugin.Permissions.Abstractions.PermissionStatus.Denied:
+					return Status.Denied;
 
-                case global::Plugin.Permissions.Abstractions.PermissionStatus.Granted:
-                    return Status.Granted;
+				case global::Plugin.Permissions.Abstractions.PermissionStatus.Granted:
+					return Status.Granted;
 
-                case global::Plugin.Permissions.Abstractions.PermissionStatus.Unknown:
-                    return Status.Unknown;
+				case global::Plugin.Permissions.Abstractions.PermissionStatus.Unknown:
+					return Status.Unknown;
 
-                default:
-                    // Comprises
-                    // - PermissionStatus.Disabled and
-                    // - PermissionStatus.Restricted.
-                    return Status.DeniedRequiresSettingsUI;
-            }
-        }
+				default:
+					// Comprises
+					// - PermissionStatus.Disabled and
+					// - PermissionStatus.Restricted.
+					return Status.DeniedRequiresSettingsUI;
+			}
+		}
 
-        /// <summary> Opens app settings dialog.</summary>
-        public bool OpenAppSettings()
-            => CrossPermissions.Current.OpenAppSettings();
-    }
+		/// <summary> Opens app settings dialog.</summary>
+		public bool OpenAppSettings()
+			=> CrossPermissions.Current.OpenAppSettings();
+	}
 }
diff --git a/TINKLib/Services/ServicesContainerMutable.cs b/TINKLib/Services/ServicesContainerMutable.cs
index 939c9c2..ac79cc6 100644
--- a/TINKLib/Services/ServicesContainerMutable.cs
+++ b/TINKLib/Services/ServicesContainerMutable.cs
@@ -6,50 +6,50 @@ using System.Linq;
 
 namespace TINK.Services
 {
-    public class ServicesContainerMutable : IEnumerable<string>, INotifyPropertyChanged, IServicesContainer<string>
-    {
-        private readonly Dictionary<string, string> serviceDict;
+	public class ServicesContainerMutable : IEnumerable<string>, INotifyPropertyChanged, IServicesContainer<string>
+	{
+		private readonly Dictionary<string, string> serviceDict;
 
-        public event PropertyChangedEventHandler PropertyChanged;
+		public event PropertyChangedEventHandler PropertyChanged;
 
-        /// <summary> Constructs object on startup of app.</summary>
-        /// <param name="services">Fixed list of service- objects .</param>
-        /// <param name="activeName">LocksService name which is activated on startup of app.</param>
-        public ServicesContainerMutable(
-            IEnumerable<string> services,
-            string activeName)
-        {
-            serviceDict = services.Distinct().ToDictionary(x => x);
+		/// <summary> Constructs object on startup of app.</summary>
+		/// <param name="services">Fixed list of service- objects .</param>
+		/// <param name="activeName">LocksService name which is activated on startup of app.</param>
+		public ServicesContainerMutable(
+			IEnumerable<string> services,
+			string activeName)
+		{
+			serviceDict = services.Distinct().ToDictionary(x => x);
 
-            if (!serviceDict.ContainsKey(activeName))
-            {
-                throw new ArgumentException($"Can not instantiate {typeof(string).Name}- object. Active lock service {activeName} must be contained in [{String.Join(",", serviceDict)}].");
-            }
+			if (!serviceDict.ContainsKey(activeName))
+			{
+				throw new ArgumentException($"Can not instantiate {typeof(string).Name}- object. Active lock service {activeName} must be contained in [{String.Join(",", serviceDict)}].");
+			}
 
-            Active = serviceDict[activeName];
-        }
+			Active = serviceDict[activeName];
+		}
 
-        /// <summary> Active locks service.</summary>
-        public string Active { get; private set; }
+		/// <summary> Active locks service.</summary>
+		public string Active { get; private set; }
 
-        /// <summary> Sets a lock service as active locks service by name. </summary>
-        /// <param name="active">Name of the new locks service.</param>
-        public void SetActive(string active)
-        {
-            if (!serviceDict.ContainsKey(active))
-            {
-                throw new ArgumentException($"Can not set active lock service {active}. Service must be contained in [{String.Join(",", serviceDict)}].");
-            }
+		/// <summary> Sets a lock service as active locks service by name. </summary>
+		/// <param name="active">Name of the new locks service.</param>
+		public void SetActive(string active)
+		{
+			if (!serviceDict.ContainsKey(active))
+			{
+				throw new ArgumentException($"Can not set active lock service {active}. Service must be contained in [{String.Join(",", serviceDict)}].");
+			}
 
-            Active = serviceDict[active];
+			Active = serviceDict[active];
 
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Active)));
-        }
+			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Active)));
+		}
 
-        public IEnumerator<string> GetEnumerator()
-            => serviceDict.Values.GetEnumerator();
+		public IEnumerator<string> GetEnumerator()
+			=> serviceDict.Values.GetEnumerator();
 
-        IEnumerator IEnumerable.GetEnumerator()
-            => serviceDict.Values.GetEnumerator();
-    }
+		IEnumerator IEnumerable.GetEnumerator()
+			=> serviceDict.Values.GetEnumerator();
+	}
 }
diff --git a/TINKLib/Services/ServicesContainerMutableT.cs b/TINKLib/Services/ServicesContainerMutableT.cs
index 5c6ea63..adf42f3 100644
--- a/TINKLib/Services/ServicesContainerMutableT.cs
+++ b/TINKLib/Services/ServicesContainerMutableT.cs
@@ -6,52 +6,52 @@ using System.Linq;
 
 namespace TINK.Services
 {
-    /// <summary> Container of service objects (locks , geolocation, ...) where one service is active. </summary>
-    /// <remarks> All service objects must be of different type. </remarks>
-    public class ServicesContainerMutableT<T> : IEnumerable<T>, INotifyPropertyChanged, IServicesContainer<T>
-    {
-        private readonly Dictionary<string, T> serviceDict;
+	/// <summary> Container of service objects (locks , geolocation, ...) where one service is active. </summary>
+	/// <remarks> All service objects must be of different type. </remarks>
+	public class ServicesContainerMutableT<T> : IEnumerable<T>, INotifyPropertyChanged, IServicesContainer<T>
+	{
+		private readonly Dictionary<string, T> serviceDict;
 
-        public event PropertyChangedEventHandler PropertyChanged;
+		public event PropertyChangedEventHandler PropertyChanged;
 
-        /// <summary> Constructs object on startup of app.</summary>
-        /// <param name="services">Fixed list of service- objects .</param>
-        /// <param name="activeName">LocksService name which is activated on startup of app.</param>
-        public ServicesContainerMutableT(
-            IEnumerable<T> services,
-            string activeName)
-        {
-            serviceDict = services.Distinct().ToDictionary(x => x.GetType().FullName);
+		/// <summary> Constructs object on startup of app.</summary>
+		/// <param name="services">Fixed list of service- objects .</param>
+		/// <param name="activeName">LocksService name which is activated on startup of app.</param>
+		public ServicesContainerMutableT(
+			IEnumerable<T> services,
+			string activeName)
+		{
+			serviceDict = services.Distinct().ToDictionary(x => x.GetType().FullName);
 
-            if (!serviceDict.ContainsKey(activeName))
-            {
-                throw new ArgumentException($"Can not instantiate {typeof(T).Name}- object. Active lock service {activeName} must be contained in [{String.Join(",", serviceDict)}].");
-            }
+			if (!serviceDict.ContainsKey(activeName))
+			{
+				throw new ArgumentException($"Can not instantiate {typeof(T).Name}- object. Active lock service {activeName} must be contained in [{String.Join(",", serviceDict)}].");
+			}
 
-            Active = serviceDict[activeName];
-        }
+			Active = serviceDict[activeName];
+		}
 
-        /// <summary> Active locks service.</summary>
-        public T Active { get; private set; }
+		/// <summary> Active locks service.</summary>
+		public T Active { get; private set; }
 
-        /// <summary> Sets a lock service as active locks service by name. </summary>
-        /// <param name="active">Name of the new locks service.</param>
-        public void SetActive(string active)
-        {
-            if (!serviceDict.ContainsKey(active))
-            {
-                throw new ArgumentException($"Can not set active lock service {active}. Service must be contained in [{String.Join(",", serviceDict)}].");
-            }
+		/// <summary> Sets a lock service as active locks service by name. </summary>
+		/// <param name="active">Name of the new locks service.</param>
+		public void SetActive(string active)
+		{
+			if (!serviceDict.ContainsKey(active))
+			{
+				throw new ArgumentException($"Can not set active lock service {active}. Service must be contained in [{String.Join(",", serviceDict)}].");
+			}
 
-            Active = serviceDict[active];
+			Active = serviceDict[active];
 
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Active)));
-        }
+			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Active)));
+		}
 
-        public IEnumerator<T> GetEnumerator()
-            => serviceDict.Values.GetEnumerator();
+		public IEnumerator<T> GetEnumerator()
+			=> serviceDict.Values.GetEnumerator();
 
-        IEnumerator IEnumerable.GetEnumerator()
-            => serviceDict.Values.GetEnumerator();
-    }
+		IEnumerator IEnumerable.GetEnumerator()
+			=> serviceDict.Values.GetEnumerator();
+	}
 }
diff --git a/TINKLib/Services/ThemeNS/ITheme.cs b/TINKLib/Services/ThemeNS/ITheme.cs
index ee8736e..42f9b96 100644
--- a/TINKLib/Services/ThemeNS/ITheme.cs
+++ b/TINKLib/Services/ThemeNS/ITheme.cs
@@ -1,18 +1,18 @@
 
 namespace TINK.Services.ThemeNS
 {
-    /// <summary>
-    /// Set of available app themes
-    /// </summary>
-    public enum ThemeSet
-    {
-        ShareeBike,
-        Konrad,
-        LastenradBayern
-    }
+	/// <summary>
+	/// Set of available app themes
+	/// </summary>
+	public enum ThemeSet
+	{
+		ShareeBike,
+		Konrad,
+		LastenradBayern
+	}
 
-    public interface ITheme
-    {
-        void SetActiveTheme(string themeName);
-    }
+	public interface ITheme
+	{
+		void SetActiveTheme(string themeName);
+	}
 }
diff --git a/TINKLib/Services/ThemeNS/Theme.cs b/TINKLib/Services/ThemeNS/Theme.cs
index 44d845f..a04ef78 100644
--- a/TINKLib/Services/ThemeNS/Theme.cs
+++ b/TINKLib/Services/ThemeNS/Theme.cs
@@ -4,47 +4,47 @@ using Xamarin.Forms;
 
 namespace TINK.Services.ThemeNS
 {
-    /// <summary>
-    /// Manges themeing functionalty.
-    /// Objects ResourceDictionary, Themes.Konrad, ... need Xamarin.Forms framework to be initialized which might break tests.
-    /// </summary>
-    public class Theme : ITheme
-    {
-        private ICollection<ResourceDictionary> _MergedDictionaries;
+	/// <summary>
+	/// Manges themeing functionalty.
+	/// Objects ResourceDictionary, Themes.Konrad, ... need Xamarin.Forms framework to be initialized which might break tests.
+	/// </summary>
+	public class Theme : ITheme
+	{
+		private ICollection<ResourceDictionary> _MergedDictionaries;
 
-        public Theme(ICollection<ResourceDictionary> mergedDictionaries)
-        {
-            _MergedDictionaries = mergedDictionaries ?? throw new ArgumentNullException(nameof(mergedDictionaries));
-        }
+		public Theme(ICollection<ResourceDictionary> mergedDictionaries)
+		{
+			_MergedDictionaries = mergedDictionaries ?? throw new ArgumentNullException(nameof(mergedDictionaries));
+		}
 
-        /// <summary>
-        /// Sets active theme. 
-        /// </summary>
-        /// <param name="themeName">Name of the new active theme.</param>
-        public void SetActiveTheme(string themeName)
-        {
-            if (!Enum.TryParse(themeName, false, out ThemeSet theme))
-                return;
+		/// <summary>
+		/// Sets active theme. 
+		/// </summary>
+		/// <param name="themeName">Name of the new active theme.</param>
+		public void SetActiveTheme(string themeName)
+		{
+			if (!Enum.TryParse(themeName, false, out ThemeSet theme))
+				return;
 
-            if (_MergedDictionaries == null)
-                return;
+			if (_MergedDictionaries == null)
+				return;
 
-            _MergedDictionaries.Clear();
+			_MergedDictionaries.Clear();
 
-            switch (theme)
-            {
-                case ThemeSet.Konrad:
-                    _MergedDictionaries.Add(new Themes.Konrad());
-                    break;
+			switch (theme)
+			{
+				case ThemeSet.Konrad:
+					_MergedDictionaries.Add(new Themes.Konrad());
+					break;
 
-                case ThemeSet.LastenradBayern:
-                    _MergedDictionaries.Add(new Themes.LastenradBayern());
-                    break;
+				case ThemeSet.LastenradBayern:
+					_MergedDictionaries.Add(new Themes.LastenradBayern());
+					break;
 
-                default:
-                    _MergedDictionaries.Add(new Themes.ShareeBike());
-                    break;
-            }
-        }
-    }
+				default:
+					_MergedDictionaries.Add(new Themes.ShareeBike());
+					break;
+			}
+		}
+	}
 }
diff --git a/TINKLib/TINKLib.csproj b/TINKLib/TINKLib.csproj
index 0eced84..bad016f 100644
--- a/TINKLib/TINKLib.csproj
+++ b/TINKLib/TINKLib.csproj
@@ -46,7 +46,7 @@
     <PackageReference Include="Xam.Plugins.Messaging" Version="5.2.0" />
     <PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
     <PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
-    <PackageReference Include="Xamarin.Forms.GoogleMaps" Version="3.3.0" />
+    <PackageReference Include="Xamarin.Forms.GoogleMaps" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Update="NETStandard.Library" Version="2.0.3" />
diff --git a/TINKLib/View/IViewService.cs b/TINKLib/View/IViewService.cs
index a8296f6..7324f17 100644
--- a/TINKLib/View/IViewService.cs
+++ b/TINKLib/View/IViewService.cs
@@ -3,53 +3,53 @@ using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 
 namespace TINK.View
 {
-    public interface IViewService
-    {
-        /// <summary> Displays alert message. </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="cancel">Text of button.</param>
-        Task DisplayAlert(
-            string title,
-            string message,
-            string cancel);
+	public interface IViewService
+	{
+		/// <summary> Displays alert message. </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="cancel">Text of button.</param>
+		Task DisplayAlert(
+			string title,
+			string message,
+			string cancel);
 
-        /// <summary> Displays alert message. </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="cancel">Text of button.</param>
-        Task DisplayAdvancedAlert(
-            string title,
-            string message,
-            string details,
-            string cancel);
+		/// <summary> Displays alert message. </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="cancel">Text of button.</param>
+		Task DisplayAdvancedAlert(
+			string title,
+			string message,
+			string details,
+			string cancel);
 
-        /// <summary> Displays alert message. </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        Task<bool> DisplayAlert(string title, string message, string accept, string cancel);
+		/// <summary> Displays alert message. </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		Task<bool> DisplayAlert(string title, string message, string accept, string cancel);
 
-        /// <summary> Displays alert message. </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="details">Detailed error description.</param>
-        /// <param name="accept">Text of accept button.</param>
-        /// <param name="cancel">Text of button.</param>
-        /// <returns>True if user pressed accept.</returns>
-        Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel);
+		/// <summary> Displays alert message. </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="details">Detailed error description.</param>
+		/// <param name="accept">Text of accept button.</param>
+		/// <param name="cancel">Text of button.</param>
+		/// <returns>True if user pressed accept.</returns>
+		Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel);
 
-        /// <summary> Displays an action sheet. </summary>
-        /// <param name="title">Title of message.</param>
-        /// <param name="message">Message to display.</param>
-        /// <param name="cancel">Text of button.</param>
-        /// <param name="destruction"></param>
-        /// <param name="buttons">Buttons holding options to select.</param>
-        /// <returns>T</returns>
-        Task<string> DisplayActionSheet(string title, string cancel, string destruction, params string[] buttons);
+		/// <summary> Displays an action sheet. </summary>
+		/// <param name="title">Title of message.</param>
+		/// <param name="message">Message to display.</param>
+		/// <param name="cancel">Text of button.</param>
+		/// <param name="destruction"></param>
+		/// <param name="buttons">Buttons holding options to select.</param>
+		/// <returns>T</returns>
+		Task<string> DisplayActionSheet(string title, string cancel, string destruction, params string[] buttons);
 
 #if USEFLYOUT
         /// <summary> Shows a page.</summary>
@@ -57,33 +57,33 @@ namespace TINK.View
         /// <param name="title">Title of page to show.</param>
         void ShowPage(ViewTypes type, string title = null);
 #else
-        /// <summary> Shows a page.</summary>
-        /// <param name="route">Route of the page to show.</param>
+		/// <summary> Shows a page.</summary>
+		/// <param name="route">Route of the page to show.</param>
 #if USCSHARP9
         public Task ShowPage(string route);
 #else
-        Task ShowPage(string route);
+		Task ShowPage(string route);
 #endif
 #endif
 
-        /// <summary> Pushes a page onto the stack. </summary>
-        /// <param name="typeOfPage">Page to display.</param>
-        Task PushAsync(ViewTypes typeOfPage);
+		/// <summary> Pushes a page onto the stack. </summary>
+		/// <param name="typeOfPage">Page to display.</param>
+		Task PushAsync(ViewTypes typeOfPage);
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        /// <param name="typeOfPage">Page to display.</param>
-        Task PushModalAsync(ViewTypes typeOfPage);
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		/// <param name="typeOfPage">Page to display.</param>
+		Task PushModalAsync(ViewTypes typeOfPage);
 
-        /// <summary> Pushes a page onto the modal stack. </summary>
-        Task PopModalAsync();
+		/// <summary> Pushes a page onto the modal stack. </summary>
+		Task PopModalAsync();
 
-        /// <summary> Displays user feedback popup.</summary>
-        /// <param name="battery">Object holding info about battery. For some batteries charging level might need to be updated by user.</param>
-        /// <param name="co2Saving"> Co2 saving information.</param>
-        /// <returns>User feedback.</returns>
-        Task<IUserFeedback> DisplayUserFeedbackPopup(
-            IBattery battery = null,
-            string co2Saving = null);
+		/// <summary> Displays user feedback popup.</summary>
+		/// <param name="battery">Object holding info about battery. For some batteries charging level might need to be updated by user.</param>
+		/// <param name="co2Saving"> Co2 saving information.</param>
+		/// <returns>User feedback.</returns>
+		Task<IUserFeedback> DisplayUserFeedbackPopup(
+			IBattery battery = null,
+			string co2Saving = null);
 
 #if USCSHARP9
         /// <summary>
@@ -105,31 +105,31 @@ namespace TINK.View
             string Message { get; set; }
         }
 #endif
-    }
+	}
 
 #if !USCSHARP9
-    /// <summary>
-    /// Feedback given by user when returning bike.
-    /// </summary>
-    public interface IUserFeedback
-    {
-        /// <summary>
-        /// Holds the current chargeing level of the battery in bars, null if unkonwn.
-        /// </summary>
-        int? CurrentChargeBars { get; set; }
+	/// <summary>
+	/// Feedback given by user when returning bike.
+	/// </summary>
+	public interface IUserFeedback
+	{
+		/// <summary>
+		/// Holds the current chargeing level of the battery in bars, null if unkonwn.
+		/// </summary>
+		int? CurrentChargeBars { get; set; }
 
-        /// <summary>
-        /// Holds whether bike is broken or not.
-        /// </summary>
-        bool IsBikeBroken { get; set; }
+		/// <summary>
+		/// Holds whether bike is broken or not.
+		/// </summary>
+		bool IsBikeBroken { get; set; }
 
-        /// <summary>
-        /// Holds either 
-        /// - general feedback
-        /// - error description of broken bike 
-        /// or both.
-        /// </summary>
-        string Message { get; set; }
-    }
+		/// <summary>
+		/// Holds either 
+		/// - general feedback
+		/// - error description of broken bike 
+		/// or both.
+		/// </summary>
+		string Message { get; set; }
+	}
 #endif
 }
diff --git a/TINKLib/View/Settings/BackendPermissionsToVisibleConverter.cs b/TINKLib/View/Settings/BackendPermissionsToVisibleConverter.cs
index 246a0bc..06e3a30 100644
--- a/TINKLib/View/Settings/BackendPermissionsToVisibleConverter.cs
+++ b/TINKLib/View/Settings/BackendPermissionsToVisibleConverter.cs
@@ -6,25 +6,25 @@ using Xamarin.Forms;
 namespace TINK.View.Settings
 {
 
-    /// <summary> 
-    /// Translates user permissions into visibility state. 
-    /// Used for container which holds a bunch of GUI elemets which migth all/ partly/ none be visible
-    /// If all childs are invisible frame must be invisible as well. As soon as one child is visible frame must be visible as well.
-    /// </summary>
-    public class BackendPermissionsToVisibleConverter : IValueConverter
-    {
-        /// <summary> Converts permission value into visible state.</summary>
-        /// <param name="value">Permission value from view model used to derive whether object is visible or not.</param>
-        /// <returns>Boolean value indicating whether object is visible or not.</returns>
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            var enumValue = (Permissions)value;
-            return enumValue.HasFlag(Permissions.PickCopriServer) | enumValue.HasFlag(Permissions.ManagePolling) | enumValue.HasFlag(Permissions.ManageCopriCacheExpiration);
-        }
+	/// <summary> 
+	/// Translates user permissions into visibility state. 
+	/// Used for container which holds a bunch of GUI elemets which migth all/ partly/ none be visible
+	/// If all childs are invisible frame must be invisible as well. As soon as one child is visible frame must be visible as well.
+	/// </summary>
+	public class BackendPermissionsToVisibleConverter : IValueConverter
+	{
+		/// <summary> Converts permission value into visible state.</summary>
+		/// <param name="value">Permission value from view model used to derive whether object is visible or not.</param>
+		/// <returns>Boolean value indicating whether object is visible or not.</returns>
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			var enumValue = (Permissions)value;
+			return enumValue.HasFlag(Permissions.PickCopriServer) | enumValue.HasFlag(Permissions.ManagePolling) | enumValue.HasFlag(Permissions.ManageCopriCacheExpiration);
+		}
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return Permissions.None;
-        }
-    }
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			return Permissions.None;
+		}
+	}
 }
diff --git a/TINKLib/View/Settings/PermissionToVisibleConverter.cs b/TINKLib/View/Settings/PermissionToVisibleConverter.cs
index 9d0e4dd..ca61cb0 100644
--- a/TINKLib/View/Settings/PermissionToVisibleConverter.cs
+++ b/TINKLib/View/Settings/PermissionToVisibleConverter.cs
@@ -5,30 +5,30 @@ using Xamarin.Forms;
 
 namespace TINK.View.Settings
 {
-    /// <summary> Translates user permissions into visibility state. </summary>
-    public class PermissionToVisibleConverter : BindableObject, IValueConverter
-    {
-        static readonly BindableProperty VisibleFlagProperty =
-            BindableProperty.Create(nameof(VisibleFlag), typeof(Permissions), typeof(BindableObject));
+	/// <summary> Translates user permissions into visibility state. </summary>
+	public class PermissionToVisibleConverter : BindableObject, IValueConverter
+	{
+		static readonly BindableProperty VisibleFlagProperty =
+			BindableProperty.Create(nameof(VisibleFlag), typeof(Permissions), typeof(BindableObject));
 
-        /// <summary> Property set from XAML determinig for which permission value object is visible.</summary>
-        public Permissions VisibleFlag
-        {
-            get => (Permissions)GetValue(VisibleFlagProperty);
-            set => SetValue(VisibleFlagProperty, value);
-        }
+		/// <summary> Property set from XAML determinig for which permission value object is visible.</summary>
+		public Permissions VisibleFlag
+		{
+			get => (Permissions)GetValue(VisibleFlagProperty);
+			set => SetValue(VisibleFlagProperty, value);
+		}
 
-        /// <summary> Converts permission value into visible state.</summary>
-        /// <param name="value">Permission value from view model used to derive whether object is visible or not.</param>
-        /// <returns>Boolean value indicating whether object is visible or not.</returns>
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return ((Permissions)value).HasFlag(VisibleFlag);
-        }
+		/// <summary> Converts permission value into visible state.</summary>
+		/// <param name="value">Permission value from view model used to derive whether object is visible or not.</param>
+		/// <returns>Boolean value indicating whether object is visible or not.</returns>
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			return ((Permissions)value).HasFlag(VisibleFlag);
+		}
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return Permissions.None;
-        }
-    }
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			return Permissions.None;
+		}
+	}
 }
diff --git a/TINKLib/View/Themes/ITheme.cs b/TINKLib/View/Themes/ITheme.cs
index c9937a1..c921aec 100644
--- a/TINKLib/View/Themes/ITheme.cs
+++ b/TINKLib/View/Themes/ITheme.cs
@@ -1,7 +1,7 @@
 namespace TINK.View.Themes
 {
-    public interface ITheme
-    {
-        string OperatorInfo { get; }
-    }
+	public interface ITheme
+	{
+		string OperatorInfo { get; }
+	}
 }
diff --git a/TINKLib/View/Themes/Konrad.xaml.cs b/TINKLib/View/Themes/Konrad.xaml.cs
index 961dd19..7e8748a 100644
--- a/TINKLib/View/Themes/Konrad.xaml.cs
+++ b/TINKLib/View/Themes/Konrad.xaml.cs
@@ -4,16 +4,16 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.Themes
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class Konrad : ResourceDictionary, ITheme
-    {
-        public const string OPERATORINFO = "Mein konrad";
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class Konrad : ResourceDictionary, ITheme
+	{
+		public const string OPERATORINFO = "Mein konrad";
 
-        public Konrad()
-        {
-            InitializeComponent();
-        }
+		public Konrad()
+		{
+			InitializeComponent();
+		}
 
-        public string OperatorInfo => OPERATORINFO;
-    }
+		public string OperatorInfo => OPERATORINFO;
+	}
 }
\ No newline at end of file
diff --git a/TINKLib/View/Themes/LastenradBayern.xaml.cs b/TINKLib/View/Themes/LastenradBayern.xaml.cs
index 2263839..e63dc65 100644
--- a/TINKLib/View/Themes/LastenradBayern.xaml.cs
+++ b/TINKLib/View/Themes/LastenradBayern.xaml.cs
@@ -4,16 +4,16 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.Themes
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class LastenradBayern : ResourceDictionary, ITheme
-    {
-        public const string OPERATORINFO = "Lastenrad Bayern";
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class LastenradBayern : ResourceDictionary, ITheme
+	{
+		public const string OPERATORINFO = "Lastenrad Bayern";
 
-        public LastenradBayern()
-        {
-            InitializeComponent();
-        }
+		public LastenradBayern()
+		{
+			InitializeComponent();
+		}
 
-        public string OperatorInfo => OPERATORINFO;
-    }
+		public string OperatorInfo => OPERATORINFO;
+	}
 }
\ No newline at end of file
diff --git a/TINKLib/View/Themes/ShareeBike.xaml.cs b/TINKLib/View/Themes/ShareeBike.xaml.cs
index 9ad6b64..d8ddaa6 100644
--- a/TINKLib/View/Themes/ShareeBike.xaml.cs
+++ b/TINKLib/View/Themes/ShareeBike.xaml.cs
@@ -4,16 +4,16 @@ using Xamarin.Forms.Xaml;
 
 namespace TINK.Themes
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class ShareeBike : ResourceDictionary, ITheme
-    {
-        public const string OPERATORINFO = "sharee.bike";
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class ShareeBike : ResourceDictionary, ITheme
+	{
+		public const string OPERATORINFO = "sharee.bike";
 
-        public ShareeBike()
-        {
-            InitializeComponent();
-        }
+		public ShareeBike()
+		{
+			InitializeComponent();
+		}
 
-        public string OperatorInfo => OPERATORINFO;
-    }
+		public string OperatorInfo => OPERATORINFO;
+	}
 }
\ No newline at end of file
diff --git a/TINKLib/ViewModel/Account/AccountPageViewModel.cs b/TINKLib/ViewModel/Account/AccountPageViewModel.cs
index 6981436..b97481d 100644
--- a/TINKLib/ViewModel/Account/AccountPageViewModel.cs
+++ b/TINKLib/ViewModel/Account/AccountPageViewModel.cs
@@ -8,443 +8,442 @@ using TINK.Model;
 using TINK.MultilingualResources;
 using TINK.Repository.Exception;
 using TINK.View;
-using TINK.ViewModel.Info;
 using TINK.ViewModel.Settings;
 
 namespace TINK.ViewModel.Account
 {
-    public class AccountPageViewModel : INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Count of requested/ booked bikes of logged in user.
-        /// </summary>
-        private int? m_iMyBikesCount;
+	public class AccountPageViewModel : INotifyPropertyChanged
+	{
+		/// <summary>
+		/// Count of requested/ booked bikes of logged in user.
+		/// </summary>
+		private int? m_iMyBikesCount;
 
-        /// <summary>
-        /// Reference on view service to show modal notifications and to perform navigation.
-        /// </summary>
-        private readonly IViewService m_oViewService;
+		/// <summary>
+		/// Reference on view service to show modal notifications and to perform navigation.
+		/// </summary>
+		private readonly IViewService m_oViewService;
 
-        /// <summary>
-        /// Holds the exception which occurred getting bikes occupied information.
-        /// </summary>
-        private Exception m_oException;
+		/// <summary>
+		/// Holds the exception which occurred getting bikes occupied information.
+		/// </summary>
+		private Exception m_oException;
 
-        /// <summary>
-        /// Fired if a property changes.
-        /// </summary>
-        public event PropertyChangedEventHandler PropertyChanged;
+		/// <summary>
+		/// Fired if a property changes.
+		/// </summary>
+		public event PropertyChangedEventHandler PropertyChanged;
 
-        /// <summary> Object to manage update of view model objects from Copri.</summary>
-        private IPollingUpdateTaskManager m_oViewUpdateManager;
+		/// <summary> Object to manage update of view model objects from Copri.</summary>
+		private IPollingUpdateTaskManager m_oViewUpdateManager;
 
-        /// <summary> Holds a reference to the external trigger service. </summary>
-        private Action<string> OpenUrlInExternalBrowser { get; }
+		/// <summary> Holds a reference to the external trigger service. </summary>
+		private Action<string> OpenUrlInExternalBrowser { get; }
 
-        /// <summary> Reference on the tink app instance. </summary>
-        private ITinkApp TinkApp { get; }
+		/// <summary> Reference on the tink app instance. </summary>
+		private ITinkApp TinkApp { get; }
 
-        /// <summary> Constructs a settings page view model object.</summary>
-        /// <param name="tinkApp"> Reference to tink app model.</param>
-        /// <param name="p_oUser"></param>
-        /// <param name="p_oDevice"></param>
-        /// <param name="p_oFilterGroup">Filter to apply on stations and bikes.</param>
-        /// <param name="p_oUris">Available copri server host uris including uri to use for next start.</param>
-        /// <param name="p_oPolling"> Holds whether to poll or not and the periode leght is polling is on. </param>
-        /// <param name="p_oDefaultPollingPeriode">Default polling periode lenght.</param>
-        /// <param name="p_oMinimumLogEventLevel">Controls logging level.</param>
-        /// <param name="viewService">Interface to view</param>
-        public AccountPageViewModel(
-            ITinkApp tinkApp,
-            Action<string> openUrlInExternalBrowser,
-            IViewService viewService)
-        {
-            TinkApp = tinkApp
-                ?? throw new ArgumentException("Can not instantiate settings page view model- object. No tink app object available.");
+		/// <summary> Constructs a settings page view model object.</summary>
+		/// <param name="tinkApp"> Reference to tink app model.</param>
+		/// <param name="p_oUser"></param>
+		/// <param name="p_oDevice"></param>
+		/// <param name="p_oFilterGroup">Filter to apply on stations and bikes.</param>
+		/// <param name="p_oUris">Available copri server host uris including uri to use for next start.</param>
+		/// <param name="p_oPolling"> Holds whether to poll or not and the periode leght is polling is on. </param>
+		/// <param name="p_oDefaultPollingPeriode">Default polling periode lenght.</param>
+		/// <param name="p_oMinimumLogEventLevel">Controls logging level.</param>
+		/// <param name="viewService">Interface to view</param>
+		public AccountPageViewModel(
+			ITinkApp tinkApp,
+			Action<string> openUrlInExternalBrowser,
+			IViewService viewService)
+		{
+			TinkApp = tinkApp
+				?? throw new ArgumentException("Can not instantiate settings page view model- object. No tink app object available.");
 
-            OpenUrlInExternalBrowser = openUrlInExternalBrowser
-                ?? throw new ArgumentException("Can not instantiate settings page view model- object. No user external browse service available.");
+			OpenUrlInExternalBrowser = openUrlInExternalBrowser
+				?? throw new ArgumentException("Can not instantiate settings page view model- object. No user external browse service available.");
 
-            m_oViewService = viewService
-                ?? throw new ArgumentException("Can not instantiate settings page view model- object. No user view service available.");
+			m_oViewService = viewService
+				?? throw new ArgumentException("Can not instantiate settings page view model- object. No user view service available.");
 
-            m_oViewUpdateManager = new IdlePollingUpdateTaskManager();
+			m_oViewUpdateManager = new IdlePollingUpdateTaskManager();
 
-            Polling = new PollingViewModel(TinkApp.Polling);
+			Polling = new PollingViewModel(TinkApp.Polling);
 
-            TinkApp.ActiveUser.StateChanged += OnStateChanged;
-        }
+			TinkApp.ActiveUser.StateChanged += OnStateChanged;
+		}
 
-        /// <summary>
-        /// Log in state of user changed.
-        /// </summary>
-        /// <param name="p_oSender"></param>
-        /// <param name="p_oEventArgs"></param>
-        private void OnStateChanged(object p_oSender, EventArgs p_oEventArgs)
-        {
-            var l_oPropertyChanged = PropertyChanged;
-            if (l_oPropertyChanged != null)
-            {
-                l_oPropertyChanged(this, new PropertyChangedEventArgs(nameof(LoggedInInfo)));
-                l_oPropertyChanged(this, new PropertyChangedEventArgs(nameof(IsBookingStateInfoVisible)));
-                l_oPropertyChanged(this, new PropertyChangedEventArgs(nameof(BookingStateInfo)));
-            }
-        }
+		/// <summary>
+		/// Log in state of user changed.
+		/// </summary>
+		/// <param name="p_oSender"></param>
+		/// <param name="p_oEventArgs"></param>
+		private void OnStateChanged(object p_oSender, EventArgs p_oEventArgs)
+		{
+			var l_oPropertyChanged = PropertyChanged;
+			if (l_oPropertyChanged != null)
+			{
+				l_oPropertyChanged(this, new PropertyChangedEventArgs(nameof(LoggedInInfo)));
+				l_oPropertyChanged(this, new PropertyChangedEventArgs(nameof(IsBookingStateInfoVisible)));
+				l_oPropertyChanged(this, new PropertyChangedEventArgs(nameof(BookingStateInfo)));
+			}
+		}
 
-        /// <summary> Holds information whether app is connected to web or not. </summary>
-        private bool? isConnected = null;
+		/// <summary> Holds information whether app is connected to web or not. </summary>
+		private bool? isConnected = null;
 
-        /// <summary>Exposes the is connected state. </summary>
-        private bool IsConnected
-        {
-            get => isConnected ?? false;
-            set
-            {
-                var bookingStateInfo = BookingStateInfo;
-                isConnected = value;
-                if (bookingStateInfo == BookingStateInfo)
-                {
-                    // Nothing to do.
-                    return;
-                }
+		/// <summary>Exposes the is connected state. </summary>
+		private bool IsConnected
+		{
+			get => isConnected ?? false;
+			set
+			{
+				var bookingStateInfo = BookingStateInfo;
+				isConnected = value;
+				if (bookingStateInfo == BookingStateInfo)
+				{
+					// Nothing to do.
+					return;
+				}
 
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BookingStateInfo)));
-            }
-        }
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BookingStateInfo)));
+			}
+		}
 
-        /// <summary>
-        /// Gets the value of sessionn cookie (for debugging purposes).
-        /// </summary>
-        public string SessionCookie
-        {
-            get { return TinkApp.ActiveUser.SessionCookie; }
-        }
+		/// <summary>
+		/// Gets the value of sessionn cookie (for debugging purposes).
+		/// </summary>
+		public string SessionCookie
+		{
+			get { return TinkApp.ActiveUser.SessionCookie; }
+		}
 
-        /// <summary>
-        /// Gets value whether a user is logged in or not.
-        /// </summary>
-        public bool IsLogoutPossible
-        {
-            get
-            {
-                return m_oException == null
-                    && TinkApp.ActiveUser.IsLoggedIn;
-            }
-        }
+		/// <summary>
+		/// Gets value whether a user is logged in or not.
+		/// </summary>
+		public bool IsLogoutPossible
+		{
+			get
+			{
+				return m_oException == null
+					&& TinkApp.ActiveUser.IsLoggedIn;
+			}
+		}
 
-        /// <summary>
-        /// Is true if user is logged in.
-        /// </summary>
-        public bool IsLoggedIn
-        {
-            get
-            {
-                return TinkApp.ActiveUser.IsLoggedIn;
-            }
-        }
+		/// <summary>
+		/// Is true if user is logged in.
+		/// </summary>
+		public bool IsLoggedIn
+		{
+			get
+			{
+				return TinkApp.ActiveUser.IsLoggedIn;
+			}
+		}
 
-        /// <summary>
-        /// Shows info about logged in user if user is logged in. Text "Logged out" otherwise.
-        /// </summary>
-        public string LoggedInInfo
-        {
-            get
-            {
-                if (!TinkApp.ActiveUser.IsLoggedIn)
-                {
-                    return AppResources.MarkingLoggedInStateInfoNotLoggedIn;
-                }
+		/// <summary>
+		/// Shows info about logged in user if user is logged in. Text "Logged out" otherwise.
+		/// </summary>
+		public string LoggedInInfo
+		{
+			get
+			{
+				if (!TinkApp.ActiveUser.IsLoggedIn)
+				{
+					return AppResources.MarkingLoggedInStateInfoNotLoggedIn;
+				}
 
-                return string.Format(AppResources.MarkingLoggedInStateInfoLoggedIn, TinkApp.ActiveUser.Mail);
-            }
-        }
+				return string.Format(AppResources.MarkingLoggedInStateInfoLoggedIn, TinkApp.ActiveUser.Mail);
+			}
+		}
 
-        /// <summary>
-        /// Gets a value indicating whether booking state info is avilable or not.
-        /// </summary>
-        public bool IsBookingStateInfoVisible
-        {
-            get
-            {
-                return BookingStateInfo.Length > 0;
-            }
-        }
+		/// <summary>
+		/// Gets a value indicating whether booking state info is avilable or not.
+		/// </summary>
+		public bool IsBookingStateInfoVisible
+		{
+			get
+			{
+				return BookingStateInfo.Length > 0;
+			}
+		}
 
-        /// <summary>
-        /// Count of bikes reserved and/ or occupied.
-        /// </summary>
-        private int? BikesOccupiedCount
-        {
-            get
-            {
-                return m_iMyBikesCount;
-            }
+		/// <summary>
+		/// Count of bikes reserved and/ or occupied.
+		/// </summary>
+		private int? BikesOccupiedCount
+		{
+			get
+			{
+				return m_iMyBikesCount;
+			}
 
-            set
-            {
-                var isBookingStateInfoVisible = IsBookingStateInfoVisible;
-                var bookingStateInfo = BookingStateInfo;
-                m_iMyBikesCount = value;
+			set
+			{
+				var isBookingStateInfoVisible = IsBookingStateInfoVisible;
+				var bookingStateInfo = BookingStateInfo;
+				m_iMyBikesCount = value;
 
-                if (isBookingStateInfoVisible != IsBookingStateInfoVisible)
-                {
-                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsBookingStateInfoVisible)));
-                }
+				if (isBookingStateInfoVisible != IsBookingStateInfoVisible)
+				{
+					PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsBookingStateInfoVisible)));
+				}
 
-                if (bookingStateInfo != BookingStateInfo)
-                {
-                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BookingStateInfo)));
-                }
-            }
-        }
+				if (bookingStateInfo != BookingStateInfo)
+				{
+					PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BookingStateInfo)));
+				}
+			}
+		}
 
-        /// <summary>
-        /// Shows info about reserved/ booked bikes if there are.
-        /// </summary>
-        public string BookingStateInfo
-        {
-            get
-            {
-                if (!TinkApp.ActiveUser.IsLoggedIn || !m_iMyBikesCount.HasValue || m_iMyBikesCount.Value <= 0)
-                {
-                    // Either
-                    // - user is not logged in or
-                    // - user has no bikes requested/ booked
-                    return string.Empty;
-                }
+		/// <summary>
+		/// Shows info about reserved/ booked bikes if there are.
+		/// </summary>
+		public string BookingStateInfo
+		{
+			get
+			{
+				if (!TinkApp.ActiveUser.IsLoggedIn || !m_iMyBikesCount.HasValue || m_iMyBikesCount.Value <= 0)
+				{
+					// Either
+					// - user is not logged in or
+					// - user has no bikes requested/ booked
+					return string.Empty;
+				}
 
-                var bookingStateInfo = string.Format("Aktuell {0} Fahrräder reserviert/ gebucht.", m_iMyBikesCount.Value);
+				var bookingStateInfo = string.Format("Aktuell {0} Fahrräder reserviert/ gebucht.", m_iMyBikesCount.Value);
 
-                if (!IsConnected)
-                {
-                    // Append offline info
-                    return $"{bookingStateInfo} Verbindungsstatus: Offline.";
-                }
+				if (!IsConnected)
+				{
+					// Append offline info
+					return $"{bookingStateInfo} Verbindungsstatus: Offline.";
+				}
 
-                if (Exception != null)
-                {
-                    // Append offline info
-                    return $"{bookingStateInfo} Verbindungstatus: Verbindung unterbrochen. ";
-                }
+				if (Exception != null)
+				{
+					// Append offline info
+					return $"{bookingStateInfo} Verbindungstatus: Verbindung unterbrochen. ";
+				}
 
-                return bookingStateInfo;
-            }
-        }
+				return bookingStateInfo;
+			}
+		}
 
-        /// <summary> Command object to bind logout button to view model.</summary>
-        public System.Windows.Input.ICommand OnLogoutRequest
-        {
-            get
-            {
-                return new Xamarin.Forms.Command(async () => await Logout(), () => IsLogoutPossible);
-            }
-        }
+		/// <summary> Command object to bind logout button to view model.</summary>
+		public System.Windows.Input.ICommand OnLogoutRequest
+		{
+			get
+			{
+				return new Xamarin.Forms.Command(async () => await Logout(), () => IsLogoutPossible);
+			}
+		}
 
-        /// <summary> Processes request to view personal data.</summary>
-        public System.Windows.Input.ICommand OnManageAccount => new Xamarin.Forms.Command(async () =>
-        {
-            if (CrossConnectivity.Current.IsConnected)
-            {
-                await m_oViewService.PushAsync(ViewTypes.ManageAccountPage);
-            }
-            else
-            {
-                await m_oViewService.DisplayAlert(
-                    "Hinweis",
-                    "Bitte mit Internet verbinden zum Verwalten der persönlichen Daten.",
-                    "OK");
-            }
-        });
+		/// <summary> Processes request to view personal data.</summary>
+		public System.Windows.Input.ICommand OnManageAccount => new Xamarin.Forms.Command(async () =>
+		{
+			if (CrossConnectivity.Current.IsConnected)
+			{
+				await m_oViewService.PushAsync(ViewTypes.ManageAccountPage);
+			}
+			else
+			{
+				await m_oViewService.DisplayAlert(
+					"Hinweis",
+					"Bitte mit Internet verbinden zum Verwalten der persönlichen Daten.",
+					"OK");
+			}
+		});
 
 
-        /// <summary>
-        /// Request to log out.
-        /// </summary>
-        public async Task Logout()
-        {
-            try
-            {
-                // Backup logout message before logout.
-                var l_oMessage = string.Format("Benutzer {0} abgemeldet.", TinkApp.ActiveUser.Mail);
+		/// <summary>
+		/// Request to log out.
+		/// </summary>
+		public async Task Logout()
+		{
+			try
+			{
+				// Backup logout message before logout.
+				var l_oMessage = string.Format("Benutzer {0} abgemeldet.", TinkApp.ActiveUser.Mail);
 
-                // Stop polling before requesting bike.
-                await m_oViewUpdateManager.StopUpdatePeridically();
+				// Stop polling before requesting bike.
+				await m_oViewUpdateManager.StopUpdatePeridically();
 
-                try
-                {
-                    // Log out user.
-                    IsConnected = TinkApp.GetIsConnected();
-                    await TinkApp.GetConnector(IsConnected).Command.DoLogout();
-                }
-                catch (UnsupportedCopriVersionDetectedException)
-                {
-                    await m_oViewService.DisplayAlert(
-                        AppResources.MessageLogoutErrorTitle,
-                         string.Format(AppResources.MessageAppVersionIsOutdated, ContactPageViewModel.GetAppName(TinkApp.Uris.ActiveUri)),
-                        AppResources.MessageAnswerOk);
+				try
+				{
+					// Log out user.
+					IsConnected = TinkApp.GetIsConnected();
+					await TinkApp.GetConnector(IsConnected).Command.DoLogout();
+				}
+				catch (UnsupportedCopriVersionDetectedException)
+				{
+					await m_oViewService.DisplayAlert(
+						AppResources.MessageLogoutErrorTitle,
+						 string.Format(AppResources.MessageAppVersionIsOutdated, TinkApp.Flavor.GetDisplayName()),
+						AppResources.MessageAnswerOk);
 
-                    // Restart polling again.
-                    await m_oViewUpdateManager.StartUpdateAyncPeridically(Polling.ToImmutable());
-                    return;
-                }
-                catch (Exception l_oException)
-                {
-                    // Copri server is not reachable.
-                    if (l_oException is WebConnectFailureException)
-                    {
-                        await m_oViewService.DisplayAlert(
-                            "Verbingungsfehler bei Abmeldung!",
-                            string.Format("{0}\r\n{1}", l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
-                            "OK");
-                    }
-                    else
-                    {
-                        await m_oViewService.DisplayAlert("Fehler bei Abmeldung!", l_oException.Message, "OK");
-                    }
+					// Restart polling again.
+					await m_oViewUpdateManager.StartUpdateAyncPeridically(Polling.ToImmutable());
+					return;
+				}
+				catch (Exception l_oException)
+				{
+					// Copri server is not reachable.
+					if (l_oException is WebConnectFailureException)
+					{
+						await m_oViewService.DisplayAlert(
+							"Verbingungsfehler bei Abmeldung!",
+							string.Format("{0}\r\n{1}", l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+							"OK");
+					}
+					else
+					{
+						await m_oViewService.DisplayAlert("Fehler bei Abmeldung!", l_oException.Message, "OK");
+					}
 
-                    // Restart polling again.
-                    await m_oViewUpdateManager.StartUpdateAyncPeridically(Polling.ToImmutable());
-                    return;
-                }
+					// Restart polling again.
+					await m_oViewUpdateManager.StartUpdateAyncPeridically(Polling.ToImmutable());
+					return;
+				}
 
-                TinkApp.ActiveUser.Logout();
+				TinkApp.ActiveUser.Logout();
 
-                // Display information that log out was perfomrmed.
-                await m_oViewService.DisplayAlert("Auf Wiedersehen!", l_oMessage, "OK");
-            }
-            catch (Exception p_oException)
-            {
-                Log.Error("An unexpected error occurred displaying log out page. {@Exception}", p_oException);
-                return;
-            }
-            try
-            {
-                // Switch to map view after log out.
+				// Display information that log out was perfomrmed.
+				await m_oViewService.DisplayAlert("Auf Wiedersehen!", l_oMessage, "OK");
+			}
+			catch (Exception p_oException)
+			{
+				Log.Error("An unexpected error occurred displaying log out page. {@Exception}", p_oException);
+				return;
+			}
+			try
+			{
+				// Switch to map view after log out.
 #if USEFLYOUT
                 m_oViewService.ShowPage(ViewTypes.MapPage);
 #else
-                await m_oViewService.ShowPage("//MapPage");
+				await m_oViewService.ShowPage("//MapPage");
 #endif
-            }
-            catch (Exception p_oException)
-            {
-                Log.Error("An unexpected error occurred switching back to map page after displaying log out page. {@Exception}", p_oException);
-                return;
-            }
-        }
+			}
+			catch (Exception p_oException)
+			{
+				Log.Error("An unexpected error occurred switching back to map page after displaying log out page. {@Exception}", p_oException);
+				return;
+			}
+		}
 
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        public async Task OnAppearing()
-        {
-            IsConnected = TinkApp.GetIsConnected();
-            BikesOccupiedCount = TinkApp.ActiveUser.IsLoggedIn
-                            ? (await TinkApp.GetConnector(IsConnected).Query.GetBikesOccupiedAsync()).Response.Count
-                            : 0;
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		public async Task OnAppearing()
+		{
+			IsConnected = TinkApp.GetIsConnected();
+			BikesOccupiedCount = TinkApp.ActiveUser.IsLoggedIn
+							? (await TinkApp.GetConnector(IsConnected).Query.GetBikesOccupiedAsync()).Response.Count
+							: 0;
 
 
-            m_oViewUpdateManager = new PollingUpdateTaskManager(
-                    () =>
-                    {
-                        TinkApp.PostAction(
-                            unused => IsConnected = TinkApp.GetIsConnected(),
-                            null);
+			m_oViewUpdateManager = new PollingUpdateTaskManager(
+					() =>
+					{
+						TinkApp.PostAction(
+							unused => IsConnected = TinkApp.GetIsConnected(),
+							null);
 
-                        int? l_iBikesCount = null;
+						int? l_iBikesCount = null;
 
-                        var bikesOccupied = TinkApp.GetConnector(IsConnected).Query.GetBikesOccupiedAsync().Result;
-                        l_iBikesCount = TinkApp.ActiveUser.IsLoggedIn
-                            ? bikesOccupied.Response.Count
-                            : 0;
+						var bikesOccupied = TinkApp.GetConnector(IsConnected).Query.GetBikesOccupiedAsync().Result;
+						l_iBikesCount = TinkApp.ActiveUser.IsLoggedIn
+							? bikesOccupied.Response.Count
+							: 0;
 
-                        TinkApp.PostAction(
-                            unused =>
-                            {
-                                BikesOccupiedCount = l_iBikesCount;
-                                Exception = bikesOccupied.Exception;
-                            },
-                            null);
-                    }
-                );
-            try
-            {
-                // Update bikes at station or my bikes depending on context.
-                await m_oViewUpdateManager.StartUpdateAyncPeridically(Polling.ToImmutable());
-            }
-            catch (Exception l_oExcetion)
-            {
-                Log.Error("Getting count of bikes on settings pags failed. {@l_oExcetion}.", l_oExcetion);
-            }
-        }
-        /// <summary> 
-        /// Invoked when page is shutdown. 
-        /// Currently invoked by code behind, would be nice if called by XAML in future versions.
-        /// </summary>
-        public async Task OnDisappearing()
-        {
-            try
-            {
-                Log.ForContext<AccountPageViewModel>().Information($"Entering {nameof(OnDisappearing)}...");
+						TinkApp.PostAction(
+							unused =>
+							{
+								BikesOccupiedCount = l_iBikesCount;
+								Exception = bikesOccupied.Exception;
+							},
+							null);
+					}
+				);
+			try
+			{
+				// Update bikes at station or my bikes depending on context.
+				await m_oViewUpdateManager.StartUpdateAyncPeridically(Polling.ToImmutable());
+			}
+			catch (Exception l_oExcetion)
+			{
+				Log.Error("Getting count of bikes on settings pags failed. {@l_oExcetion}.", l_oExcetion);
+			}
+		}
+		/// <summary> 
+		/// Invoked when page is shutdown. 
+		/// Currently invoked by code behind, would be nice if called by XAML in future versions.
+		/// </summary>
+		public async Task OnDisappearing()
+		{
+			try
+			{
+				Log.ForContext<AccountPageViewModel>().Information($"Entering {nameof(OnDisappearing)}...");
 
-                await m_oViewUpdateManager.StopUpdatePeridically();
+				await m_oViewUpdateManager.StopUpdatePeridically();
 
-            }
-            catch (Exception l_oException)
-            {
-                await m_oViewService.DisplayAlert(
-                    "Fehler",
-                    $"Ein unerwarteter Fehler ist aufgetreten. \r\n{l_oException.Message}",
-                    "OK");
-            }
-        }
+			}
+			catch (Exception l_oException)
+			{
+				await m_oViewService.DisplayAlert(
+					"Fehler",
+					$"Ein unerwarteter Fehler ist aufgetreten. \r\n{l_oException.Message}",
+					"OK");
+			}
+		}
 
 
-        /// <summary>
-        /// Exception which occurred getting bike information.
-        /// </summary>
-        protected Exception Exception
-        {
-            get
-            {
-                return m_oException;
-            }
+		/// <summary>
+		/// Exception which occurred getting bike information.
+		/// </summary>
+		protected Exception Exception
+		{
+			get
+			{
+				return m_oException;
+			}
 
-            set
-            {
-                var l_oException = m_oException;
-                var bookingStateInfo = BookingStateInfo;
-                m_oException = value;
-                if ((m_oException != null && l_oException == null)
-                    || (m_oException == null && l_oException != null))
-                {
-                    // Error information is available and was not or the other way round.
-                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLogoutPossible)));
-                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLogoutPossible)));
-                }
-                if (bookingStateInfo != BookingStateInfo)
-                {
-                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BookingStateInfo)));
-                }
-            }
-        }
+			set
+			{
+				var l_oException = m_oException;
+				var bookingStateInfo = BookingStateInfo;
+				m_oException = value;
+				if ((m_oException != null && l_oException == null)
+					|| (m_oException == null && l_oException != null))
+				{
+					// Error information is available and was not or the other way round.
+					PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLogoutPossible)));
+					PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLogoutPossible)));
+				}
+				if (bookingStateInfo != BookingStateInfo)
+				{
+					PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BookingStateInfo)));
+				}
+			}
+		}
 
-        /// <summary>Polling periode.</summary>
-        public PollingViewModel Polling { get; }
+		/// <summary>Polling periode.</summary>
+		public PollingViewModel Polling { get; }
 
-        /// <summary> Opens login page.</summary>
-        public void RegisterRequest(string url)
-        {
-            try
-            {
-                OpenUrlInExternalBrowser(url);
-            }
-            catch (Exception p_oException)
-            {
-                Log.Error("Ein unerwarteter Fehler ist auf der Einstellungs- Seite beim Öffnen eines Browsers, Seite {url}, aufgetreten. {@Exception}", url, p_oException);
-                return;
-            }
-        }
-    }
+		/// <summary> Opens login page.</summary>
+		public void RegisterRequest(string url)
+		{
+			try
+			{
+				OpenUrlInExternalBrowser(url);
+			}
+			catch (Exception p_oException)
+			{
+				Log.Error("Ein unerwarteter Fehler ist auf der Einstellungs- Seite beim Öffnen eines Browsers, Seite {url}, aufgetreten. {@Exception}", url, p_oException);
+				return;
+			}
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BC/BikeViewModel.cs b/TINKLib/ViewModel/Bikes/Bike/BC/BikeViewModel.cs
index 4202e8f..9e684bd 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BC/BikeViewModel.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BC/BikeViewModel.cs
@@ -9,123 +9,123 @@ using BikeInfoMutable = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable;
 
 namespace TINK.ViewModel.Bikes.Bike.BC
 {
-    /// <summary>
-    /// View model for a BC bike.
-    /// Provides functionality for views
-    /// - MyBikes
-    /// - BikesAtStation
-    /// </summary>
-    public class BikeViewModel : BikeViewModelBase, INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Notifies GUI about changes.
-        /// </summary>
-        public override event PropertyChangedEventHandler PropertyChanged;
+	/// <summary>
+	/// View model for a BC bike.
+	/// Provides functionality for views
+	/// - MyBikes
+	/// - BikesAtStation
+	/// </summary>
+	public class BikeViewModel : BikeViewModelBase, INotifyPropertyChanged
+	{
+		/// <summary>
+		/// Notifies GUI about changes.
+		/// </summary>
+		public override event PropertyChangedEventHandler PropertyChanged;
 
-        /// <summary> Holds object which manages requests. </summary>
-        private IRequestHandler RequestHandler { get; set; }
+		/// <summary> Holds object which manages requests. </summary>
+		private IRequestHandler RequestHandler { get; set; }
 
-        /// <summary> Raises events in order to update GUI.</summary>
-        public override void RaisePropertyChanged(object sender, PropertyChangedEventArgs eventArgs) => PropertyChanged?.Invoke(sender, eventArgs);
+		/// <summary> Raises events in order to update GUI.</summary>
+		public override void RaisePropertyChanged(object sender, PropertyChangedEventArgs eventArgs) => PropertyChanged?.Invoke(sender, eventArgs);
 
-        /// <summary>
-        /// Constructs a bike view model object.
-        /// </summary>
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
-        /// <param name="selectedBike">Bike to be displayed.</param>
-        /// <param name="activeUser">Object holding logged in user or an empty user object.</param>
-        /// <param name="stateInfoProvider">Provides in use state information.</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        /// <param name="openUrlInBrowser">Delegate to open browser.</param>
-        public BikeViewModel(
-            Func<bool> isConnectedDelegate,
-            Func<bool, IConnector> connectorFactory,
-            Action<string> bikeRemoveDelegate,
-            Func<IPollingUpdateTaskManager> viewUpdateManager,
-            ISmartDevice smartDevice,
-            IViewService viewService,
-            BikeInfoMutable selectedBike,
-            IUser activeUser,
-            IInUseStateInfoProvider stateInfoProvider,
-            IBikesViewModel bikesViewModel,
-            Action<string> openUrlInBrowser) : base(isConnectedDelegate, connectorFactory, bikeRemoveDelegate, viewUpdateManager, smartDevice, viewService, selectedBike, activeUser, stateInfoProvider, bikesViewModel, openUrlInBrowser)
-        {
-            RequestHandler = activeUser.IsLoggedIn
-                ? RequestHandlerFactory.Create(
-                    selectedBike,
-                    isConnectedDelegate,
-                    connectorFactory,
-                    viewUpdateManager,
-                    smartDevice,
-                    viewService,
-                    bikesViewModel,
-                    ActiveUser)
-                : new NotLoggedIn(
-                    selectedBike.State.Value,
-                    viewService,
-                    bikesViewModel,
-                    ActiveUser);
-        }
+		/// <summary>
+		/// Constructs a bike view model object.
+		/// </summary>
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
+		/// <param name="selectedBike">Bike to be displayed.</param>
+		/// <param name="activeUser">Object holding logged in user or an empty user object.</param>
+		/// <param name="stateInfoProvider">Provides in use state information.</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		/// <param name="openUrlInBrowser">Delegate to open browser.</param>
+		public BikeViewModel(
+			Func<bool> isConnectedDelegate,
+			Func<bool, IConnector> connectorFactory,
+			Action<string> bikeRemoveDelegate,
+			Func<IPollingUpdateTaskManager> viewUpdateManager,
+			ISmartDevice smartDevice,
+			IViewService viewService,
+			BikeInfoMutable selectedBike,
+			IUser activeUser,
+			IInUseStateInfoProvider stateInfoProvider,
+			IBikesViewModel bikesViewModel,
+			Action<string> openUrlInBrowser) : base(isConnectedDelegate, connectorFactory, bikeRemoveDelegate, viewUpdateManager, smartDevice, viewService, selectedBike, activeUser, stateInfoProvider, bikesViewModel, openUrlInBrowser)
+		{
+			RequestHandler = activeUser.IsLoggedIn
+				? RequestHandlerFactory.Create(
+					selectedBike,
+					isConnectedDelegate,
+					connectorFactory,
+					viewUpdateManager,
+					smartDevice,
+					viewService,
+					bikesViewModel,
+					ActiveUser)
+				: new NotLoggedIn(
+					selectedBike.State.Value,
+					viewService,
+					bikesViewModel,
+					ActiveUser);
+		}
 
-        /// <summary>
-        /// Handles BikeInfoMutable events. 
-        /// Helper member to raise events. Maps model event change notification to view model events.
-        /// Todo: Check which events are received here and filter, to avoid event storm.
-        /// </summary>
-        /// <param name="p_strNameOfProp"></param>
-        public override void OnSelectedBikeStateChanged()
-        {
-            RequestHandler = RequestHandlerFactory.Create(
-                Bike,
-                IsConnectedDelegate,
-                ConnectorFactory,
-                ViewUpdateManager,
-                SmartDevice,
-                ViewService,
-                BikesViewModel,
-                ActiveUser);
+		/// <summary>
+		/// Handles BikeInfoMutable events. 
+		/// Helper member to raise events. Maps model event change notification to view model events.
+		/// Todo: Check which events are received here and filter, to avoid event storm.
+		/// </summary>
+		/// <param name="p_strNameOfProp"></param>
+		public override void OnSelectedBikeStateChanged()
+		{
+			RequestHandler = RequestHandlerFactory.Create(
+				Bike,
+				IsConnectedDelegate,
+				ConnectorFactory,
+				ViewUpdateManager,
+				SmartDevice,
+				ViewService,
+				BikesViewModel,
+				ActiveUser);
 
-            var handler = PropertyChanged;
-            if (handler != null)
-            {
-                handler(this, new PropertyChangedEventArgs(nameof(ButtonText)));
-                handler(this, new PropertyChangedEventArgs(nameof(IsButtonVisible)));
-            }
-        }
+			var handler = PropertyChanged;
+			if (handler != null)
+			{
+				handler(this, new PropertyChangedEventArgs(nameof(ButtonText)));
+				handler(this, new PropertyChangedEventArgs(nameof(IsButtonVisible)));
+			}
+		}
 
-        /// <summary> Gets visiblity of the copri command button. </summary>
-        public bool IsButtonVisible => RequestHandler.IsButtonVisible;
+		/// <summary> Gets visiblity of the copri command button. </summary>
+		public bool IsButtonVisible => RequestHandler.IsButtonVisible;
 
-        /// <summary> Gets the text of the copri command button. </summary>
-        public string ButtonText => RequestHandler.ButtonText;
+		/// <summary> Gets the text of the copri command button. </summary>
+		public string ButtonText => RequestHandler.ButtonText;
 
-        /// <summary> Processes request to perform a copri action (reserve bike and cancel reservation). </summary>
-        public System.Windows.Input.ICommand OnButtonClicked => new Xamarin.Forms.Command(async () =>
-        {
-            var lastHandler = RequestHandler;
-            RequestHandler = await RequestHandler.HandleRequest();
+		/// <summary> Processes request to perform a copri action (reserve bike and cancel reservation). </summary>
+		public System.Windows.Input.ICommand OnButtonClicked => new Xamarin.Forms.Command(async () =>
+		{
+			var lastHandler = RequestHandler;
+			RequestHandler = await RequestHandler.HandleRequest();
 
-            if (lastHandler.IsRemoveBikeRequired)
-            {
-                BikeRemoveDelegate(Id);
-            }
+			if (lastHandler.IsRemoveBikeRequired)
+			{
+				BikeRemoveDelegate(Id);
+			}
 
-            if (lastHandler.GetType() == RequestHandler.GetType())
-            {
-                // No state change occurred.
-                return;
-            }
+			if (lastHandler.GetType() == RequestHandler.GetType())
+			{
+				// No state change occurred.
+				return;
+			}
 
-            // State changed and instance of request handler was switched. 
-            if (lastHandler.ButtonText != ButtonText)
-            {
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ButtonText)));
-            }
+			// State changed and instance of request handler was switched. 
+			if (lastHandler.ButtonText != ButtonText)
+			{
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ButtonText)));
+			}
 
-            if (lastHandler.IsButtonVisible != IsButtonVisible)
-            {
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsButtonVisible)));
-            }
-        });
-    }
+			if (lastHandler.IsButtonVisible != IsButtonVisible)
+			{
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsButtonVisible)));
+			}
+		});
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Base.cs b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Base.cs
index 4b5b97c..a3ca68c 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Base.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Base.cs
@@ -6,96 +6,96 @@ using TINK.View;
 
 namespace TINK.ViewModel.Bikes.Bike.BC.RequestHandler
 {
-    public abstract class Base<T>
-    {
-        /// <summary>
-        /// View model to be used by subclasses for progress report and unlocking/ locking view.
-        /// </summary>
-        public IBikesViewModel BikesViewModel { get; set; }
+	public abstract class Base<T>
+	{
+		/// <summary>
+		/// View model to be used by subclasses for progress report and unlocking/ locking view.
+		/// </summary>
+		public IBikesViewModel BikesViewModel { get; set; }
 
-        /// <summary>
-        /// Gets a value indicating whether the button to reserve bike is visible or not.
-        /// </summary>
-        public bool IsButtonVisible { get; }
+		/// <summary>
+		/// Gets a value indicating whether the button to reserve bike is visible or not.
+		/// </summary>
+		public bool IsButtonVisible { get; }
 
-        /// <summary>
-        /// Gets the name of the button when bike is disposable.
-        /// </summary>
-        public string ButtonText { get; }
+		/// <summary>
+		/// Gets the name of the button when bike is disposable.
+		/// </summary>
+		public string ButtonText { get; }
 
-        /// <summary> Provides info about the smart device (phone, tablet, ...).</summary>
-        protected ISmartDevice SmartDevice;
+		/// <summary> Provides info about the smart device (phone, tablet, ...).</summary>
+		protected ISmartDevice SmartDevice;
 
-        /// <summary>
-        /// Reference on view service to show modal notifications and to perform navigation.
-        /// </summary>
-        protected IViewService ViewService { get; }
+		/// <summary>
+		/// Reference on view service to show modal notifications and to perform navigation.
+		/// </summary>
+		protected IViewService ViewService { get; }
 
-        /// <summary> Provides a connector object.</summary>
-        protected Func<bool, IConnector> ConnectorFactory { get; }
+		/// <summary> Provides a connector object.</summary>
+		protected Func<bool, IConnector> ConnectorFactory { get; }
 
-        /// <summary> Delegate to retrieve connected state. </summary>
-        protected Func<bool> IsConnectedDelegate { get; }
+		/// <summary> Delegate to retrieve connected state. </summary>
+		protected Func<bool> IsConnectedDelegate { get; }
 
-        /// <summary> Object to manage update of view model objects from Copri.</summary>
-        protected Func<IPollingUpdateTaskManager> ViewUpdateManager { get; }
+		/// <summary> Object to manage update of view model objects from Copri.</summary>
+		protected Func<IPollingUpdateTaskManager> ViewUpdateManager { get; }
 
-        /// <summary> Reference on the user </summary>
-        protected IUser ActiveUser { get; }
+		/// <summary> Reference on the user </summary>
+		protected IUser ActiveUser { get; }
 
-        /// <summary> Bike to display. </summary>
-        protected T SelectedBike { get; }
+		/// <summary> Bike to display. </summary>
+		protected T SelectedBike { get; }
 
-        /// <summary>Holds the is connected state. </summary>
-        private bool isConnected;
+		/// <summary>Holds the is connected state. </summary>
+		private bool isConnected;
 
-        /// <summary>Gets the is connected state. </summary>
-        public bool IsConnected
-        {
-            get => isConnected;
-            set
-            {
-                if (value == isConnected)
-                    return;
+		/// <summary>Gets the is connected state. </summary>
+		public bool IsConnected
+		{
+			get => isConnected;
+			set
+			{
+				if (value == isConnected)
+					return;
 
-                isConnected = value;
-            }
-        }
+				isConnected = value;
+			}
+		}
 
-        /// <summary> Gets if the bike has to be remvoed after action has been completed. </summary>
-        public bool IsRemoveBikeRequired { get; set; }
+		/// <summary> Gets if the bike has to be remvoed after action has been completed. </summary>
+		public bool IsRemoveBikeRequired { get; set; }
 
 
-        /// <summary>
-        /// Constructs the reqest handler base.
-        /// </summary>
-        /// <param name="selectedBike">Bike which is reserved or for which reservation is canceled.</param>
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
-        /// <param name="bikesViewModel">View model to be used by subclasses for progress report and unlocking/ locking view.</param>
-        public Base(
-            T selectedBike,
-            string buttonText,
-            bool isCopriButtonVisible,
-            Func<bool> isConnectedDelegate,
-            Func<bool, IConnector> connectorFactory,
-            Func<IPollingUpdateTaskManager> viewUpdateManager,
-            ISmartDevice smartDevice,
-            IViewService viewService,
-            IBikesViewModel bikesViewModel,
-            IUser activeUser)
-        {
-            ButtonText = buttonText;
-            IsButtonVisible = isCopriButtonVisible;
-            SelectedBike = selectedBike;
-            IsConnectedDelegate = isConnectedDelegate;
-            ConnectorFactory = connectorFactory;
-            ViewUpdateManager = viewUpdateManager;
-            SmartDevice = smartDevice;
-            ViewService = viewService;
-            ActiveUser = activeUser;
-            IsRemoveBikeRequired = false;
-            BikesViewModel = bikesViewModel
-                ?? throw new ArgumentException($"Can not construct {GetType().Name}-object. {nameof(bikesViewModel)} must not be null.");
-        }
-    }
+		/// <summary>
+		/// Constructs the reqest handler base.
+		/// </summary>
+		/// <param name="selectedBike">Bike which is reserved or for which reservation is canceled.</param>
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
+		/// <param name="bikesViewModel">View model to be used by subclasses for progress report and unlocking/ locking view.</param>
+		public Base(
+			T selectedBike,
+			string buttonText,
+			bool isCopriButtonVisible,
+			Func<bool> isConnectedDelegate,
+			Func<bool, IConnector> connectorFactory,
+			Func<IPollingUpdateTaskManager> viewUpdateManager,
+			ISmartDevice smartDevice,
+			IViewService viewService,
+			IBikesViewModel bikesViewModel,
+			IUser activeUser)
+		{
+			ButtonText = buttonText;
+			IsButtonVisible = isCopriButtonVisible;
+			SelectedBike = selectedBike;
+			IsConnectedDelegate = isConnectedDelegate;
+			ConnectorFactory = connectorFactory;
+			ViewUpdateManager = viewUpdateManager;
+			SmartDevice = smartDevice;
+			ViewService = viewService;
+			ActiveUser = activeUser;
+			IsRemoveBikeRequired = false;
+			BikesViewModel = bikesViewModel
+				?? throw new ArgumentException($"Can not construct {GetType().Name}-object. {nameof(bikesViewModel)} must not be null.");
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Booked.cs b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Booked.cs
index beef053..2cc71b4 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Booked.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Booked.cs
@@ -8,67 +8,67 @@ using TINK.View;
 
 namespace TINK.ViewModel.Bikes.Bike.BC.RequestHandler
 {
-    public class Booked : IRequestHandler
-    {
-        /// <summary>
-        /// If a bike is booked unbooking can not be done by though app.
-        /// </summary>
-        public bool IsButtonVisible => false;
+	public class Booked : IRequestHandler
+	{
+		/// <summary>
+		/// If a bike is booked unbooking can not be done by though app.
+		/// </summary>
+		public bool IsButtonVisible => false;
 
-        /// <summary>
-        /// Gets the name of the button when bike is cancel reservation.
-        /// </summary>
-        public string ButtonText => AppResources.ActionReturn; // "Miete beenden"
+		/// <summary>
+		/// Gets the name of the button when bike is cancel reservation.
+		/// </summary>
+		public string ButtonText => AppResources.ActionReturn; // "Miete beenden"
 
-        /// <summary>
-        /// Reference on view service to show modal notifications and to perform navigation.
-        /// </summary>
-        protected IViewService ViewService { get; }
+		/// <summary>
+		/// Reference on view service to show modal notifications and to perform navigation.
+		/// </summary>
+		protected IViewService ViewService { get; }
 
-        /// <summary>View model to be used for progress report and unlocking/ locking view.</summary>
-        public IBikesViewModel BikesViewModel { get; }
+		/// <summary>View model to be used for progress report and unlocking/ locking view.</summary>
+		public IBikesViewModel BikesViewModel { get; }
 
-        /// <summary> Executes user request to cancel reservation. </summary>
-        public async Task<IRequestHandler> HandleRequest()
-        {
-            // Lock list to avoid multiple taps while copri action is pending.
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            BikesViewModel.IsIdle = false;
+		/// <summary> Executes user request to cancel reservation. </summary>
+		public async Task<IRequestHandler> HandleRequest()
+		{
+			// Lock list to avoid multiple taps while copri action is pending.
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			BikesViewModel.IsIdle = false;
 
-            Log.ForContext<BikesViewModel>().Error("User selected booked bike {l_oId}.", SelectedBike.Id);
+			Log.ForContext<BikesViewModel>().Error("User selected booked bike {l_oId}.", SelectedBike.Id);
 
-            BikesViewModel.ActionText = string.Empty;
-            await ViewService.DisplayAlert(
-                string.Empty,
-                "Rückgabe nur über Bordcomputer des Fahrrads durch Drücken der Taste 2 möglich!",
-                "Ok");
+			BikesViewModel.ActionText = string.Empty;
+			await ViewService.DisplayAlert(
+				string.Empty,
+				"Rückgabe nur über Bordcomputer des Fahrrads durch Drücken der Taste 2 möglich!",
+				"Ok");
 
-            BikesViewModel.IsIdle = true;
-            return this;
-        }
+			BikesViewModel.IsIdle = true;
+			return this;
+		}
 
-        /// <summary>
-        /// Bike to display.
-        /// </summary>
-        protected IBikeInfoMutable SelectedBike { get; }
+		/// <summary>
+		/// Bike to display.
+		/// </summary>
+		protected IBikeInfoMutable SelectedBike { get; }
 
-        /// <summary>Gets the is connected state. </summary>
-        public bool IsConnected { get; set; }
+		/// <summary>Gets the is connected state. </summary>
+		public bool IsConnected { get; set; }
 
-        /// <summary> Gets if the bike has to be remvoed after action has been completed. </summary>
-        public bool IsRemoveBikeRequired => false;
+		/// <summary> Gets if the bike has to be remvoed after action has been completed. </summary>
+		public bool IsRemoveBikeRequired => false;
 
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public Booked(
-            IBikeInfoMutable selectedBike,
-            IViewService viewService,
-            IBikesViewModel bikesViewModel,
-            IUser activeUser)
-        {
-            SelectedBike = selectedBike;
-            ViewService = viewService;
-            BikesViewModel = bikesViewModel
-                                ?? throw new ArgumentException($"Can not construct {GetType().Name}-object. {nameof(bikesViewModel)} must not be null.");
-        }
-    }
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public Booked(
+			IBikeInfoMutable selectedBike,
+			IViewService viewService,
+			IBikesViewModel bikesViewModel,
+			IUser activeUser)
+		{
+			SelectedBike = selectedBike;
+			ViewService = viewService;
+			BikesViewModel = bikesViewModel
+								?? throw new ArgumentException($"Can not construct {GetType().Name}-object. {nameof(bikesViewModel)} must not be null.");
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Disposable.cs b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Disposable.cs
index 4fd6ff4..06efe2a 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Disposable.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Disposable.cs
@@ -12,103 +12,103 @@ using BikeInfoMutable = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable;
 
 namespace TINK.ViewModel.Bikes.Bike.BC.RequestHandler
 {
-    /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-    /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-    public class Disposable : Base<BikeInfoMutable>, IRequestHandler
-    {
-        public Disposable(
-            BikeInfoMutable selectedBike,
-            Func<bool> isConnectedDelegate,
-            Func<bool, IConnector> connectorFactory,
-            Func<IPollingUpdateTaskManager> viewUpdateManager,
-            ISmartDevice smartDevice,
-            IViewService viewService,
-            IBikesViewModel bikesViewModel,
-            IUser activeUser) : base(selectedBike, selectedBike.State.Value.GetActionText(), true, isConnectedDelegate, connectorFactory, viewUpdateManager, smartDevice, viewService, bikesViewModel, activeUser)
-        {
-        }
-        /// <summary> Request bike. </summary>
-        public async Task<IRequestHandler> HandleRequest()
-        {
-            // Lock list to avoid multiple taps while copri action is pending.
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            BikesViewModel.IsIdle = false;
+	/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
+	/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+	public class Disposable : Base<BikeInfoMutable>, IRequestHandler
+	{
+		public Disposable(
+			BikeInfoMutable selectedBike,
+			Func<bool> isConnectedDelegate,
+			Func<bool, IConnector> connectorFactory,
+			Func<IPollingUpdateTaskManager> viewUpdateManager,
+			ISmartDevice smartDevice,
+			IViewService viewService,
+			IBikesViewModel bikesViewModel,
+			IUser activeUser) : base(selectedBike, selectedBike.State.Value.GetActionText(), true, isConnectedDelegate, connectorFactory, viewUpdateManager, smartDevice, viewService, bikesViewModel, activeUser)
+		{
+		}
+		/// <summary> Request bike. </summary>
+		public async Task<IRequestHandler> HandleRequest()
+		{
+			// Lock list to avoid multiple taps while copri action is pending.
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			BikesViewModel.IsIdle = false;
 
-            var l_oResult = await ViewService.DisplayAlert(
-            string.Empty,
-            string.Format(AppResources.QuestionReserveBike, SelectedBike.GetFullDisplayName(), StateRequestedInfo.MaximumReserveTime.Minutes),
-            AppResources.MessageAnswerYes,
-            AppResources.MessageAnswerNo);
+			var l_oResult = await ViewService.DisplayAlert(
+			string.Empty,
+			string.Format(AppResources.QuestionReserveBike, SelectedBike.GetFullDisplayName(), StateRequestedInfo.MaximumReserveTime.Minutes),
+			AppResources.MessageAnswerYes,
+			AppResources.MessageAnswerNo);
 
-            if (l_oResult == false)
-            {
-                // User aborted booking process
-                Log.ForContext<Disposable>().Information("User selected availalbe bike {l_oId} in order to reserve but action was canceled.", SelectedBike.Id);
-                BikesViewModel.IsIdle = true;
-                return this;
-            }
+			if (l_oResult == false)
+			{
+				// User aborted booking process
+				Log.ForContext<Disposable>().Information("User selected availalbe bike {l_oId} in order to reserve but action was canceled.", SelectedBike.Id);
+				BikesViewModel.IsIdle = true;
+				return this;
+			}
 
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
 
-            // Stop polling before requesting bike.
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before requesting bike.
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            IsConnected = IsConnectedDelegate();
+			IsConnected = IsConnectedDelegate();
 
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.DoReserve(SelectedBike);
-            }
-            catch (Exception l_oException)
-            {
-                if (l_oException is BookingDeclinedException)
-                {
-                    // Too many bikes booked.
-                    Log.ForContext<Disposable>().Information("Request declined because maximum count of bikes {l_oException.MaxBikesCount} already requested/ booked.", (l_oException as BookingDeclinedException).MaxBikesCount);
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.DoReserve(SelectedBike);
+			}
+			catch (Exception l_oException)
+			{
+				if (l_oException is BookingDeclinedException)
+				{
+					// Too many bikes booked.
+					Log.ForContext<Disposable>().Information("Request declined because maximum count of bikes {l_oException.MaxBikesCount} already requested/ booked.", (l_oException as BookingDeclinedException).MaxBikesCount);
 
-                    BikesViewModel.ActionText = string.Empty;
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageTitleHint,
-                        string.Format(AppResources.MessageReservationBikeErrorTooManyReservationsRentals, SelectedBike.Id, (l_oException as BookingDeclinedException).MaxBikesCount),
-                        AppResources.MessageAnswerOk);
-                }
-                else if (l_oException is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<Disposable>().Information("User selected availalbe bike {l_oId} but reserving failed (Copri server not reachable).", SelectedBike.Id);
+					BikesViewModel.ActionText = string.Empty;
+					await ViewService.DisplayAlert(
+						AppResources.MessageTitleHint,
+						string.Format(AppResources.MessageReservationBikeErrorTooManyReservationsRentals, SelectedBike.Id, (l_oException as BookingDeclinedException).MaxBikesCount),
+						AppResources.MessageAnswerOk);
+				}
+				else if (l_oException is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<Disposable>().Information("User selected availalbe bike {l_oId} but reserving failed (Copri server not reachable).", SelectedBike.Id);
 
-                    BikesViewModel.ActionText = string.Empty;
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageReservingBikeErrorConnectionTitle,
-                        string.Format("{0}\r\n{1}", l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<Disposable>().Error("User selected availalbe bike {l_oId} but reserving failed. {@l_oException}", SelectedBike.Id, l_oException);
+					BikesViewModel.ActionText = string.Empty;
+					await ViewService.DisplayAlert(
+						AppResources.MessageReservingBikeErrorConnectionTitle,
+						string.Format("{0}\r\n{1}", l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<Disposable>().Error("User selected availalbe bike {l_oId} but reserving failed. {@l_oException}", SelectedBike.Id, l_oException);
 
-                    BikesViewModel.ActionText = string.Empty;
-                    await ViewService.DisplayAlert(AppResources.MessageReservingBikeErrorGeneralTitle, l_oException.Message, AppResources.MessageAnswerOk);
-                }
+					BikesViewModel.ActionText = string.Empty;
+					await ViewService.DisplayAlert(AppResources.MessageReservingBikeErrorGeneralTitle, l_oException.Message, AppResources.MessageAnswerOk);
+				}
 
-                BikesViewModel.ActionText = string.Empty; // Todo: Remove this statement because in catch block ActionText is already set to empty above.
-                BikesViewModel.IsIdle = true;
-                return this;
-            }
+				BikesViewModel.ActionText = string.Empty; // Todo: Remove this statement because in catch block ActionText is already set to empty above.
+				BikesViewModel.IsIdle = true;
+				return this;
+			}
 
-            finally
-            {
-                // Restart polling again.
-                await ViewUpdateManager().StartUpdateAyncPeridically();
+			finally
+			{
+				// Restart polling again.
+				await ViewUpdateManager().StartUpdateAyncPeridically();
 
-                // Update status text and unlock list of bikes because no more action is pending.
-                BikesViewModel.ActionText = string.Empty; // Todo: Move this statement in front of finally block because in catch block ActionText is already set to empty.
-                BikesViewModel.IsIdle = true;
-            }
+				// Update status text and unlock list of bikes because no more action is pending.
+				BikesViewModel.ActionText = string.Empty; // Todo: Move this statement in front of finally block because in catch block ActionText is already set to empty.
+				BikesViewModel.IsIdle = true;
+			}
 
-            Log.ForContext<Disposable>().Information("User reserved bike {l_oId} successfully.", SelectedBike.Id);
+			Log.ForContext<Disposable>().Information("User reserved bike {l_oId} successfully.", SelectedBike.Id);
 
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
-    }
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/IRequestHandler.cs b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/IRequestHandler.cs
index fd5b4e1..fd2cd6b 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/IRequestHandler.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/IRequestHandler.cs
@@ -3,12 +3,12 @@ using System.Threading.Tasks;
 
 namespace TINK.ViewModel.Bikes.Bike.BC.RequestHandler
 {
-    public interface IRequestHandler : IRequestHandlerBase
-    {
-        /// <summary>
-        /// Performs the copri action to be executed when user presses the copri button managed by request handler.
-        /// </summary>
-        /// <returns>New handler object if action suceesed, same handler otherwise.</returns>
-        Task<IRequestHandler> HandleRequest();
-    }
+	public interface IRequestHandler : IRequestHandlerBase
+	{
+		/// <summary>
+		/// Performs the copri action to be executed when user presses the copri button managed by request handler.
+		/// </summary>
+		/// <returns>New handler object if action suceesed, same handler otherwise.</returns>
+		Task<IRequestHandler> HandleRequest();
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/NotLoggedIn.cs b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/NotLoggedIn.cs
index d21a4ac..c526b56 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/NotLoggedIn.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/NotLoggedIn.cs
@@ -7,81 +7,81 @@ using TINK.View;
 
 namespace TINK.ViewModel.Bikes.Bike.BC.RequestHandler
 {
-    public class NotLoggedIn : IRequestHandler
-    {
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public NotLoggedIn(
-             InUseStateEnum state,
-             IViewService viewService,
-             IBikesViewModel bikesViewModel,
-             IUser activeUser)
-        {
-            ButtonText = state.GetActionText();
-            IsIdle = true;
-            ViewService = viewService;
-            BikesViewModel = bikesViewModel
-                ?? throw new ArgumentException($"Can not construct {GetType().Name}-object. {nameof(bikesViewModel)} must not be null.");
-        }
+	public class NotLoggedIn : IRequestHandler
+	{
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public NotLoggedIn(
+			 InUseStateEnum state,
+			 IViewService viewService,
+			 IBikesViewModel bikesViewModel,
+			 IUser activeUser)
+		{
+			ButtonText = state.GetActionText();
+			IsIdle = true;
+			ViewService = viewService;
+			BikesViewModel = bikesViewModel
+				?? throw new ArgumentException($"Can not construct {GetType().Name}-object. {nameof(bikesViewModel)} must not be null.");
+		}
 
-        public bool IsButtonVisible => true;
+		public bool IsButtonVisible => true;
 
-        public bool IsIdle { get; private set; }
+		public bool IsIdle { get; private set; }
 
-        public string ButtonText { get; private set; }
+		public string ButtonText { get; private set; }
 
-        public string ActionText { get => BikesViewModel.ActionText; private set => BikesViewModel.ActionText = value; }
+		public string ActionText { get => BikesViewModel.ActionText; private set => BikesViewModel.ActionText = value; }
 
-        /// <summary>
-        /// Reference on view service to show modal notifications and to perform navigation.
-        /// </summary>
-        protected IViewService ViewService { get; }
+		/// <summary>
+		/// Reference on view service to show modal notifications and to perform navigation.
+		/// </summary>
+		protected IViewService ViewService { get; }
 
-        /// <summary>View model to be used for progress report and unlocking/ locking view.</summary>
-        public IBikesViewModel BikesViewModel { get; }
+		/// <summary>View model to be used for progress report and unlocking/ locking view.</summary>
+		public IBikesViewModel BikesViewModel { get; }
 
-        public bool IsConnected => throw new NotImplementedException();
+		public bool IsConnected => throw new NotImplementedException();
 
-        /// <summary> Gets if the bike has to be removed after action has been completed. </summary>
-        public bool IsRemoveBikeRequired => false;
+		/// <summary> Gets if the bike has to be removed after action has been completed. </summary>
+		public bool IsRemoveBikeRequired => false;
 
-        public async Task<IRequestHandler> HandleRequest()
-        {
-            Log.ForContext<NotLoggedIn>().Information("User selected bike but is not logged in.");
+		public async Task<IRequestHandler> HandleRequest()
+		{
+			Log.ForContext<NotLoggedIn>().Information("User selected bike but is not logged in.");
 
-            // User is not logged in
-            ActionText = string.Empty;
-            var l_oResult = await ViewService.DisplayAlert(
-                "Hinweis",
-                "Bitte anmelden vor Reservierung eines Fahrrads!\r\nAuf Anmeldeseite wechseln?",
-                "Ja",
-                "Nein");
+			// User is not logged in
+			ActionText = string.Empty;
+			var l_oResult = await ViewService.DisplayAlert(
+				"Hinweis",
+				"Bitte anmelden vor Reservierung eines Fahrrads!\r\nAuf Anmeldeseite wechseln?",
+				"Ja",
+				"Nein");
 
-            if (l_oResult == false)
-            {
-                // User aborted booking process
-                IsIdle = true;
-                return this;
-            }
+			if (l_oResult == false)
+			{
+				// User aborted booking process
+				IsIdle = true;
+				return this;
+			}
 
-            try
-            {
-                // Switch to login page
+			try
+			{
+				// Switch to login page
 #if USEFLYOUT
                 ViewService.ShowPage(ViewTypes.LoginPage);
 #else
-                await ViewService.ShowPage("//LoginPage");
+				await ViewService.ShowPage("//LoginPage");
 #endif
 
-            }
-            catch (Exception p_oException)
-            {
-                Log.ForContext<BikesViewModel>().Error("Ein unerwarteter Fehler ist in der Klasse NotLoggedIn aufgetreten. Kontext: Aufruf nach Reservierungsversuch ohne Anmeldung. {@Exception}", p_oException);
-                IsIdle = true;
-                return this;
-            }
+			}
+			catch (Exception p_oException)
+			{
+				Log.ForContext<BikesViewModel>().Error("Ein unerwarteter Fehler ist in der Klasse NotLoggedIn aufgetreten. Kontext: Aufruf nach Reservierungsversuch ohne Anmeldung. {@Exception}", p_oException);
+				IsIdle = true;
+				return this;
+			}
 
-            IsIdle = true;
-            return this;
-        }
-    }
+			IsIdle = true;
+			return this;
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Reserved.cs b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Reserved.cs
index 17a6606..7f58278 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Reserved.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Reserved.cs
@@ -11,103 +11,103 @@ using BikeInfoMutable = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable;
 
 namespace TINK.ViewModel.Bikes.Bike.BC.RequestHandler
 {
-    public class Reserved : Base<BikeInfoMutable>, IRequestHandler
-    {
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public Reserved(
-           BikeInfoMutable selectedBike,
-           Func<bool> isConnectedDelegate,
-           Func<bool, IConnector> connectorFactory,
-           Func<IPollingUpdateTaskManager> viewUpdateManager,
-           ISmartDevice smartDevice,
-           IViewService viewService,
-           IBikesViewModel bikesViewModel,
-           IUser activeUser) : base(selectedBike, AppResources.ActionCancelRequest, true, isConnectedDelegate, connectorFactory, viewUpdateManager, smartDevice, viewService, bikesViewModel, activeUser)
-        {
-        }
+	public class Reserved : Base<BikeInfoMutable>, IRequestHandler
+	{
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public Reserved(
+		   BikeInfoMutable selectedBike,
+		   Func<bool> isConnectedDelegate,
+		   Func<bool, IConnector> connectorFactory,
+		   Func<IPollingUpdateTaskManager> viewUpdateManager,
+		   ISmartDevice smartDevice,
+		   IViewService viewService,
+		   IBikesViewModel bikesViewModel,
+		   IUser activeUser) : base(selectedBike, AppResources.ActionCancelRequest, true, isConnectedDelegate, connectorFactory, viewUpdateManager, smartDevice, viewService, bikesViewModel, activeUser)
+		{
+		}
 
-        /// <summary> Executes user request to cancel reservation. </summary>
-        public async Task<IRequestHandler> HandleRequest()
-        {
-            // Lock list to avoid multiple taps while copri action is pending.
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            BikesViewModel.IsIdle = false;
+		/// <summary> Executes user request to cancel reservation. </summary>
+		public async Task<IRequestHandler> HandleRequest()
+		{
+			// Lock list to avoid multiple taps while copri action is pending.
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			BikesViewModel.IsIdle = false;
 
-            BikesViewModel.ActionText = string.Empty;
-            var l_oResult = await ViewService.DisplayAlert(
-                string.Empty,
-                string.Format("Reservierung für Fahrrad {0} aufheben?", SelectedBike.GetFullDisplayName()),
-                "Ja",
-                "Nein");
+			BikesViewModel.ActionText = string.Empty;
+			var l_oResult = await ViewService.DisplayAlert(
+				string.Empty,
+				string.Format("Reservierung für Fahrrad {0} aufheben?", SelectedBike.GetFullDisplayName()),
+				"Ja",
+				"Nein");
 
-            if (l_oResult == false)
-            {
-                // User aborted cancel process
-                Log.ForContext<Reserved>().Information("User selected reserved bike {l_oId} in order to cancel reservation but action was canceled.", SelectedBike.Id);
-                BikesViewModel.IsIdle = true;
-                return this;
-            }
+			if (l_oResult == false)
+			{
+				// User aborted cancel process
+				Log.ForContext<Reserved>().Information("User selected reserved bike {l_oId} in order to cancel reservation but action was canceled.", SelectedBike.Id);
+				BikesViewModel.IsIdle = true;
+				return this;
+			}
 
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
 
-            // Stop polling before cancel request.
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before cancel request.
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            try
-            {
-                IsConnected = IsConnectedDelegate();
+			try
+			{
+				IsConnected = IsConnectedDelegate();
 
-                await ConnectorFactory(IsConnected).Command.DoCancelReservation(SelectedBike);
+				await ConnectorFactory(IsConnected).Command.DoCancelReservation(SelectedBike);
 
-                // If canceling bike succedes remove bike because it is not ready to be booked again
-                IsRemoveBikeRequired = true;
-            }
-            catch (Exception l_oException)
-            {
-                if (l_oException is InvalidAuthorizationResponseException)
-                {
-                    // Copri response is invalid.
-                    Log.ForContext<Reserved>().Error("User selected reserved bike {l_oId} but canceling reservation failed (Invalid auth. response).", SelectedBike.Id);
-                    BikesViewModel.ActionText = String.Empty;
-                    await ViewService.DisplayAlert("Fehler beim Stornieren der Buchung!", l_oException.Message, "OK");
-                    BikesViewModel.IsIdle = true;
-                    return this;
-                }
-                else if (l_oException is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<Reserved>().Information("User selected reserved bike {l_oId} but cancel reservation failed (Copri server not reachable).", SelectedBike.Id);
-                    BikesViewModel.ActionText = String.Empty;
-                    await ViewService.DisplayAlert(
-                        "Verbingungsfehler beim Stornieren der Buchung!",
-                        string.Format("{0}\r\n{1}", l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
-                        "OK");
-                    BikesViewModel.IsIdle = true;
-                    return this;
-                }
-                else
-                {
-                    Log.ForContext<Reserved>().Error("User selected reserved bike {l_oId} but cancel reservation failed. {@l_oException}.", SelectedBike.Id, l_oException);
-                    BikesViewModel.ActionText = String.Empty;
-                    await ViewService.DisplayAlert("Fehler beim Stornieren der Buchung!", l_oException.Message, "OK");
-                    BikesViewModel.IsIdle = true;
-                    return this;
-                }
-            }
-            finally
-            {
-                // Restart polling again.
-                await ViewUpdateManager().StartUpdateAyncPeridically();
+				// If canceling bike succedes remove bike because it is not ready to be booked again
+				IsRemoveBikeRequired = true;
+			}
+			catch (Exception l_oException)
+			{
+				if (l_oException is InvalidAuthorizationResponseException)
+				{
+					// Copri response is invalid.
+					Log.ForContext<Reserved>().Error("User selected reserved bike {l_oId} but canceling reservation failed (Invalid auth. response).", SelectedBike.Id);
+					BikesViewModel.ActionText = String.Empty;
+					await ViewService.DisplayAlert("Fehler beim Stornieren der Buchung!", l_oException.Message, "OK");
+					BikesViewModel.IsIdle = true;
+					return this;
+				}
+				else if (l_oException is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<Reserved>().Information("User selected reserved bike {l_oId} but cancel reservation failed (Copri server not reachable).", SelectedBike.Id);
+					BikesViewModel.ActionText = String.Empty;
+					await ViewService.DisplayAlert(
+						"Verbingungsfehler beim Stornieren der Buchung!",
+						string.Format("{0}\r\n{1}", l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+						"OK");
+					BikesViewModel.IsIdle = true;
+					return this;
+				}
+				else
+				{
+					Log.ForContext<Reserved>().Error("User selected reserved bike {l_oId} but cancel reservation failed. {@l_oException}.", SelectedBike.Id, l_oException);
+					BikesViewModel.ActionText = String.Empty;
+					await ViewService.DisplayAlert("Fehler beim Stornieren der Buchung!", l_oException.Message, "OK");
+					BikesViewModel.IsIdle = true;
+					return this;
+				}
+			}
+			finally
+			{
+				// Restart polling again.
+				await ViewUpdateManager().StartUpdateAyncPeridically();
 
-                // Unlock list of bikes because no more action is pending.
-                BikesViewModel.ActionText = string.Empty; // Todo: Move this statement in front of finally block because in catch block ActionText is already set to empty.
-            }
+				// Unlock list of bikes because no more action is pending.
+				BikesViewModel.ActionText = string.Empty; // Todo: Move this statement in front of finally block because in catch block ActionText is already set to empty.
+			}
 
-            Log.ForContext<Reserved>().Information("User canceled reservation of bike {l_oId} successfully.", SelectedBike.Id);
+			Log.ForContext<Reserved>().Information("User canceled reservation of bike {l_oId} successfully.", SelectedBike.Id);
 
-            BikesViewModel.IsIdle = true;
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
-    }
+			BikesViewModel.IsIdle = true;
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandlerFactory.cs b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandlerFactory.cs
index 8d3830a..e8cbf70 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandlerFactory.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandlerFactory.cs
@@ -8,54 +8,54 @@ using BikeInfoMutable = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable;
 
 namespace TINK.ViewModel.Bikes.Bike.BC
 {
-    public static class RequestHandlerFactory
-    {
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public static IRequestHandler Create(
-            BikeInfoMutable selectedBike,
-            Func<bool> isConnectedDelegate,
-            Func<bool, IConnector> connectorFactory,
-            Func<IPollingUpdateTaskManager> viewUpdateManager,
-            ISmartDevice smartDevice,
-            IViewService viewService,
-            IBikesViewModel bikesViewModel,
-            IUser activeUser)
-        {
-            switch (selectedBike.State.Value)
-            {
-                case Model.State.InUseStateEnum.Disposable:
-                    // Bike can be booked.
-                    return new Disposable(
-                        selectedBike,
-                        isConnectedDelegate,
-                        connectorFactory,
-                        viewUpdateManager,
-                        smartDevice,
-                        viewService,
-                        bikesViewModel,
-                        activeUser);
+	public static class RequestHandlerFactory
+	{
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public static IRequestHandler Create(
+			BikeInfoMutable selectedBike,
+			Func<bool> isConnectedDelegate,
+			Func<bool, IConnector> connectorFactory,
+			Func<IPollingUpdateTaskManager> viewUpdateManager,
+			ISmartDevice smartDevice,
+			IViewService viewService,
+			IBikesViewModel bikesViewModel,
+			IUser activeUser)
+		{
+			switch (selectedBike.State.Value)
+			{
+				case Model.State.InUseStateEnum.Disposable:
+					// Bike can be booked.
+					return new Disposable(
+						selectedBike,
+						isConnectedDelegate,
+						connectorFactory,
+						viewUpdateManager,
+						smartDevice,
+						viewService,
+						bikesViewModel,
+						activeUser);
 
-                case Model.State.InUseStateEnum.Reserved:
-                    // Reservation can be cancelled.
-                    return new Reserved(
-                        selectedBike,
-                        isConnectedDelegate,
-                        connectorFactory,
-                        viewUpdateManager,
-                        smartDevice,
-                        viewService,
-                        bikesViewModel,
-                        activeUser);
+				case Model.State.InUseStateEnum.Reserved:
+					// Reservation can be cancelled.
+					return new Reserved(
+						selectedBike,
+						isConnectedDelegate,
+						connectorFactory,
+						viewUpdateManager,
+						smartDevice,
+						viewService,
+						bikesViewModel,
+						activeUser);
 
-                default:
-                    // No action using app possible.
-                    return new Booked(
-                        selectedBike,
-                        viewService,
-                        bikesViewModel,
-                        activeUser);
-            }
-        }
-    }
+				default:
+					// No action using app possible.
+					return new Booked(
+						selectedBike,
+						viewService,
+						bikesViewModel,
+						activeUser);
+			}
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BC/StateToText.cs b/TINKLib/ViewModel/Bikes/Bike/BC/StateToText.cs
index 5aaad50..a9047a1 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BC/StateToText.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BC/StateToText.cs
@@ -2,25 +2,25 @@
 
 namespace TINK.ViewModel.Bikes.Bike.BC
 {
-    public static class StateToText
-    {
-        /// <summary> Get button text for given copri state. </summary>
-        public static string GetActionText(this InUseStateEnum state)
-        {
-            switch (state)
-            {
-                case InUseStateEnum.Disposable:
-                    return "Rad reservieren";
+	public static class StateToText
+	{
+		/// <summary> Get button text for given copri state. </summary>
+		public static string GetActionText(this InUseStateEnum state)
+		{
+			switch (state)
+			{
+				case InUseStateEnum.Disposable:
+					return "Rad reservieren";
 
-                case InUseStateEnum.Reserved:
-                    return "Reservierung aufheben";
+				case InUseStateEnum.Reserved:
+					return "Reservierung aufheben";
 
-                case InUseStateEnum.Booked:
-                    return "Miete beenden";
+				case InUseStateEnum.Booked:
+					return "Miete beenden";
 
-                default:
-                    return $"{state}";
-            }
-        }
-    }
+				default:
+					return $"{state}";
+			}
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BikeViewModelBase.cs b/TINKLib/ViewModel/Bikes/Bike/BikeViewModelBase.cs
index 9e841c8..b3a937e 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BikeViewModelBase.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BikeViewModelBase.cs
@@ -16,392 +16,392 @@ using BikeInfoMutable = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable;
 
 namespace TINK.ViewModel.Bikes.Bike
 {
-    /// <summary>
-    /// Defines the type of BikesViewModel child items, i.e. BikesViewModel derives from ObservableCollection&ltBikeViewModelBase&gt. 
-    /// Holds references to 
-    /// - connection state services
-    /// - copri service
-    /// - view service
-    /// </summary>
-    public abstract class BikeViewModelBase
-    {
-        /// <summary>
-        /// Time format for text "Gebucht seit".
-        /// </summary>
-        public const string TIMEFORMAT = "dd. MMMM HH:mm";
-
-        /// <summary> Provides info about the smart device (phone, tablet, ...).</summary>
-        protected ISmartDevice SmartDevice;
-
-        /// <summary>
-        /// Reference on view service to show modal notifications and to perform navigation.
-        /// </summary>
-        protected IViewService ViewService { get; }
-
-        /// <summary> Provides a connect orobject.</summary>
-        protected Func<bool, IConnector> ConnectorFactory { get; }
-
-        /// <summary> Delegate to retrieve connected state. </summary>
-        protected Func<bool> IsConnectedDelegate { get; }
-
-        /// <summary> Removes bike from bikes view model. </summary>
-        protected Action<string> BikeRemoveDelegate { get; }
-
-        /// <summary> Object to manage update of view model objects from Copri.</summary>
-        public Func<IPollingUpdateTaskManager> ViewUpdateManager { get; }
-
-        /// <summary>
-        /// Holds the bike to display.
-        /// </summary>
-        protected BikeInfoMutable Bike;
-
-        /// <summary> Reference on the user </summary>
-        protected IUser ActiveUser { get; }
-
-        /// <summary>
-        /// Provides context related info.
-        /// </summary>
-        private IInUseStateInfoProvider StateInfoProvider { get; }
-
-        /// <summary>View model to be used for progress report and unlocking/ locking view.</summary>
-        protected IBikesViewModel BikesViewModel { get; }
-
-        /// <summary> Delegate to open browser. </summary>
-        private Action<string> OpenUrlInBrowser;
-
-        /// <summary>
-        /// Notifies GUI about changes.
-        /// </summary>
-        public abstract event PropertyChangedEventHandler PropertyChanged;
-
-        /// <summary>
-        /// Notfies childs about changed bike state.
-        /// </summary>
-        public abstract void OnSelectedBikeStateChanged();
-
-        /// <summary> Raises events in order to update GUI.</summary>
-        public abstract void RaisePropertyChanged(object sender, PropertyChangedEventArgs eventArgs);
-
-        /// <summary>
-        /// Constructs a bike view model object.
-        /// </summary>
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
-        /// <param name="selectedBike">Bike to be displayed.</param>
-        /// <param name="activeUser">Object holding logged in user or an empty user object.</param>
-        /// <param name="stateInfoProvider">Provides in use state information.</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        /// <param name="openUrlInBrowser">Delegate to open browser.</param>
-        public BikeViewModelBase(
-            Func<bool> isConnectedDelegate,
-            Func<bool, IConnector> connectorFactory,
-            Action<string> bikeRemoveDelegate,
-            Func<IPollingUpdateTaskManager> viewUpdateManager,
-            ISmartDevice smartDevice,
-            IViewService viewService,
-            BikeInfoMutable selectedBike,
-            IUser activeUser,
-            IInUseStateInfoProvider stateInfoProvider,
-            IBikesViewModel bikesViewModel,
-            Action<string> openUrlInBrowser)
-        {
-            IsConnectedDelegate = isConnectedDelegate;
-
-            ConnectorFactory = connectorFactory;
-
-            BikeRemoveDelegate = bikeRemoveDelegate;
-
-            ViewUpdateManager = viewUpdateManager;
-
-            SmartDevice = smartDevice;
-
-            ViewService = viewService;
-
-            Bike = selectedBike
-                ?? throw new ArgumentException(string.Format("Can not construct {0}- object, bike object is null.", typeof(BikeViewModelBase)));
-
-            ActiveUser = activeUser
-                ?? throw new ArgumentException(string.Format("Can not construct {0}- object, user object is null.", typeof(BikeViewModelBase)));
-
-            StateInfoProvider = stateInfoProvider
-                ?? throw new ArgumentException(string.Format("Can not construct {0}- object, user object is null.", typeof(IInUseStateInfoProvider)));
-
-            selectedBike.PropertyChanged +=
-                (sender, eventargs) => OnSelectedBikePropertyChanged(eventargs.PropertyName);
-
-            BikesViewModel = bikesViewModel
-                                ?? throw new ArgumentException($"Can not construct {GetType().Name}-object. {nameof(bikesViewModel)} must not be null.");
-
-            OpenUrlInBrowser = openUrlInBrowser ?? (url => { Log.ForContext<BikeViewModelBase>().Error($"No browse service avialble to upen {url}."); });
-        }
-
-        /// <summary>
-        /// Handles BikeInfoMutable events. 
-        /// Helper member to raise events. Maps model event change notification to view model events.
-        /// </summary>
-        /// <param name="p_strNameOfProp"></param>
-        private void OnSelectedBikePropertyChanged(string p_strNameOfProp)
-        {
-            if (p_strNameOfProp == nameof(State))
-            {
-                OnSelectedBikeStateChanged(); // Notify derived class about change of state.
-            }
-
-            var state = State;
-            if (LastState != state)
-            {
-                RaisePropertyChanged(this, new PropertyChangedEventArgs(nameof(State)));
-                LastState = state;
-            }
-
-            var stateText = StateText;
-            if (LastStateText != stateText)
-            {
-                RaisePropertyChanged(this, new PropertyChangedEventArgs(nameof(StateText)));
-                LastStateText = stateText;
-            }
-
-            var stateColor = StateColor;
-            if (LastStateColor != stateColor)
-            {
-                RaisePropertyChanged(this, new PropertyChangedEventArgs(nameof(StateColor)));
-                LastStateColor = stateColor;
-            }
-        }
-
-        /// <summary>
-        /// Gets the display name of the bike containing of bike id and type of bike..
-        /// </summary>
-        public string Name => Bike.GetDisplayName();
-
-        public string TypeOfBike => Bike.GetDisplayTypeOfBike();
-
-        public string WheelType => Bike.GetDisplayWheelType();
-
-        /// <summary>
-        /// Gets the unique Id of bike or an empty string, if no name is defined to avoid duplicate display of id.
-        /// </summary>
-        public string DisplayId => Bike.GetDisplayId();
-
-        /// <summary>
-        /// Gets the unique Id of bike used by derived model to determine which bike to remove.
-        /// </summary>
-        public string Id => Bike.Id;
-
-        public bool IsBikeWithCopriLock => Bike.LockModel == Model.Bikes.BikeInfoNS.BikeNS.LockModel.Sigo;
-
-        /// Returns if type of bike is a cargo pedelec bike.
-        public bool IsBatteryChargeVisible =>
-            Bike.Drive.Type == Model.Bikes.BikeInfoNS.DriveNS.DriveType.Pedelec
-            && (!Bike.Drive.Battery.IsHidden.HasValue /* no value means show battery level */ || Bike.Drive.Battery.IsHidden.Value == false);
-
-        /// Gets the image path for bike type Citybike, CargoLong, Trike or Pedelec.
-        public string DisplayedBikeImageSourceString => $"bike_{Bike.TypeOfBike}_{Bike.Drive.Type}_{Bike.WheelType}.png";
-
-        /// <summary>
-        /// Gets the current charge level.
-        /// </summary>
-        public string CurrentChargeBars => Bike.Drive.Type == Model.Bikes.BikeInfoNS.DriveNS.DriveType.Pedelec
-            ? Bike.Drive.Battery.CurrentChargeBars?.ToString() ?? string.Empty
-            : string.Empty;
-
-        /// <summary>
-        /// Gets the value if current charge level is low ( <= 1 ).
-        /// </summary>
-        public bool IsCurrentChargeLow => this.CurrentChargeBars == "1" || this.CurrentChargeBars == "0";
-
-        /// <summary>
-        /// Gets the current charge level.
-        /// </summary>
-        public string MaxChargeBars => Bike.Drive.Type == Model.Bikes.BikeInfoNS.DriveNS.DriveType.Pedelec
-            ? Bike.Drive.Battery.MaxChargeBars?.ToString() ?? string.Empty
-            : string.Empty;
-
-        /// <summary>
-        /// Returns status of a bike as text (binds to GUI). 
-        /// </summary>
-        /// <todo> Log invalid states for diagnose purposes.</todo>
-        public string StateText
-        {
-            get
-            {
-                switch (Bike.State.Value)
-                {
-                    case InUseStateEnum.FeedbackPending:
-                        return AppResources.StatusTextFeedbackPending;
-
-                    case InUseStateEnum.Disposable:
-                        return AppResources.StatusTextAvailable;
-                }
-
-                if (!ActiveUser.IsLoggedIn)
-                {
-                    // Nobody is logged in.
-                    switch (Bike.State.Value)
-                    {
-                        case InUseStateEnum.Reserved:
-                            return GetReservedInfo(
-                                Bike.State.RemainingTime,
-                                Bike.StationId,
-                                null); // Hide reservation code because no one but active user should see code
-
-                        case InUseStateEnum.Booked:
-                            return GetBookedInfo(
-                                Bike.State.From,
-                                Bike.StationId,
-                                null); // Hide reservation code because no one but active user should see code
-
-                        default:
-                            return string.Format("Unbekannter status {0}.", Bike.State.Value);
-                    }
-                }
-
-                switch (Bike.State.Value)
-                {
-                    case InUseStateEnum.Reserved:
-                        return Bike.State.MailAddress == ActiveUser.Mail
-                            ? GetReservedInfo(
-                                Bike.State.RemainingTime,
-                                Bike.StationId,
-                                Bike.State.Code)
-                            : "Fahrrad bereits reserviert durch anderen Nutzer.";
-
-                    case InUseStateEnum.Booked:
-                        return Bike.State.MailAddress == ActiveUser.Mail
-                            ? GetBookedInfo(
-                                Bike.State.From,
-                                Bike.StationId,
-                                Bike.State.Code)
-                            : "Fahrrad bereits gebucht durch anderen Nutzer.";
-
-                    default:
-                        return string.Format("Unbekannter status {0}.", Bike.State.Value);
-                }
-            }
-        }
-
-        /// <summary> Gets the value of property <see cref="StateColor"/> when PropertyChanged was fired. </summary>
-        private string LastStateText { get; set; }
-
-        /// <summary>
-        /// Gets reserved into display text.
-        /// </summary>
-        /// <todo>Log unexpeced states.</todo>
-        /// <param name="p_oInUseState"></param>
-        /// <returns>Display text</returns>
-        private string GetReservedInfo(
-            TimeSpan? p_oRemainingTime,
-            string p_strStation = null,
-            string p_strCode = null)
-        {
-            return StateInfoProvider.GetReservedInfo(p_oRemainingTime, p_strStation, p_strCode);
-        }
-
-        /// <summary>
-        /// Gets booked into display text.
-        /// </summary>
-        /// <todo>Log unexpeced states.</todo>
-        /// <param name="p_oInUseState"></param>
-        /// <returns>Display text</returns>
-        private string GetBookedInfo(
-            DateTime? p_oFrom,
-            string p_strStation = null,
-            string p_strCode = null)
-        {
-            return StateInfoProvider.GetBookedInfo(p_oFrom, p_strStation, p_strCode);
-        }
-
-        /// <summary>
-        /// Exposes the bike state.
-        /// </summary>
-        public InUseStateEnum State => Bike.State.Value;
-
-        /// <summary> Gets the value of property <see cref="State"/> when PropertyChanged was fired. </summary>
-        public InUseStateEnum LastState { get; set; }
-
-        /// <summary>
-        /// Gets the color which visualizes the state of bike in relation to logged in user.
-        /// </summary>
-        public Color StateColor
-        {
-            get
-            {
-                if (!ActiveUser.IsLoggedIn)
-                {
-                    return Color.Default;
-                }
-
-                var l_oSelectedBikeState = Bike.State;
-                switch (l_oSelectedBikeState.Value)
-                {
-                    case InUseStateEnum.Reserved:
-                        return l_oSelectedBikeState.MailAddress == ActiveUser.Mail
-                            ? InUseStateEnum.Reserved.GetColor()
-                            : Color.Red;    // Bike is reserved by someone else
-
-                    case InUseStateEnum.Booked:
-                        return l_oSelectedBikeState.MailAddress == ActiveUser.Mail
-                            ? InUseStateEnum.Booked.GetColor()
-                            : Color.Red;    // Bike is booked by someone else
-
-                    default:
-                        return Color.Default;
-                }
-            }
-        }
-
-        /// <summary> Holds description about the tarif. </summary>
-        public TariffDescriptionViewModel TariffDescription => new TariffDescriptionViewModel(Bike.TariffDescription);
-
-        /// <summary> Gets the value of property <see cref="StateColor"/> when PropertyChanged was fired. </summary>
-        public Color LastStateColor { get; set; }
-
-        /// <summary> Command object to bind login page redirect link to view model.</summary>
-        public System.Windows.Input.ICommand ShowAgbTappedCommand
-                => new Xamarin.Forms.Command(() => ShowAgbPageAsync());
-
-        /// <summary> Opens login page. </summary>
-        public void ShowAgbPageAsync()
-        {
-            try
-            {
-                var url = GetUrlFirstOrDefault(TariffDescription.OperatorAgb);
-                if (string.IsNullOrEmpty(url))
-                {
-                    // No url contained in string.
-                    return;
-                }
-
-                OpenUrlInBrowser(url);
-
-            }
-            catch (Exception p_oException)
-            {
-                Log.Error("An unexpected error occurred opening broser. {@Exception}", p_oException);
-                return;
-            }
-        }
-
-        /// <summary> Gets first url from text.</summary>
-        /// <param name="htmlSource">url to extract text from.</param>
-        /// <returns>Gets first url or an empty string if on url is contained in text.</returns>
-
-        public static string GetUrlFirstOrDefault(string htmlSource)
-        {
-            if (string.IsNullOrEmpty(htmlSource))
-                return string.Empty;
-
-            try
-            {
-                var matches = new Regex(@"https://[-a-zA-Z0-9+&@#/%?=~_|!:, .;]*[-a-zA-Z0-9+&@#/%=~_|]").Matches(htmlSource);
-                return matches.Count > 0
-                    ? matches[0].Value
-                    : string.Empty;
-            }
-            catch (Exception e)
-            {
-                Log.ForContext<BikeViewModelBase>().Error("Extracting URL failed. {Exception}", e);
-                return string.Empty;
-            }
-        }
-    }
+	/// <summary>
+	/// Defines the type of BikesViewModel child items, i.e. BikesViewModel derives from ObservableCollection&ltBikeViewModelBase&gt. 
+	/// Holds references to 
+	/// - connection state services
+	/// - copri service
+	/// - view service
+	/// </summary>
+	public abstract class BikeViewModelBase
+	{
+		/// <summary>
+		/// Time format for text "Gebucht seit".
+		/// </summary>
+		public const string TIMEFORMAT = "dd. MMMM HH:mm";
+
+		/// <summary> Provides info about the smart device (phone, tablet, ...).</summary>
+		protected ISmartDevice SmartDevice;
+
+		/// <summary>
+		/// Reference on view service to show modal notifications and to perform navigation.
+		/// </summary>
+		protected IViewService ViewService { get; }
+
+		/// <summary> Provides a connect orobject.</summary>
+		protected Func<bool, IConnector> ConnectorFactory { get; }
+
+		/// <summary> Delegate to retrieve connected state. </summary>
+		protected Func<bool> IsConnectedDelegate { get; }
+
+		/// <summary> Removes bike from bikes view model. </summary>
+		protected Action<string> BikeRemoveDelegate { get; }
+
+		/// <summary> Object to manage update of view model objects from Copri.</summary>
+		public Func<IPollingUpdateTaskManager> ViewUpdateManager { get; }
+
+		/// <summary>
+		/// Holds the bike to display.
+		/// </summary>
+		protected BikeInfoMutable Bike;
+
+		/// <summary> Reference on the user </summary>
+		protected IUser ActiveUser { get; }
+
+		/// <summary>
+		/// Provides context related info.
+		/// </summary>
+		private IInUseStateInfoProvider StateInfoProvider { get; }
+
+		/// <summary>View model to be used for progress report and unlocking/ locking view.</summary>
+		protected IBikesViewModel BikesViewModel { get; }
+
+		/// <summary> Delegate to open browser. </summary>
+		private Action<string> OpenUrlInBrowser;
+
+		/// <summary>
+		/// Notifies GUI about changes.
+		/// </summary>
+		public abstract event PropertyChangedEventHandler PropertyChanged;
+
+		/// <summary>
+		/// Notfies childs about changed bike state.
+		/// </summary>
+		public abstract void OnSelectedBikeStateChanged();
+
+		/// <summary> Raises events in order to update GUI.</summary>
+		public abstract void RaisePropertyChanged(object sender, PropertyChangedEventArgs eventArgs);
+
+		/// <summary>
+		/// Constructs a bike view model object.
+		/// </summary>
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
+		/// <param name="selectedBike">Bike to be displayed.</param>
+		/// <param name="activeUser">Object holding logged in user or an empty user object.</param>
+		/// <param name="stateInfoProvider">Provides in use state information.</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		/// <param name="openUrlInBrowser">Delegate to open browser.</param>
+		public BikeViewModelBase(
+			Func<bool> isConnectedDelegate,
+			Func<bool, IConnector> connectorFactory,
+			Action<string> bikeRemoveDelegate,
+			Func<IPollingUpdateTaskManager> viewUpdateManager,
+			ISmartDevice smartDevice,
+			IViewService viewService,
+			BikeInfoMutable selectedBike,
+			IUser activeUser,
+			IInUseStateInfoProvider stateInfoProvider,
+			IBikesViewModel bikesViewModel,
+			Action<string> openUrlInBrowser)
+		{
+			IsConnectedDelegate = isConnectedDelegate;
+
+			ConnectorFactory = connectorFactory;
+
+			BikeRemoveDelegate = bikeRemoveDelegate;
+
+			ViewUpdateManager = viewUpdateManager;
+
+			SmartDevice = smartDevice;
+
+			ViewService = viewService;
+
+			Bike = selectedBike
+				?? throw new ArgumentException(string.Format("Can not construct {0}- object, bike object is null.", typeof(BikeViewModelBase)));
+
+			ActiveUser = activeUser
+				?? throw new ArgumentException(string.Format("Can not construct {0}- object, user object is null.", typeof(BikeViewModelBase)));
+
+			StateInfoProvider = stateInfoProvider
+				?? throw new ArgumentException(string.Format("Can not construct {0}- object, user object is null.", typeof(IInUseStateInfoProvider)));
+
+			selectedBike.PropertyChanged +=
+				(sender, eventargs) => OnSelectedBikePropertyChanged(eventargs.PropertyName);
+
+			BikesViewModel = bikesViewModel
+								?? throw new ArgumentException($"Can not construct {GetType().Name}-object. {nameof(bikesViewModel)} must not be null.");
+
+			OpenUrlInBrowser = openUrlInBrowser ?? (url => { Log.ForContext<BikeViewModelBase>().Error($"No browse service avialble to upen {url}."); });
+		}
+
+		/// <summary>
+		/// Handles BikeInfoMutable events. 
+		/// Helper member to raise events. Maps model event change notification to view model events.
+		/// </summary>
+		/// <param name="p_strNameOfProp"></param>
+		private void OnSelectedBikePropertyChanged(string p_strNameOfProp)
+		{
+			if (p_strNameOfProp == nameof(State))
+			{
+				OnSelectedBikeStateChanged(); // Notify derived class about change of state.
+			}
+
+			var state = State;
+			if (LastState != state)
+			{
+				RaisePropertyChanged(this, new PropertyChangedEventArgs(nameof(State)));
+				LastState = state;
+			}
+
+			var stateText = StateText;
+			if (LastStateText != stateText)
+			{
+				RaisePropertyChanged(this, new PropertyChangedEventArgs(nameof(StateText)));
+				LastStateText = stateText;
+			}
+
+			var stateColor = StateColor;
+			if (LastStateColor != stateColor)
+			{
+				RaisePropertyChanged(this, new PropertyChangedEventArgs(nameof(StateColor)));
+				LastStateColor = stateColor;
+			}
+		}
+
+		/// <summary>
+		/// Gets the display name of the bike containing of bike id and type of bike..
+		/// </summary>
+		public string Name => Bike.GetDisplayName();
+
+		public string TypeOfBike => Bike.GetDisplayTypeOfBike();
+
+		public string WheelType => Bike.GetDisplayWheelType();
+
+		/// <summary>
+		/// Gets the unique Id of bike or an empty string, if no name is defined to avoid duplicate display of id.
+		/// </summary>
+		public string DisplayId => Bike.GetDisplayId();
+
+		/// <summary>
+		/// Gets the unique Id of bike used by derived model to determine which bike to remove.
+		/// </summary>
+		public string Id => Bike.Id;
+
+		public bool IsBikeWithCopriLock => Bike.LockModel == Model.Bikes.BikeInfoNS.BikeNS.LockModel.Sigo;
+
+		/// Returns if type of bike is a cargo pedelec bike.
+		public bool IsBatteryChargeVisible =>
+			Bike.Drive.Type == Model.Bikes.BikeInfoNS.DriveNS.DriveType.Pedelec
+			&& (!Bike.Drive.Battery.IsHidden.HasValue /* no value means show battery level */ || Bike.Drive.Battery.IsHidden.Value == false);
+
+		/// Gets the image path for bike type Citybike, CargoLong, Trike or Pedelec.
+		public string DisplayedBikeImageSourceString => $"bike_{Bike.TypeOfBike}_{Bike.Drive.Type}_{Bike.WheelType}.png";
+
+		/// <summary>
+		/// Gets the current charge level.
+		/// </summary>
+		public string CurrentChargeBars => Bike.Drive.Type == Model.Bikes.BikeInfoNS.DriveNS.DriveType.Pedelec
+			? Bike.Drive.Battery.CurrentChargeBars?.ToString() ?? string.Empty
+			: string.Empty;
+
+		/// <summary>
+		/// Gets the value if current charge level is low ( <= 1 ).
+		/// </summary>
+		public bool IsCurrentChargeLow => this.CurrentChargeBars == "1" || this.CurrentChargeBars == "0";
+
+		/// <summary>
+		/// Gets the current charge level.
+		/// </summary>
+		public string MaxChargeBars => Bike.Drive.Type == Model.Bikes.BikeInfoNS.DriveNS.DriveType.Pedelec
+			? Bike.Drive.Battery.MaxChargeBars?.ToString() ?? string.Empty
+			: string.Empty;
+
+		/// <summary>
+		/// Returns status of a bike as text (binds to GUI). 
+		/// </summary>
+		/// <todo> Log invalid states for diagnose purposes.</todo>
+		public string StateText
+		{
+			get
+			{
+				switch (Bike.State.Value)
+				{
+					case InUseStateEnum.FeedbackPending:
+						return AppResources.StatusTextFeedbackPending;
+
+					case InUseStateEnum.Disposable:
+						return AppResources.StatusTextAvailable;
+				}
+
+				if (!ActiveUser.IsLoggedIn)
+				{
+					// Nobody is logged in.
+					switch (Bike.State.Value)
+					{
+						case InUseStateEnum.Reserved:
+							return GetReservedInfo(
+								Bike.State.RemainingTime,
+								Bike.StationId,
+								null); // Hide reservation code because no one but active user should see code
+
+						case InUseStateEnum.Booked:
+							return GetBookedInfo(
+								Bike.State.From,
+								Bike.StationId,
+								null); // Hide reservation code because no one but active user should see code
+
+						default:
+							return string.Format("Unbekannter status {0}.", Bike.State.Value);
+					}
+				}
+
+				switch (Bike.State.Value)
+				{
+					case InUseStateEnum.Reserved:
+						return Bike.State.MailAddress == ActiveUser.Mail
+							? GetReservedInfo(
+								Bike.State.RemainingTime,
+								Bike.StationId,
+								Bike.State.Code)
+							: "Fahrrad bereits reserviert durch anderen Nutzer.";
+
+					case InUseStateEnum.Booked:
+						return Bike.State.MailAddress == ActiveUser.Mail
+							? GetBookedInfo(
+								Bike.State.From,
+								Bike.StationId,
+								Bike.State.Code)
+							: "Fahrrad bereits gebucht durch anderen Nutzer.";
+
+					default:
+						return string.Format("Unbekannter status {0}.", Bike.State.Value);
+				}
+			}
+		}
+
+		/// <summary> Gets the value of property <see cref="StateColor"/> when PropertyChanged was fired. </summary>
+		private string LastStateText { get; set; }
+
+		/// <summary>
+		/// Gets reserved into display text.
+		/// </summary>
+		/// <todo>Log unexpeced states.</todo>
+		/// <param name="p_oInUseState"></param>
+		/// <returns>Display text</returns>
+		private string GetReservedInfo(
+			TimeSpan? p_oRemainingTime,
+			string p_strStation = null,
+			string p_strCode = null)
+		{
+			return StateInfoProvider.GetReservedInfo(p_oRemainingTime, p_strStation, p_strCode);
+		}
+
+		/// <summary>
+		/// Gets booked into display text.
+		/// </summary>
+		/// <todo>Log unexpeced states.</todo>
+		/// <param name="p_oInUseState"></param>
+		/// <returns>Display text</returns>
+		private string GetBookedInfo(
+			DateTime? p_oFrom,
+			string p_strStation = null,
+			string p_strCode = null)
+		{
+			return StateInfoProvider.GetBookedInfo(p_oFrom, p_strStation, p_strCode);
+		}
+
+		/// <summary>
+		/// Exposes the bike state.
+		/// </summary>
+		public InUseStateEnum State => Bike.State.Value;
+
+		/// <summary> Gets the value of property <see cref="State"/> when PropertyChanged was fired. </summary>
+		public InUseStateEnum LastState { get; set; }
+
+		/// <summary>
+		/// Gets the color which visualizes the state of bike in relation to logged in user.
+		/// </summary>
+		public Color StateColor
+		{
+			get
+			{
+				if (!ActiveUser.IsLoggedIn)
+				{
+					return Color.Default;
+				}
+
+				var l_oSelectedBikeState = Bike.State;
+				switch (l_oSelectedBikeState.Value)
+				{
+					case InUseStateEnum.Reserved:
+						return l_oSelectedBikeState.MailAddress == ActiveUser.Mail
+							? InUseStateEnum.Reserved.GetColor()
+							: Color.Red;    // Bike is reserved by someone else
+
+					case InUseStateEnum.Booked:
+						return l_oSelectedBikeState.MailAddress == ActiveUser.Mail
+							? InUseStateEnum.Booked.GetColor()
+							: Color.Red;    // Bike is booked by someone else
+
+					default:
+						return Color.Default;
+				}
+			}
+		}
+
+		/// <summary> Holds description about the tarif. </summary>
+		public TariffDescriptionViewModel TariffDescription => new TariffDescriptionViewModel(Bike.TariffDescription);
+
+		/// <summary> Gets the value of property <see cref="StateColor"/> when PropertyChanged was fired. </summary>
+		public Color LastStateColor { get; set; }
+
+		/// <summary> Command object to bind login page redirect link to view model.</summary>
+		public System.Windows.Input.ICommand ShowAgbTappedCommand
+				=> new Xamarin.Forms.Command(() => ShowAgbPageAsync());
+
+		/// <summary> Opens login page. </summary>
+		public void ShowAgbPageAsync()
+		{
+			try
+			{
+				var url = GetUrlFirstOrDefault(TariffDescription.OperatorAgb);
+				if (string.IsNullOrEmpty(url))
+				{
+					// No url contained in string.
+					return;
+				}
+
+				OpenUrlInBrowser(url);
+
+			}
+			catch (Exception p_oException)
+			{
+				Log.Error("An unexpected error occurred opening broser. {@Exception}", p_oException);
+				return;
+			}
+		}
+
+		/// <summary> Gets first url from text.</summary>
+		/// <param name="htmlSource">url to extract text from.</param>
+		/// <returns>Gets first url or an empty string if on url is contained in text.</returns>
+
+		public static string GetUrlFirstOrDefault(string htmlSource)
+		{
+			if (string.IsNullOrEmpty(htmlSource))
+				return string.Empty;
+
+			try
+			{
+				var matches = new Regex(@"https://[-a-zA-Z0-9+&@#/%?=~_|!:, .;]*[-a-zA-Z0-9+&@#/%=~_|]").Matches(htmlSource);
+				return matches.Count > 0
+					? matches[0].Value
+					: string.Empty;
+			}
+			catch (Exception e)
+			{
+				Log.ForContext<BikeViewModelBase>().Error("Extracting URL failed. {Exception}", e);
+				return string.Empty;
+			}
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BikeViewModelFactory.cs b/TINKLib/ViewModel/Bikes/Bike/BikeViewModelFactory.cs
index 50aa1eb..7129533 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BikeViewModelFactory.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BikeViewModelFactory.cs
@@ -8,61 +8,61 @@ using TINK.View;
 
 namespace TINK.ViewModel.Bikes.Bike
 {
-    public static class BikeViewModelFactory
-    {
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
-        /// <param name="stateInfoProvider">Provides in use state information.</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        /// <param name="openUrlInBrowser">Delegate to open browser.</param>
-        public static BikeViewModelBase Create(
-            Func<bool> isConnectedDelegate,
-            Func<bool, IConnector> connectorFactory,
-            IGeolocation geolocation,
-            ILocksService lockService,
-            Action<string> bikeRemoveDelegate,
-            Func<IPollingUpdateTaskManager> viewUpdateManager,
-            ISmartDevice smartDevice,
-            IViewService viewService,
-            Model.Bikes.BikeInfoNS.BC.BikeInfoMutable bikeInfo,
-            IUser activeUser,
-            IInUseStateInfoProvider stateInfoProvider,
-            IBikesViewModel bikesViewModel,
-            Action<string> openUrlInBrowser)
-        {
-            if (bikeInfo is Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable)
-            {
-                return new BluetoothLock.BikeViewModel(
-                    isConnectedDelegate,
-                    connectorFactory,
-                    geolocation,
-                    lockService,
-                    bikeRemoveDelegate,
-                    viewUpdateManager,
-                    smartDevice,
-                    viewService,
-                    bikeInfo as Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable,
-                    activeUser,
-                    stateInfoProvider,
-                    bikesViewModel,
-                    openUrlInBrowser);
-            }
-            if (bikeInfo is Model.Bikes.BikeInfoNS.CopriLock.BikeInfoMutable)
-            {
-                return new CopriLock.BikeViewModel(
-                    isConnectedDelegate,
-                    connectorFactory,
-                    bikeRemoveDelegate,
-                    viewUpdateManager,
-                    smartDevice,
-                    viewService,
-                    bikeInfo,
-                    activeUser,
-                    stateInfoProvider,
-                    bikesViewModel,
-                    openUrlInBrowser);
-            }
+	public static class BikeViewModelFactory
+	{
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
+		/// <param name="stateInfoProvider">Provides in use state information.</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		/// <param name="openUrlInBrowser">Delegate to open browser.</param>
+		public static BikeViewModelBase Create(
+			Func<bool> isConnectedDelegate,
+			Func<bool, IConnector> connectorFactory,
+			IGeolocation geolocation,
+			ILocksService lockService,
+			Action<string> bikeRemoveDelegate,
+			Func<IPollingUpdateTaskManager> viewUpdateManager,
+			ISmartDevice smartDevice,
+			IViewService viewService,
+			Model.Bikes.BikeInfoNS.BC.BikeInfoMutable bikeInfo,
+			IUser activeUser,
+			IInUseStateInfoProvider stateInfoProvider,
+			IBikesViewModel bikesViewModel,
+			Action<string> openUrlInBrowser)
+		{
+			if (bikeInfo is Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable)
+			{
+				return new BluetoothLock.BikeViewModel(
+					isConnectedDelegate,
+					connectorFactory,
+					geolocation,
+					lockService,
+					bikeRemoveDelegate,
+					viewUpdateManager,
+					smartDevice,
+					viewService,
+					bikeInfo as Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable,
+					activeUser,
+					stateInfoProvider,
+					bikesViewModel,
+					openUrlInBrowser);
+			}
+			if (bikeInfo is Model.Bikes.BikeInfoNS.CopriLock.BikeInfoMutable)
+			{
+				return new CopriLock.BikeViewModel(
+					isConnectedDelegate,
+					connectorFactory,
+					bikeRemoveDelegate,
+					viewUpdateManager,
+					smartDevice,
+					viewService,
+					bikeInfo,
+					activeUser,
+					stateInfoProvider,
+					bikesViewModel,
+					openUrlInBrowser);
+			}
 
-            return null;
-        }
-    }
+			return null;
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/BikeViewModel.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/BikeViewModel.cs
index a224a9e..5a43f7d 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/BikeViewModel.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/BikeViewModel.cs
@@ -12,184 +12,184 @@ using BikeInfoMutable = TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutabl
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock
 {
-    /// <summary>
-    /// View model for a ILockIt bike.
-    /// Provides functionality for views
-    /// - MyBikes
-    /// - BikesAtStation
-    /// </summary>
-    public class BikeViewModel : BikeViewModelBase, INotifyPropertyChanged
-    {
-        /// <summary> Notifies GUI about changes. </summary>
-        public override event PropertyChangedEventHandler PropertyChanged;
+	/// <summary>
+	/// View model for a ILockIt bike.
+	/// Provides functionality for views
+	/// - MyBikes
+	/// - BikesAtStation
+	/// </summary>
+	public class BikeViewModel : BikeViewModelBase, INotifyPropertyChanged
+	{
+		/// <summary> Notifies GUI about changes. </summary>
+		public override event PropertyChangedEventHandler PropertyChanged;
 
-        private IGeolocation Geolocation { get; }
+		private IGeolocation Geolocation { get; }
 
-        private ILocksService LockService { get; }
+		private ILocksService LockService { get; }
 
-        /// <summary> Holds object which manages requests. </summary>
-        private IRequestHandler RequestHandler { get; set; }
+		/// <summary> Holds object which manages requests. </summary>
+		private IRequestHandler RequestHandler { get; set; }
 
-        /// <summary> Raises events in order to update GUI.</summary>
-        public override void RaisePropertyChanged(object sender, PropertyChangedEventArgs eventArgs) => PropertyChanged?.Invoke(sender, eventArgs);
+		/// <summary> Raises events in order to update GUI.</summary>
+		public override void RaisePropertyChanged(object sender, PropertyChangedEventArgs eventArgs) => PropertyChanged?.Invoke(sender, eventArgs);
 
-        /// <summary> Raises events if property values changed in order to update GUI.</summary>
-        private void RaisePropertyChangedEvent(
-            IRequestHandler lastHandler,
-            string lastStateText = null,
-            Xamarin.Forms.Color? lastStateColor = null)
-        {
-            if (lastHandler.ButtonText != ButtonText)
-            {
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ButtonText)));
-            }
+		/// <summary> Raises events if property values changed in order to update GUI.</summary>
+		private void RaisePropertyChangedEvent(
+			IRequestHandler lastHandler,
+			string lastStateText = null,
+			Xamarin.Forms.Color? lastStateColor = null)
+		{
+			if (lastHandler.ButtonText != ButtonText)
+			{
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ButtonText)));
+			}
 
-            if (lastHandler.IsButtonVisible != IsButtonVisible)
-            {
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsButtonVisible)));
-            }
+			if (lastHandler.IsButtonVisible != IsButtonVisible)
+			{
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsButtonVisible)));
+			}
 
-            if (lastHandler.LockitButtonText != LockitButtonText)
-            {
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(LockitButtonText)));
-            }
+			if (lastHandler.LockitButtonText != LockitButtonText)
+			{
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(LockitButtonText)));
+			}
 
-            if (lastHandler.IsLockitButtonVisible != IsLockitButtonVisible)
-            {
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLockitButtonVisible)));
-            }
+			if (lastHandler.IsLockitButtonVisible != IsLockitButtonVisible)
+			{
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLockitButtonVisible)));
+			}
 
-            if (RequestHandler.ErrorText != lastHandler.ErrorText)
-            {
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ErrorText)));
-            }
+			if (RequestHandler.ErrorText != lastHandler.ErrorText)
+			{
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ErrorText)));
+			}
 
-            if (!string.IsNullOrEmpty(lastStateText) && lastStateText != StateText)
-            {
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StateText)));
-            }
+			if (!string.IsNullOrEmpty(lastStateText) && lastStateText != StateText)
+			{
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StateText)));
+			}
 
-            if (lastStateColor != null && lastStateColor != StateColor)
-            {
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StateColor)));
-            }
-        }
+			if (lastStateColor != null && lastStateColor != StateColor)
+			{
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StateColor)));
+			}
+		}
 
-        /// <summary>
-        /// Constructs a bike view model object.
-        /// </summary>
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-        /// <param name="selectedBike">Bike to be displayed.</param>
-        /// <param name="user">Object holding logged in user or an empty user object.</param>
-        /// <param name="stateInfoProvider">Provides in use state information.</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        /// <param name="openUrlInBrowser">Delegate to open browser.</param>
-        public BikeViewModel(
-            Func<bool> isConnectedDelegate,
-            Func<bool, IConnector> connectorFactory,
-            IGeolocation geolocation,
-            ILocksService lockService,
-            Action<string> bikeRemoveDelegate,
-            Func<IPollingUpdateTaskManager> viewUpdateManager,
-            ISmartDevice smartDevice,
-            IViewService viewService,
-            BikeInfoMutable selectedBike,
-            IUser user,
-            IInUseStateInfoProvider stateInfoProvider,
-            IBikesViewModel bikesViewModel,
-            Action<string> openUrlInBrowser) : base(isConnectedDelegate, connectorFactory, bikeRemoveDelegate, viewUpdateManager, smartDevice, viewService, selectedBike, user, stateInfoProvider, bikesViewModel, openUrlInBrowser)
-        {
-            RequestHandler = user.IsLoggedIn
-                ? RequestHandlerFactory.Create(
-                    selectedBike,
-                    isConnectedDelegate,
-                    connectorFactory,
-                    geolocation,
-                    lockService,
-                    viewUpdateManager,
-                    smartDevice,
-                    viewService,
-                    bikesViewModel,
-                    user)
-                : new NotLoggedIn(
-                    selectedBike.State.Value,
-                    viewService,
-                    bikesViewModel);
+		/// <summary>
+		/// Constructs a bike view model object.
+		/// </summary>
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
+		/// <param name="selectedBike">Bike to be displayed.</param>
+		/// <param name="user">Object holding logged in user or an empty user object.</param>
+		/// <param name="stateInfoProvider">Provides in use state information.</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		/// <param name="openUrlInBrowser">Delegate to open browser.</param>
+		public BikeViewModel(
+			Func<bool> isConnectedDelegate,
+			Func<bool, IConnector> connectorFactory,
+			IGeolocation geolocation,
+			ILocksService lockService,
+			Action<string> bikeRemoveDelegate,
+			Func<IPollingUpdateTaskManager> viewUpdateManager,
+			ISmartDevice smartDevice,
+			IViewService viewService,
+			BikeInfoMutable selectedBike,
+			IUser user,
+			IInUseStateInfoProvider stateInfoProvider,
+			IBikesViewModel bikesViewModel,
+			Action<string> openUrlInBrowser) : base(isConnectedDelegate, connectorFactory, bikeRemoveDelegate, viewUpdateManager, smartDevice, viewService, selectedBike, user, stateInfoProvider, bikesViewModel, openUrlInBrowser)
+		{
+			RequestHandler = user.IsLoggedIn
+				? RequestHandlerFactory.Create(
+					selectedBike,
+					isConnectedDelegate,
+					connectorFactory,
+					geolocation,
+					lockService,
+					viewUpdateManager,
+					smartDevice,
+					viewService,
+					bikesViewModel,
+					user)
+				: new NotLoggedIn(
+					selectedBike.State.Value,
+					viewService,
+					bikesViewModel);
 
-            Geolocation = geolocation
-                ?? throw new ArgumentException($"Can not instantiate {this.GetType().Name}-object. Parameter {nameof(geolocation)} can not be null.");
+			Geolocation = geolocation
+				?? throw new ArgumentException($"Can not instantiate {this.GetType().Name}-object. Parameter {nameof(geolocation)} can not be null.");
 
-            LockService = lockService
-                ?? throw new ArgumentException($"Can not instantiate {this.GetType().Name}-object. Parameter {nameof(lockService)} can not be null.");
-        }
+			LockService = lockService
+				?? throw new ArgumentException($"Can not instantiate {this.GetType().Name}-object. Parameter {nameof(lockService)} can not be null.");
+		}
 
-        /// <summary>
-        /// Handles BikeInfoMutable events. 
-        /// Helper member to raise events. Maps model event change notification to view model events.
-        /// Todo: Check which events are received here and filter, to avoid event storm.
-        /// </summary>
-        public override void OnSelectedBikeStateChanged()
-        {
-            var lastHandler = RequestHandler;
-            RequestHandler = RequestHandlerFactory.Create(
-                Bike,
-                IsConnectedDelegate,
-                ConnectorFactory,
-                Geolocation,
-                LockService,
-                ViewUpdateManager,
-                SmartDevice,
-                ViewService,
-                BikesViewModel,
-                ActiveUser);
+		/// <summary>
+		/// Handles BikeInfoMutable events. 
+		/// Helper member to raise events. Maps model event change notification to view model events.
+		/// Todo: Check which events are received here and filter, to avoid event storm.
+		/// </summary>
+		public override void OnSelectedBikeStateChanged()
+		{
+			var lastHandler = RequestHandler;
+			RequestHandler = RequestHandlerFactory.Create(
+				Bike,
+				IsConnectedDelegate,
+				ConnectorFactory,
+				Geolocation,
+				LockService,
+				ViewUpdateManager,
+				SmartDevice,
+				ViewService,
+				BikesViewModel,
+				ActiveUser);
 
-            RaisePropertyChangedEvent(lastHandler);
-        }
+			RaisePropertyChangedEvent(lastHandler);
+		}
 
-        /// <summary> Gets visiblity of the copri command button. </summary>
-        public bool IsButtonVisible => RequestHandler.IsButtonVisible;
+		/// <summary> Gets visiblity of the copri command button. </summary>
+		public bool IsButtonVisible => RequestHandler.IsButtonVisible;
 
-        /// <summary> Gets the text of the copri command button. </summary>
-        public string ButtonText => RequestHandler.ButtonText;
+		/// <summary> Gets the text of the copri command button. </summary>
+		public string ButtonText => RequestHandler.ButtonText;
 
-        /// <summary> Gets visiblity of the ILockIt command button. </summary>
-        public bool IsLockitButtonVisible => RequestHandler.IsLockitButtonVisible;
+		/// <summary> Gets visiblity of the ILockIt command button. </summary>
+		public bool IsLockitButtonVisible => RequestHandler.IsLockitButtonVisible;
 
-        /// <summary> Gets the text of the ILockIt command button. </summary>
-        public string LockitButtonText => RequestHandler.LockitButtonText;
+		/// <summary> Gets the text of the ILockIt command button. </summary>
+		public string LockitButtonText => RequestHandler.LockitButtonText;
 
-        /// <summary> Processes request to perform a copri action (reserve bike and cancel reservation). </summary>
-        public System.Windows.Input.ICommand OnButtonClicked => new Xamarin.Forms.Command(async () => await ClickButton(RequestHandler.HandleRequestOption1()));
+		/// <summary> Processes request to perform a copri action (reserve bike and cancel reservation). </summary>
+		public System.Windows.Input.ICommand OnButtonClicked => new Xamarin.Forms.Command(async () => await ClickButton(RequestHandler.HandleRequestOption1()));
 
-        /// <summary> Processes request to perform a ILockIt action (unlock bike and lock bike). </summary>
-        public System.Windows.Input.ICommand OnLockitButtonClicked => new Xamarin.Forms.Command(async () => await ClickButton(RequestHandler.HandleRequestOption2()));
+		/// <summary> Processes request to perform a ILockIt action (unlock bike and lock bike). </summary>
+		public System.Windows.Input.ICommand OnLockitButtonClicked => new Xamarin.Forms.Command(async () => await ClickButton(RequestHandler.HandleRequestOption2()));
 
-        /// <summary> Processes request to perform a copri action (reserve bike and cancel reservation). </summary>
-        private async Task ClickButton(Task<IRequestHandler> handleRequest)
-        {
-            var lastHandler = RequestHandler;
-            var lastStateText = StateText;
-            var lastStateColor = StateColor;
+		/// <summary> Processes request to perform a copri action (reserve bike and cancel reservation). </summary>
+		private async Task ClickButton(Task<IRequestHandler> handleRequest)
+		{
+			var lastHandler = RequestHandler;
+			var lastStateText = StateText;
+			var lastStateColor = StateColor;
 
-            RequestHandler = await handleRequest;
+			RequestHandler = await handleRequest;
 
-            if (lastHandler.IsRemoveBikeRequired)
-            {
-                BikeRemoveDelegate(Id);
-            }
+			if (lastHandler.IsRemoveBikeRequired)
+			{
+				BikeRemoveDelegate(Id);
+			}
 
-            if (RuntimeHelpers.Equals(lastHandler, RequestHandler))
-            {
-                // No state change occurred (same instance is returned).
-                return;
-            }
+			if (RuntimeHelpers.Equals(lastHandler, RequestHandler))
+			{
+				// No state change occurred (same instance is returned).
+				return;
+			}
 
-            RaisePropertyChangedEvent(
-                lastHandler,
-                lastStateText,
-                lastStateColor);
-        }
+			RaisePropertyChangedEvent(
+				lastHandler,
+				lastStateText,
+				lastStateColor);
+		}
 
-        public string ErrorText => RequestHandler.ErrorText;
-    }
+		public string ErrorText => RequestHandler.ErrorText;
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/Base.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/Base.cs
index c3389cd..b15ccd7 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/Base.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/Base.cs
@@ -8,43 +8,43 @@ using TINK.View;
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    public abstract class Base : BC.RequestHandler.Base<Model.Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMutable>
-    {
-        /// <summary>
-        /// Constructs the reqest handler base.
-        /// </summary>
-        /// <param name="selectedBike">Bike which is reserved or for which reservation is canceled.</param>
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public Base(
-            Model.Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMutable selectedBike,
-            string buttonText,
-            bool isCopriButtonVisible,
-            Func<bool> isConnectedDelegate,
-            Func<bool, IConnector> connectorFactory,
-            IGeolocation geolocation,
-            ILocksService lockService,
-            Func<IPollingUpdateTaskManager> viewUpdateManager,
-            ISmartDevice smartDevice,
-            IViewService viewService,
-            IBikesViewModel bikesViewModel,
-            IUser activeUser) : base(selectedBike, buttonText, isCopriButtonVisible, isConnectedDelegate, connectorFactory, viewUpdateManager, smartDevice, viewService, bikesViewModel, activeUser)
-        {
-            Geolocation = geolocation
-                ?? throw new ArgumentException($"Can not construct {GetType().Name}-object. Parameter {nameof(geolocation)} must not be null.");
+	public abstract class Base : BC.RequestHandler.Base<Model.Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMutable>
+	{
+		/// <summary>
+		/// Constructs the reqest handler base.
+		/// </summary>
+		/// <param name="selectedBike">Bike which is reserved or for which reservation is canceled.</param>
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public Base(
+			Model.Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMutable selectedBike,
+			string buttonText,
+			bool isCopriButtonVisible,
+			Func<bool> isConnectedDelegate,
+			Func<bool, IConnector> connectorFactory,
+			IGeolocation geolocation,
+			ILocksService lockService,
+			Func<IPollingUpdateTaskManager> viewUpdateManager,
+			ISmartDevice smartDevice,
+			IViewService viewService,
+			IBikesViewModel bikesViewModel,
+			IUser activeUser) : base(selectedBike, buttonText, isCopriButtonVisible, isConnectedDelegate, connectorFactory, viewUpdateManager, smartDevice, viewService, bikesViewModel, activeUser)
+		{
+			Geolocation = geolocation
+				?? throw new ArgumentException($"Can not construct {GetType().Name}-object. Parameter {nameof(geolocation)} must not be null.");
 
-            LockService = lockService
-                ?? throw new ArgumentException($"Can not construct {GetType().Name}-object. Parameter {nameof(lockService)} must not be null.");
-        }
+			LockService = lockService
+				?? throw new ArgumentException($"Can not construct {GetType().Name}-object. Parameter {nameof(lockService)} must not be null.");
+		}
 
-        protected IGeolocation Geolocation { get; }
+		protected IGeolocation Geolocation { get; }
 
-        protected ILocksService LockService { get; }
+		protected ILocksService LockService { get; }
 
-        public string LockitButtonText { get; protected set; }
+		public string LockitButtonText { get; protected set; }
 
-        public bool IsLockitButtonVisible { get; protected set; }
+		public bool IsLockitButtonVisible { get; protected set; }
 
-        public string ErrorText => string.Empty;
-    }
+		public string ErrorText => string.Empty;
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedClosed.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedClosed.cs
index 5bf4b81..0855f9e 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedClosed.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedClosed.cs
@@ -19,429 +19,429 @@ using Xamarin.Essentials;
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    public class BookedClosed : Base, IRequestHandler
-    {
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public BookedClosed(
-           IBikeInfoMutable selectedBike,
-           Func<bool> isConnectedDelegate,
-           Func<bool, IConnector> connectorFactory,
-           IGeolocation geolocation,
-           ILocksService lockService,
-           Func<IPollingUpdateTaskManager> viewUpdateManager,
-           ISmartDevice smartDevice,
-           IViewService viewService,
-           IBikesViewModel bikesViewModel,
-           IUser activeUser) : base(
-               selectedBike,
-               AppResources.ActionReturn, // Copri button text "Miete beenden"
-               true, // Show button to enabled returning of bike.
-               isConnectedDelegate,
-               connectorFactory,
-               geolocation,
-               lockService,
-               viewUpdateManager,
-               smartDevice,
-               viewService,
-               bikesViewModel,
-               activeUser)
-        {
-            LockitButtonText = AppResources.ActionOpenAndPause;
-            IsLockitButtonVisible = true; // Show button to enable opening lock in case user took a pause and does not want to return the bike.
-        }
+	public class BookedClosed : Base, IRequestHandler
+	{
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public BookedClosed(
+		   IBikeInfoMutable selectedBike,
+		   Func<bool> isConnectedDelegate,
+		   Func<bool, IConnector> connectorFactory,
+		   IGeolocation geolocation,
+		   ILocksService lockService,
+		   Func<IPollingUpdateTaskManager> viewUpdateManager,
+		   ISmartDevice smartDevice,
+		   IViewService viewService,
+		   IBikesViewModel bikesViewModel,
+		   IUser activeUser) : base(
+			   selectedBike,
+			   AppResources.ActionReturn, // Copri button text "Miete beenden"
+			   false, // Do no more allow to return bike.
+			   isConnectedDelegate,
+			   connectorFactory,
+			   geolocation,
+			   lockService,
+			   viewUpdateManager,
+			   smartDevice,
+			   viewService,
+			   bikesViewModel,
+			   activeUser)
+		{
+			LockitButtonText = AppResources.ActionOpenAndPause;
+			IsLockitButtonVisible = true; // Show button to enable opening lock in case user took a pause and does not want to return the bike.
+		}
 
-        /// <summary> Return bike. </summary>
-        public async Task<IRequestHandler> HandleRequestOption1() => await ReturnBike();
+		/// <summary> Return bike. </summary>
+		public async Task<IRequestHandler> HandleRequestOption1() => await ReturnBike();
 
-        /// <summary> Open bike and update COPRI lock state. </summary>
-        public async Task<IRequestHandler> HandleRequestOption2() => await OpenLock();
+		/// <summary> Open bike and update COPRI lock state. </summary>
+		public async Task<IRequestHandler> HandleRequestOption2() => await OpenLock();
 
 
-        /// <summary> Return bike. </summary>
-        public async Task<IRequestHandler> ReturnBike()
-        {
-            BikesViewModel.IsIdle = false;
-            var ctsLocation = new CancellationTokenSource();
-            Task<Location> currentLocationTask = null;
-            var timeStamp = DateTime.Now;
+		/// <summary> Return bike. </summary>
+		public async Task<IRequestHandler> ReturnBike()
+		{
+			BikesViewModel.IsIdle = false;
+			var ctsLocation = new CancellationTokenSource();
+			Task<Location> currentLocationTask = null;
+			var timeStamp = DateTime.Now;
 
-            // Check if bike is around.
-            var deviceState = LockService[SelectedBike.LockInfo.Id].GetDeviceState();
-            if (deviceState == DeviceState.Connected)
-            {
-                BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationStart;    // Bluetooth is in reach
+			// Check if bike is around.
+			var deviceState = LockService[SelectedBike.LockInfo.Id].GetDeviceState();
+			if (deviceState == DeviceState.Connected)
+			{
+				BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationStart;    // Bluetooth is in reach
 
-                // Start getting geolocation.
-                try
-                {
-                    currentLocationTask = Geolocation.GetAsync(ctsLocation.Token, timeStamp);
-                }
-                catch (Exception ex)
-                {
-                    // No location information available.
-                    Log.ForContext<BookedClosed>().Information("Getting geolocation when returning bike {Bike} failed. {Exception}", SelectedBike, ex);
-                }
-            }
+				// Start getting geolocation.
+				try
+				{
+					currentLocationTask = Geolocation.GetAsync(ctsLocation.Token, timeStamp);
+				}
+				catch (Exception ex)
+				{
+					// No location information available.
+					Log.ForContext<BookedClosed>().Information("Getting geolocation when returning bike {Bike} failed. {Exception}", SelectedBike, ex);
+				}
+			}
 
-            // Ask whether to really return bike?
-            var l_oResult = await ViewService.DisplayAlert(
-                string.Empty,
-                string.Format(AppResources.QuestionReturnBike, SelectedBike.GetFullDisplayName()),
-                AppResources.MessageAnswerYes,
-                AppResources.MessageAnswerNo);
+			// Ask whether to really return bike?
+			var l_oResult = await ViewService.DisplayAlert(
+				string.Empty,
+				string.Format(AppResources.QuestionReturnBike, SelectedBike.GetFullDisplayName()),
+				AppResources.MessageAnswerYes,
+				AppResources.MessageAnswerNo);
 
-            if (l_oResult == false)
-            {
-                // User aborted returning bike process
-                Log.ForContext<BookedClosed>().Information("User selected booked bike {l_oId} in order to return but action was canceled.", SelectedBike.Id);
+			if (l_oResult == false)
+			{
+				// User aborted returning bike process
+				Log.ForContext<BookedClosed>().Information("User selected booked bike {l_oId} in order to return but action was canceled.", SelectedBike.Id);
 
-                // Cancel getting geolocation.
-                ctsLocation.Cancel();
-                BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationCancelWait;
-                try
-                {
-                    await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
-                }
-                catch (Exception ex)
-                {
-                    // No location information available.
-                    Log.ForContext<BookedClosed>().Information("Canceling query location failed on abort returning closed bike failed. {Exception}", SelectedBike, ex);
-                }
+				// Cancel getting geolocation.
+				ctsLocation.Cancel();
+				BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationCancelWait;
+				try
+				{
+					await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
+				}
+				catch (Exception ex)
+				{
+					// No location information available.
+					Log.ForContext<BookedClosed>().Information("Canceling query location failed on abort returning closed bike failed. {Exception}", SelectedBike, ex);
+				}
 
-                BikesViewModel.IsIdle = true;
-                return this;
-            }
+				BikesViewModel.IsIdle = true;
+				return this;
+			}
 
-            // Lock list to avoid multiple taps while copri action is pending.
-            Log.ForContext<BookedClosed>().Information("Request to return bike {bike} detected.", SelectedBike);
+			// Lock list to avoid multiple taps while copri action is pending.
+			Log.ForContext<BookedClosed>().Information("Request to return bike {bike} detected.", SelectedBike);
 
-            // Stop polling before returning bike.
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before returning bike.
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            // Check if bike is around.
-            Location currentLocation = null;
-            LocationDto currentLocationDto = null;
-            if (deviceState == DeviceState.Connected)
-            {
-                BikesViewModel.ActionText = AppResources.ActivityTextQueryLocation;
-                try
-                {
-                    await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
-                    currentLocation = currentLocationTask?.Result ?? null;
-                }
-                catch (Exception ex)
-                {
-                    // No location information available.
-                    Log.ForContext<BookedClosed>().Information("Returning closed bike {Bike} is not possible. Cancel geolocation query failed. {Exception}", SelectedBike, ex);
-                }
+			// Check if bike is around.
+			Location currentLocation = null;
+			LocationDto currentLocationDto = null;
+			if (deviceState == DeviceState.Connected)
+			{
+				BikesViewModel.ActionText = AppResources.ActivityTextQueryLocation;
+				try
+				{
+					await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
+					currentLocation = currentLocationTask?.Result ?? null;
+				}
+				catch (Exception ex)
+				{
+					// No location information available.
+					Log.ForContext<BookedClosed>().Information("Returning closed bike {Bike} is not possible. Cancel geolocation query failed. {Exception}", SelectedBike, ex);
+				}
 
-                currentLocationDto = currentLocation != null
-                    ? new LocationDto.Builder
-                    {
-                        Latitude = currentLocation.Latitude,
-                        Longitude = currentLocation.Longitude,
-                        Accuracy = currentLocation.Accuracy ?? double.NaN,
-                        Age = timeStamp.Subtract(currentLocation.Timestamp.DateTime),
-                    }.Build()
-                    : null;
-            }
-            else
-            {
-                // Bluetooth out of reach. Lock state is no more known.
-                SelectedBike.LockInfo.State = LockingState.UnknownDisconnected;
-            }
+				currentLocationDto = currentLocation != null
+					? new LocationDto.Builder
+					{
+						Latitude = currentLocation.Latitude,
+						Longitude = currentLocation.Longitude,
+						Accuracy = currentLocation.Accuracy ?? double.NaN,
+						Age = timeStamp.Subtract(currentLocation.Timestamp.DateTime),
+					}.Build()
+					: null;
+			}
+			else
+			{
+				// Bluetooth out of reach. Lock state is no more known.
+				SelectedBike.LockInfo.State = LockingState.UnknownDisconnected;
+			}
 
-            BikesViewModel.ActionText = "Returning bike...";
-            IsConnected = IsConnectedDelegate();
+			BikesViewModel.ActionText = "Returning bike...";
+			IsConnected = IsConnectedDelegate();
 
-            var feedBackUri = SelectedBike?.OperatorUri;
-            BookingFinishedModel bookingFinished;
-            try
-            {
-                bookingFinished = await ConnectorFactory(IsConnected).Command.DoReturn(
-                    SelectedBike,
-                    currentLocationDto);
+			var feedBackUri = SelectedBike?.OperatorUri;
+			BookingFinishedModel bookingFinished;
+			try
+			{
+				bookingFinished = await ConnectorFactory(IsConnected).Command.DoReturn(
+					SelectedBike,
+					currentLocationDto);
 
-                // If canceling bike succedes remove bike because it is not ready to be booked again
-                IsRemoveBikeRequired = true;
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
+				// If canceling bike succedes remove bike because it is not ready to be booked again
+				IsRemoveBikeRequired = true;
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                if (exception is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<BookedClosed>().Information("User selected booked bike {bike} but returing failed (Copri server not reachable).", SelectedBike);
+				if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<BookedClosed>().Information("User selected booked bike {bike} but returing failed (Copri server not reachable).", SelectedBike);
 
-                    await ViewService.DisplayAdvancedAlert(
-                        AppResources.ErrorReturnBikeNoWebTitle,
-                        string.Format("{0}\r\n{1}", AppResources.ErrorReturnBikeNoWebMessage, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is NotAtStationException notAtStationException)
-                {
-                    // COPRI returned an error.
-                    Log.ForContext<BookedClosed>().Information("User selected booked bike {bike} but returning failed. COPRI returned an not at station error.", SelectedBike);
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.ErrorReturnBikeNoWebTitle,
+						string.Format("{0}\r\n{1}", AppResources.ErrorReturnBikeNoWebMessage, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is NotAtStationException notAtStationException)
+				{
+					// COPRI returned an error.
+					Log.ForContext<BookedClosed>().Information("User selected booked bike {bike} but returning failed. COPRI returned an not at station error.", SelectedBike);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorReturnBikeTitle,
-                        string.Format(AppResources.ErrorReturnBikeNotAtStationMessage, notAtStationException.StationNr, notAtStationException.Distance),
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is NoGPSDataException)
-                {
-                    // COPRI returned an error.
-                    Log.ForContext<BookedClosed>().Information("User selected booked bike {bike} but returing failed. COPRI returned an no GPS- data error.", SelectedBike);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorReturnBikeTitle,
+						string.Format(AppResources.ErrorReturnBikeNotAtStationMessage, notAtStationException.StationNr, notAtStationException.Distance),
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is NoGPSDataException)
+				{
+					// COPRI returned an error.
+					Log.ForContext<BookedClosed>().Information("User selected booked bike {bike} but returing failed. COPRI returned an no GPS- data error.", SelectedBike);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorReturnBikeTitle,
-                        string.Format(AppResources.ErrorReturnBikeLockClosedNoGPSMessage),
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is ResponseException copriException)
-                {
-                    // COPRI returned an error.
-                    Log.ForContext<BookedClosed>().Information("User selected booked bike {bike} but returing failed. COPRI returned an error.", SelectedBike);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorReturnBikeTitle,
+						string.Format(AppResources.ErrorReturnBikeLockClosedNoGPSMessage),
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is ResponseException copriException)
+				{
+					// COPRI returned an error.
+					Log.ForContext<BookedClosed>().Information("User selected booked bike {bike} but returing failed. COPRI returned an error.", SelectedBike);
 
-                    await ViewService.DisplayAdvancedAlert(
-                        "Statusfehler beim Zurückgeben des Rads!",
-                        copriException.Message,
-                        copriException.Response,
-                        "OK");
-                }
-                else
-                {
-                    Log.ForContext<BookedClosed>().Error("User selected booked bike {bike} but returning failed. {@l_oException}", SelectedBike.Id, exception);
+					await ViewService.DisplayAdvancedAlert(
+						"Statusfehler beim Zurückgeben des Rads!",
+						copriException.Message,
+						copriException.Response,
+						"OK");
+				}
+				else
+				{
+					Log.ForContext<BookedClosed>().Error("User selected booked bike {bike} but returning failed. {@l_oException}", SelectedBike.Id, exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorReturnBikeTitle,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAlert(
+						AppResources.ErrorReturnBikeTitle,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            Log.ForContext<BookedClosed>().Information("User returned bike {bike} successfully.", SelectedBike);
+			Log.ForContext<BookedClosed>().Information("User returned bike {bike} successfully.", SelectedBike);
 
-            // Disconnect lock.
-            BikesViewModel.ActionText = AppResources.ActivityTextDisconnectingLock;
-            try
-            {
-                SelectedBike.LockInfo.State = await LockService.DisconnectAsync(SelectedBike.LockInfo.Id, SelectedBike.LockInfo.Guid);
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<BookedClosed>().Error("Lock can not be disconnected. {Exception}", exception);
+			// Disconnect lock.
+			BikesViewModel.ActionText = AppResources.ActivityTextDisconnectingLock;
+			try
+			{
+				SelectedBike.LockInfo.State = await LockService.DisconnectAsync(SelectedBike.LockInfo.Id, SelectedBike.LockInfo.Guid);
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<BookedClosed>().Error("Lock can not be disconnected. {Exception}", exception);
 
-                BikesViewModel.ActionText = AppResources.ActivityTextErrorDisconnect;
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextErrorDisconnect;
+			}
 
 
 #if !USERFEEDBACKDLG_OFF
-            // Do get Feedback
-            var feedback = await ViewService.DisplayUserFeedbackPopup(SelectedBike.Drive?.Battery, bookingFinished?.Co2Saving);
-            IsConnected = IsConnectedDelegate();
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.DoSubmitFeedback(
-                     new UserFeedbackDto
-                     {
-                         BikeId = SelectedBike.Id,
-                         CurrentChargeBars = feedback.CurrentChargeBars,
-                         IsBikeBroken = feedback.IsBikeBroken,
-                         Message = feedback.Message
-                     },
-                    feedBackUri);
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
+			// Do get Feedback
+			var feedback = await ViewService.DisplayUserFeedbackPopup(SelectedBike.Drive?.Battery, bookingFinished?.Co2Saving);
+			IsConnected = IsConnectedDelegate();
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.DoSubmitFeedback(
+					 new UserFeedbackDto
+					 {
+						 BikeId = SelectedBike.Id,
+						 CurrentChargeBars = feedback.CurrentChargeBars,
+						 IsBikeBroken = feedback.IsBikeBroken,
+						 Message = feedback.Message
+					 },
+					feedBackUri);
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                if (exception is ResponseException copriException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<BookedClosed>().Information("Submitting feedback for bike {bike} failed. COPRI returned an error.", SelectedBike);
-                }
-                else
-                {
-                    Log.ForContext<BookedClosed>().Error("Submitting feedback for bike {bike} failed. {@l_oException}", SelectedBike.Id, exception);
-                }
+				if (exception is ResponseException copriException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<BookedClosed>().Information("Submitting feedback for bike {bike} failed. COPRI returned an error.", SelectedBike);
+				}
+				else
+				{
+					Log.ForContext<BookedClosed>().Error("Submitting feedback for bike {bike} failed. {@l_oException}", SelectedBike.Id, exception);
+				}
 
-                await ViewService.DisplayAlert(
-                    AppResources.ErrorReturnSubmitFeedbackTitle,
-                    AppResources.ErrorReturnSubmitFeedbackMessage,
-                    AppResources.MessageAnswerOk);
+				await ViewService.DisplayAlert(
+					AppResources.ErrorReturnSubmitFeedbackTitle,
+					AppResources.ErrorReturnSubmitFeedbackMessage,
+					AppResources.MessageAnswerOk);
 
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
 
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 #endif
-            if (bookingFinished != null && bookingFinished.MiniSurvey.Questions.Count > 0)
-            {
-                await ViewService.PushModalAsync(ViewTypes.MiniSurvey);
-            }
+			if (bookingFinished != null && bookingFinished.MiniSurvey.Questions.Count > 0)
+			{
+				await ViewService.PushModalAsync(ViewTypes.MiniSurvey);
+			}
 
-            // Restart polling again.
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically();
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true;
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
+			// Restart polling again.
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically();
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true;
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
 
-        /// <summary> Open bike and update COPRI lock state. </summary>
-        public async Task<IRequestHandler> OpenLock()
-        {
-            // Unlock bike.
-            Log.ForContext<BookedClosed>().Information("User request to unlock bike {bike}.", SelectedBike);
+		/// <summary> Open bike and update COPRI lock state. </summary>
+		public async Task<IRequestHandler> OpenLock()
+		{
+			// Unlock bike.
+			Log.ForContext<BookedClosed>().Information("User request to unlock bike {bike}.", SelectedBike);
 
-            // Stop polling before returning bike.
-            BikesViewModel.IsIdle = false;
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before returning bike.
+			BikesViewModel.IsIdle = false;
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            BikesViewModel.ActionText = AppResources.ActivityTextOpeningLock;
-            try
-            {
-                SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].OpenAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.ActionText = AppResources.ActivityTextOpeningLock;
+			try
+			{
+				SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].OpenAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                if (exception is OutOfReachException)
-                {
-                    Log.ForContext<BookedClosed>().Debug("Lock can not be opened. {Exception}", exception);
+				if (exception is OutOfReachException)
+				{
+					Log.ForContext<BookedClosed>().Debug("Lock can not be opened. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        AppResources.ErrorOpenLockOutOfReachMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntOpenBoldIsBlockedException)
-                {
-                    Log.ForContext<BookedClosed>().Debug("Lock can not be opened. Bold is blocked. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockOutOfReachMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntOpenBoldIsBlockedException)
+				{
+					Log.ForContext<BookedClosed>().Debug("Lock can not be opened. Bold is blocked. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        AppResources.ErrorOpenLockBoldBlockedMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntOpenBoldWasBlockedException)
-                {
-                    Log.ForContext<BookedClosed>().Debug("Lock can not be opened. Bold was or is blocked. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockBoldBlockedMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntOpenBoldWasBlockedException)
+				{
+					Log.ForContext<BookedClosed>().Debug("Lock can not be opened. Bold was or is blocked. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockStillOpenTitle,
-                        AppResources.ErrorOpenLockBoldWasBlockedMessage,
-                        "OK");
-                }
-                else if (exception is CouldntOpenInconsistentStateExecption inconsistentState
-                        && inconsistentState.State == LockingState.Closed)
-                {
-                    Log.ForContext<BookedClosed>().Debug("Lock can not be opened. lock reports state closed. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockStillOpenTitle,
+						AppResources.ErrorOpenLockBoldWasBlockedMessage,
+						"OK");
+				}
+				else if (exception is CouldntOpenInconsistentStateExecption inconsistentState
+						&& inconsistentState.State == LockingState.Closed)
+				{
+					Log.ForContext<BookedClosed>().Debug("Lock can not be opened. lock reports state closed. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        AppResources.ErrorOpenLockStillClosedMessage,
-                        "OK");
-                }
-                else
-                {
-                    Log.ForContext<BookedClosed>().Error("Lock can not be opened. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockStillClosedMessage,
+						"OK");
+				}
+				else
+				{
+					Log.ForContext<BookedClosed>().Error("Lock can not be opened. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        exception.Message,
-                        "OK");
-                }
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						exception.Message,
+						"OK");
+				}
 
-                // When bold is blocked lock is still closed even if exception occurres.
-                // In all other cases state is supposed to be unknown. Example: Lock is out of reach and no more bluetooth connected.
-                SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
-                    ? stateAwareException.State
-                    : LockingState.UnknownDisconnected;
+				// When bold is blocked lock is still closed even if exception occurres.
+				// In all other cases state is supposed to be unknown. Example: Lock is out of reach and no more bluetooth connected.
+				SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
+					? stateAwareException.State
+					: LockingState.UnknownDisconnected;
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            BikesViewModel.ActionText = AppResources.ActivityTextReadingChargingLevel;
-            try
-            {
-                SelectedBike.LockInfo.BatteryPercentage = await LockService[SelectedBike.LockInfo.Id].GetBatteryPercentageAsync();
-            }
-            catch (Exception exception)
-            {
-                if (exception is OutOfReachException)
-                {
-                    Log.ForContext<BookedClosed>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
+			BikesViewModel.ActionText = AppResources.ActivityTextReadingChargingLevel;
+			try
+			{
+				SelectedBike.LockInfo.BatteryPercentage = await LockService[SelectedBike.LockInfo.Id].GetBatteryPercentageAsync();
+			}
+			catch (Exception exception)
+			{
+				if (exception is OutOfReachException)
+				{
+					Log.ForContext<BookedClosed>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
-                }
-                else
-                {
-                    Log.ForContext<BookedClosed>().Error("Akkustate can not be read. {Exception}", exception);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
+				}
+				else
+				{
+					Log.ForContext<BookedClosed>().Error("Akkustate can not be read. {Exception}", exception);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
-                }
-            }
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
+				}
+			}
 
-            // Lock list to avoid multiple taps while copri action is pending.
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
+			// Lock list to avoid multiple taps while copri action is pending.
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
 
-            IsConnected = IsConnectedDelegate();
+			IsConnected = IsConnectedDelegate();
 
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(SelectedBike);
-            }
-            catch (Exception exception)
-            {
-                if (exception is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<BookedClosed>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", SelectedBike);
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(SelectedBike);
+			}
+			catch (Exception exception)
+			{
+				if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<BookedClosed>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", SelectedBike);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
-                }
-                else if (exception is ResponseException copriException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<BookedClosed>().Information("User locked bike {bike} in order to pause ride but updating failed. {response}.", SelectedBike, copriException.Response);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
+				}
+				else if (exception is ResponseException copriException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<BookedClosed>().Information("User locked bike {bike} in order to pause ride but updating failed. {response}.", SelectedBike, copriException.Response);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
-                }
-                else
-                {
-                    Log.ForContext<BookedClosed>().Error("User locked bike {bike} in order to pause ride but updating failed . {@l_oException}", SelectedBike.Id, exception);
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
-                }
-            }
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
+				}
+				else
+				{
+					Log.ForContext<BookedClosed>().Error("User locked bike {bike} in order to pause ride but updating failed . {@l_oException}", SelectedBike.Id, exception);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
+				}
+			}
 
-            Log.ForContext<BookedClosed>().Information("User paused ride using {bike} successfully.", SelectedBike);
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically();
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true;
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
-    }
+			Log.ForContext<BookedClosed>().Information("User paused ride using {bike} successfully.", SelectedBike);
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically();
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true;
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedDisconnected.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedDisconnected.cs
index 2d60ebb..bb09baa 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedDisconnected.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedDisconnected.cs
@@ -15,230 +15,230 @@ using TINK.View;
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    public class BookedDisconnected : Base, IRequestHandler
-    {
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public BookedDisconnected(
-           IBikeInfoMutable selectedBike,
-           Func<bool> isConnectedDelegate,
-           Func<bool, IConnector> connectorFactory,
-           IGeolocation geolocation,
-           ILocksService lockService,
-           Func<IPollingUpdateTaskManager> viewUpdateManager,
-           ISmartDevice smartDevice,
-           IViewService viewService,
-           IBikesViewModel bikesViewModel,
-           IUser activeUser) :
-            base(
-               selectedBike,
-               nameof(BookedDisconnected),
-               false,
-               isConnectedDelegate,
-               connectorFactory,
-               geolocation,
-               lockService,
-               viewUpdateManager,
-               smartDevice,
-               viewService,
-               bikesViewModel,
-               activeUser)
-        {
-            LockitButtonText = AppResources.ActionSearchLock;
-            IsLockitButtonVisible = true;
-        }
+	public class BookedDisconnected : Base, IRequestHandler
+	{
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public BookedDisconnected(
+		   IBikeInfoMutable selectedBike,
+		   Func<bool> isConnectedDelegate,
+		   Func<bool, IConnector> connectorFactory,
+		   IGeolocation geolocation,
+		   ILocksService lockService,
+		   Func<IPollingUpdateTaskManager> viewUpdateManager,
+		   ISmartDevice smartDevice,
+		   IViewService viewService,
+		   IBikesViewModel bikesViewModel,
+		   IUser activeUser) :
+			base(
+			   selectedBike,
+			   nameof(BookedDisconnected),
+			   false,
+			   isConnectedDelegate,
+			   connectorFactory,
+			   geolocation,
+			   lockService,
+			   viewUpdateManager,
+			   smartDevice,
+			   viewService,
+			   bikesViewModel,
+			   activeUser)
+		{
+			LockitButtonText = AppResources.ActionSearchLock;
+			IsLockitButtonVisible = true;
+		}
 
-        public async Task<IRequestHandler> HandleRequestOption1() => await UnsupportedRequest();
+		public async Task<IRequestHandler> HandleRequestOption1() => await UnsupportedRequest();
 
-        /// <summary> Scan for lock.</summary>
-        /// <returns></returns>
-        public async Task<IRequestHandler> HandleRequestOption2() => await ConnectLock();
+		/// <summary> Scan for lock.</summary>
+		/// <returns></returns>
+		public async Task<IRequestHandler> HandleRequestOption2() => await ConnectLock();
 
-        /// <summary> Requst is not supported, button should be disabled. </summary>
-        /// <returns></returns>
-        public async Task<IRequestHandler> UnsupportedRequest()
-        {
-            Log.ForContext<BookedDisconnected>().Error("Click of unsupported button click detected.");
-            return await Task.FromResult<IRequestHandler>(this);
-        }
+		/// <summary> Requst is not supported, button should be disabled. </summary>
+		/// <returns></returns>
+		public async Task<IRequestHandler> UnsupportedRequest()
+		{
+			Log.ForContext<BookedDisconnected>().Error("Click of unsupported button click detected.");
+			return await Task.FromResult<IRequestHandler>(this);
+		}
 
-        /// <summary> Scan for lock.</summary>
-        /// <returns></returns>
-        public async Task<IRequestHandler> ConnectLock()
-        {
-            // Lock list to avoid multiple taps while copri action is pending.
-            BikesViewModel.IsIdle = false;
-            Log.ForContext<BookedDisconnected>().Information("Request to search {bike} detected.", SelectedBike);
+		/// <summary> Scan for lock.</summary>
+		/// <returns></returns>
+		public async Task<IRequestHandler> ConnectLock()
+		{
+			// Lock list to avoid multiple taps while copri action is pending.
+			BikesViewModel.IsIdle = false;
+			Log.ForContext<BookedDisconnected>().Information("Request to search {bike} detected.", SelectedBike);
 
-            // Stop polling before getting new auth-values.
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before getting new auth-values.
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            BikesViewModel.ActionText = AppResources.ActivityTextQuerryServer;
-            IsConnected = IsConnectedDelegate();
-            try
-            {
-                // Repeat booking to get a new seed/ k_user value.
-                await ConnectorFactory(IsConnected).Command.CalculateAuthKeys(SelectedBike);
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.ActionText = AppResources.ActivityTextQuerryServer;
+			IsConnected = IsConnectedDelegate();
+			try
+			{
+				// Repeat booking to get a new seed/ k_user value.
+				await ConnectorFactory(IsConnected).Command.CalculateAuthKeys(SelectedBike);
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                if (exception is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<BookedDisconnected>().Information("User selected booked bike {l_oId} to connect to lock. (Copri server not reachable).", SelectedBike.Id);
+				if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<BookedDisconnected>().Information("User selected booked bike {l_oId} to connect to lock. (Copri server not reachable).", SelectedBike.Id);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageConnectLockErrorTitle,
-                        $"{AppResources.ErrorConnectLockRentedBikeNoWebMessage}\r\n{exception.Message}\r\n{WebConnectFailureException.GetHintToPossibleExceptionsReasons}",
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<BookedDisconnected>().Error("User selected booked bike {l_oId} to connect to lock. {@l_oException}", SelectedBike.Id, exception);
+					await ViewService.DisplayAlert(
+						AppResources.MessageConnectLockErrorTitle,
+						$"{AppResources.ErrorConnectLockRentedBikeNoWebMessage}\r\n{exception.Message}\r\n{WebConnectFailureException.GetHintToPossibleExceptionsReasons}",
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<BookedDisconnected>().Error("User selected booked bike {l_oId} to connect to lock. {@l_oException}", SelectedBike.Id, exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageConnectLockErrorTitle,
-                        $"{AppResources.ErrorConnectLockGeneralErrorMessage}\r\n{exception.Message}",
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAlert(
+						AppResources.MessageConnectLockErrorTitle,
+						$"{AppResources.ErrorConnectLockGeneralErrorMessage}\r\n{exception.Message}",
+						AppResources.MessageAnswerOk);
+				}
 
-                // Restart polling again.
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return this;
-            }
+				// Restart polling again.
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return this;
+			}
 
-            LockInfoTdo result = null;
-            var continueConnect = true;
-            var retryCount = 1;
-            while (continueConnect && result == null)
-            {
-                BikesViewModel.ActionText = AppResources.ActivityTextSearchingLock;
+			LockInfoTdo result = null;
+			var continueConnect = true;
+			var retryCount = 1;
+			while (continueConnect && result == null)
+			{
+				BikesViewModel.ActionText = AppResources.ActivityTextSearchingLock;
 
-                try
-                {
-                    result = await LockService.ConnectAsync(
-                        new LockInfoAuthTdo.Builder { Id = SelectedBike.LockInfo.Id, Guid = SelectedBike.LockInfo.Guid, K_seed = SelectedBike.LockInfo.Seed, K_u = SelectedBike.LockInfo.UserKey }.Build(),
-                        LockService.TimeOut.GetSingleConnect(retryCount));
-                }
-                catch (Exception exception)
-                {
+				try
+				{
+					result = await LockService.ConnectAsync(
+						new LockInfoAuthTdo.Builder { Id = SelectedBike.LockInfo.Id, Guid = SelectedBike.LockInfo.Guid, K_seed = SelectedBike.LockInfo.Seed, K_u = SelectedBike.LockInfo.UserKey }.Build(),
+						LockService.TimeOut.GetSingleConnect(retryCount));
+				}
+				catch (Exception exception)
+				{
 
-                    BikesViewModel.ActionText = string.Empty;
-                    if (exception is ConnectBluetoothNotOnException)
-                    {
-                        continueConnect = false;
+					BikesViewModel.ActionText = string.Empty;
+					if (exception is ConnectBluetoothNotOnException)
+					{
+						continueConnect = false;
 
-                        await ViewService.DisplayAlert(
-                            AppResources.MessageConnectLockErrorTitle,
-                            AppResources.ErrorFindLockBluetoothNotOn,
-                            AppResources.MessageAnswerOk);
-                    }
-                    else if (exception is ConnectLocationPermissionMissingException)
-                    {
-                        continueConnect = false;
+						await ViewService.DisplayAlert(
+							AppResources.MessageConnectLockErrorTitle,
+							AppResources.ErrorFindLockBluetoothNotOn,
+							AppResources.MessageAnswerOk);
+					}
+					else if (exception is ConnectLocationPermissionMissingException)
+					{
+						continueConnect = false;
 
-                        await ViewService.DisplayAlert(
-                            AppResources.MessageConnectLockErrorTitle,
-                            AppResources.ErrorFindLockLocationPermissionMissing,
-                            AppResources.MessageAnswerOk);
-                    }
-                    else if (exception is ConnectLocationOffException)
-                    {
-                        continueConnect = false;
+						await ViewService.DisplayAlert(
+							AppResources.MessageConnectLockErrorTitle,
+							AppResources.ErrorFindLockLocationPermissionMissing,
+							AppResources.MessageAnswerOk);
+					}
+					else if (exception is ConnectLocationOffException)
+					{
+						continueConnect = false;
 
-                        await ViewService.DisplayAlert(
-                            AppResources.MessageConnectLockErrorTitle,
-                            AppResources.ErrorFindLockLocationOff,
-                            AppResources.MessageAnswerOk);
-                    }
-                    else if (exception is OutOfReachException)
-                    {
-                        Log.ForContext<BookedDisconnected>().Debug("Lock can not be found. {Exception}", exception);
+						await ViewService.DisplayAlert(
+							AppResources.MessageConnectLockErrorTitle,
+							AppResources.ErrorFindLockLocationOff,
+							AppResources.MessageAnswerOk);
+					}
+					else if (exception is OutOfReachException)
+					{
+						Log.ForContext<BookedDisconnected>().Debug("Lock can not be found because out of reach. {Exception}", exception);
 
-                        continueConnect = await ViewService.DisplayAlert(
-                            AppResources.MessageConnectLockErrorTitle,
-                            AppResources.ErrorFindLockRentedBikeOutOfReachMessage,
-                            AppResources.MessageAnswerRetry,
-                            AppResources.MessageAnswerCancel);
-                    }
-                    else
-                    {
-                        Log.ForContext<BookedDisconnected>().Error("Lock can not be found. {Exception}", exception);
+						continueConnect = await ViewService.DisplayAlert(
+							AppResources.MessageConnectLockErrorTitle,
+							AppResources.ErrorFindLockRentedBikeOutOfReachMessage,
+							AppResources.MessageAnswerRetry,
+							AppResources.MessageAnswerCancel);
+					}
+					else
+					{
+						Log.ForContext<BookedDisconnected>().Error("Lock can not be found. {Exception}", exception);
 
-                        string message;
-                        if (retryCount < 2)
-                        {
-                            message = AppResources.ErrorBookedSearchMessage;
-                        }
-                        else if (retryCount < 3)
-                        {
-                            message = AppResources.ErrorBookedSearchMessageEscalationLevel1;
-                        }
-                        else
-                        {
-                            message = AppResources.ErrorBookedSearchMessageEscalationLevel2;
-                        }
+						string message;
+						if (retryCount < 2)
+						{
+							message = AppResources.ErrorBookedSearchMessage;
+						}
+						else if (retryCount < 3)
+						{
+							message = AppResources.ErrorBookedSearchMessageEscalationLevel1;
+						}
+						else
+						{
+							message = AppResources.ErrorBookedSearchMessageEscalationLevel2;
+						}
 
 
-                        continueConnect = await ViewService.DisplayAdvancedAlert(
-                                AppResources.MessageConnectLockErrorTitle,
-                                message,
-                                "", // bool IsReportLevelVerbose ? exception.Message : string.Empty,  // or use ActiveUser.DebugLevel.HasFlag(Permissions.ReportLevel) instead?
-                                AppResources.MessageAnswerRetry,
-                                AppResources.MessageAnswerCancel);
-                    }
+						continueConnect = await ViewService.DisplayAdvancedAlert(
+								AppResources.MessageConnectLockErrorTitle,
+								message,
+								"", // bool IsReportLevelVerbose ? exception.Message : string.Empty,  // or use ActiveUser.DebugLevel.HasFlag(Permissions.ReportLevel) instead?
+								AppResources.MessageAnswerRetry,
+								AppResources.MessageAnswerCancel);
+					}
 
-                    if (continueConnect)
-                    {
-                        retryCount++;
-                        continue;
-                    }
+					if (continueConnect)
+					{
+						retryCount++;
+						continue;
+					}
 
-                    // Quit and restart polling again.
-                    BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                    await ViewUpdateManager().StartUpdateAyncPeridically();
-                    BikesViewModel.ActionText = string.Empty;
-                    BikesViewModel.IsIdle = true;
-                    return this;
-                }
-            }
+					// Quit and restart polling again.
+					BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+					await ViewUpdateManager().StartUpdateAyncPeridically();
+					BikesViewModel.ActionText = string.Empty;
+					BikesViewModel.IsIdle = true;
+					return this;
+				}
+			}
 
-            if (result?.State == null)
-            {
-                Log.ForContext<BookedDisconnected>().Information("Lock for bike {bike} not found.", SelectedBike);
+			if (result?.State == null)
+			{
+				Log.ForContext<BookedDisconnected>().Information("Lock for bike {bike} not found.", SelectedBike);
 
-                BikesViewModel.ActionText = string.Empty;
-                await ViewService.DisplayAlert(
-                    AppResources.MessageConnectLockErrorTitle,
-                    $"Schlossstatus des gemieteten Rads konnte nicht ermittelt werden.",
-                    AppResources.MessageAnswerOk);
+				BikesViewModel.ActionText = string.Empty;
+				await ViewService.DisplayAlert(
+					AppResources.MessageConnectLockErrorTitle,
+					$"Schlossstatus des gemieteten Rads konnte nicht ermittelt werden.",
+					AppResources.MessageAnswerOk);
 
-                // Restart polling again.
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return this;
-            }
+				// Restart polling again.
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return this;
+			}
 
-            var state = result.State.Value.GetLockingState();
-            SelectedBike.LockInfo.State = state;
-            SelectedBike.LockInfo.Guid = result?.Guid ?? new Guid();
+			var state = result.State.Value.GetLockingState();
+			SelectedBike.LockInfo.State = state;
+			SelectedBike.LockInfo.Guid = result?.Guid ?? new Guid();
 
-            Log.ForContext<BookedDisconnected>().Information($"State for bike {SelectedBike.Id} updated successfully. Value is {SelectedBike.LockInfo.State}.");
+			Log.ForContext<BookedDisconnected>().Information($"State for bike {SelectedBike.Id} updated successfully. Value is {SelectedBike.LockInfo.State}.");
 
-            // Restart polling again.
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically();
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true;
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
-    }
+			// Restart polling again.
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically();
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true;
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedOpen.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedOpen.cs
index 91b8da8..8ff3c61 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedOpen.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedOpen.cs
@@ -20,652 +20,652 @@ using Xamarin.Essentials;
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    public class BookedOpen : Base, IRequestHandler
-    {
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public BookedOpen(
-           IBikeInfoMutable selectedBike,
-           Func<bool> isConnectedDelegate,
-           Func<bool, IConnector> connectorFactory,
-           IGeolocation geolocation,
-           ILocksService lockService,
-           Func<IPollingUpdateTaskManager> viewUpdateManager,
-           ISmartDevice smartDevice,
-           IViewService viewService,
-           IBikesViewModel bikesViewModel,
-           IUser activeUser) : base(
-               selectedBike,
-               AppResources.ActionCloseAndReturn,  // Copri button text: "Schloss schließen & Miete beenden"
-               true, // Show button to allow user to return bike.
-               isConnectedDelegate,
-               connectorFactory,
-               geolocation,
-               lockService,
-               viewUpdateManager,
-               smartDevice,
-               viewService,
-               bikesViewModel,
-               activeUser)
-        {
-            LockitButtonText = AppResources.ActionClose; // BT button text "Schließen".
-            IsLockitButtonVisible = true; // Show button to allow user to lock bike.
-        }
+	public class BookedOpen : Base, IRequestHandler
+	{
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public BookedOpen(
+		   IBikeInfoMutable selectedBike,
+		   Func<bool> isConnectedDelegate,
+		   Func<bool, IConnector> connectorFactory,
+		   IGeolocation geolocation,
+		   ILocksService lockService,
+		   Func<IPollingUpdateTaskManager> viewUpdateManager,
+		   ISmartDevice smartDevice,
+		   IViewService viewService,
+		   IBikesViewModel bikesViewModel,
+		   IUser activeUser) : base(
+			   selectedBike,
+			   AppResources.ActionCloseAndReturn,  // Copri button text: "Schloss schließen & Miete beenden"
+			   true, // Show button to allow user to return bike.
+			   isConnectedDelegate,
+			   connectorFactory,
+			   geolocation,
+			   lockService,
+			   viewUpdateManager,
+			   smartDevice,
+			   viewService,
+			   bikesViewModel,
+			   activeUser)
+		{
+			LockitButtonText = AppResources.ActionClose; // BT button text "Schließen".
+			IsLockitButtonVisible = true; // Show button to allow user to lock bike.
+		}
 
-        /// <summary> Close lock and return bike.</summary>
-        public async Task<IRequestHandler> HandleRequestOption1() => await CloseLockAndReturnBike();
+		/// <summary> Close lock and return bike.</summary>
+		public async Task<IRequestHandler> HandleRequestOption1() => await CloseLockAndReturnBike();
 
-        /// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
-        public async Task<IRequestHandler> HandleRequestOption2() => await CloseLock();
+		/// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
+		public async Task<IRequestHandler> HandleRequestOption2() => await CloseLock();
 
-        /// <summary> Close lock and return bike.</summary>
-        public async Task<IRequestHandler> CloseLockAndReturnBike()
-        {
-            // Prevent concurrent interaction
-            BikesViewModel.IsIdle = false;
+		/// <summary> Close lock and return bike.</summary>
+		public async Task<IRequestHandler> CloseLockAndReturnBike()
+		{
+			// Prevent concurrent interaction
+			BikesViewModel.IsIdle = false;
 
-            // Start getting geolocation.
-            BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationStart;
-            var ctsLocation = new CancellationTokenSource();
-            Task<Location> currentLocationTask = null;
-            var timeStamp = DateTime.Now;
-            try
-            {
-                currentLocationTask = Geolocation.GetAsync(ctsLocation.Token, timeStamp);
-            }
-            catch (Exception ex)
-            {
-                // No location information available.
-                Log.ForContext<BookedOpen>().Information("Returning bike {Bike} is not possible. Start query location failed. {Exception}", SelectedBike, ex);
+			// Start getting geolocation.
+			BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationStart;
+			var ctsLocation = new CancellationTokenSource();
+			Task<Location> currentLocationTask = null;
+			var timeStamp = DateTime.Now;
+			try
+			{
+				currentLocationTask = Geolocation.GetAsync(ctsLocation.Token, timeStamp);
+			}
+			catch (Exception ex)
+			{
+				// No location information available.
+				Log.ForContext<BookedOpen>().Information("Returning bike {Bike} is not possible. Start query location failed. {Exception}", SelectedBike, ex);
 
-                BikesViewModel.ActionText = string.Empty;
-                await ViewService.DisplayAlert(
-                    AppResources.MessageErrorQueryLocationStartTitle,
-                    $"{AppResources.MessageErrorQueryLocationMessage}\r\n{ex.Message}",
-                    AppResources.MessageAnswerOk);
+				BikesViewModel.ActionText = string.Empty;
+				await ViewService.DisplayAlert(
+					AppResources.MessageErrorQueryLocationStartTitle,
+					$"{AppResources.MessageErrorQueryLocationMessage}\r\n{ex.Message}",
+					AppResources.MessageAnswerOk);
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
 
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true; // Unlock GUI                
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true; // Unlock GUI                
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            // Ask whether to really return bike?
-            var result = await ViewService.DisplayAlert(
-                string.Empty,
-                string.Format(AppResources.QuestionCloseLockAndReturnBike, SelectedBike.GetFullDisplayName()),
-                AppResources.MessageAnswerYes,
-                AppResources.MessageAnswerNo);
+			// Ask whether to really return bike?
+			var result = await ViewService.DisplayAlert(
+				string.Empty,
+				string.Format(AppResources.QuestionCloseLockAndReturnBike, SelectedBike.GetFullDisplayName()),
+				AppResources.MessageAnswerYes,
+				AppResources.MessageAnswerNo);
 
-            if (result == false)
-            {
-                // User aborted closing and returning bike process
-                Log.ForContext<BookedOpen>().Information("User selected booked bike {l_oId} in order to close and return but action was canceled.", SelectedBike.Id);
+			if (result == false)
+			{
+				// User aborted closing and returning bike process
+				Log.ForContext<BookedOpen>().Information("User selected booked bike {l_oId} in order to close and return but action was canceled.", SelectedBike.Id);
 
-                // Cancel getting geolocation.
-                ctsLocation.Cancel();
-                BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationCancelWait;
-                try
-                {
-                    await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
-                }
-                catch (Exception ex)
-                {
-                    // No location information available.
-                    Log.ForContext<BookedOpen>().Information("Canceling query location failed on abort returning opened bike failed. {Exception}", SelectedBike, ex);
-                }
+				// Cancel getting geolocation.
+				ctsLocation.Cancel();
+				BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationCancelWait;
+				try
+				{
+					await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
+				}
+				catch (Exception ex)
+				{
+					// No location information available.
+					Log.ForContext<BookedOpen>().Information("Canceling query location failed on abort returning opened bike failed. {Exception}", SelectedBike, ex);
+				}
 
-                BikesViewModel.IsIdle = true;
-                return this;
-            }
+				BikesViewModel.IsIdle = true;
+				return this;
+			}
 
-            // Start of closing lock and returing bike sequence.
-            Log.ForContext<BookedOpen>().Information("Request to return bike {bike} detected.", SelectedBike);
+			// Start of closing lock and returing bike sequence.
+			Log.ForContext<BookedOpen>().Information("Request to return bike {bike} detected.", SelectedBike);
 
-            // Clear logging memory sink to avoid passing log data not related to returning of bike to backend.
-            // Log data is passed to backend when calling CopriCallsHttps.DoReturn().
-            MemoryStackSink.ClearMessages();
+			// Clear logging memory sink to avoid passing log data not related to returning of bike to backend.
+			// Log data is passed to backend when calling CopriCallsHttps.DoReturn().
+			MemoryStackSink.ClearMessages();
 
-            // Stop polling before returning bike.
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before returning bike.
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            // Notify COPRI about start returning bike sequence: "request=booking_update ... &lock_state=locking ..."
-            BikesViewModel.ActionText = AppResources.ActivityTextStartReturningBike;
-            IsConnected = IsConnectedDelegate();
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.StartReturningBike(
-                    SelectedBike);
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
-                if (exception is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<BookedOpen>().Information("User selected booked bike {bike} but returing failed (Copri server not reachable).", SelectedBike);
+			// Notify COPRI about start returning bike sequence: "request=booking_update ... &lock_state=locking ..."
+			BikesViewModel.ActionText = AppResources.ActivityTextStartReturningBike;
+			IsConnected = IsConnectedDelegate();
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.StartReturningBike(
+					SelectedBike);
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
+				if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<BookedOpen>().Information("User selected booked bike {bike} but returing failed (Copri server not reachable).", SelectedBike);
 
-                    await ViewService.DisplayAdvancedAlert(
-                        AppResources.ErrorReturnBikeNoWebTitle,
-                        string.Format("{0}\r\n{1}", AppResources.ErrorReturnBikeNoWebMessage, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<BookedOpen>().Error("User selected booked bike {bike} but returning failed. {@l_oException}", SelectedBike.Id, exception);
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.ErrorReturnBikeNoWebTitle,
+						string.Format("{0}\r\n{1}", AppResources.ErrorReturnBikeNoWebMessage, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<BookedOpen>().Error("User selected booked bike {bike} but returning failed. {@l_oException}", SelectedBike.Id, exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorReturnBikeTitle,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAlert(
+						AppResources.ErrorReturnBikeTitle,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
 
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            // Close lock
-            BikesViewModel.ActionText = AppResources.ActivityTextClosingLock;
-            try
-            {
-                SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())
-                    ?.GetLockingState() ?? LockingState.UnknownDisconnected;
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
+			// Close lock
+			BikesViewModel.ActionText = AppResources.ActivityTextClosingLock;
+			try
+			{
+				SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())
+					?.GetLockingState() ?? LockingState.UnknownDisconnected;
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
-                    ? stateAwareException.State
-                    : LockingState.UnknownDisconnected;
+				SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
+					? stateAwareException.State
+					: LockingState.UnknownDisconnected;
 
-                // Signal cts to  cancel getting geolocation.
-                ctsLocation.Cancel();
-                Task updateLockingStateTask = Task.CompletedTask;
-                IsConnected = IsConnectedDelegate();
-                try
-                {
-                    updateLockingStateTask = ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(
-                        SelectedBike);
-                }
-                catch (Exception innerExceptionStartUpdateLockingState)
-                {
-                    // No location information available/ updating state failed.
-                    Log.ForContext<BookedOpen>().Information("Start update locking state failed on lock operating error. {Exception}", SelectedBike, innerExceptionStartUpdateLockingState);
-                }
+				// Signal cts to  cancel getting geolocation.
+				ctsLocation.Cancel();
+				Task updateLockingStateTask = Task.CompletedTask;
+				IsConnected = IsConnectedDelegate();
+				try
+				{
+					updateLockingStateTask = ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(
+						SelectedBike);
+				}
+				catch (Exception innerExceptionStartUpdateLockingState)
+				{
+					// No location information available/ updating state failed.
+					Log.ForContext<BookedOpen>().Information("Start update locking state failed on lock operating error. {Exception}", SelectedBike, innerExceptionStartUpdateLockingState);
+				}
 
-                if (exception is OutOfReachException)
-                {
-                    Log.ForContext<BookedOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
+				if (exception is OutOfReachException)
+				{
+					Log.ForContext<BookedOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorCloseLockTitle,
-                        AppResources.ErrorCloseLockOutOfReachMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntCloseMovingException)
-                {
-                    Log.ForContext<BookedOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						AppResources.ErrorCloseLockOutOfReachMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntCloseMovingException)
+				{
+					Log.ForContext<BookedOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorCloseLockTitle,
-                        AppResources.ErrorCloseLockMovingMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntCloseBoldBlockedException)
-                {
-                    Log.ForContext<BookedOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						AppResources.ErrorCloseLockMovingMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntCloseBoldBlockedException)
+				{
+					Log.ForContext<BookedOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorCloseLockTitle,
-                        AppResources.ErrorCloseLockBoldBlockedMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<BookedOpen>().Error("Lock can not be closed. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						AppResources.ErrorCloseLockBoldBlockedMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<BookedOpen>().Error("Lock can not be closed. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorCloseLockTitle,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
 
-                // Wait until cancel getting geolocation has completed.
-                BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationCancelWait;
-                try
-                {
-                    await Task.WhenAll(new List<Task> { currentLocationTask ?? Task.CompletedTask, updateLockingStateTask });
-                }
-                catch (Exception innerExWhenAll)
-                {
-                    // No location information available/ updating state failed.
-                    Log.ForContext<BookedOpen>().Information("Canceling query location/ updating lock state failed on closing lock error. {Exception}", SelectedBike, innerExWhenAll);
-                }
+				// Wait until cancel getting geolocation has completed.
+				BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationCancelWait;
+				try
+				{
+					await Task.WhenAll(new List<Task> { currentLocationTask ?? Task.CompletedTask, updateLockingStateTask });
+				}
+				catch (Exception innerExWhenAll)
+				{
+					// No location information available/ updating state failed.
+					Log.ForContext<BookedOpen>().Information("Canceling query location/ updating lock state failed on closing lock error. {Exception}", SelectedBike, innerExWhenAll);
+				}
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
 
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true; // Unlock GUI                
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true; // Unlock GUI                
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            // Check locking state.
-            if (SelectedBike.LockInfo.State != LockingState.Closed)
-            {
-                Log.ForContext<BookedOpen>().Error($"Lock can not be closed. Invalid locking state state {SelectedBike.LockInfo.State} detected.");
+			// Check locking state.
+			if (SelectedBike.LockInfo.State != LockingState.Closed)
+			{
+				Log.ForContext<BookedOpen>().Error($"Lock can not be closed. Invalid locking state state {SelectedBike.LockInfo.State} detected.");
 
-                BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.ActionText = string.Empty;
 
 
-                // Signal cts to  cancel getting geolocation.
-                ctsLocation.Cancel();
+				// Signal cts to  cancel getting geolocation.
+				ctsLocation.Cancel();
 
-                // Notify COPRI about closing failure: "request=booking_update ... &lock_state=unlocked ..."
-                Task updateLockingStateTask = Task.CompletedTask;
-                IsConnected = IsConnectedDelegate();
-                try
-                {
-                    updateLockingStateTask = ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(
-                        SelectedBike);
-                }
-                catch (Exception innerExceptionStartUpdateLockingState)
-                {
-                    // No location information available/ updating state failed.
-                    Log.ForContext<BookedOpen>().Information("Start update locking state failed on unexpected state. {Exception}", SelectedBike, innerExceptionStartUpdateLockingState);
-                }
+				// Notify COPRI about closing failure: "request=booking_update ... &lock_state=unlocked ..."
+				Task updateLockingStateTask = Task.CompletedTask;
+				IsConnected = IsConnectedDelegate();
+				try
+				{
+					updateLockingStateTask = ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(
+						SelectedBike);
+				}
+				catch (Exception innerExceptionStartUpdateLockingState)
+				{
+					// No location information available/ updating state failed.
+					Log.ForContext<BookedOpen>().Information("Start update locking state failed on unexpected state. {Exception}", SelectedBike, innerExceptionStartUpdateLockingState);
+				}
 
-                await ViewService.DisplayAlert(
-                    AppResources.ErrorCloseLockTitle,
-                    SelectedBike.LockInfo.State == LockingState.Open
-                        ? AppResources.ErrorCloseLockStillOpenMessage
-                        : string.Format(AppResources.ErrorCloseLockUnexpectedStateMessage, SelectedBike.LockInfo.State),
-                    AppResources.MessageAnswerOk);
+				await ViewService.DisplayAlert(
+					AppResources.ErrorCloseLockTitle,
+					SelectedBike.LockInfo.State == LockingState.Open
+						? AppResources.ErrorCloseLockStillOpenMessage
+						: string.Format(AppResources.ErrorCloseLockUnexpectedStateMessage, SelectedBike.LockInfo.State),
+					AppResources.MessageAnswerOk);
 
-                // Wait until cancel getting geolocation has completed.
-                BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationCancelWait;
-                try
-                {
-                    await Task.WhenAll(new List<Task> { currentLocationTask ?? Task.CompletedTask, updateLockingStateTask });
-                }
-                catch (Exception innerExWhenAll)
-                {
-                    // No location information available.
-                    Log.ForContext<BookedOpen>().Information("Canceling query location/ updating lock state failed failed on unexpected lock state failed. {Exception}", SelectedBike, innerExWhenAll);
-                }
+				// Wait until cancel getting geolocation has completed.
+				BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationCancelWait;
+				try
+				{
+					await Task.WhenAll(new List<Task> { currentLocationTask ?? Task.CompletedTask, updateLockingStateTask });
+				}
+				catch (Exception innerExWhenAll)
+				{
+					// No location information available.
+					Log.ForContext<BookedOpen>().Information("Canceling query location/ updating lock state failed failed on unexpected lock state failed. {Exception}", SelectedBike, innerExWhenAll);
+				}
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
 
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true; // Unlock GUI                
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true; // Unlock GUI                
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            // Get geolocation information.
-            BikesViewModel.ActionText = AppResources.ActivityTextQueryLocation;
-            Location currentLocation = null;
-            try
-            {
-                var task = await Task.WhenAny(new List<Task> { currentLocationTask });
-                currentLocation = currentLocationTask.Result;
-            }
-            catch (Exception ex)
-            {
-                // No location information available.
-                Log.ForContext<BookedOpen>().Information("Returning bike {Bike} is not possible. Query location failed. {Exception}", SelectedBike, ex);
+			// Get geolocation information.
+			BikesViewModel.ActionText = AppResources.ActivityTextQueryLocation;
+			Location currentLocation = null;
+			try
+			{
+				var task = await Task.WhenAny(new List<Task> { currentLocationTask });
+				currentLocation = currentLocationTask.Result;
+			}
+			catch (Exception ex)
+			{
+				// No location information available.
+				Log.ForContext<BookedOpen>().Information("Returning bike {Bike} is not possible. Query location failed. {Exception}", SelectedBike, ex);
 
-                BikesViewModel.ActionText = string.Empty;
-                await ViewService.DisplayAdvancedAlert(
-                    AppResources.MessageErrorQueryLocationTitle,
-                    AppResources.MessageErrorQueryLocationMessage,
-                    ex.GetErrorMessage(),
-                    AppResources.MessageAnswerOk);
+				BikesViewModel.ActionText = string.Empty;
+				await ViewService.DisplayAdvancedAlert(
+					AppResources.MessageErrorQueryLocationTitle,
+					AppResources.MessageErrorQueryLocationMessage,
+					ex.GetErrorMessage(),
+					AppResources.MessageAnswerOk);
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
 
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true; // Unlock GUI                
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true; // Unlock GUI                
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            // Notify COPRI about end of rental: "request=booking_update ... "&state=available" ... &lock_state=locked ..."
-            BikesViewModel.ActionText = AppResources.ActivityTextReturningBike;
-            IsConnected = IsConnectedDelegate();
+			// Notify COPRI about end of rental: "request=booking_update ... "&state=available" ... &lock_state=locked ..."
+			BikesViewModel.ActionText = AppResources.ActivityTextReturningBike;
+			IsConnected = IsConnectedDelegate();
 
-            var feedBackUri = SelectedBike?.OperatorUri;
-            BookingFinishedModel bookingFinished;
-            try
-            {
-                bookingFinished = await ConnectorFactory(IsConnected).Command.DoReturn(
-                    SelectedBike,
-                    currentLocation != null
-                        ? new LocationDto.Builder
-                        {
-                            Latitude = currentLocation.Latitude,
-                            Longitude = currentLocation.Longitude,
-                            Accuracy = currentLocation.Accuracy ?? double.NaN,
-                            Age = timeStamp.Subtract(currentLocation.Timestamp.DateTime),
-                        }.Build()
-                        : null,
-                    SmartDevice);
-                // If canceling bike succedes remove bike because it is not ready to be booked again
-                IsRemoveBikeRequired = true;
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
-                if (exception is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<BookedOpen>().Information("User selected booked bike {bike} but returing failed (Copri server not reachable).", SelectedBike);
+			var feedBackUri = SelectedBike?.OperatorUri;
+			BookingFinishedModel bookingFinished;
+			try
+			{
+				bookingFinished = await ConnectorFactory(IsConnected).Command.DoReturn(
+					SelectedBike,
+					currentLocation != null
+						? new LocationDto.Builder
+						{
+							Latitude = currentLocation.Latitude,
+							Longitude = currentLocation.Longitude,
+							Accuracy = currentLocation.Accuracy ?? double.NaN,
+							Age = timeStamp.Subtract(currentLocation.Timestamp.DateTime),
+						}.Build()
+						: null,
+					SmartDevice);
+				// If canceling bike succedes remove bike because it is not ready to be booked again
+				IsRemoveBikeRequired = true;
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
+				if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<BookedOpen>().Information("User selected booked bike {bike} but returing failed (Copri server not reachable).", SelectedBike);
 
-                    await ViewService.DisplayAdvancedAlert(
-                        AppResources.ErrorReturnBikeNoWebTitle,
-                        string.Format("{0}\r\n{1}", AppResources.ErrorReturnBikeNoWebMessage, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is NotAtStationException notAtStationException)
-                {
-                    // COPRI returned an error.
-                    Log.ForContext<BookedOpen>().Information("User selected booked bike {bike} but returing failed. COPRI returned an error.", SelectedBike);
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.ErrorReturnBikeNoWebTitle,
+						string.Format("{0}\r\n{1}", AppResources.ErrorReturnBikeNoWebMessage, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is NotAtStationException notAtStationException)
+				{
+					// COPRI returned an error.
+					Log.ForContext<BookedOpen>().Information("User selected booked bike {bike} but returing failed. COPRI returned an error.", SelectedBike);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorReturnBikeTitle,
-                        string.Format(AppResources.ErrorReturnBikeNotAtStationMessage, notAtStationException.StationNr, notAtStationException.Distance),
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is NoGPSDataException)
-                {
-                    // COPRI returned an error.
-                    Log.ForContext<BookedOpen>().Information("User selected booked bike {bike} but returing failed. COPRI returned an no GPS- data error.", SelectedBike);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorReturnBikeTitle,
+						string.Format(AppResources.ErrorReturnBikeNotAtStationMessage, notAtStationException.StationNr, notAtStationException.Distance),
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is NoGPSDataException)
+				{
+					// COPRI returned an error.
+					Log.ForContext<BookedOpen>().Information("User selected booked bike {bike} but returing failed. COPRI returned an no GPS- data error.", SelectedBike);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorReturnBikeTitle,
-                        string.Format(AppResources.ErrorReturnBikeLockOpenNoGPSMessage),
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is ResponseException copriException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<BookedOpen>().Information("User selected booked bike {bike} but returing failed. COPRI returned an error.", SelectedBike);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorReturnBikeTitle,
+						string.Format(AppResources.ErrorReturnBikeLockOpenNoGPSMessage),
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is ResponseException copriException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<BookedOpen>().Information("User selected booked bike {bike} but returing failed. COPRI returned an error.", SelectedBike);
 
-                    await ViewService.DisplayAdvancedAlert(
-                        "Statusfehler beim Zurückgeben des Rads!",
-                        copriException.Message,
-                        copriException.Response,
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<BookedOpen>().Error("User selected booked bike {bike} but returning failed. {@l_oException}", SelectedBike.Id, exception);
+					await ViewService.DisplayAdvancedAlert(
+						"Statusfehler beim Zurückgeben des Rads!",
+						copriException.Message,
+						copriException.Response,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<BookedOpen>().Error("User selected booked bike {bike} but returning failed. {@l_oException}", SelectedBike.Id, exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorReturnBikeTitle,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAlert(
+						AppResources.ErrorReturnBikeTitle,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
 
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            Log.ForContext<BookedOpen>().Information("User returned bike {bike} successfully.", SelectedBike);
+			Log.ForContext<BookedOpen>().Information("User returned bike {bike} successfully.", SelectedBike);
 
-            // Disconnect lock.
-            BikesViewModel.ActionText = AppResources.ActivityTextDisconnectingLock;
-            try
-            {
-                SelectedBike.LockInfo.State = await LockService.DisconnectAsync(SelectedBike.LockInfo.Id, SelectedBike.LockInfo.Guid);
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<BookedOpen>().Error("Lock can not be disconnected. {Exception}", exception);
+			// Disconnect lock.
+			BikesViewModel.ActionText = AppResources.ActivityTextDisconnectingLock;
+			try
+			{
+				SelectedBike.LockInfo.State = await LockService.DisconnectAsync(SelectedBike.LockInfo.Id, SelectedBike.LockInfo.Guid);
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<BookedOpen>().Error("Lock can not be disconnected. {Exception}", exception);
 
-                BikesViewModel.ActionText = AppResources.ActivityTextErrorDisconnect;
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextErrorDisconnect;
+			}
 
 #if !USERFEEDBACKDLG_OFF
-            // Do get Feedback
-            var feedback = await ViewService.DisplayUserFeedbackPopup(
-                SelectedBike.Drive?.Battery,
-                bookingFinished?.Co2Saving);
-            IsConnected = IsConnectedDelegate();
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.DoSubmitFeedback(
-                     new UserFeedbackDto
-                     {
-                         BikeId = SelectedBike.Id,
-                         CurrentChargeBars = feedback.CurrentChargeBars,
-                         IsBikeBroken = feedback.IsBikeBroken,
-                         Message = feedback.Message
-                     },
-                    feedBackUri);
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
+			// Do get Feedback
+			var feedback = await ViewService.DisplayUserFeedbackPopup(
+				SelectedBike.Drive?.Battery,
+				bookingFinished?.Co2Saving);
+			IsConnected = IsConnectedDelegate();
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.DoSubmitFeedback(
+					 new UserFeedbackDto
+					 {
+						 BikeId = SelectedBike.Id,
+						 CurrentChargeBars = feedback.CurrentChargeBars,
+						 IsBikeBroken = feedback.IsBikeBroken,
+						 Message = feedback.Message
+					 },
+					feedBackUri);
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                if (exception is ResponseException copriException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<BookedOpen>().Information("Submitting feedback for bike {bike} failed. COPRI returned an error.", SelectedBike);
-                }
-                else
-                {
-                    Log.ForContext<BookedOpen>().Error("Submitting feedback for bike {bike} failed. {@l_oException}", SelectedBike.Id, exception);
-                }
+				if (exception is ResponseException copriException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<BookedOpen>().Information("Submitting feedback for bike {bike} failed. COPRI returned an error.", SelectedBike);
+				}
+				else
+				{
+					Log.ForContext<BookedOpen>().Error("Submitting feedback for bike {bike} failed. {@l_oException}", SelectedBike.Id, exception);
+				}
 
-                await ViewService.DisplayAlert(
-                    AppResources.ErrorReturnSubmitFeedbackTitle,
-                    AppResources.ErrorReturnSubmitFeedbackMessage,
-                    AppResources.MessageAnswerOk);
+				await ViewService.DisplayAlert(
+					AppResources.ErrorReturnSubmitFeedbackTitle,
+					AppResources.ErrorReturnSubmitFeedbackMessage,
+					AppResources.MessageAnswerOk);
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
 
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 #endif
 
-            if (bookingFinished != null && bookingFinished.MiniSurvey.Questions.Count > 0)
-            {
-                await ViewService.PushModalAsync(ViewTypes.MiniSurvey);
-            }
+			if (bookingFinished != null && bookingFinished.MiniSurvey.Questions.Count > 0)
+			{
+				await ViewService.PushModalAsync(ViewTypes.MiniSurvey);
+			}
 
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically();
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true;
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically();
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true;
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
 
-        /// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
-        public async Task<IRequestHandler> CloseLock()
-        {
-            // Unlock bike.
-            BikesViewModel.IsIdle = false;
-            Log.ForContext<BookedOpen>().Information("User request to lock bike {bike} in order to pause ride.", SelectedBike);
+		/// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
+		public async Task<IRequestHandler> CloseLock()
+		{
+			// Unlock bike.
+			BikesViewModel.IsIdle = false;
+			Log.ForContext<BookedOpen>().Information("User request to lock bike {bike} in order to pause ride.", SelectedBike);
 
-            // Clear logging memory sink to avoid passing log data not related to returning of bike to backend.
-            // Log data is passed to backend when calling CopriCallsHttps.DoReturn().
-            MemoryStackSink.ClearMessages();
+			// Clear logging memory sink to avoid passing log data not related to returning of bike to backend.
+			// Log data is passed to backend when calling CopriCallsHttps.DoReturn().
+			MemoryStackSink.ClearMessages();
 
-            // Start getting geolocation.
-            BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationStart;
-            var ctsLocation = new CancellationTokenSource();
-            Task<Location> currentLocationTask = null;
-            var timeStamp = DateTime.Now;
-            try
-            {
-                currentLocationTask = Geolocation.GetAsync(ctsLocation.Token, timeStamp);
-            }
-            catch (Exception ex)
-            {
-                // No location information available.
-                Log.ForContext<BookedOpen>().Information("Closing lock of bike {Bike} is not possible. Starting query location failed. {Exception}", SelectedBike, ex);
+			// Start getting geolocation.
+			BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationStart;
+			var ctsLocation = new CancellationTokenSource();
+			Task<Location> currentLocationTask = null;
+			var timeStamp = DateTime.Now;
+			try
+			{
+				currentLocationTask = Geolocation.GetAsync(ctsLocation.Token, timeStamp);
+			}
+			catch (Exception ex)
+			{
+				// No location information available.
+				Log.ForContext<BookedOpen>().Information("Closing lock of bike {Bike} is not possible. Starting query location failed. {Exception}", SelectedBike, ex);
 
-                BikesViewModel.ActionText = AppResources.ActivityTextErrorQueryLocationQuery;
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextErrorQueryLocationQuery;
+			}
 
-            // Stop polling before returning bike.
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before returning bike.
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            // Close lock
-            BikesViewModel.ActionText = AppResources.ActivityTextClosingLock;
-            try
-            {
-                SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
+			// Close lock
+			BikesViewModel.ActionText = AppResources.ActivityTextClosingLock;
+			try
+			{
+				SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                // Signal cts to  cancel getting geolocation.
-                ctsLocation.Cancel();
+				// Signal cts to  cancel getting geolocation.
+				ctsLocation.Cancel();
 
-                if (exception is OutOfReachException)
-                {
-                    Log.ForContext<BookedOpen>().Debug("Lock can not be closed. {Exception}", exception);
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorCloseLockTitle,
-                        AppResources.ErrorCloseLockOutOfReachMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntCloseMovingException)
-                {
-                    Log.ForContext<BookedOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
+				if (exception is OutOfReachException)
+				{
+					Log.ForContext<BookedOpen>().Debug("Lock can not be closed. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						AppResources.ErrorCloseLockOutOfReachMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntCloseMovingException)
+				{
+					Log.ForContext<BookedOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorCloseLockTitle,
-                        AppResources.ErrorCloseLockMovingMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntCloseBoldBlockedException)
-                {
-                    Log.ForContext<BookedOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						AppResources.ErrorCloseLockMovingMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntCloseBoldBlockedException)
+				{
+					Log.ForContext<BookedOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorCloseLockTitle,
-                        AppResources.ErrorCloseLockBoldBlockedMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<BookedOpen>().Error("Lock can not be closed. {Exception}", exception);
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorCloseLockTitle,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						AppResources.ErrorCloseLockBoldBlockedMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<BookedOpen>().Error("Lock can not be closed. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
 
-                SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
-                    ? stateAwareException.State
-                    : LockingState.UnknownDisconnected;
+				SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
+					? stateAwareException.State
+					: LockingState.UnknownDisconnected;
 
-                // Wait until cancel getting geolocation has completed.
-                BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationCancelWait;
-                try
-                {
-                    await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
-                }
-                catch (Exception ex)
-                {
-                    // No location information available.
-                    Log.ForContext<BookedOpen>().Information("Canceling query location failed on closing lock error. {Exception}", SelectedBike, ex);
-                }
+				// Wait until cancel getting geolocation has completed.
+				BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationCancelWait;
+				try
+				{
+					await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
+				}
+				catch (Exception ex)
+				{
+					// No location information available.
+					Log.ForContext<BookedOpen>().Information("Canceling query location failed on closing lock error. {Exception}", SelectedBike, ex);
+				}
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
 
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            // Get geoposition.
-            BikesViewModel.ActionText = AppResources.ActivityTextQueryLocation;
-            Location currentLocation = null;
-            try
-            {
-                await Task.WhenAny(new List<Task> { currentLocationTask });
-                currentLocation = currentLocationTask.Result;
-            }
-            catch (Exception ex)
-            {
-                // No location information available.
-                Log.ForContext<BookedOpen>().Information("Getting geolocation when closing lock of bike {Bike} failed. {Exception}", SelectedBike, ex);
+			// Get geoposition.
+			BikesViewModel.ActionText = AppResources.ActivityTextQueryLocation;
+			Location currentLocation = null;
+			try
+			{
+				await Task.WhenAny(new List<Task> { currentLocationTask });
+				currentLocation = currentLocationTask.Result;
+			}
+			catch (Exception ex)
+			{
+				// No location information available.
+				Log.ForContext<BookedOpen>().Information("Getting geolocation when closing lock of bike {Bike} failed. {Exception}", SelectedBike, ex);
 
-                BikesViewModel.ActionText = AppResources.ActivityTextErrorQueryLocationWhenAny;
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextErrorQueryLocationWhenAny;
+			}
 
-            // Lock list to avoid multiple taps while copri action is pending.
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
+			// Lock list to avoid multiple taps while copri action is pending.
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
 
-            IsConnected = IsConnectedDelegate();
+			IsConnected = IsConnectedDelegate();
 
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(
-                    SelectedBike,
-                    currentLocation != null
-                        ? new LocationDto.Builder
-                        {
-                            Latitude = currentLocation.Latitude,
-                            Longitude = currentLocation.Longitude,
-                            Accuracy = currentLocation.Accuracy ?? double.NaN,
-                            Age = timeStamp.Subtract(currentLocation.Timestamp.DateTime),
-                        }.Build()
-                        : null);
-            }
-            catch (Exception exception)
-            {
-                if (exception is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<BookedOpen>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", SelectedBike);
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(
+					SelectedBike,
+					currentLocation != null
+						? new LocationDto.Builder
+						{
+							Latitude = currentLocation.Latitude,
+							Longitude = currentLocation.Longitude,
+							Accuracy = currentLocation.Accuracy ?? double.NaN,
+							Age = timeStamp.Subtract(currentLocation.Timestamp.DateTime),
+						}.Build()
+						: null);
+			}
+			catch (Exception exception)
+			{
+				if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<BookedOpen>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", SelectedBike);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
-                }
-                else if (exception is ResponseException copriException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<BookedOpen>().Information("User locked bike {bike} in order to pause ride but updating failed. Message: {Message} Details: {Details}", SelectedBike, copriException.Message, copriException.Response);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
+				}
+				else if (exception is ResponseException copriException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<BookedOpen>().Information("User locked bike {bike} in order to pause ride but updating failed. Message: {Message} Details: {Details}", SelectedBike, copriException.Message, copriException.Response);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
-                }
-                else
-                {
-                    Log.ForContext<BookedOpen>().Error("User locked bike {bike} in order to pause ride but updating failed. {@l_oException}", SelectedBike.Id, exception);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
+				}
+				else
+				{
+					Log.ForContext<BookedOpen>().Error("User locked bike {bike} in order to pause ride but updating failed. {@l_oException}", SelectedBike.Id, exception);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
-                }
-            }
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
+				}
+			}
 
-            Log.ForContext<BookedOpen>().Information("User paused ride using {bike} successfully.", SelectedBike);
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically();
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true;
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
-    }
+			Log.ForContext<BookedOpen>().Information("User paused ride using {bike} successfully.", SelectedBike);
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically();
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true;
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedUnknown.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedUnknown.cs
index 7fd802b..fb763ec 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedUnknown.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedUnknown.cs
@@ -18,352 +18,352 @@ using Xamarin.Essentials;
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    public class BookedUnknown : Base, IRequestHandler
-    {
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public BookedUnknown(
-           IBikeInfoMutable selectedBike,
-           Func<bool> isConnectedDelegate,
-           Func<bool, IConnector> connectorFactory,
-           IGeolocation geolocation,
-           ILocksService lockService,
-           Func<IPollingUpdateTaskManager> viewUpdateManager,
-           ISmartDevice smartDevice,
-           IViewService viewService,
-           IBikesViewModel bikesViewModel,
-           IUser activeUser) : base(
-               selectedBike,
-               AppResources.ActionOpenAndPause, // Schloss öffnen und Miete fortsetzen.
-               true, // Show button to enabled returning of bike.
-               isConnectedDelegate,
-               connectorFactory,
-               geolocation,
-               lockService,
-               viewUpdateManager,
-               smartDevice,
-               viewService,
-               bikesViewModel,
-               activeUser)
-        {
-            LockitButtonText = AppResources.ActionClose; // BT button text "Schließen".;
-            IsLockitButtonVisible = true; // Show button to enable opening lock in case user took a pause and does not want to return the bike.
-        }
+	public class BookedUnknown : Base, IRequestHandler
+	{
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public BookedUnknown(
+		   IBikeInfoMutable selectedBike,
+		   Func<bool> isConnectedDelegate,
+		   Func<bool, IConnector> connectorFactory,
+		   IGeolocation geolocation,
+		   ILocksService lockService,
+		   Func<IPollingUpdateTaskManager> viewUpdateManager,
+		   ISmartDevice smartDevice,
+		   IViewService viewService,
+		   IBikesViewModel bikesViewModel,
+		   IUser activeUser) : base(
+			   selectedBike,
+			   AppResources.ActionOpenAndPause, // Schloss öffnen und Miete fortsetzen.
+			   true, // Show button to enabled returning of bike.
+			   isConnectedDelegate,
+			   connectorFactory,
+			   geolocation,
+			   lockService,
+			   viewUpdateManager,
+			   smartDevice,
+			   viewService,
+			   bikesViewModel,
+			   activeUser)
+		{
+			LockitButtonText = AppResources.ActionClose; // BT button text "Schließen".;
+			IsLockitButtonVisible = true; // Show button to enable opening lock in case user took a pause and does not want to return the bike.
+		}
 
-        /// <summary> Open bike and update COPRI lock state. </summary>
-        public async Task<IRequestHandler> HandleRequestOption1() => await OpenLock();
+		/// <summary> Open bike and update COPRI lock state. </summary>
+		public async Task<IRequestHandler> HandleRequestOption1() => await OpenLock();
 
-        /// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
-        public async Task<IRequestHandler> HandleRequestOption2() => await CloseLock();
+		/// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
+		public async Task<IRequestHandler> HandleRequestOption2() => await CloseLock();
 
 
-        /// <summary> Open bike and update COPRI lock state. </summary>
-        public async Task<IRequestHandler> OpenLock()
-        {
-            // Unlock bike.
-            Log.ForContext<BookedUnknown>().Information("User request to unlock bike {bike}.", SelectedBike);
+		/// <summary> Open bike and update COPRI lock state. </summary>
+		public async Task<IRequestHandler> OpenLock()
+		{
+			// Unlock bike.
+			Log.ForContext<BookedUnknown>().Information("User request to unlock bike {bike}.", SelectedBike);
 
-            // Stop polling before returning bike.
-            BikesViewModel.IsIdle = false;
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before returning bike.
+			BikesViewModel.IsIdle = false;
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            BikesViewModel.ActionText = AppResources.ActivityTextOpeningLock;
-            try
-            {
-                SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].OpenAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.ActionText = AppResources.ActivityTextOpeningLock;
+			try
+			{
+				SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].OpenAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                if (exception is OutOfReachException)
-                {
-                    Log.ForContext<BookedUnknown>().Debug("Lock can not be opened. {Exception}", exception);
+				if (exception is OutOfReachException)
+				{
+					Log.ForContext<BookedUnknown>().Debug("Lock can not be opened. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        AppResources.ErrorOpenLockOutOfReachMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntOpenBoldIsBlockedException)
-                {
-                    Log.ForContext<BookedUnknown>().Debug("Lock can not be opened. Bold is blocked. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockOutOfReachMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntOpenBoldIsBlockedException)
+				{
+					Log.ForContext<BookedUnknown>().Debug("Lock can not be opened. Bold is blocked. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        AppResources.ErrorOpenLockBoldBlockedMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntOpenBoldWasBlockedException)
-                {
-                    Log.ForContext<BookedUnknown>().Debug("Lock can not be opened. Bold was or is blocked. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockBoldBlockedMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntOpenBoldWasBlockedException)
+				{
+					Log.ForContext<BookedUnknown>().Debug("Lock can not be opened. Bold was or is blocked. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockStillOpenTitle,
-                        AppResources.ErrorOpenLockBoldWasBlockedMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntOpenInconsistentStateExecption inconsistentState
-                        && inconsistentState.State == LockingState.Closed)
-                {
-                    Log.ForContext<BookedUnknown>().Debug("Lock can not be opened. lock reports state closed. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockStillOpenTitle,
+						AppResources.ErrorOpenLockBoldWasBlockedMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntOpenInconsistentStateExecption inconsistentState
+						&& inconsistentState.State == LockingState.Closed)
+				{
+					Log.ForContext<BookedUnknown>().Debug("Lock can not be opened. lock reports state closed. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        AppResources.ErrorOpenLockStillClosedMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<BookedUnknown>().Error("Lock can not be opened. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockStillClosedMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<BookedUnknown>().Error("Lock can not be opened. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
 
-                // When bold is blocked lock is still closed even if exception occurres.
-                // In all other cases state is supposed to be unknown. Example: Lock is out of reach and no more bluetooth connected.
-                SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
-                    ? stateAwareException.State
-                    : LockingState.UnknownDisconnected;
+				// When bold is blocked lock is still closed even if exception occurres.
+				// In all other cases state is supposed to be unknown. Example: Lock is out of reach and no more bluetooth connected.
+				SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
+					? stateAwareException.State
+					: LockingState.UnknownDisconnected;
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            BikesViewModel.ActionText = AppResources.ActivityTextReadingChargingLevel;
-            try
-            {
-                SelectedBike.LockInfo.BatteryPercentage = await LockService[SelectedBike.LockInfo.Id].GetBatteryPercentageAsync();
-            }
-            catch (Exception exception)
-            {
-                if (exception is OutOfReachException)
-                {
-                    Log.ForContext<BookedUnknown>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
+			BikesViewModel.ActionText = AppResources.ActivityTextReadingChargingLevel;
+			try
+			{
+				SelectedBike.LockInfo.BatteryPercentage = await LockService[SelectedBike.LockInfo.Id].GetBatteryPercentageAsync();
+			}
+			catch (Exception exception)
+			{
+				if (exception is OutOfReachException)
+				{
+					Log.ForContext<BookedUnknown>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
-                }
-                else
-                {
-                    Log.ForContext<BookedUnknown>().Error("Akkustate can not be read. {Exception}", exception);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
+				}
+				else
+				{
+					Log.ForContext<BookedUnknown>().Error("Akkustate can not be read. {Exception}", exception);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
-                }
-            }
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
+				}
+			}
 
-            // Lock list to avoid multiple taps while copri action is pending.
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
+			// Lock list to avoid multiple taps while copri action is pending.
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
 
-            IsConnected = IsConnectedDelegate();
+			IsConnected = IsConnectedDelegate();
 
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(SelectedBike);
-            }
-            catch (Exception exception)
-            {
-                if (exception is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<BookedUnknown>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", SelectedBike);
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(SelectedBike);
+			}
+			catch (Exception exception)
+			{
+				if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<BookedUnknown>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", SelectedBike);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
-                }
-                else if (exception is ResponseException copriException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<BookedUnknown>().Information("User locked bike {bike} in order to pause ride but updating failed. {response}.", SelectedBike, copriException.Response);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
+				}
+				else if (exception is ResponseException copriException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<BookedUnknown>().Information("User locked bike {bike} in order to pause ride but updating failed. {response}.", SelectedBike, copriException.Response);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
-                }
-                else
-                {
-                    Log.ForContext<BookedUnknown>().Error("User locked bike {bike} in order to pause ride but updating failed . {@l_oException}", SelectedBike.Id, exception);
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
-                }
-            }
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
+				}
+				else
+				{
+					Log.ForContext<BookedUnknown>().Error("User locked bike {bike} in order to pause ride but updating failed . {@l_oException}", SelectedBike.Id, exception);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
+				}
+			}
 
-            Log.ForContext<BookedUnknown>().Information("User paused ride using {bike} successfully.", SelectedBike);
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically();
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true;
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
+			Log.ForContext<BookedUnknown>().Information("User paused ride using {bike} successfully.", SelectedBike);
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically();
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true;
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
 
-        /// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
-        public async Task<IRequestHandler> CloseLock()
-        {
-            // Unlock bike.
-            BikesViewModel.IsIdle = false;
+		/// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
+		public async Task<IRequestHandler> CloseLock()
+		{
+			// Unlock bike.
+			BikesViewModel.IsIdle = false;
 
-            Log.ForContext<BookedUnknown>().Information("User request to lock bike {bike} in order to pause ride.", SelectedBike);
+			Log.ForContext<BookedUnknown>().Information("User request to lock bike {bike} in order to pause ride.", SelectedBike);
 
-            // Start getting geolocation.
-            BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationStart;
-            var ctsLocation = new CancellationTokenSource();
-            Task<Location> currentLocationTask = null;
-            var timeStamp = DateTime.Now;
-            try
-            {
-                currentLocationTask = Geolocation.GetAsync(ctsLocation.Token, timeStamp);
-            }
-            catch (Exception ex)
-            {
-                // No location information available.
-                Log.ForContext<BookedUnknown>().Information("Returning bike {Bike} is not possible. Start query location failed. {Exception}", SelectedBike, ex);
+			// Start getting geolocation.
+			BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationStart;
+			var ctsLocation = new CancellationTokenSource();
+			Task<Location> currentLocationTask = null;
+			var timeStamp = DateTime.Now;
+			try
+			{
+				currentLocationTask = Geolocation.GetAsync(ctsLocation.Token, timeStamp);
+			}
+			catch (Exception ex)
+			{
+				// No location information available.
+				Log.ForContext<BookedUnknown>().Information("Returning bike {Bike} is not possible. Start query location failed. {Exception}", SelectedBike, ex);
 
-                BikesViewModel.ActionText = AppResources.ActivityTextErrorQueryLocationQuery;
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextErrorQueryLocationQuery;
+			}
 
-            // Stop polling before returning bike.
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before returning bike.
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            // Close lock
-            BikesViewModel.ActionText = AppResources.ActivityTextClosingLock;
-            try
-            {
-                SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
+			// Close lock
+			BikesViewModel.ActionText = AppResources.ActivityTextClosingLock;
+			try
+			{
+				SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                // Signal cts to  cancel getting geolocation.
-                ctsLocation.Cancel();
+				// Signal cts to  cancel getting geolocation.
+				ctsLocation.Cancel();
 
-                if (exception is OutOfReachException)
-                {
-                    Log.ForContext<BookedUnknown>().Debug("Lock can not be closed. {Exception}", exception);
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorCloseLockTitle,
-                        AppResources.ErrorCloseLockOutOfReachMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntCloseMovingException)
-                {
-                    Log.ForContext<BookedUnknown>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
+				if (exception is OutOfReachException)
+				{
+					Log.ForContext<BookedUnknown>().Debug("Lock can not be closed. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						AppResources.ErrorCloseLockOutOfReachMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntCloseMovingException)
+				{
+					Log.ForContext<BookedUnknown>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorCloseLockTitle,
-                        AppResources.ErrorCloseLockMovingMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntCloseBoldBlockedException)
-                {
-                    Log.ForContext<BookedUnknown>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						AppResources.ErrorCloseLockMovingMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntCloseBoldBlockedException)
+				{
+					Log.ForContext<BookedUnknown>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorCloseLockTitle,
-                        AppResources.ErrorCloseLockBoldBlockedMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<BookedUnknown>().Error("Lock can not be closed. {Exception}", exception);
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorCloseLockTitle,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						AppResources.ErrorCloseLockBoldBlockedMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<BookedUnknown>().Error("Lock can not be closed. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
 
-                SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
-                    ? stateAwareException.State
-                    : LockingState.UnknownDisconnected;
+				SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
+					? stateAwareException.State
+					: LockingState.UnknownDisconnected;
 
-                // Wait until cancel getting geolocation has completed.
-                BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationCancelWait;
-                try
-                {
-                    await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
-                }
-                catch (Exception ex)
-                {
-                    // No location information available.
-                    Log.ForContext<BookedUnknown>().Information("Canceling query location failed on unexpected lock state failed. {Exception}", SelectedBike, ex);
-                }
+				// Wait until cancel getting geolocation has completed.
+				BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationCancelWait;
+				try
+				{
+					await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
+				}
+				catch (Exception ex)
+				{
+					// No location information available.
+					Log.ForContext<BookedUnknown>().Information("Canceling query location failed on unexpected lock state failed. {Exception}", SelectedBike, ex);
+				}
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
 
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            // Get geoposition.
-            BikesViewModel.ActionText = AppResources.ActivityTextQueryLocation;
-            Location currentLocation = null;
-            try
-            {
-                await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
-                currentLocation = currentLocationTask?.Result ?? null;
-            }
-            catch (Exception ex)
-            {
-                // No location information available.
-                Log.ForContext<BookedUnknown>().Information("Get geolocation failed when closing lock  of bike {Bike} with unknown state. {Exception}", SelectedBike, ex);
+			// Get geoposition.
+			BikesViewModel.ActionText = AppResources.ActivityTextQueryLocation;
+			Location currentLocation = null;
+			try
+			{
+				await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
+				currentLocation = currentLocationTask?.Result ?? null;
+			}
+			catch (Exception ex)
+			{
+				// No location information available.
+				Log.ForContext<BookedUnknown>().Information("Get geolocation failed when closing lock  of bike {Bike} with unknown state. {Exception}", SelectedBike, ex);
 
-                BikesViewModel.ActionText = AppResources.ActivityTextErrorQueryLocationWhenAny;
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextErrorQueryLocationWhenAny;
+			}
 
-            // Lock list to avoid multiple taps while copri action is pending.
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
+			// Lock list to avoid multiple taps while copri action is pending.
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
 
-            IsConnected = IsConnectedDelegate();
+			IsConnected = IsConnectedDelegate();
 
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(
-                    SelectedBike,
-                    currentLocation != null
-                        ? new LocationDto.Builder
-                        {
-                            Latitude = currentLocation.Latitude,
-                            Longitude = currentLocation.Longitude,
-                            Accuracy = currentLocation.Accuracy ?? double.NaN,
-                            Age = timeStamp.Subtract(currentLocation.Timestamp.DateTime),
-                        }.Build()
-                        : null);
-            }
-            catch (Exception exception)
-            {
-                if (exception is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<BookedUnknown>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", SelectedBike);
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(
+					SelectedBike,
+					currentLocation != null
+						? new LocationDto.Builder
+						{
+							Latitude = currentLocation.Latitude,
+							Longitude = currentLocation.Longitude,
+							Accuracy = currentLocation.Accuracy ?? double.NaN,
+							Age = timeStamp.Subtract(currentLocation.Timestamp.DateTime),
+						}.Build()
+						: null);
+			}
+			catch (Exception exception)
+			{
+				if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<BookedUnknown>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", SelectedBike);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
-                }
-                else if (exception is ResponseException copriException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<BookedUnknown>().Information("User locked bike {bike} in order to pause ride but updating failed. Message: {Message} Details: {Details}", SelectedBike, copriException.Message, copriException.Response);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
+				}
+				else if (exception is ResponseException copriException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<BookedUnknown>().Information("User locked bike {bike} in order to pause ride but updating failed. Message: {Message} Details: {Details}", SelectedBike, copriException.Message, copriException.Response);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
-                }
-                else
-                {
-                    Log.ForContext<BookedUnknown>().Error("User locked bike {bike} in order to pause ride but updating failed. {@l_oException}", SelectedBike.Id, exception);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
+				}
+				else
+				{
+					Log.ForContext<BookedUnknown>().Error("User locked bike {bike} in order to pause ride but updating failed. {@l_oException}", SelectedBike.Id, exception);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
-                }
-            }
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
+				}
+			}
 
-            Log.ForContext<BookedUnknown>().Information("User paused ride using {bike} successfully.", SelectedBike);
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically();
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true;
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
-    }
+			Log.ForContext<BookedUnknown>().Information("User paused ride using {bike} successfully.", SelectedBike);
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically();
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true;
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableDisconnected.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableDisconnected.cs
index f2b0ab6..f6fa548 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableDisconnected.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableDisconnected.cs
@@ -16,390 +16,390 @@ using TINK.View;
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    public class DisposableDisconnected : Base, IRequestHandler
-    {
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public DisposableDisconnected(
-           IBikeInfoMutable selectedBike,
-           Func<bool> isConnectedDelegate,
-           Func<bool, IConnector> connectorFactory,
-           IGeolocation geolocation,
-           ILocksService lockService,
-           Func<IPollingUpdateTaskManager> viewUpdateManager,
-           ISmartDevice smartDevice,
-           IViewService viewService,
-           IBikesViewModel bikesViewModel,
-           IUser activeUser) : base(
-               selectedBike,
-               AppResources.ActionRequest, // Copri text: "Rad reservieren"
-               true, // Show copri button to enable reserving and opening
-               isConnectedDelegate,
-               connectorFactory,
-               geolocation,
-               lockService,
-               viewUpdateManager,
-               smartDevice,
-               viewService,
-               bikesViewModel,
-               activeUser)
-        {
-            LockitButtonText = GetType().Name;
-            IsLockitButtonVisible = false; // If bike is not reserved/ booked app can not connect to lock
-        }
+	public class DisposableDisconnected : Base, IRequestHandler
+	{
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public DisposableDisconnected(
+		   IBikeInfoMutable selectedBike,
+		   Func<bool> isConnectedDelegate,
+		   Func<bool, IConnector> connectorFactory,
+		   IGeolocation geolocation,
+		   ILocksService lockService,
+		   Func<IPollingUpdateTaskManager> viewUpdateManager,
+		   ISmartDevice smartDevice,
+		   IViewService viewService,
+		   IBikesViewModel bikesViewModel,
+		   IUser activeUser) : base(
+			   selectedBike,
+			   AppResources.ActionRequest, // Copri text: "Rad reservieren"
+			   true, // Show copri button to enable reserving and opening
+			   isConnectedDelegate,
+			   connectorFactory,
+			   geolocation,
+			   lockService,
+			   viewUpdateManager,
+			   smartDevice,
+			   viewService,
+			   bikesViewModel,
+			   activeUser)
+		{
+			LockitButtonText = GetType().Name;
+			IsLockitButtonVisible = false; // If bike is not reserved/ booked app can not connect to lock
+		}
 
-        /// <summary>Reserve bike and connect to lock.</summary>
-        public async Task<IRequestHandler> HandleRequestOption1() => await ReserveBookAndOpen();
+		/// <summary>Reserve bike and connect to lock.</summary>
+		public async Task<IRequestHandler> HandleRequestOption1() => await ReserveBookAndOpen();
 
-        public async Task<IRequestHandler> HandleRequestOption2() => await UnsupportedRequest();
+		public async Task<IRequestHandler> HandleRequestOption2() => await UnsupportedRequest();
 
-        /// <summary>Reserve bike and connect to lock.</summary>
-        public async Task<IRequestHandler> ReserveBookAndOpen()
-        {
-            BikesViewModel.IsIdle = false;
+		/// <summary>Reserve bike and connect to lock.</summary>
+		public async Task<IRequestHandler> ReserveBookAndOpen()
+		{
+			BikesViewModel.IsIdle = false;
 
-            // Ask whether to really book bike?
-            var alertResult = await ViewService.DisplayAlert(
-                string.Empty,
-                string.Format(AppResources.QuestionReserveBike, SelectedBike.GetFullDisplayName(), StateRequestedInfo.MaximumReserveTime.Minutes),
-                AppResources.MessageAnswerYes,
-                AppResources.MessageAnswerNo);
+			// Ask whether to really book bike?
+			var alertResult = await ViewService.DisplayAlert(
+				string.Empty,
+				string.Format(AppResources.QuestionReserveBike, SelectedBike.GetFullDisplayName(), StateRequestedInfo.MaximumReserveTime.Minutes),
+				AppResources.MessageAnswerYes,
+				AppResources.MessageAnswerNo);
 
-            if (alertResult == false)
-            {
-                // User aborted booking process
-                Log.ForContext<DisposableDisconnected>().Information("User selected availalbe bike {bike} in order to reserve but action was canceled.", SelectedBike);
-                BikesViewModel.IsIdle = true;
-                return this;
-            }
+			if (alertResult == false)
+			{
+				// User aborted booking process
+				Log.ForContext<DisposableDisconnected>().Information("User selected availalbe bike {bike} in order to reserve but action was canceled.", SelectedBike);
+				BikesViewModel.IsIdle = true;
+				return this;
+			}
 
-            // Lock list to avoid multiple taps while copri action is pending.
-            Log.ForContext<DisposableDisconnected>().Information("Request to book and open lock for bike {bike} detected.", SelectedBike);
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			// Lock list to avoid multiple taps while copri action is pending.
+			Log.ForContext<DisposableDisconnected>().Information("Request to book and open lock for bike {bike} detected.", SelectedBike);
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
 
-            // Stop polling before requesting bike.
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before requesting bike.
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            BikesViewModel.ActionText = AppResources.ActivityTextReservingBike;
-            IsConnected = IsConnectedDelegate();
+			BikesViewModel.ActionText = AppResources.ActivityTextReservingBike;
+			IsConnected = IsConnectedDelegate();
 
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.DoReserve(SelectedBike);
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.DoReserve(SelectedBike);
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                if (exception is BookingDeclinedException)
-                {
-                    // Too many bikes booked.
-                    Log.ForContext<DisposableDisconnected>().Information("Request declined because maximum count of bikes {l_oException.MaxBikesCount} already requested/ booked.", (exception as BookingDeclinedException).MaxBikesCount);
+				if (exception is BookingDeclinedException)
+				{
+					// Too many bikes booked.
+					Log.ForContext<DisposableDisconnected>().Information("Request declined because maximum count of bikes {l_oException.MaxBikesCount} already requested/ booked.", (exception as BookingDeclinedException).MaxBikesCount);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageTitleHint,
-                        string.Format(AppResources.MessageReservationBikeErrorTooManyReservationsRentals, SelectedBike.Id, (exception as BookingDeclinedException).MaxBikesCount),
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<DisposableDisconnected>().Information("User selected availalbe bike {bike} but reserving failed (Copri server not reachable).", SelectedBike);
+					await ViewService.DisplayAlert(
+						AppResources.MessageTitleHint,
+						string.Format(AppResources.MessageReservationBikeErrorTooManyReservationsRentals, SelectedBike.Id, (exception as BookingDeclinedException).MaxBikesCount),
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<DisposableDisconnected>().Information("User selected availalbe bike {bike} but reserving failed (Copri server not reachable).", SelectedBike);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageReservingBikeErrorConnectionTitle,
-                        string.Format("{0}\r\n{1}", exception.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<DisposableDisconnected>().Error("User selected availalbe bike {bike} but reserving failed. {@l_oException}", SelectedBike, exception);
+					await ViewService.DisplayAlert(
+						AppResources.MessageReservingBikeErrorConnectionTitle,
+						string.Format("{0}\r\n{1}", exception.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<DisposableDisconnected>().Error("User selected availalbe bike {bike} but reserving failed. {@l_oException}", SelectedBike, exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageReservingBikeErrorGeneralTitle,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAlert(
+						AppResources.MessageReservingBikeErrorGeneralTitle,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
 
-                // Restart polling again.
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return this;
-            }
+				// Restart polling again.
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return this;
+			}
 
-            // Search for lock.
-            LockInfoTdo result = null;
-            BikesViewModel.ActionText = AppResources.ActivityTextSearchingLock;
-            try
-            {
-                result = await LockService.ConnectAsync(
-                    new LockInfoAuthTdo.Builder { Id = SelectedBike.LockInfo.Id, Guid = SelectedBike.LockInfo.Guid, K_seed = SelectedBike.LockInfo.Seed, K_u = SelectedBike.LockInfo.UserKey }.Build(),
-                    LockService.TimeOut.GetSingleConnect(1));
-            }
-            catch (Exception exception)
-            {
-                // Do not display any messages here, because search is implicit.
-                if (exception is OutOfReachException)
-                {
-                    Log.ForContext<DisposableDisconnected>().Debug("Lock state can not be retrieved, lock is out of reach. {Exception}", exception);
+			// Search for lock.
+			LockInfoTdo result = null;
+			BikesViewModel.ActionText = AppResources.ActivityTextSearchingLock;
+			try
+			{
+				result = await LockService.ConnectAsync(
+					new LockInfoAuthTdo.Builder { Id = SelectedBike.LockInfo.Id, Guid = SelectedBike.LockInfo.Guid, K_seed = SelectedBike.LockInfo.Seed, K_u = SelectedBike.LockInfo.UserKey }.Build(),
+					LockService.TimeOut.GetSingleConnect(1));
+			}
+			catch (Exception exception)
+			{
+				// Do not display any messages here, because search is implicit.
+				if (exception is OutOfReachException)
+				{
+					Log.ForContext<DisposableDisconnected>().Debug("Lock state can not be retrieved, lock is out of reach. {Exception}", exception);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextLockIsOutOfReach;
-                }
-                else
-                {
-                    Log.ForContext<DisposableDisconnected>().Error("Lock state can not be retrieved. {Exception}", exception);
-                    BikesViewModel.ActionText = AppResources.ActivityTextLockNotFound;
-                }
+					BikesViewModel.ActionText = AppResources.ActivityTextLockIsOutOfReach;
+				}
+				else
+				{
+					Log.ForContext<DisposableDisconnected>().Error("Lock state can not be retrieved. {Exception}", exception);
+					BikesViewModel.ActionText = AppResources.ActivityTextLockNotFound;
+				}
 
-                // Restart polling again.
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				// Restart polling again.
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            SelectedBike.LockInfo.State = result?.State?.GetLockingState() ?? LockingState.UnknownDisconnected;
-            if (SelectedBike.LockInfo.State == LockingState.UnknownDisconnected)
-            {
-                // Do not display any messages here, because search is implicit.
-                Log.ForContext<DisposableDisconnected>().Information("Lock for bike {bike} not found.", SelectedBike);
+			SelectedBike.LockInfo.State = result?.State?.GetLockingState() ?? LockingState.UnknownDisconnected;
+			if (SelectedBike.LockInfo.State == LockingState.UnknownDisconnected)
+			{
+				// Do not display any messages here, because search is implicit.
+				Log.ForContext<DisposableDisconnected>().Information("Lock for bike {bike} not found.", SelectedBike);
 
-                // Restart polling again.
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
-            SelectedBike.LockInfo.Guid = result?.Guid ?? new Guid();
+				// Restart polling again.
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
+			SelectedBike.LockInfo.Guid = result?.Guid ?? new Guid();
 
-            Log.ForContext<DisposableDisconnected>().Information("Lock found {bike} successfully.", SelectedBike);
+			Log.ForContext<DisposableDisconnected>().Information("Lock found {bike} successfully.", SelectedBike);
 
-            BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.ActionText = string.Empty;
 
-            // Ask whether to really book bike?
-            alertResult = await ViewService.DisplayAlert(
-                string.Empty,
-                string.Format(AppResources.QuestionOpenLockAndBookBike, SelectedBike.GetFullDisplayName()),
-                AppResources.MessageAnswerYes,
-                AppResources.MessageAnswerNo);
+			// Ask whether to really book bike?
+			alertResult = await ViewService.DisplayAlert(
+				string.Empty,
+				string.Format(AppResources.QuestionOpenLockAndBookBike, SelectedBike.GetFullDisplayName()),
+				AppResources.MessageAnswerYes,
+				AppResources.MessageAnswerNo);
 
-            if (alertResult == false)
-            {
-                // User aborted booking process
-                Log.ForContext<DisposableDisconnected>().Information("User selected recently requested bike {bike} in order to reserve but did deny to book bike.", SelectedBike);
+			if (alertResult == false)
+			{
+				// User aborted booking process
+				Log.ForContext<DisposableDisconnected>().Information("User selected recently requested bike {bike} in order to reserve but did deny to book bike.", SelectedBike);
 
-                // Disconnect lock.
-                BikesViewModel.ActionText = AppResources.ActivityTextDisconnectingLock;
-                try
-                {
-                    SelectedBike.LockInfo.State = await LockService.DisconnectAsync(SelectedBike.LockInfo.Id, SelectedBike.LockInfo.Guid);
-                }
-                catch (Exception exception)
-                {
-                    Log.ForContext<DisposableDisconnected>().Error("Lock can not be disconnected. {Exception}", exception);
+				// Disconnect lock.
+				BikesViewModel.ActionText = AppResources.ActivityTextDisconnectingLock;
+				try
+				{
+					SelectedBike.LockInfo.State = await LockService.DisconnectAsync(SelectedBike.LockInfo.Id, SelectedBike.LockInfo.Guid);
+				}
+				catch (Exception exception)
+				{
+					Log.ForContext<DisposableDisconnected>().Error("Lock can not be disconnected. {Exception}", exception);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorDisconnect;
-                }
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorDisconnect;
+				}
 
-                // Restart polling again.
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				// Restart polling again.
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            Log.ForContext<DisposableDisconnected>().Information("User selected recently requested bike {bike} in order to book.", SelectedBike);
+			Log.ForContext<DisposableDisconnected>().Information("User selected recently requested bike {bike} in order to book.", SelectedBike);
 
-            // Book bike prior to opening lock.
-            BikesViewModel.ActionText = AppResources.ActivityTextRentingBike;
-            IsConnected = IsConnectedDelegate();
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.DoBook(SelectedBike);
-            }
-            catch (Exception l_oException)
-            {
-                BikesViewModel.ActionText = string.Empty;
+			// Book bike prior to opening lock.
+			BikesViewModel.ActionText = AppResources.ActivityTextRentingBike;
+			IsConnected = IsConnectedDelegate();
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.DoBook(SelectedBike);
+			}
+			catch (Exception l_oException)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                if (l_oException is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<DisposableDisconnected>().Information("User selected recently requested bike {l_oId} but booking failed (Copri server not reachable).", SelectedBike.Id);
+				if (l_oException is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<DisposableDisconnected>().Information("User selected recently requested bike {l_oId} but booking failed (Copri server not reachable).", SelectedBike.Id);
 
-                    await ViewService.DisplayAdvancedAlert(
-                        AppResources.MessageRentingBikeErrorConnectionTitle,
-                        WebConnectFailureException.GetHintToPossibleExceptionsReasons,
-                        l_oException.Message,
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<DisposableDisconnected>().Error("User selected recently requested bike {l_oId} but reserving failed. {@l_oException}", SelectedBike.Id, l_oException);
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.MessageRentingBikeErrorConnectionTitle,
+						WebConnectFailureException.GetHintToPossibleExceptionsReasons,
+						l_oException.Message,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<DisposableDisconnected>().Error("User selected recently requested bike {l_oId} but reserving failed. {@l_oException}", SelectedBike.Id, l_oException);
 
-                    await ViewService.DisplayAdvancedAlert(
-                        AppResources.MessageRentingBikeErrorGeneralTitle,
-                        string.Empty,
-                        l_oException.Message,
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.MessageRentingBikeErrorGeneralTitle,
+						string.Empty,
+						l_oException.Message,
+						AppResources.MessageAnswerOk);
+				}
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true; // Unlock GUI
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true; // Unlock GUI
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            // Unlock bike.
-            BikesViewModel.ActionText = AppResources.ActivityTextOpeningLock;
-            try
-            {
-                SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].OpenAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
-                if (exception is OutOfReachException)
-                {
-                    Log.ForContext<DisposableDisconnected>().Debug("Lock can not be opened. {Exception}", exception);
+			// Unlock bike.
+			BikesViewModel.ActionText = AppResources.ActivityTextOpeningLock;
+			try
+			{
+				SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].OpenAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
+				if (exception is OutOfReachException)
+				{
+					Log.ForContext<DisposableDisconnected>().Debug("Lock can not be opened. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        AppResources.ErrorOpenLockOutOfReachMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntOpenBoldIsBlockedException)
-                {
-                    Log.ForContext<DisposableDisconnected>().Debug("Lock can not be opened. Bold is blocked. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockOutOfReachMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntOpenBoldIsBlockedException)
+				{
+					Log.ForContext<DisposableDisconnected>().Debug("Lock can not be opened. Bold is blocked. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        AppResources.ErrorOpenLockBoldBlockedMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntOpenBoldWasBlockedException)
-                {
-                    Log.ForContext<DisposableDisconnected>().Debug("Lock can not be opened. Bold was or is blocked. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockBoldBlockedMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntOpenBoldWasBlockedException)
+				{
+					Log.ForContext<DisposableDisconnected>().Debug("Lock can not be opened. Bold was or is blocked. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockStillOpenTitle,
-                        AppResources.ErrorOpenLockBoldWasBlockedMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntOpenInconsistentStateExecption inconsistentState
-                        && inconsistentState.State == LockingState.Closed)
-                {
-                    Log.ForContext<DisposableDisconnected>().Debug("Lock can not be opened. lock reports state closed. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockStillOpenTitle,
+						AppResources.ErrorOpenLockBoldWasBlockedMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntOpenInconsistentStateExecption inconsistentState
+						&& inconsistentState.State == LockingState.Closed)
+				{
+					Log.ForContext<DisposableDisconnected>().Debug("Lock can not be opened. lock reports state closed. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        AppResources.ErrorOpenLockStillClosedMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<DisposableDisconnected>().Error("Lock can not be opened. {Exception}", exception);
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockStillClosedMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<DisposableDisconnected>().Error("Lock can not be opened. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
 
-                SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
-                    ? stateAwareException.State
-                    : LockingState.UnknownDisconnected;
+				SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
+					? stateAwareException.State
+					: LockingState.UnknownDisconnected;
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
 
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            if (SelectedBike.LockInfo.State != LockingState.Open)
-            {
-                // Opening lock failed.
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+			if (SelectedBike.LockInfo.State != LockingState.Open)
+			{
+				// Opening lock failed.
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
 
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true; // Unlock GUI
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true; // Unlock GUI
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            BikesViewModel.ActionText = AppResources.ActivityTextReadingChargingLevel;
-            try
-            {
-                SelectedBike.LockInfo.BatteryPercentage = await LockService[SelectedBike.LockInfo.Id].GetBatteryPercentageAsync();
-            }
-            catch (Exception exception)
-            {
-                if (exception is OutOfReachException)
-                {
-                    Log.ForContext<DisposableDisconnected>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
+			BikesViewModel.ActionText = AppResources.ActivityTextReadingChargingLevel;
+			try
+			{
+				SelectedBike.LockInfo.BatteryPercentage = await LockService[SelectedBike.LockInfo.Id].GetBatteryPercentageAsync();
+			}
+			catch (Exception exception)
+			{
+				if (exception is OutOfReachException)
+				{
+					Log.ForContext<DisposableDisconnected>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
-                }
-                else
-                {
-                    Log.ForContext<DisposableDisconnected>().Error("Akkustate can not be read. {Exception}", exception);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
+				}
+				else
+				{
+					Log.ForContext<DisposableDisconnected>().Error("Akkustate can not be read. {Exception}", exception);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
-                }
-            }
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
+				}
+			}
 
-            // Lock list to avoid multiple taps while copri action is pending.
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
+			// Lock list to avoid multiple taps while copri action is pending.
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
 
-            IsConnected = IsConnectedDelegate();
+			IsConnected = IsConnectedDelegate();
 
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(SelectedBike);
-            }
-            catch (Exception exception)
-            {
-                if (exception is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<DisposableDisconnected>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", SelectedBike);
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(SelectedBike);
+			}
+			catch (Exception exception)
+			{
+				if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<DisposableDisconnected>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", SelectedBike);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
-                }
-                else if (exception is ResponseException copriException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<DisposableDisconnected>().Information("User locked bike {bike} in order to pause ride but updating failed. {response}.", SelectedBike, copriException.Response);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
+				}
+				else if (exception is ResponseException copriException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<DisposableDisconnected>().Information("User locked bike {bike} in order to pause ride but updating failed. {response}.", SelectedBike, copriException.Response);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
-                }
-                else
-                {
-                    Log.ForContext<DisposableDisconnected>().Error("User locked bike {bike} in order to pause ride but updating failed . {@l_oException}", SelectedBike.Id, exception);
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
-                }
-            }
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
+				}
+				else
+				{
+					Log.ForContext<DisposableDisconnected>().Error("User locked bike {bike} in order to pause ride but updating failed . {@l_oException}", SelectedBike.Id, exception);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
+				}
+			}
 
-            Log.ForContext<DisposableDisconnected>().Information("User reserved bike {bike} successfully.", SelectedBike);
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true; // Unlock GUI
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
+			Log.ForContext<DisposableDisconnected>().Information("User reserved bike {bike} successfully.", SelectedBike);
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true; // Unlock GUI
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
 
-        /// <summary> Requst is not supported, button should be disabled. </summary>
-        /// <returns></returns>
-        public async Task<IRequestHandler> UnsupportedRequest()
-        {
-            Log.ForContext<DisposableDisconnected>().Error("Click of unsupported button click detected.");
-            return await Task.FromResult<IRequestHandler>(this);
-        }
-    }
+		/// <summary> Requst is not supported, button should be disabled. </summary>
+		/// <returns></returns>
+		public async Task<IRequestHandler> UnsupportedRequest()
+		{
+			Log.ForContext<DisposableDisconnected>().Error("Click of unsupported button click detected.");
+			return await Task.FromResult<IRequestHandler>(this);
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableOpen.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableOpen.cs
index 58fa597..66cb8e2 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableOpen.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableOpen.cs
@@ -14,268 +14,268 @@ using TINK.View;
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    /// <summary> Bike is disposable, lock is open and connected to app. </summary>
-    /// <remarks> 
-    /// This state can not be occur because
-    /// - app does not allow to return bike/ cancel reservation when lock is not closed
-    /// - as long as app is connected to lock
-    ///     - lock can not be opened manually
-    ///     - no other device can access lock
-    /// </remarks>
-    public class DisposableOpen : Base, IRequestHandler
-    {
-        /// <summary> Bike is disposable, lock is open and can be reached via bluetooth. </summary>
-        /// <remarks> 
-        /// This state should never occure because as long as a ILOCKIT is connected it
-        /// - cannot be closed manually 
-        /// - no other device can access lock
-        /// - app itself should never event attempt to open a lock which is not rented.
-        /// </remarks>
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public DisposableOpen(
-               IBikeInfoMutable selectedBike,
-               Func<bool> isConnectedDelegate,
-               Func<bool, IConnector> connectorFactory,
-               IGeolocation geolocation,
-               ILocksService lockService,
-               Func<IPollingUpdateTaskManager> viewUpdateManager,
-               ISmartDevice smartDevice,
-               IViewService viewService,
-               IBikesViewModel bikesViewModel,
-               IUser activeUser) : base(
-                   selectedBike,
-                   AppResources.ActionBookOrClose,
-                   true, // Show copri button to enable reserving
-                   isConnectedDelegate,
-                   connectorFactory,
-                   geolocation,
-                   lockService,
-                   viewUpdateManager,
-                   smartDevice,
-                   viewService,
-                   bikesViewModel,
-                   activeUser)
-        {
-            LockitButtonText = GetType().Name;
-            IsLockitButtonVisible = false;
-        }
+	/// <summary> Bike is disposable, lock is open and connected to app. </summary>
+	/// <remarks> 
+	/// This state can not be occur because
+	/// - app does not allow to return bike/ cancel reservation when lock is not closed
+	/// - as long as app is connected to lock
+	///     - lock can not be opened manually
+	///     - no other device can access lock
+	/// </remarks>
+	public class DisposableOpen : Base, IRequestHandler
+	{
+		/// <summary> Bike is disposable, lock is open and can be reached via bluetooth. </summary>
+		/// <remarks> 
+		/// This state should never occure because as long as a ILOCKIT is connected it
+		/// - cannot be closed manually 
+		/// - no other device can access lock
+		/// - app itself should never event attempt to open a lock which is not rented.
+		/// </remarks>
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public DisposableOpen(
+			   IBikeInfoMutable selectedBike,
+			   Func<bool> isConnectedDelegate,
+			   Func<bool, IConnector> connectorFactory,
+			   IGeolocation geolocation,
+			   ILocksService lockService,
+			   Func<IPollingUpdateTaskManager> viewUpdateManager,
+			   ISmartDevice smartDevice,
+			   IViewService viewService,
+			   IBikesViewModel bikesViewModel,
+			   IUser activeUser) : base(
+				   selectedBike,
+				   AppResources.ActionBookOrClose,
+				   true, // Show copri button to enable reserving
+				   isConnectedDelegate,
+				   connectorFactory,
+				   geolocation,
+				   lockService,
+				   viewUpdateManager,
+				   smartDevice,
+				   viewService,
+				   bikesViewModel,
+				   activeUser)
+		{
+			LockitButtonText = GetType().Name;
+			IsLockitButtonVisible = false;
+		}
 
-        /// <summary>Books bike by reserving bike, opening lock and booking bike.</summary>
-        /// <returns>Next request handler.</returns>
-        public async Task<IRequestHandler> HandleRequestOption1() => await DoBookOrClose();
+		/// <summary>Books bike by reserving bike, opening lock and booking bike.</summary>
+		/// <returns>Next request handler.</returns>
+		public async Task<IRequestHandler> HandleRequestOption1() => await DoBookOrClose();
 
-        public async Task<IRequestHandler> HandleRequestOption2() => await UnsupportedRequest();
+		public async Task<IRequestHandler> HandleRequestOption2() => await UnsupportedRequest();
 
 
-        /// <summary>Books bike by reserving bike, opening lock and booking bike.</summary>
-        /// <returns>Next request handler.</returns>
-        public async Task<IRequestHandler> DoBookOrClose()
-        {
-            BikesViewModel.IsIdle = false; // Lock list to avoid multiple taps while copri action is pending.
+		/// <summary>Books bike by reserving bike, opening lock and booking bike.</summary>
+		/// <returns>Next request handler.</returns>
+		public async Task<IRequestHandler> DoBookOrClose()
+		{
+			BikesViewModel.IsIdle = false; // Lock list to avoid multiple taps while copri action is pending.
 
-            // Stop polling before requesting bike.
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before requesting bike.
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            // Ask whether to really book bike or close lock?
-            var l_oResult = await ViewService.DisplayAlert(
-                string.Empty,
-                $"Fahrrad {SelectedBike.GetFullDisplayName()} mieten oder Schloss schließen?",
-                "Mieten",
-                "Schloss schließen");
+			// Ask whether to really book bike or close lock?
+			var l_oResult = await ViewService.DisplayAlert(
+				string.Empty,
+				$"Fahrrad {SelectedBike.GetFullDisplayName()} mieten oder Schloss schließen?",
+				"Mieten",
+				"Schloss schließen");
 
-            if (l_oResult == false)
-            {
-                // Close lock
-                Log.ForContext<DisposableOpen>().Information("User selected disposable bike {bike} in order to close lock.", SelectedBike);
-                BikesViewModel.ActionText = AppResources.ActivityTextClosingLock;
-                try
-                {
-                    SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
-                }
-                catch (Exception exception)
-                {
-                    BikesViewModel.ActionText = string.Empty;
-                    if (exception is OutOfReachException)
-                    {
-                        Log.ForContext<DisposableOpen>().Debug("Lock can not be closed. {Exception}", exception);
+			if (l_oResult == false)
+			{
+				// Close lock
+				Log.ForContext<DisposableOpen>().Information("User selected disposable bike {bike} in order to close lock.", SelectedBike);
+				BikesViewModel.ActionText = AppResources.ActivityTextClosingLock;
+				try
+				{
+					SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
+				}
+				catch (Exception exception)
+				{
+					BikesViewModel.ActionText = string.Empty;
+					if (exception is OutOfReachException)
+					{
+						Log.ForContext<DisposableOpen>().Debug("Lock can not be closed. {Exception}", exception);
 
-                        await ViewService.DisplayAlert(
-                            AppResources.ErrorCloseLockTitle,
-                            AppResources.ErrorCloseLockOutOfReachMessage,
-                            AppResources.MessageAnswerOk);
-                    }
-                    else if (exception is CouldntCloseMovingException)
-                    {
-                        Log.ForContext<DisposableOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
+						await ViewService.DisplayAlert(
+							AppResources.ErrorCloseLockTitle,
+							AppResources.ErrorCloseLockOutOfReachMessage,
+							AppResources.MessageAnswerOk);
+					}
+					else if (exception is CouldntCloseMovingException)
+					{
+						Log.ForContext<DisposableOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
 
-                        await ViewService.DisplayAlert(
-                            AppResources.ErrorCloseLockTitle,
-                            AppResources.ErrorCloseLockMovingMessage,
-                            AppResources.MessageAnswerOk);
-                    }
-                    else if (exception is CouldntCloseBoldBlockedException)
-                    {
-                        Log.ForContext<DisposableOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
+						await ViewService.DisplayAlert(
+							AppResources.ErrorCloseLockTitle,
+							AppResources.ErrorCloseLockMovingMessage,
+							AppResources.MessageAnswerOk);
+					}
+					else if (exception is CouldntCloseBoldBlockedException)
+					{
+						Log.ForContext<DisposableOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
 
-                        await ViewService.DisplayAlert(
-                            AppResources.ErrorCloseLockTitle,
-                            AppResources.ErrorCloseLockBoldBlockedMessage,
-                            AppResources.MessageAnswerOk);
-                    }
-                    else
-                    {
-                        Log.ForContext<DisposableOpen>().Error("Lock can not be closed. {Exception}", exception);
+						await ViewService.DisplayAlert(
+							AppResources.ErrorCloseLockTitle,
+							AppResources.ErrorCloseLockBoldBlockedMessage,
+							AppResources.MessageAnswerOk);
+					}
+					else
+					{
+						Log.ForContext<DisposableOpen>().Error("Lock can not be closed. {Exception}", exception);
 
-                        await ViewService.DisplayAlert(
-                            AppResources.ErrorCloseLockTitle,
-                            exception.Message,
-                            AppResources.MessageAnswerOk);
-                    }
+						await ViewService.DisplayAlert(
+							AppResources.ErrorCloseLockTitle,
+							exception.Message,
+							AppResources.MessageAnswerOk);
+					}
 
-                    SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
-                        ? stateAwareException.State
-                        : LockingState.UnknownDisconnected;
+					SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
+						? stateAwareException.State
+						: LockingState.UnknownDisconnected;
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                    await ViewUpdateManager().StartUpdateAyncPeridically();
-                    BikesViewModel.ActionText = string.Empty;
-                    BikesViewModel.IsIdle = true;
-                    return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-                }
+					BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+					await ViewUpdateManager().StartUpdateAyncPeridically();
+					BikesViewModel.ActionText = string.Empty;
+					BikesViewModel.IsIdle = true;
+					return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+				}
 
-                // Disconnect lock.
-                BikesViewModel.ActionText = AppResources.ActivityTextDisconnectingLock;
-                try
-                {
-                    SelectedBike.LockInfo.State = await LockService.DisconnectAsync(SelectedBike.LockInfo.Id, SelectedBike.LockInfo.Guid);
-                }
-                catch (Exception exception)
-                {
-                    Log.ForContext<DisposableOpen>().Error("Lock can not be disconnected. {Exception}", exception);
+				// Disconnect lock.
+				BikesViewModel.ActionText = AppResources.ActivityTextDisconnectingLock;
+				try
+				{
+					SelectedBike.LockInfo.State = await LockService.DisconnectAsync(SelectedBike.LockInfo.Id, SelectedBike.LockInfo.Guid);
+				}
+				catch (Exception exception)
+				{
+					Log.ForContext<DisposableOpen>().Error("Lock can not be disconnected. {Exception}", exception);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorDisconnect;
-                }
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorDisconnect;
+				}
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            // Lock list to avoid multiple taps while copri action is pending.
-            Log.ForContext<DisposableOpen>().Information("Request to book bike {bike}.", SelectedBike);
+			// Lock list to avoid multiple taps while copri action is pending.
+			Log.ForContext<DisposableOpen>().Information("Request to book bike {bike}.", SelectedBike);
 
-            BikesViewModel.ActionText = AppResources.ActivityTextReadingChargingLevel;
-            try
-            {
-                SelectedBike.LockInfo.BatteryPercentage = await LockService[SelectedBike.LockInfo.Id].GetBatteryPercentageAsync();
-            }
-            catch (Exception exception)
-            {
-                if (exception is OutOfReachException)
-                {
-                    Log.ForContext<DisposableOpen>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
+			BikesViewModel.ActionText = AppResources.ActivityTextReadingChargingLevel;
+			try
+			{
+				SelectedBike.LockInfo.BatteryPercentage = await LockService[SelectedBike.LockInfo.Id].GetBatteryPercentageAsync();
+			}
+			catch (Exception exception)
+			{
+				if (exception is OutOfReachException)
+				{
+					Log.ForContext<DisposableOpen>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
-                }
-                else
-                {
-                    Log.ForContext<DisposableOpen>().Error("Akkustate can not be read. {Exception}", exception);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
+				}
+				else
+				{
+					Log.ForContext<DisposableOpen>().Error("Akkustate can not be read. {Exception}", exception);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
-                }
-            }
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
+				}
+			}
 
-            // Notify corpi about unlock action in order to start booking.
-            BikesViewModel.ActionText = AppResources.ActivityTextRentingBike;
-            IsConnected = IsConnectedDelegate();
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.DoBook(SelectedBike);
-            }
-            catch (Exception l_oException)
-            {
-                BikesViewModel.ActionText = string.Empty;
+			// Notify corpi about unlock action in order to start booking.
+			BikesViewModel.ActionText = AppResources.ActivityTextRentingBike;
+			IsConnected = IsConnectedDelegate();
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.DoBook(SelectedBike);
+			}
+			catch (Exception l_oException)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                if (l_oException is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<DisposableOpen>().Information("User selected requested bike {l_oId} but reserving failed (Copri server not reachable).", SelectedBike.Id);
+				if (l_oException is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<DisposableOpen>().Information("User selected requested bike {l_oId} but reserving failed (Copri server not reachable).", SelectedBike.Id);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageRentingBikeErrorConnectionTitle,
-                        string.Format(AppResources.MessageErrorLockIsClosedThreeLines, l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<DisposableOpen>().Error("User selected requested bike {l_oId} but reserving failed. {@l_oException}", SelectedBike.Id, l_oException);
+					await ViewService.DisplayAlert(
+						AppResources.MessageRentingBikeErrorConnectionTitle,
+						string.Format(AppResources.MessageErrorLockIsClosedThreeLines, l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<DisposableOpen>().Error("User selected requested bike {l_oId} but reserving failed. {@l_oException}", SelectedBike.Id, l_oException);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageRentingBikeErrorGeneralTitle,
-                        string.Format(AppResources.MessageErrorLockIsClosedTwoLines, l_oException.Message),
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAlert(
+						AppResources.MessageRentingBikeErrorGeneralTitle,
+						string.Format(AppResources.MessageErrorLockIsClosedTwoLines, l_oException.Message),
+						AppResources.MessageAnswerOk);
+				}
 
-                // If booking failed lock bike again because bike is only reserved.
-                BikesViewModel.ActionText = "Verschließe Schloss...";
-                try
-                {
-                    SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
-                }
-                catch (Exception exception)
-                {
-                    Log.ForContext<DisposableOpen>().Error("Locking bike after booking failure failed. {Exception}", exception);
+				// If booking failed lock bike again because bike is only reserved.
+				BikesViewModel.ActionText = "Verschließe Schloss...";
+				try
+				{
+					SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
+				}
+				catch (Exception exception)
+				{
+					Log.ForContext<DisposableOpen>().Error("Locking bike after booking failure failed. {Exception}", exception);
 
-                    SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
-                        ? stateAwareException.State
-                        : LockingState.UnknownDisconnected;
-                }
+					SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
+						? stateAwareException.State
+						: LockingState.UnknownDisconnected;
+				}
 
-                // Disconnect lock.
-                BikesViewModel.ActionText = AppResources.ActivityTextDisconnectingLock;
-                try
-                {
-                    SelectedBike.LockInfo.State = await LockService.DisconnectAsync(SelectedBike.LockInfo.Id, SelectedBike.LockInfo.Guid);
-                }
-                catch (Exception exception)
-                {
-                    Log.ForContext<DisposableOpen>().Error("Lock can not be disconnected. {Exception}", exception);
+				// Disconnect lock.
+				BikesViewModel.ActionText = AppResources.ActivityTextDisconnectingLock;
+				try
+				{
+					SelectedBike.LockInfo.State = await LockService.DisconnectAsync(SelectedBike.LockInfo.Id, SelectedBike.LockInfo.Guid);
+				}
+				catch (Exception exception)
+				{
+					Log.ForContext<DisposableOpen>().Error("Lock can not be disconnected. {Exception}", exception);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorDisconnect;
-                }
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorDisconnect;
+				}
 
-                // Restart polling again.
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
+				// Restart polling again.
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
 
-                // Update status text and unlock list of bikes because no more action is pending.
-                BikesViewModel.ActionText = string.Empty; // Todo: Move this statement in front of finally block because in catch block BikesViewModel.ActionText is already set to empty.
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				// Update status text and unlock list of bikes because no more action is pending.
+				BikesViewModel.ActionText = string.Empty; // Todo: Move this statement in front of finally block because in catch block BikesViewModel.ActionText is already set to empty.
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            Log.ForContext<DisposableOpen>().Information("User reserved bike {bike} successfully.", SelectedBike);
+			Log.ForContext<DisposableOpen>().Information("User reserved bike {bike} successfully.", SelectedBike);
 
-            // Restart polling again.
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically();
+			// Restart polling again.
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically();
 
-            // Update status text and unlock list of bikes because no more action is pending.
-            BikesViewModel.ActionText = string.Empty; // Todo: Move this statement in front of finally block because in catch block BikesViewModel.ActionText is already set to empty.
-            BikesViewModel.IsIdle = true;
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
+			// Update status text and unlock list of bikes because no more action is pending.
+			BikesViewModel.ActionText = string.Empty; // Todo: Move this statement in front of finally block because in catch block BikesViewModel.ActionText is already set to empty.
+			BikesViewModel.IsIdle = true;
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
 
-        /// <summary> Requst is not supported, button should be disabled. </summary>
-        /// <returns></returns>
-        public async Task<IRequestHandler> UnsupportedRequest()
-        {
-            Log.ForContext<DisposableOpen>().Error("Click of unsupported button click detected.");
-            return await Task.FromResult<IRequestHandler>(this);
-        }
-    }
+		/// <summary> Requst is not supported, button should be disabled. </summary>
+		/// <returns></returns>
+		public async Task<IRequestHandler> UnsupportedRequest()
+		{
+			Log.ForContext<DisposableOpen>().Error("Click of unsupported button click detected.");
+			return await Task.FromResult<IRequestHandler>(this);
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/IRequestHandler.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/IRequestHandler.cs
index 3e4c2bd..e606d3c 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/IRequestHandler.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/IRequestHandler.cs
@@ -2,25 +2,25 @@
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock
 {
-    public interface IRequestHandler : IRequestHandlerBase
-    {
-        /// <summary> Gets a value indicating whether the ILockIt button which is managed by request hadnler is visible or not. </summary>
-        bool IsLockitButtonVisible { get; }
+	public interface IRequestHandler : IRequestHandlerBase
+	{
+		/// <summary> Gets a value indicating whether the ILockIt button which is managed by request hadnler is visible or not. </summary>
+		bool IsLockitButtonVisible { get; }
 
-        /// <summary> Gets the text of the ILockIt button which is managed by request handler. </summary>
-        string LockitButtonText { get; }
+		/// <summary> Gets the text of the ILockIt button which is managed by request handler. </summary>
+		string LockitButtonText { get; }
 
-        /// <summary>
-        /// Performs the copri action to be executed when user presses the copri button managed by request handler.
-        /// </summary>
-        /// <returns>New handler object if action suceeded, same handler otherwise.</returns>
-        Task<IRequestHandler> HandleRequestOption1();
+		/// <summary>
+		/// Performs the copri action to be executed when user presses the copri button managed by request handler.
+		/// </summary>
+		/// <returns>New handler object if action suceeded, same handler otherwise.</returns>
+		Task<IRequestHandler> HandleRequestOption1();
 
-        Task<IRequestHandler> HandleRequestOption2();
+		Task<IRequestHandler> HandleRequestOption2();
 
-        /// <summary>
-        /// Holds error discription (invalid state).
-        /// </summary>
-        string ErrorText { get; }
-    }
+		/// <summary>
+		/// Holds error discription (invalid state).
+		/// </summary>
+		string ErrorText { get; }
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/InvalidState.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/InvalidState.cs
index 11917df..fafeb69 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/InvalidState.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/InvalidState.cs
@@ -6,51 +6,51 @@ using TINK.Model.State;
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    public class InvalidState : IRequestHandler
-    {
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public InvalidState(
-            IBikesViewModel bikesViewModel,
-            InUseStateEnum copriState,
-            LockingState lockingState,
-            string errorText)
-        {
-            BikesViewModel = bikesViewModel
-                                ?? throw new ArgumentException($"Can not construct {GetType().Name}-object. {nameof(bikesViewModel)} must not be null.");
+	public class InvalidState : IRequestHandler
+	{
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public InvalidState(
+			IBikesViewModel bikesViewModel,
+			InUseStateEnum copriState,
+			LockingState lockingState,
+			string errorText)
+		{
+			BikesViewModel = bikesViewModel
+								?? throw new ArgumentException($"Can not construct {GetType().Name}-object. {nameof(bikesViewModel)} must not be null.");
 
-            ErrorText = errorText;
+			ErrorText = errorText;
 
-            Log.Error($"{errorText}. Copri state is {copriState} and lock state is {lockingState}.");
-        }
+			Log.Error($"{errorText}. Copri state is {copriState} and lock state is {lockingState}.");
+		}
 
-        /// <summary>View model to be used for progress report and unlocking/ locking view.</summary>
-        public IBikesViewModel BikesViewModel { get; }
+		/// <summary>View model to be used for progress report and unlocking/ locking view.</summary>
+		public IBikesViewModel BikesViewModel { get; }
 
-        public bool IsLockitButtonVisible => false;
+		public bool IsLockitButtonVisible => false;
 
-        public string LockitButtonText => GetType().Name;
+		public string LockitButtonText => GetType().Name;
 
-        public bool IsConnected => false;
+		public bool IsConnected => false;
 
-        public bool IsButtonVisible => false;
+		public bool IsButtonVisible => false;
 
-        public string ButtonText => GetType().Name;
+		public string ButtonText => GetType().Name;
 
-        /// <summary> Gets if the bike has to be remvoed after action has been completed. </summary>
-        public bool IsRemoveBikeRequired => false;
+		/// <summary> Gets if the bike has to be remvoed after action has been completed. </summary>
+		public bool IsRemoveBikeRequired => false;
 
-        public string ErrorText { get; }
+		public string ErrorText { get; }
 
-        public async Task<IRequestHandler> HandleRequestOption2()
-        {
-            Log.ForContext<InvalidState>().Error($"Click of unsupported button {nameof(HandleRequestOption2)} detected.");
-            return await Task.FromResult<IRequestHandler>(this);
-        }
+		public async Task<IRequestHandler> HandleRequestOption2()
+		{
+			Log.ForContext<InvalidState>().Error($"Click of unsupported button {nameof(HandleRequestOption2)} detected.");
+			return await Task.FromResult<IRequestHandler>(this);
+		}
 
-        public async Task<IRequestHandler> HandleRequestOption1()
-        {
-            Log.ForContext<InvalidState>().Error($"Click of unsupported button {nameof(HandleRequestOption1)} detected.");
-            return await Task.FromResult<IRequestHandler>(this);
-        }
-    }
+		public async Task<IRequestHandler> HandleRequestOption1()
+		{
+			Log.ForContext<InvalidState>().Error($"Click of unsupported button {nameof(HandleRequestOption1)} detected.");
+			return await Task.FromResult<IRequestHandler>(this);
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/NotLoggedIn.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/NotLoggedIn.cs
index e5987b4..d3a1993 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/NotLoggedIn.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/NotLoggedIn.cs
@@ -6,86 +6,86 @@ using TINK.View;
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock
 {
-    public class NotLoggedIn : IRequestHandler
-    {
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public NotLoggedIn(
-             InUseStateEnum state,
-             IViewService viewService,
-             IBikesViewModel bikesViewModel)
-        {
-            ButtonText = BC.StateToText.GetActionText(state);
-            ViewService = viewService;
-            BikesViewModel = bikesViewModel
-                                ?? throw new ArgumentException($"Can not construct {GetType().Name}-object. {nameof(bikesViewModel)} must not be null.");
-        }
+	public class NotLoggedIn : IRequestHandler
+	{
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public NotLoggedIn(
+			 InUseStateEnum state,
+			 IViewService viewService,
+			 IBikesViewModel bikesViewModel)
+		{
+			ButtonText = BC.StateToText.GetActionText(state);
+			ViewService = viewService;
+			BikesViewModel = bikesViewModel
+								?? throw new ArgumentException($"Can not construct {GetType().Name}-object. {nameof(bikesViewModel)} must not be null.");
+		}
 
-        /// <summary>View model to be used for progress report and unlocking/ locking view.</summary>
-        public IBikesViewModel BikesViewModel { get; }
+		/// <summary>View model to be used for progress report and unlocking/ locking view.</summary>
+		public IBikesViewModel BikesViewModel { get; }
 
-        public bool IsButtonVisible => true;
+		public bool IsButtonVisible => true;
 
-        public bool IsLockitButtonVisible => false;
+		public bool IsLockitButtonVisible => false;
 
-        public string ButtonText { get; private set; }
+		public string ButtonText { get; private set; }
 
-        public string LockitButtonText => GetType().Name;
+		public string LockitButtonText => GetType().Name;
 
-        /// <summary>
-        /// Reference on view service to show modal notifications and to perform navigation.
-        /// </summary>
-        private IViewService ViewService { get; }
+		/// <summary>
+		/// Reference on view service to show modal notifications and to perform navigation.
+		/// </summary>
+		private IViewService ViewService { get; }
 
-        public bool IsConnected => throw new NotImplementedException();
+		public bool IsConnected => throw new NotImplementedException();
 
-        /// <summary> Gets if the bike has to be remvoed after action has been completed. </summary>
-        public bool IsRemoveBikeRequired => false;
+		/// <summary> Gets if the bike has to be remvoed after action has been completed. </summary>
+		public bool IsRemoveBikeRequired => false;
 
-        public async Task<IRequestHandler> HandleRequestOption1()
-        {
-            Log.ForContext<BikesViewModel>().Information("User selected bike but is not logged in.");
+		public async Task<IRequestHandler> HandleRequestOption1()
+		{
+			Log.ForContext<BikesViewModel>().Information("User selected bike but is not logged in.");
 
-            // User is not logged in
-            BikesViewModel.ActionText = string.Empty;
-            var l_oResult = await ViewService.DisplayAlert(
-                "Hinweis",
-                "Bitte anmelden vor Reservierung eines Fahrrads!\r\nAuf Anmeldeseite wechseln?",
-                "Ja",
-                "Nein");
+			// User is not logged in
+			BikesViewModel.ActionText = string.Empty;
+			var l_oResult = await ViewService.DisplayAlert(
+				"Hinweis",
+				"Bitte anmelden vor Reservierung eines Fahrrads!\r\nAuf Anmeldeseite wechseln?",
+				"Ja",
+				"Nein");
 
-            if (l_oResult == false)
-            {
-                // User aborted booking process
-                BikesViewModel.IsIdle = true;
-                return this;
-            }
+			if (l_oResult == false)
+			{
+				// User aborted booking process
+				BikesViewModel.IsIdle = true;
+				return this;
+			}
 
-            try
-            {
-                // Switch to map page
+			try
+			{
+				// Switch to map page
 #if USEFLYOUT
                 ViewService.ShowPage(ViewTypes.LoginPage);
 #else
-                await ViewService.ShowPage("//LoginPage");
+				await ViewService.ShowPage("//LoginPage");
 #endif
-            }
-            catch (Exception p_oException)
-            {
-                Log.ForContext<BikesViewModel>().Error("Ein unerwarteter Fehler ist in der Klasse NotLoggedIn aufgetreten. Kontext: Aufruf nach Reservierungsversuch ohne Anmeldung. {@Exception}", p_oException);
-                BikesViewModel.IsIdle = true;
-                return this;
-            }
+			}
+			catch (Exception p_oException)
+			{
+				Log.ForContext<BikesViewModel>().Error("Ein unerwarteter Fehler ist in der Klasse NotLoggedIn aufgetreten. Kontext: Aufruf nach Reservierungsversuch ohne Anmeldung. {@Exception}", p_oException);
+				BikesViewModel.IsIdle = true;
+				return this;
+			}
 
-            BikesViewModel.IsIdle = true;
-            return this;
-        }
+			BikesViewModel.IsIdle = true;
+			return this;
+		}
 
-        public async Task<IRequestHandler> HandleRequestOption2()
-        {
-            Log.ForContext<NotLoggedIn>().Error("Click of unsupported button detected.");
-            return await Task.FromResult(this);
-        }
+		public async Task<IRequestHandler> HandleRequestOption2()
+		{
+			Log.ForContext<NotLoggedIn>().Error("Click of unsupported button detected.");
+			return await Task.FromResult(this);
+		}
 
-        public string ErrorText => string.Empty;
-    }
+		public string ErrorText => string.Empty;
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedClosed.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedClosed.cs
index 4fa2bd0..cebe7ca 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedClosed.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedClosed.cs
@@ -15,348 +15,348 @@ using IBikeInfoMutable = TINK.Model.Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMuta
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    /// <summary> Bike is reserved, lock is closed and and connected to app. </summary>
-    /// <remarks> 
-    /// Occures when 
-    /// - biks was reserved out of reach and is in reach now
-    /// - bike is is reserved while in reach
-    /// </remarks>
-    public class ReservedClosed : Base, IRequestHandler
-    {
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public ReservedClosed(
-           IBikeInfoMutable selectedBike,
-           Func<bool> isConnectedDelegate,
-           Func<bool, IConnector> connectorFactory,
-           IGeolocation geolocation,
-           ILocksService lockService,
-           Func<IPollingUpdateTaskManager> viewUpdateManager,
-           ISmartDevice smartDevice,
-           IViewService viewService,
-           IBikesViewModel bikesViewModel,
-           IUser activeUser) : base(
-               selectedBike,
-               AppResources.ActionCancelRequest, // Copri button text: "Reservierung abbrechen"
-               true, // Show button to enable canceling reservation.
-               isConnectedDelegate,
-               connectorFactory,
-               geolocation,
-               lockService,
-               viewUpdateManager,
-               smartDevice,
-               viewService,
-               bikesViewModel,
-               activeUser)
-        {
-            LockitButtonText = AppResources.ActionOpenAndBook; // Button text: "Schloss öffnen & Rad mieten"
-            IsLockitButtonVisible = true; // Show "Öffnen" button to enable unlocking
-        }
+	/// <summary> Bike is reserved, lock is closed and and connected to app. </summary>
+	/// <remarks> 
+	/// Occures when 
+	/// - biks was reserved out of reach and is in reach now
+	/// - bike is is reserved while in reach
+	/// </remarks>
+	public class ReservedClosed : Base, IRequestHandler
+	{
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public ReservedClosed(
+		   IBikeInfoMutable selectedBike,
+		   Func<bool> isConnectedDelegate,
+		   Func<bool, IConnector> connectorFactory,
+		   IGeolocation geolocation,
+		   ILocksService lockService,
+		   Func<IPollingUpdateTaskManager> viewUpdateManager,
+		   ISmartDevice smartDevice,
+		   IViewService viewService,
+		   IBikesViewModel bikesViewModel,
+		   IUser activeUser) : base(
+			   selectedBike,
+			   AppResources.ActionCancelRequest, // Copri button text: "Reservierung abbrechen"
+			   true, // Show button to enable canceling reservation.
+			   isConnectedDelegate,
+			   connectorFactory,
+			   geolocation,
+			   lockService,
+			   viewUpdateManager,
+			   smartDevice,
+			   viewService,
+			   bikesViewModel,
+			   activeUser)
+		{
+			LockitButtonText = AppResources.ActionOpenAndBook; // Button text: "Schloss öffnen & Rad mieten"
+			IsLockitButtonVisible = true; // Show "Öffnen" button to enable unlocking
+		}
 
-        /// <summary> Cancel reservation. </summary>
-        public async Task<IRequestHandler> HandleRequestOption1() => await CancelReservation();
+		/// <summary> Cancel reservation. </summary>
+		public async Task<IRequestHandler> HandleRequestOption1() => await CancelReservation();
 
-        /// <summary> Open lock and book bike. </summary>
-        public async Task<IRequestHandler> HandleRequestOption2() => await OpenLockAndDoBook();
+		/// <summary> Open lock and book bike. </summary>
+		public async Task<IRequestHandler> HandleRequestOption2() => await OpenLockAndDoBook();
 
-        /// <summary> Cancel reservation. </summary>
-        public async Task<IRequestHandler> CancelReservation()
-        {
-            BikesViewModel.IsIdle = false; // Lock list to avoid multiple taps while copri action is pending.
+		/// <summary> Cancel reservation. </summary>
+		public async Task<IRequestHandler> CancelReservation()
+		{
+			BikesViewModel.IsIdle = false; // Lock list to avoid multiple taps while copri action is pending.
 
-            var l_oResult = await ViewService.DisplayAlert(
-                string.Empty,
-                string.Format(AppResources.QuestionCancelReservation, SelectedBike.GetFullDisplayName()),
-                AppResources.QuestionAnswerYes,
-                AppResources.QuestionAnswerNo);
+			var l_oResult = await ViewService.DisplayAlert(
+				string.Empty,
+				string.Format(AppResources.QuestionCancelReservation, SelectedBike.GetFullDisplayName()),
+				AppResources.QuestionAnswerYes,
+				AppResources.QuestionAnswerNo);
 
-            if (l_oResult == false)
-            {
-                // User aborted cancel process
-                Log.ForContext<ReservedClosed>().Information("User selected reserved bike {l_oId} in order to cancel reservation but action was canceled.", SelectedBike.Id);
-                BikesViewModel.IsIdle = true;
-                return this;
-            }
+			if (l_oResult == false)
+			{
+				// User aborted cancel process
+				Log.ForContext<ReservedClosed>().Information("User selected reserved bike {l_oId} in order to cancel reservation but action was canceled.", SelectedBike.Id);
+				BikesViewModel.IsIdle = true;
+				return this;
+			}
 
-            Log.ForContext<ReservedClosed>().Information("User selected reserved bike {l_oId} in order to cancel reservation.", SelectedBike.Id);
+			Log.ForContext<ReservedClosed>().Information("User selected reserved bike {l_oId} in order to cancel reservation.", SelectedBike.Id);
 
-            // Stop polling before cancel request.
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before cancel request.
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            BikesViewModel.ActionText = AppResources.ActivityTextCancelingReservation;
-            IsConnected = IsConnectedDelegate();
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.DoCancelReservation(SelectedBike);
+			BikesViewModel.ActionText = AppResources.ActivityTextCancelingReservation;
+			IsConnected = IsConnectedDelegate();
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.DoCancelReservation(SelectedBike);
 
-                // If canceling bike succedes remove bike because it is not ready to be booked again
-                IsRemoveBikeRequired = true;
-            }
-            catch (Exception l_oException)
-            {
-                BikesViewModel.ActionText = string.Empty;
+				// If canceling bike succedes remove bike because it is not ready to be booked again
+				IsRemoveBikeRequired = true;
+			}
+			catch (Exception l_oException)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                if (l_oException is InvalidAuthorizationResponseException)
-                {
-                    // Copri response is invalid.
-                    Log.ForContext<BikesViewModel>().Error("User selected reserved bike {l_oId} but canceling reservation failed (Invalid auth. response).", SelectedBike.Id);
+				if (l_oException is InvalidAuthorizationResponseException)
+				{
+					// Copri response is invalid.
+					Log.ForContext<BikesViewModel>().Error("User selected reserved bike {l_oId} but canceling reservation failed (Invalid auth. response).", SelectedBike.Id);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageCancelReservationBikeErrorGeneralTitle,
-                        l_oException.Message,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (l_oException is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<BikesViewModel>().Information("User selected reserved bike {l_oId} but cancel reservation failed (Copri server not reachable).", SelectedBike.Id);
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageCancelReservationBikeErrorConnectionTitle,
-                        string.Format("{0}\r\n{1}", l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<BikesViewModel>().Error("User selected reserved bike {l_oId} but cancel reservation failed. {@l_oException}.", SelectedBike.Id, l_oException);
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageCancelReservationBikeErrorGeneralTitle,
-                        l_oException.Message,
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAlert(
+						AppResources.MessageCancelReservationBikeErrorGeneralTitle,
+						l_oException.Message,
+						AppResources.MessageAnswerOk);
+				}
+				else if (l_oException is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<BikesViewModel>().Information("User selected reserved bike {l_oId} but cancel reservation failed (Copri server not reachable).", SelectedBike.Id);
+					await ViewService.DisplayAlert(
+						AppResources.MessageCancelReservationBikeErrorConnectionTitle,
+						string.Format("{0}\r\n{1}", l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<BikesViewModel>().Error("User selected reserved bike {l_oId} but cancel reservation failed. {@l_oException}.", SelectedBike.Id, l_oException);
+					await ViewService.DisplayAlert(
+						AppResources.MessageCancelReservationBikeErrorGeneralTitle,
+						l_oException.Message,
+						AppResources.MessageAnswerOk);
+				}
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.            
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true; // Unlock GUI                
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.            
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true; // Unlock GUI                
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            Log.ForContext<BikesViewModel>().Information("User canceled reservation of bike {l_oId} successfully.", SelectedBike.Id);
+			Log.ForContext<BikesViewModel>().Information("User canceled reservation of bike {l_oId} successfully.", SelectedBike.Id);
 
-            // Disconnect lock.
-            BikesViewModel.ActionText = AppResources.ActivityTextDisconnectingLock;
-            try
-            {
-                SelectedBike.LockInfo.State = await LockService.DisconnectAsync(SelectedBike.LockInfo.Id, SelectedBike.LockInfo.Guid);
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<ReservedClosed>().Error("Lock can not be disconnected. {Exception}", exception);
+			// Disconnect lock.
+			BikesViewModel.ActionText = AppResources.ActivityTextDisconnectingLock;
+			try
+			{
+				SelectedBike.LockInfo.State = await LockService.DisconnectAsync(SelectedBike.LockInfo.Id, SelectedBike.LockInfo.Guid);
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<ReservedClosed>().Error("Lock can not be disconnected. {Exception}", exception);
 
-                BikesViewModel.ActionText = AppResources.ActivityTextErrorDisconnect;
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextErrorDisconnect;
+			}
 
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.            
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true; // Unlock GUI
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.            
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true; // Unlock GUI
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
 
-        /// <summary> Open lock and book bike. </summary>
-        public async Task<IRequestHandler> OpenLockAndDoBook()
-        {
-            BikesViewModel.IsIdle = false;
+		/// <summary> Open lock and book bike. </summary>
+		public async Task<IRequestHandler> OpenLockAndDoBook()
+		{
+			BikesViewModel.IsIdle = false;
 
-            // Ask whether to really book bike?
-            var alertResult = await ViewService.DisplayAlert(
-                string.Empty,
-                string.Format(AppResources.QuestionOpenLockAndBookBike, SelectedBike.GetFullDisplayName()),
-                AppResources.MessageAnswerYes,
-                AppResources.MessageAnswerNo);
+			// Ask whether to really book bike?
+			var alertResult = await ViewService.DisplayAlert(
+				string.Empty,
+				string.Format(AppResources.QuestionOpenLockAndBookBike, SelectedBike.GetFullDisplayName()),
+				AppResources.MessageAnswerYes,
+				AppResources.MessageAnswerNo);
 
-            if (alertResult == false)
-            {
-                // User aborted booking process
-                Log.ForContext<ReservedClosed>().Information("User selected requested bike {bike} in order to book but action was canceled.", SelectedBike);
-                BikesViewModel.IsIdle = true;
-                return this;
-            }
+			if (alertResult == false)
+			{
+				// User aborted booking process
+				Log.ForContext<ReservedClosed>().Information("User selected requested bike {bike} in order to book but action was canceled.", SelectedBike);
+				BikesViewModel.IsIdle = true;
+				return this;
+			}
 
-            Log.ForContext<ReservedClosed>().Information("User selected requested bike {bike} in order to book but action was canceled.", SelectedBike);
+			Log.ForContext<ReservedClosed>().Information("User selected requested bike {bike} in order to book but action was canceled.", SelectedBike);
 
-            // Stop polling before cancel request.
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before cancel request.
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            // Book bike prior to opening lock.
-            BikesViewModel.ActionText = AppResources.ActivityTextRentingBike;
-            IsConnected = IsConnectedDelegate();
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.DoBook(SelectedBike);
-            }
-            catch (Exception l_oException)
-            {
-                BikesViewModel.ActionText = string.Empty;
+			// Book bike prior to opening lock.
+			BikesViewModel.ActionText = AppResources.ActivityTextRentingBike;
+			IsConnected = IsConnectedDelegate();
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.DoBook(SelectedBike);
+			}
+			catch (Exception l_oException)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                if (l_oException is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<ReservedClosed>().Information("User selected requested bike {l_oId} but booking failed (Copri server not reachable).", SelectedBike.Id);
+				if (l_oException is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<ReservedClosed>().Information("User selected requested bike {l_oId} but booking failed (Copri server not reachable).", SelectedBike.Id);
 
-                    await ViewService.DisplayAdvancedAlert(
-                        AppResources.MessageRentingBikeErrorConnectionTitle,
-                        WebConnectFailureException.GetHintToPossibleExceptionsReasons,
-                        l_oException.Message,
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<ReservedClosed>().Error("User selected requested bike {l_oId} but reserving failed. {@l_oException}", SelectedBike.Id, l_oException);
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.MessageRentingBikeErrorConnectionTitle,
+						WebConnectFailureException.GetHintToPossibleExceptionsReasons,
+						l_oException.Message,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<ReservedClosed>().Error("User selected requested bike {l_oId} but reserving failed. {@l_oException}", SelectedBike.Id, l_oException);
 
-                    await ViewService.DisplayAdvancedAlert(
-                        AppResources.MessageRentingBikeErrorGeneralTitle,
-                        string.Empty,
-                        l_oException.Message,
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.MessageRentingBikeErrorGeneralTitle,
+						string.Empty,
+						l_oException.Message,
+						AppResources.MessageAnswerOk);
+				}
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true; // Unlock GUI
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true; // Unlock GUI
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            // Unlock bike.
-            BikesViewModel.ActionText = AppResources.ActivityTextOpeningLock;
-            try
-            {
-                SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].OpenAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
-                if (exception is OutOfReachException)
-                {
-                    Log.ForContext<ReservedClosed>().Debug("Lock can not be opened. {Exception}", exception);
+			// Unlock bike.
+			BikesViewModel.ActionText = AppResources.ActivityTextOpeningLock;
+			try
+			{
+				SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].OpenAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
+				if (exception is OutOfReachException)
+				{
+					Log.ForContext<ReservedClosed>().Debug("Lock can not be opened. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        AppResources.ErrorOpenLockOutOfReachMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntOpenBoldIsBlockedException)
-                {
-                    Log.ForContext<ReservedClosed>().Debug("Lock can not be opened. Bold is blocked. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockOutOfReachMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntOpenBoldIsBlockedException)
+				{
+					Log.ForContext<ReservedClosed>().Debug("Lock can not be opened. Bold is blocked. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        AppResources.ErrorOpenLockBoldBlockedMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntOpenBoldWasBlockedException)
-                {
-                    Log.ForContext<ReservedClosed>().Debug("Lock can not be opened. Bold was or is blocked. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockBoldBlockedMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntOpenBoldWasBlockedException)
+				{
+					Log.ForContext<ReservedClosed>().Debug("Lock can not be opened. Bold was or is blocked. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockStillOpenTitle,
-                        AppResources.ErrorOpenLockBoldWasBlockedMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntOpenInconsistentStateExecption inconsistentState
-                        && inconsistentState.State == LockingState.Closed)
-                {
-                    Log.ForContext<ReservedClosed>().Debug("Lock can not be opened. lock reports state closed. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockStillOpenTitle,
+						AppResources.ErrorOpenLockBoldWasBlockedMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntOpenInconsistentStateExecption inconsistentState
+						&& inconsistentState.State == LockingState.Closed)
+				{
+					Log.ForContext<ReservedClosed>().Debug("Lock can not be opened. lock reports state closed. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        AppResources.ErrorOpenLockStillClosedMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<ReservedClosed>().Error("Lock can not be opened. {Exception}", exception);
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockStillClosedMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<ReservedClosed>().Error("Lock can not be opened. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
 
-                SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
-                    ? stateAwareException.State
-                    : LockingState.UnknownDisconnected;
+				SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
+					? stateAwareException.State
+					: LockingState.UnknownDisconnected;
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
 
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            if (SelectedBike.LockInfo.State != LockingState.Open)
-            {
-                // Opening lock failed.
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+			if (SelectedBike.LockInfo.State != LockingState.Open)
+			{
+				// Opening lock failed.
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
 
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true; // Unlock GUI
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true; // Unlock GUI
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            BikesViewModel.ActionText = AppResources.ActivityTextReadingChargingLevel;
-            try
-            {
-                SelectedBike.LockInfo.BatteryPercentage = await LockService[SelectedBike.LockInfo.Id].GetBatteryPercentageAsync();
-            }
-            catch (Exception exception)
-            {
-                if (exception is OutOfReachException)
-                {
-                    Log.ForContext<ReservedClosed>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
+			BikesViewModel.ActionText = AppResources.ActivityTextReadingChargingLevel;
+			try
+			{
+				SelectedBike.LockInfo.BatteryPercentage = await LockService[SelectedBike.LockInfo.Id].GetBatteryPercentageAsync();
+			}
+			catch (Exception exception)
+			{
+				if (exception is OutOfReachException)
+				{
+					Log.ForContext<ReservedClosed>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
-                }
-                else
-                {
-                    Log.ForContext<ReservedClosed>().Error("Akkustate can not be read. {Exception}", exception);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
+				}
+				else
+				{
+					Log.ForContext<ReservedClosed>().Error("Akkustate can not be read. {Exception}", exception);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
-                }
-            }
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
+				}
+			}
 
-            // Lock list to avoid multiple taps while copri action is pending.
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
+			// Lock list to avoid multiple taps while copri action is pending.
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
 
-            IsConnected = IsConnectedDelegate();
+			IsConnected = IsConnectedDelegate();
 
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(SelectedBike);
-            }
-            catch (Exception exception)
-            {
-                if (exception is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<ReservedClosed>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", SelectedBike);
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(SelectedBike);
+			}
+			catch (Exception exception)
+			{
+				if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<ReservedClosed>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", SelectedBike);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
-                }
-                else if (exception is ResponseException copriException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<ReservedClosed>().Information("User locked bike {bike} in order to pause ride but updating failed. {response}.", SelectedBike, copriException.Response);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
+				}
+				else if (exception is ResponseException copriException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<ReservedClosed>().Information("User locked bike {bike} in order to pause ride but updating failed. {response}.", SelectedBike, copriException.Response);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
-                }
-                else
-                {
-                    Log.ForContext<ReservedClosed>().Error("User locked bike {bike} in order to pause ride but updating failed . {@l_oException}", SelectedBike.Id, exception);
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
-                }
-            }
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
+				}
+				else
+				{
+					Log.ForContext<ReservedClosed>().Error("User locked bike {bike} in order to pause ride but updating failed . {@l_oException}", SelectedBike.Id, exception);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
+				}
+			}
 
-            Log.ForContext<ReservedClosed>().Information("User reserved bike {bike} successfully.", SelectedBike);
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true; // Unlock GUI
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
-    }
+			Log.ForContext<ReservedClosed>().Information("User reserved bike {bike} successfully.", SelectedBike);
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true; // Unlock GUI
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedDisconnected.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedDisconnected.cs
index 302b7d3..077f61a 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedDisconnected.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedDisconnected.cs
@@ -15,512 +15,512 @@ using TINK.View;
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    public class ReservedDisconnected : Base, IRequestHandler
-    {
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public ReservedDisconnected(
-           IBikeInfoMutable selectedBike,
-           Func<bool> isConnectedDelegate,
-           Func<bool, IConnector> connectorFactory,
-           IGeolocation geolocation,
-           ILocksService lockService,
-           Func<IPollingUpdateTaskManager> viewUpdateManager,
-           ISmartDevice smartDevice,
-           IViewService viewService,
-           IBikesViewModel bikesViewModel,
-           IUser activeUser) : base(
-               selectedBike,
-               AppResources.ActionCancelRequest, // Copri button text: "Reservierung abbrechen"
-               true, // Show button to enable canceling reservation.
-               isConnectedDelegate,
-               connectorFactory,
-               geolocation,
-               lockService,
-               viewUpdateManager,
-               smartDevice,
-               viewService,
-               bikesViewModel,
-               activeUser)
-        {
-            LockitButtonText = AppResources.ActionSearchLock;
-            IsLockitButtonVisible = true; // Show "Öffnen" button to enable unlocking
-        }
-
-        /// <summary> Cancel reservation. </summary>
-        public async Task<IRequestHandler> HandleRequestOption1() => await CancelReservation();
-
-        /// <summary> Connect to reserved bike ask whether to book bike bike or not and if yes open lock. </summary>
-        /// <returns></returns>
-        public async Task<IRequestHandler> HandleRequestOption2() => await ConnectLockAndBook();
-
-        /// <summary> Cancel reservation. </summary>
-        public async Task<IRequestHandler> CancelReservation()
-        {
-            BikesViewModel.IsIdle = false; // Lock list to avoid multiple taps while copri action is pending.
-
-            var alertResult = await ViewService.DisplayAlert(
-                string.Empty,
-                string.Format(AppResources.QuestionCancelReservation, SelectedBike.GetFullDisplayName()),
-                AppResources.QuestionAnswerYes,
-                AppResources.QuestionAnswerNo);
-
-            if (alertResult == false)
-            {
-                // User aborted cancel process
-                Log.ForContext<ReservedDisconnected>().Information("User selected reserved bike {l_oId} in order to cancel reservation but action was canceled.", SelectedBike.Id);
-                BikesViewModel.IsIdle = true;
-                return this;
-            }
-
-            Log.ForContext<ReservedDisconnected>().Information("User selected reserved bike {l_oId} in order to cancel reservation.", SelectedBike.Id);
-
-            // Stop polling before cancel request.
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
-
-            BikesViewModel.ActionText = AppResources.ActivityTextCancelingReservation;
-            IsConnected = IsConnectedDelegate();
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.DoCancelReservation(SelectedBike);
-
-                // If canceling bike succedes remove bike because it is not ready to be booked again
-                IsRemoveBikeRequired = true;
-            }
-            catch (Exception l_oException)
-            {
-                BikesViewModel.ActionText = string.Empty;
-                if (l_oException is InvalidAuthorizationResponseException)
-                {
-                    // Copri response is invalid.
-                    Log.ForContext<ReservedDisconnected>().Error("User selected reserved bike {l_oId} but canceling reservation failed (Invalid auth. response).", SelectedBike.Id);
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageCancelReservationBikeErrorGeneralTitle,
-                        l_oException.Message,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (l_oException is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<ReservedDisconnected>().Information("User selected reserved bike {l_oId} but cancel reservation failed (Copri server not reachable).", SelectedBike.Id);
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageCancelReservationBikeErrorConnectionTitle,
-                        string.Format("{0}\r\n{1}", l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<ReservedDisconnected>().Error("User selected reserved bike {l_oId} but cancel reservation failed. {@l_oException}.", SelectedBike.Id, l_oException);
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageCancelReservationBikeErrorGeneralTitle,
-                        l_oException.Message,
-                        "OK");
-                }
-
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true; // Unlock GUI                
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
-
-            Log.ForContext<ReservedDisconnected>().Information("User canceled reservation of bike {l_oId} successfully.", SelectedBike.Id);
-
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true; // Unlock GUI                
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
-
-        /// <summary> Connect to reserved bike ask whether to book bike bike or not and if yes open lock. </summary>
-        /// <returns></returns>
-        public async Task<IRequestHandler> ConnectLockAndBook()
-        {
-            BikesViewModel.IsIdle = false;
-            Log.ForContext<ReservedDisconnected>().Information("Request to search for {bike} detected.", SelectedBike);
-
-            // Stop polling before getting new auth-values.
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
-
-            BikesViewModel.ActionText = AppResources.ActivityTextQuerryServer;
-            IsConnected = IsConnectedDelegate();
-            try
-            {
-                // Repeat reservation to get a new seed/ k_user value.
-                await ConnectorFactory(IsConnected).Command.CalculateAuthKeys(SelectedBike);
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
-
-                if (exception is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<ReservedDisconnected>().Information("User selected requested bike {l_oId} to connect to lock. (Copri server not reachable).", SelectedBike.Id);
-
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageErrorConnectTitle,
-                        $"{AppResources.ErrorConnectLockReservedBikeNoWebMessage}\r\n{exception.Message}\r\n{WebConnectFailureException.GetHintToPossibleExceptionsReasons}",
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<ReservedDisconnected>().Error("User selected requested bike {l_oId} to scan for lock. {@l_oException}", SelectedBike.Id, exception);
-
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageErrorConnectTitle,
-                        $"{AppResources.ErrorConnectLockGeneralErrorMessage}\r\n{exception.Message}",
-                        AppResources.MessageAnswerOk);
-                }
-
-                // Restart polling again.
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return this;
-            }
-
-            // Connect to lock.
-            LockInfoTdo result = null;
-            var continueConnect = true;
-            var retryCount = 1;
-            while (continueConnect && result == null)
-            {
-                BikesViewModel.ActionText = AppResources.ActivityTextSearchingLock;
-                try
-                {
-                    result = await LockService.ConnectAsync(
-                        new LockInfoAuthTdo.Builder
-                        {
-                            Id = SelectedBike.LockInfo.Id,
-                            Guid = SelectedBike.LockInfo.Guid,
-                            K_seed = SelectedBike.LockInfo.Seed,
-                            K_u = SelectedBike.LockInfo.UserKey
-                        }.Build(),
-                        LockService.TimeOut.GetSingleConnect(retryCount));
-                }
-                catch (Exception exception)
-                {
-                    BikesViewModel.ActionText = string.Empty;
-
-                    if (exception is ConnectBluetoothNotOnException)
-                    {
-                        continueConnect = false;
-
-                        await ViewService.DisplayAlert(
-                            AppResources.MessageErrorConnectTitle,
-                            AppResources.ErrorFindLockBluetoothNotOn,
-                            AppResources.MessageAnswerOk);
-                    }
-                    else if (exception is ConnectLocationPermissionMissingException)
-                    {
-                        continueConnect = false;
-
-                        await ViewService.DisplayAlert(
-                            AppResources.MessageConnectLockErrorTitle,
-                            AppResources.ErrorFindLockLocationPermissionMissing,
-                            AppResources.MessageAnswerOk);
-                    }
-                    else if (exception is ConnectLocationOffException)
-                    {
-                        continueConnect = false;
-
-                        await ViewService.DisplayAlert(
-                            AppResources.MessageConnectLockErrorTitle,
-                            AppResources.ErrorFindLockLocationOff,
-                            AppResources.MessageAnswerOk);
-                    }
-                    else if (exception is OutOfReachException)
-                    {
-                        Log.ForContext<ReservedDisconnected>().Debug("Lock state can not be retrieved. {Exception}", exception);
-
-                        continueConnect = await ViewService.DisplayAlert(
-                            AppResources.MessageErrorConnectTitle,
-                            AppResources.ErrorFindLockReservedBikeOutOfReachMessage,
-                            AppResources.MessageAnswerRetry,
-                            AppResources.MessageAnswerCancel);
-                    }
-                    else
-                    {
-                        Log.ForContext<BookedDisconnected>().Error("Lock can not be found. {Exception}", exception);
-
-                        string message;
-                        if (retryCount < 2)
-                        {
-                            message = AppResources.ErrorReservedSearchMessage;
-                        }
-                        else
-                        {
-                            message = AppResources.ErrorReservedSearchMessageEscalationLevel1;
-                        }
-
-                        Log.ForContext<ReservedDisconnected>().Error("Lock state can not be retrieved. {Exception}", exception);
-                        continueConnect = await ViewService.DisplayAdvancedAlert(
-                                AppResources.MessageErrorConnectTitle,
-                                message,
-                                "", // bool IsReportLevelVerbose ? exception.Message : string.Empty,  // or use ActiveUser.DebugLevel.HasFlag(Permissions.ReportLevel) instead?
-                                AppResources.MessageAnswerRetry,
-                                AppResources.MessageAnswerCancel);
-                    }
-
-                    if (continueConnect)
-                    {
-                        retryCount++;
-                        continue;
-                    }
-
-                    // Restart polling again.
-                    BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                    await ViewUpdateManager().StartUpdateAyncPeridically();
-                    BikesViewModel.ActionText = string.Empty;
-                    BikesViewModel.IsIdle = true;
-                    return this;
-                }
-            }
-            if (result?.State == null)
-            {
-                Log.ForContext<ReservedDisconnected>().Information("Lock for bike {bike} not found.", SelectedBike);
-                BikesViewModel.ActionText = string.Empty;
-
-                await ViewService.DisplayAlert(
-                    AppResources.MessageErrorConnectTitle,
-                    AppResources.ErrorFindLockReservedBikeNoStausMessage,
-                    AppResources.MessageAnswerOk);
-
-                // Restart polling again.
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return this;
-            }
-
-            var state = result.State.Value.GetLockingState();
-            SelectedBike.LockInfo.State = state;
-            SelectedBike.LockInfo.Guid = result?.Guid ?? new Guid();
-
-            Log.ForContext<ReservedDisconnected>().Information($"State for bike {SelectedBike.Id} updated successfully. Value is {SelectedBike.LockInfo.State}.");
-
-            BikesViewModel.ActionText = string.Empty;
-
-            // Ask whether to really book bike?
-            var alertResult = await ViewService.DisplayAlert(
-                string.Empty,
-                string.Format(AppResources.QuestionOpenLockAndBookBike, SelectedBike.GetFullDisplayName()),
-                AppResources.MessageAnswerYes,
-                AppResources.MessageAnswerNo);
-
-            if (alertResult == false)
-            {
-                // User aborted booking process
-                Log.ForContext<ReservedDisconnected>().Information("User selected recently requested bike {bike} in order to reserve but did deny to book bike.", SelectedBike);
-
-                // Disconnect lock.
-                BikesViewModel.ActionText = AppResources.ActivityTextDisconnectingLock;
-                try
-                {
-                    SelectedBike.LockInfo.State = await LockService.DisconnectAsync(SelectedBike.LockInfo.Id, SelectedBike.LockInfo.Guid);
-                }
-                catch (Exception exception)
-                {
-                    Log.ForContext<ReservedDisconnected>().Error("Lock can not be disconnected. {Exception}", exception);
-
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorDisconnect;
-                }
-
-                // Restart polling again.
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
-
-            Log.ForContext<ReservedDisconnected>().Information("User selected recently requested bike {bike} in order to book.", SelectedBike);
-
-            // Book bike prior to opening lock.
-            BikesViewModel.ActionText = AppResources.ActivityTextRentingBike;
-            IsConnected = IsConnectedDelegate();
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.DoBook(SelectedBike);
-            }
-            catch (Exception l_oException)
-            {
-                BikesViewModel.ActionText = string.Empty;
-
-                if (l_oException is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<ReservedDisconnected>().Information("User selected recently requested bike {l_oId} but booking failed (Copri server not reachable).", SelectedBike.Id);
-
-                    await ViewService.DisplayAdvancedAlert(
-                        AppResources.MessageRentingBikeErrorConnectionTitle,
-                        WebConnectFailureException.GetHintToPossibleExceptionsReasons,
-                        l_oException.Message,
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<ReservedDisconnected>().Error("User selected recently requested bike {l_oId} but reserving failed. {@l_oException}", SelectedBike.Id, l_oException);
-
-                    await ViewService.DisplayAdvancedAlert(
-                        AppResources.MessageRentingBikeErrorGeneralTitle,
-                        string.Empty,
-                        l_oException.Message,
-                        AppResources.MessageAnswerOk);
-                }
-
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true; // Unlock GUI
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
-
-            // Unlock bike.
-            BikesViewModel.ActionText = AppResources.ActivityTextOpeningLock;
-            try
-            {
-                SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].OpenAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
-                if (exception is OutOfReachException)
-                {
-                    Log.ForContext<ReservedDisconnected>().Debug("Lock can not be opened. {Exception}", exception);
-
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        AppResources.ErrorOpenLockOutOfReachMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntOpenBoldIsBlockedException)
-                {
-                    Log.ForContext<ReservedDisconnected>().Debug("Lock can not be opened. Bold is blocked. {Exception}", exception);
-
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        AppResources.ErrorOpenLockBoldBlockedMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntOpenBoldWasBlockedException)
-                {
-                    Log.ForContext<ReservedDisconnected>().Debug("Lock can not be opened. Bold was or is blocked. {Exception}", exception);
-
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockStillOpenTitle,
-                        AppResources.ErrorOpenLockBoldWasBlockedMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntOpenInconsistentStateExecption inconsistentState
-                        && inconsistentState.State == LockingState.Closed)
-                {
-                    Log.ForContext<ReservedDisconnected>().Debug("Lock can not be opened. lock reports state closed. {Exception}", exception);
-
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        AppResources.ErrorOpenLockStillClosedMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<ReservedDisconnected>().Error("Lock can not be opened. {Exception}", exception);
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
-
-                SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
-                    ? stateAwareException.State
-                    : LockingState.UnknownDisconnected;
-
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
-
-            if (SelectedBike.LockInfo.State != LockingState.Open)
-            {
-                // Opening lock failed.
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true; // Unlock GUI
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
-
-            BikesViewModel.ActionText = AppResources.ActivityTextReadingChargingLevel;
-            try
-            {
-                SelectedBike.LockInfo.BatteryPercentage = await LockService[SelectedBike.LockInfo.Id].GetBatteryPercentageAsync();
-            }
-            catch (Exception exception)
-            {
-                if (exception is OutOfReachException)
-                {
-                    Log.ForContext<ReservedDisconnected>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
-
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
-                }
-                else
-                {
-                    Log.ForContext<ReservedDisconnected>().Error("Akkustate can not be read. {Exception}", exception);
-
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
-                }
-            }
-
-            // Lock list to avoid multiple taps while copri action is pending.
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
-
-            IsConnected = IsConnectedDelegate();
-
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(SelectedBike);
-            }
-            catch (Exception exception)
-            {
-                if (exception is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<ReservedDisconnected>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", SelectedBike);
-
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
-                }
-                else if (exception is ResponseException copriException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<ReservedDisconnected>().Information("User locked bike {bike} in order to pause ride but updating failed. {response}.", SelectedBike, copriException.Response);
-
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
-                }
-                else
-                {
-                    Log.ForContext<ReservedDisconnected>().Error("User locked bike {bike} in order to pause ride but updating failed . {@l_oException}", SelectedBike.Id, exception);
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
-                }
-            }
-
-            Log.ForContext<ReservedDisconnected>().Information("User reserved bike {bike} successfully.", SelectedBike);
-
-            // Restart polling again.
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically();
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true; // Unlock GUI
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
-    }
+	public class ReservedDisconnected : Base, IRequestHandler
+	{
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public ReservedDisconnected(
+		   IBikeInfoMutable selectedBike,
+		   Func<bool> isConnectedDelegate,
+		   Func<bool, IConnector> connectorFactory,
+		   IGeolocation geolocation,
+		   ILocksService lockService,
+		   Func<IPollingUpdateTaskManager> viewUpdateManager,
+		   ISmartDevice smartDevice,
+		   IViewService viewService,
+		   IBikesViewModel bikesViewModel,
+		   IUser activeUser) : base(
+			   selectedBike,
+			   AppResources.ActionCancelRequest, // Copri button text: "Reservierung abbrechen"
+			   true, // Show button to enable canceling reservation.
+			   isConnectedDelegate,
+			   connectorFactory,
+			   geolocation,
+			   lockService,
+			   viewUpdateManager,
+			   smartDevice,
+			   viewService,
+			   bikesViewModel,
+			   activeUser)
+		{
+			LockitButtonText = AppResources.ActionSearchLock;
+			IsLockitButtonVisible = true; // Show "Öffnen" button to enable unlocking
+		}
+
+		/// <summary> Cancel reservation. </summary>
+		public async Task<IRequestHandler> HandleRequestOption1() => await CancelReservation();
+
+		/// <summary> Connect to reserved bike ask whether to book bike bike or not and if yes open lock. </summary>
+		/// <returns></returns>
+		public async Task<IRequestHandler> HandleRequestOption2() => await ConnectLockAndBook();
+
+		/// <summary> Cancel reservation. </summary>
+		public async Task<IRequestHandler> CancelReservation()
+		{
+			BikesViewModel.IsIdle = false; // Lock list to avoid multiple taps while copri action is pending.
+
+			var alertResult = await ViewService.DisplayAlert(
+				string.Empty,
+				string.Format(AppResources.QuestionCancelReservation, SelectedBike.GetFullDisplayName()),
+				AppResources.QuestionAnswerYes,
+				AppResources.QuestionAnswerNo);
+
+			if (alertResult == false)
+			{
+				// User aborted cancel process
+				Log.ForContext<ReservedDisconnected>().Information("User selected reserved bike {l_oId} in order to cancel reservation but action was canceled.", SelectedBike.Id);
+				BikesViewModel.IsIdle = true;
+				return this;
+			}
+
+			Log.ForContext<ReservedDisconnected>().Information("User selected reserved bike {l_oId} in order to cancel reservation.", SelectedBike.Id);
+
+			// Stop polling before cancel request.
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
+
+			BikesViewModel.ActionText = AppResources.ActivityTextCancelingReservation;
+			IsConnected = IsConnectedDelegate();
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.DoCancelReservation(SelectedBike);
+
+				// If canceling bike succedes remove bike because it is not ready to be booked again
+				IsRemoveBikeRequired = true;
+			}
+			catch (Exception l_oException)
+			{
+				BikesViewModel.ActionText = string.Empty;
+				if (l_oException is InvalidAuthorizationResponseException)
+				{
+					// Copri response is invalid.
+					Log.ForContext<ReservedDisconnected>().Error("User selected reserved bike {l_oId} but canceling reservation failed (Invalid auth. response).", SelectedBike.Id);
+					await ViewService.DisplayAlert(
+						AppResources.MessageCancelReservationBikeErrorGeneralTitle,
+						l_oException.Message,
+						AppResources.MessageAnswerOk);
+				}
+				else if (l_oException is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<ReservedDisconnected>().Information("User selected reserved bike {l_oId} but cancel reservation failed (Copri server not reachable).", SelectedBike.Id);
+					await ViewService.DisplayAlert(
+						AppResources.MessageCancelReservationBikeErrorConnectionTitle,
+						string.Format("{0}\r\n{1}", l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<ReservedDisconnected>().Error("User selected reserved bike {l_oId} but cancel reservation failed. {@l_oException}.", SelectedBike.Id, l_oException);
+					await ViewService.DisplayAlert(
+						AppResources.MessageCancelReservationBikeErrorGeneralTitle,
+						l_oException.Message,
+						"OK");
+				}
+
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true; // Unlock GUI                
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
+
+			Log.ForContext<ReservedDisconnected>().Information("User canceled reservation of bike {l_oId} successfully.", SelectedBike.Id);
+
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true; // Unlock GUI                
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
+
+		/// <summary> Connect to reserved bike ask whether to book bike bike or not and if yes open lock. </summary>
+		/// <returns></returns>
+		public async Task<IRequestHandler> ConnectLockAndBook()
+		{
+			BikesViewModel.IsIdle = false;
+			Log.ForContext<ReservedDisconnected>().Information("Request to search for {bike} detected.", SelectedBike);
+
+			// Stop polling before getting new auth-values.
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
+
+			BikesViewModel.ActionText = AppResources.ActivityTextQuerryServer;
+			IsConnected = IsConnectedDelegate();
+			try
+			{
+				// Repeat reservation to get a new seed/ k_user value.
+				await ConnectorFactory(IsConnected).Command.CalculateAuthKeys(SelectedBike);
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
+
+				if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<ReservedDisconnected>().Information("User selected requested bike {l_oId} to connect to lock. (Copri server not reachable).", SelectedBike.Id);
+
+					await ViewService.DisplayAlert(
+						AppResources.MessageErrorConnectTitle,
+						$"{AppResources.ErrorConnectLockReservedBikeNoWebMessage}\r\n{exception.Message}\r\n{WebConnectFailureException.GetHintToPossibleExceptionsReasons}",
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<ReservedDisconnected>().Error("User selected requested bike {l_oId} to scan for lock. {@l_oException}", SelectedBike.Id, exception);
+
+					await ViewService.DisplayAlert(
+						AppResources.MessageErrorConnectTitle,
+						$"{AppResources.ErrorConnectLockGeneralErrorMessage}\r\n{exception.Message}",
+						AppResources.MessageAnswerOk);
+				}
+
+				// Restart polling again.
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return this;
+			}
+
+			// Connect to lock.
+			LockInfoTdo result = null;
+			var continueConnect = true;
+			var retryCount = 1;
+			while (continueConnect && result == null)
+			{
+				BikesViewModel.ActionText = AppResources.ActivityTextSearchingLock;
+				try
+				{
+					result = await LockService.ConnectAsync(
+						new LockInfoAuthTdo.Builder
+						{
+							Id = SelectedBike.LockInfo.Id,
+							Guid = SelectedBike.LockInfo.Guid,
+							K_seed = SelectedBike.LockInfo.Seed,
+							K_u = SelectedBike.LockInfo.UserKey
+						}.Build(),
+						LockService.TimeOut.GetSingleConnect(retryCount));
+				}
+				catch (Exception exception)
+				{
+					BikesViewModel.ActionText = string.Empty;
+
+					if (exception is ConnectBluetoothNotOnException)
+					{
+						continueConnect = false;
+
+						await ViewService.DisplayAlert(
+							AppResources.MessageErrorConnectTitle,
+							AppResources.ErrorFindLockBluetoothNotOn,
+							AppResources.MessageAnswerOk);
+					}
+					else if (exception is ConnectLocationPermissionMissingException)
+					{
+						continueConnect = false;
+
+						await ViewService.DisplayAlert(
+							AppResources.MessageConnectLockErrorTitle,
+							AppResources.ErrorFindLockLocationPermissionMissing,
+							AppResources.MessageAnswerOk);
+					}
+					else if (exception is ConnectLocationOffException)
+					{
+						continueConnect = false;
+
+						await ViewService.DisplayAlert(
+							AppResources.MessageConnectLockErrorTitle,
+							AppResources.ErrorFindLockLocationOff,
+							AppResources.MessageAnswerOk);
+					}
+					else if (exception is OutOfReachException)
+					{
+						Log.ForContext<ReservedDisconnected>().Debug("Lock can not be found because out of reach.. {Exception}", exception);
+
+						continueConnect = await ViewService.DisplayAlert(
+							AppResources.MessageErrorConnectTitle,
+							AppResources.ErrorFindLockReservedBikeOutOfReachMessage,
+							AppResources.MessageAnswerRetry,
+							AppResources.MessageAnswerCancel);
+					}
+					else
+					{
+						Log.ForContext<BookedDisconnected>().Error("Lock can not be found. {Exception}", exception);
+
+						string message;
+						if (retryCount < 2)
+						{
+							message = AppResources.ErrorReservedSearchMessage;
+						}
+						else
+						{
+							message = AppResources.ErrorReservedSearchMessageEscalationLevel1;
+						}
+
+						Log.ForContext<ReservedDisconnected>().Error("Lock state can not be retrieved. {Exception}", exception);
+						continueConnect = await ViewService.DisplayAdvancedAlert(
+								AppResources.MessageErrorConnectTitle,
+								message,
+								"", // bool IsReportLevelVerbose ? exception.Message : string.Empty,  // or use ActiveUser.DebugLevel.HasFlag(Permissions.ReportLevel) instead?
+								AppResources.MessageAnswerRetry,
+								AppResources.MessageAnswerCancel);
+					}
+
+					if (continueConnect)
+					{
+						retryCount++;
+						continue;
+					}
+
+					// Restart polling again.
+					BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+					await ViewUpdateManager().StartUpdateAyncPeridically();
+					BikesViewModel.ActionText = string.Empty;
+					BikesViewModel.IsIdle = true;
+					return this;
+				}
+			}
+			if (result?.State == null)
+			{
+				Log.ForContext<ReservedDisconnected>().Information("Lock for bike {bike} not found.", SelectedBike);
+				BikesViewModel.ActionText = string.Empty;
+
+				await ViewService.DisplayAlert(
+					AppResources.MessageErrorConnectTitle,
+					AppResources.ErrorFindLockReservedBikeNoStausMessage,
+					AppResources.MessageAnswerOk);
+
+				// Restart polling again.
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return this;
+			}
+
+			var state = result.State.Value.GetLockingState();
+			SelectedBike.LockInfo.State = state;
+			SelectedBike.LockInfo.Guid = result?.Guid ?? new Guid();
+
+			Log.ForContext<ReservedDisconnected>().Information($"State for bike {SelectedBike.Id} updated successfully. Value is {SelectedBike.LockInfo.State}.");
+
+			BikesViewModel.ActionText = string.Empty;
+
+			// Ask whether to really book bike?
+			var alertResult = await ViewService.DisplayAlert(
+				string.Empty,
+				string.Format(AppResources.QuestionOpenLockAndBookBike, SelectedBike.GetFullDisplayName()),
+				AppResources.MessageAnswerYes,
+				AppResources.MessageAnswerNo);
+
+			if (alertResult == false)
+			{
+				// User aborted booking process
+				Log.ForContext<ReservedDisconnected>().Information("User selected recently requested bike {bike} in order to reserve but did deny to book bike.", SelectedBike);
+
+				// Disconnect lock.
+				BikesViewModel.ActionText = AppResources.ActivityTextDisconnectingLock;
+				try
+				{
+					SelectedBike.LockInfo.State = await LockService.DisconnectAsync(SelectedBike.LockInfo.Id, SelectedBike.LockInfo.Guid);
+				}
+				catch (Exception exception)
+				{
+					Log.ForContext<ReservedDisconnected>().Error("Lock can not be disconnected. {Exception}", exception);
+
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorDisconnect;
+				}
+
+				// Restart polling again.
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
+
+			Log.ForContext<ReservedDisconnected>().Information("User selected recently requested bike {bike} in order to book.", SelectedBike);
+
+			// Book bike prior to opening lock.
+			BikesViewModel.ActionText = AppResources.ActivityTextRentingBike;
+			IsConnected = IsConnectedDelegate();
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.DoBook(SelectedBike);
+			}
+			catch (Exception l_oException)
+			{
+				BikesViewModel.ActionText = string.Empty;
+
+				if (l_oException is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<ReservedDisconnected>().Information("User selected recently requested bike {l_oId} but booking failed (Copri server not reachable).", SelectedBike.Id);
+
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.MessageRentingBikeErrorConnectionTitle,
+						WebConnectFailureException.GetHintToPossibleExceptionsReasons,
+						l_oException.Message,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<ReservedDisconnected>().Error("User selected recently requested bike {l_oId} but reserving failed. {@l_oException}", SelectedBike.Id, l_oException);
+
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.MessageRentingBikeErrorGeneralTitle,
+						string.Empty,
+						l_oException.Message,
+						AppResources.MessageAnswerOk);
+				}
+
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true; // Unlock GUI
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
+
+			// Unlock bike.
+			BikesViewModel.ActionText = AppResources.ActivityTextOpeningLock;
+			try
+			{
+				SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].OpenAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
+				if (exception is OutOfReachException)
+				{
+					Log.ForContext<ReservedDisconnected>().Debug("Lock can not be opened. {Exception}", exception);
+
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockOutOfReachMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntOpenBoldIsBlockedException)
+				{
+					Log.ForContext<ReservedDisconnected>().Debug("Lock can not be opened. Bold is blocked. {Exception}", exception);
+
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockBoldBlockedMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntOpenBoldWasBlockedException)
+				{
+					Log.ForContext<ReservedDisconnected>().Debug("Lock can not be opened. Bold was or is blocked. {Exception}", exception);
+
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockStillOpenTitle,
+						AppResources.ErrorOpenLockBoldWasBlockedMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntOpenInconsistentStateExecption inconsistentState
+						&& inconsistentState.State == LockingState.Closed)
+				{
+					Log.ForContext<ReservedDisconnected>().Debug("Lock can not be opened. lock reports state closed. {Exception}", exception);
+
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockStillClosedMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<ReservedDisconnected>().Error("Lock can not be opened. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
+
+				SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
+					? stateAwareException.State
+					: LockingState.UnknownDisconnected;
+
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
+
+			if (SelectedBike.LockInfo.State != LockingState.Open)
+			{
+				// Opening lock failed.
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true; // Unlock GUI
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
+
+			BikesViewModel.ActionText = AppResources.ActivityTextReadingChargingLevel;
+			try
+			{
+				SelectedBike.LockInfo.BatteryPercentage = await LockService[SelectedBike.LockInfo.Id].GetBatteryPercentageAsync();
+			}
+			catch (Exception exception)
+			{
+				if (exception is OutOfReachException)
+				{
+					Log.ForContext<ReservedDisconnected>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
+
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
+				}
+				else
+				{
+					Log.ForContext<ReservedDisconnected>().Error("Akkustate can not be read. {Exception}", exception);
+
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
+				}
+			}
+
+			// Lock list to avoid multiple taps while copri action is pending.
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
+
+			IsConnected = IsConnectedDelegate();
+
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(SelectedBike);
+			}
+			catch (Exception exception)
+			{
+				if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<ReservedDisconnected>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", SelectedBike);
+
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
+				}
+				else if (exception is ResponseException copriException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<ReservedDisconnected>().Information("User locked bike {bike} in order to pause ride but updating failed. {response}.", SelectedBike, copriException.Response);
+
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
+				}
+				else
+				{
+					Log.ForContext<ReservedDisconnected>().Error("User locked bike {bike} in order to pause ride but updating failed . {@l_oException}", SelectedBike.Id, exception);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
+				}
+			}
+
+			Log.ForContext<ReservedDisconnected>().Information("User reserved bike {bike} successfully.", SelectedBike);
+
+			// Restart polling again.
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically();
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true; // Unlock GUI
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedOpen.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedOpen.cs
index d00eb2a..15aaf50 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedOpen.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedOpen.cs
@@ -14,401 +14,401 @@ using TINK.View;
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    /// <summary> Bike is reserved, lock is open and connected to app. </summary>
-    /// <remarks> 
-    /// This state might occure when a ILOCKIT was manually opened (color code) and app connects afterwards. 
-    /// This should never during ILOCKIT is connected to app because
-    /// - manually opening lock is not possible when lock is connected
-    /// - two devices can not simultaneously conect to same lock.
-    public class ReservedOpen : Base, IRequestHandler
-    {
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public ReservedOpen(
-           IBikeInfoMutable selectedBike,
-           Func<bool> isConnectedDelegate,
-           Func<bool, IConnector> connectorFactory,
-           IGeolocation geolocation,
-           ILocksService lockService,
-           Func<IPollingUpdateTaskManager> viewUpdateManager,
-           ISmartDevice smartDevice,
-           IViewService viewService,
-           IBikesViewModel bikesViewModel,
-           IUser activeUser) : base(
-           selectedBike,
-           "Rad zurückgeben oder mieten",
-           true, // Show button to enable canceling reservation.
-           isConnectedDelegate,
-           connectorFactory,
-           geolocation,
-           lockService,
-           viewUpdateManager,
-           smartDevice,
-           viewService,
-           bikesViewModel,
-           activeUser)
-        {
-            LockitButtonText = "Alarm/ Sounds verwalten";
-            IsLockitButtonVisible = activeUser.DebugLevel > 0; // Will be visible in future version of user with leveraged privileges.
-        }
+	/// <summary> Bike is reserved, lock is open and connected to app. </summary>
+	/// <remarks> 
+	/// This state might occure when a ILOCKIT was manually opened (color code) and app connects afterwards. 
+	/// This should never during ILOCKIT is connected to app because
+	/// - manually opening lock is not possible when lock is connected
+	/// - two devices can not simultaneously conect to same lock.
+	public class ReservedOpen : Base, IRequestHandler
+	{
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public ReservedOpen(
+		   IBikeInfoMutable selectedBike,
+		   Func<bool> isConnectedDelegate,
+		   Func<bool, IConnector> connectorFactory,
+		   IGeolocation geolocation,
+		   ILocksService lockService,
+		   Func<IPollingUpdateTaskManager> viewUpdateManager,
+		   ISmartDevice smartDevice,
+		   IViewService viewService,
+		   IBikesViewModel bikesViewModel,
+		   IUser activeUser) : base(
+		   selectedBike,
+		   "Rad zurückgeben oder mieten",
+		   true, // Show button to enable canceling reservation.
+		   isConnectedDelegate,
+		   connectorFactory,
+		   geolocation,
+		   lockService,
+		   viewUpdateManager,
+		   smartDevice,
+		   viewService,
+		   bikesViewModel,
+		   activeUser)
+		{
+			LockitButtonText = "Alarm/ Sounds verwalten";
+			IsLockitButtonVisible = activeUser.DebugLevel > 0; // Will be visible in future version of user with leveraged privileges.
+		}
 
-        /// <summary> Cancel reservation. </summary>
-        public async Task<IRequestHandler> HandleRequestOption1() => await CloseLockOrDoBook();
+		/// <summary> Cancel reservation. </summary>
+		public async Task<IRequestHandler> HandleRequestOption1() => await CloseLockOrDoBook();
 
-        /// <summary> Manage sound/ alarm settings. </summary>
-        /// <returns></returns>
-        public async Task<IRequestHandler> HandleRequestOption2() => await ManageLockSettings();
+		/// <summary> Manage sound/ alarm settings. </summary>
+		/// <returns></returns>
+		public async Task<IRequestHandler> HandleRequestOption2() => await ManageLockSettings();
 
-        /// <summary> Cancel reservation. </summary>
-        public async Task<IRequestHandler> CloseLockOrDoBook()
-        {
-            BikesViewModel.IsIdle = false; // Lock list to avoid multiple taps while copri action is pending.
+		/// <summary> Cancel reservation. </summary>
+		public async Task<IRequestHandler> CloseLockOrDoBook()
+		{
+			BikesViewModel.IsIdle = false; // Lock list to avoid multiple taps while copri action is pending.
 
-            var l_oResult = await ViewService.DisplayAlert(
-                string.Empty,
-                string.Format("Rad {0} abschließen und zurückgeben oder Rad mieten?", SelectedBike.GetFullDisplayName()),
-                "Zurückgeben",
-                "Mieten");
+			var l_oResult = await ViewService.DisplayAlert(
+				string.Empty,
+				string.Format("Rad {0} abschließen und zurückgeben oder Rad mieten?", SelectedBike.GetFullDisplayName()),
+				"Zurückgeben",
+				"Mieten");
 
-            // Stop polling before cancel request.
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before cancel request.
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            if (l_oResult == false)
-            {
-                // User decided to book                
-                Log.ForContext<ReservedOpen>().Information("User selected requested bike {bike} in order to book.", SelectedBike);
+			if (l_oResult == false)
+			{
+				// User decided to book                
+				Log.ForContext<ReservedOpen>().Information("User selected requested bike {bike} in order to book.", SelectedBike);
 
-                BikesViewModel.ActionText = AppResources.ActivityTextReadingChargingLevel;
-                try
-                {
-                    SelectedBike.LockInfo.BatteryPercentage = await LockService[SelectedBike.LockInfo.Id].GetBatteryPercentageAsync();
-                }
-                catch (Exception exception)
-                {
-                    if (exception is OutOfReachException)
-                    {
-                        Log.ForContext<ReservedOpen>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
+				BikesViewModel.ActionText = AppResources.ActivityTextReadingChargingLevel;
+				try
+				{
+					SelectedBike.LockInfo.BatteryPercentage = await LockService[SelectedBike.LockInfo.Id].GetBatteryPercentageAsync();
+				}
+				catch (Exception exception)
+				{
+					if (exception is OutOfReachException)
+					{
+						Log.ForContext<ReservedOpen>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
 
-                        BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
-                    }
-                    else
-                    {
-                        Log.ForContext<ReservedOpen>().Error("Akkustate can not be read. {Exception}", exception);
+						BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
+					}
+					else
+					{
+						Log.ForContext<ReservedOpen>().Error("Akkustate can not be read. {Exception}", exception);
 
-                        BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
-                    }
-                }
+						BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
+					}
+				}
 
-                // Notify corpi about unlock action in order to start booking.
-                BikesViewModel.ActionText = AppResources.ActivityTextRentingBike;
-                IsConnected = IsConnectedDelegate();
-                try
-                {
-                    await ConnectorFactory(IsConnected).Command.DoBook(SelectedBike);
-                }
-                catch (Exception l_oException)
-                {
-                    BikesViewModel.ActionText = string.Empty;
+				// Notify corpi about unlock action in order to start booking.
+				BikesViewModel.ActionText = AppResources.ActivityTextRentingBike;
+				IsConnected = IsConnectedDelegate();
+				try
+				{
+					await ConnectorFactory(IsConnected).Command.DoBook(SelectedBike);
+				}
+				catch (Exception l_oException)
+				{
+					BikesViewModel.ActionText = string.Empty;
 
-                    if (l_oException is WebConnectFailureException)
-                    {
-                        // Copri server is not reachable.
-                        Log.ForContext<ReservedOpen>().Information("User selected requested bike {l_oId} but booking failed (Copri server not reachable).", SelectedBike.Id);
+					if (l_oException is WebConnectFailureException)
+					{
+						// Copri server is not reachable.
+						Log.ForContext<ReservedOpen>().Information("User selected requested bike {l_oId} but booking failed (Copri server not reachable).", SelectedBike.Id);
 
-                        await ViewService.DisplayAlert(
-                            AppResources.MessageRentingBikeErrorConnectionTitle,
-                            string.Format(AppResources.MessageErrorLockIsClosedThreeLines, l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
-                            AppResources.MessageAnswerOk);
-                    }
-                    else
-                    {
-                        Log.ForContext<ReservedOpen>().Error("User selected requested bike {l_oId} but reserving failed. {@l_oException}", SelectedBike.Id, l_oException);
+						await ViewService.DisplayAlert(
+							AppResources.MessageRentingBikeErrorConnectionTitle,
+							string.Format(AppResources.MessageErrorLockIsClosedThreeLines, l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+							AppResources.MessageAnswerOk);
+					}
+					else
+					{
+						Log.ForContext<ReservedOpen>().Error("User selected requested bike {l_oId} but reserving failed. {@l_oException}", SelectedBike.Id, l_oException);
 
-                        await ViewService.DisplayAlert(
-                            AppResources.MessageRentingBikeErrorGeneralTitle,
-                            string.Format(AppResources.MessageErrorLockIsClosedTwoLines, l_oException.Message),
-                            AppResources.MessageAnswerOk);
-                    }
+						await ViewService.DisplayAlert(
+							AppResources.MessageRentingBikeErrorGeneralTitle,
+							string.Format(AppResources.MessageErrorLockIsClosedTwoLines, l_oException.Message),
+							AppResources.MessageAnswerOk);
+					}
 
-                    // If booking failed lock bike again because bike is only reserved.
-                    BikesViewModel.ActionText = "Wiederverschließe Schloss...";
-                    try
-                    {
-                        SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
-                    }
-                    catch (Exception exception)
-                    {
-                        Log.ForContext<ReservedOpen>().Error("Locking bike after booking failure failed. {Exception}", exception);
+					// If booking failed lock bike again because bike is only reserved.
+					BikesViewModel.ActionText = "Wiederverschließe Schloss...";
+					try
+					{
+						SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
+					}
+					catch (Exception exception)
+					{
+						Log.ForContext<ReservedOpen>().Error("Locking bike after booking failure failed. {Exception}", exception);
 
-                        SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
-                            ? stateAwareException.State
-                            : LockingState.UnknownDisconnected;
-                    }
+						SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
+							? stateAwareException.State
+							: LockingState.UnknownDisconnected;
+					}
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                    await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+					BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+					await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
 
-                    BikesViewModel.ActionText = string.Empty;
-                    BikesViewModel.IsIdle = true; // Unlock GUI
-                    return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-                }
+					BikesViewModel.ActionText = string.Empty;
+					BikesViewModel.IsIdle = true; // Unlock GUI
+					return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+				}
 
-                Log.ForContext<ReservedOpen>().Information("User booked bike {bike} successfully.", SelectedBike);
+				Log.ForContext<ReservedOpen>().Information("User booked bike {bike} successfully.", SelectedBike);
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
 
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true; // Unlock GUI
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true; // Unlock GUI
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            // Close lock and cancel reservation.
-            Log.ForContext<ReservedClosed>().Information("User selected reserved bike {l_oId} in order to cancel reservation.", SelectedBike.Id);
-            BikesViewModel.ActionText = AppResources.ActivityTextClosingLock;
-            try
-            {
-                SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
-                if (exception is OutOfReachException)
-                {
-                    Log.ForContext<ReservedOpen>().Debug("Lock can not be closed. {Exception}", exception);
+			// Close lock and cancel reservation.
+			Log.ForContext<ReservedClosed>().Information("User selected reserved bike {l_oId} in order to cancel reservation.", SelectedBike.Id);
+			BikesViewModel.ActionText = AppResources.ActivityTextClosingLock;
+			try
+			{
+				SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
+				if (exception is OutOfReachException)
+				{
+					Log.ForContext<ReservedOpen>().Debug("Lock can not be closed. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorCloseLockTitle,
-                        AppResources.ErrorCloseLockOutOfReachStateReservedMessage,
-                        "OK");
-                }
-                else if (exception is CouldntCloseMovingException)
-                {
-                    Log.ForContext<ReservedOpen>().Debug("Lock can not be closed. Lock bike is moving. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						AppResources.ErrorCloseLockOutOfReachStateReservedMessage,
+						"OK");
+				}
+				else if (exception is CouldntCloseMovingException)
+				{
+					Log.ForContext<ReservedOpen>().Debug("Lock can not be closed. Lock bike is moving. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorCloseLockTitle,
-                        AppResources.ErrorCloseLockMovingMessage,
-                        "OK");
-                }
-                else if (exception is CouldntCloseBoldBlockedException)
-                {
-                    Log.ForContext<ReservedOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						AppResources.ErrorCloseLockMovingMessage,
+						"OK");
+				}
+				else if (exception is CouldntCloseBoldBlockedException)
+				{
+					Log.ForContext<ReservedOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorCloseLockTitle,
-                        AppResources.ErrorCloseLockBoldBlockedMessage,
-                        "OK");
-                }
-                else
-                {
-                    Log.ForContext<ReservedOpen>().Error("Lock can not be closed. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						AppResources.ErrorCloseLockBoldBlockedMessage,
+						"OK");
+				}
+				else
+				{
+					Log.ForContext<ReservedOpen>().Error("Lock can not be closed. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorCloseLockTitle,
-                        string.Format(AppResources.ErrorCloseLockUnkErrorMessage, exception.Message),
-                        "OK");
-                }
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						string.Format(AppResources.ErrorCloseLockUnkErrorMessage, exception.Message),
+						"OK");
+				}
 
-                SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
-                    ? stateAwareException.State
-                    : LockingState.UnknownDisconnected;
+				SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
+					? stateAwareException.State
+					: LockingState.UnknownDisconnected;
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true; // Unlock GUI                
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true; // Unlock GUI                
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            BikesViewModel.ActionText = AppResources.ActivityTextCancelingReservation;
-            IsConnected = IsConnectedDelegate();
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.DoCancelReservation(SelectedBike);
+			BikesViewModel.ActionText = AppResources.ActivityTextCancelingReservation;
+			IsConnected = IsConnectedDelegate();
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.DoCancelReservation(SelectedBike);
 
-                // If canceling bike succedes remove bike because it is not ready to be booked again
-                IsRemoveBikeRequired = true;
-            }
-            catch (Exception l_oException)
-            {
-                BikesViewModel.ActionText = String.Empty;
+				// If canceling bike succedes remove bike because it is not ready to be booked again
+				IsRemoveBikeRequired = true;
+			}
+			catch (Exception l_oException)
+			{
+				BikesViewModel.ActionText = String.Empty;
 
-                if (l_oException is InvalidAuthorizationResponseException)
-                {
-                    // Copri response is invalid.
-                    Log.ForContext<ReservedOpen>().Error("User selected reserved bike {l_oId} but canceling reservation failed (Invalid auth. response).", SelectedBike.Id);
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageCancelReservationBikeErrorGeneralTitle,
-                        l_oException.Message,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (l_oException is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<ReservedOpen>().Information("User selected reserved bike {l_oId} but cancel reservation failed (Copri server not reachable).", SelectedBike.Id);
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageCancelReservationBikeErrorConnectionTitle,
-                        string.Format("{0}\r\n{1}", l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<ReservedOpen>().Error("User selected reserved bike {l_oId} but cancel reservation failed. {@l_oException}.", SelectedBike.Id, l_oException);
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageCancelReservationBikeErrorGeneralTitle,
-                        l_oException.Message,
-                        "OK");
-                }
+				if (l_oException is InvalidAuthorizationResponseException)
+				{
+					// Copri response is invalid.
+					Log.ForContext<ReservedOpen>().Error("User selected reserved bike {l_oId} but canceling reservation failed (Invalid auth. response).", SelectedBike.Id);
+					await ViewService.DisplayAlert(
+						AppResources.MessageCancelReservationBikeErrorGeneralTitle,
+						l_oException.Message,
+						AppResources.MessageAnswerOk);
+				}
+				else if (l_oException is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<ReservedOpen>().Information("User selected reserved bike {l_oId} but cancel reservation failed (Copri server not reachable).", SelectedBike.Id);
+					await ViewService.DisplayAlert(
+						AppResources.MessageCancelReservationBikeErrorConnectionTitle,
+						string.Format("{0}\r\n{1}", l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<ReservedOpen>().Error("User selected reserved bike {l_oId} but cancel reservation failed. {@l_oException}.", SelectedBike.Id, l_oException);
+					await ViewService.DisplayAlert(
+						AppResources.MessageCancelReservationBikeErrorGeneralTitle,
+						l_oException.Message,
+						"OK");
+				}
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true; // Unlock GUI                
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true; // Unlock GUI                
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            Log.ForContext<ReservedOpen>().Information("User canceled reservation of bike {l_oId} successfully.", SelectedBike.Id);
+			Log.ForContext<ReservedOpen>().Information("User canceled reservation of bike {l_oId} successfully.", SelectedBike.Id);
 
-            // Disconnect lock.
-            BikesViewModel.ActionText = AppResources.ActivityTextDisconnectingLock;
-            try
-            {
-                SelectedBike.LockInfo.State = await LockService.DisconnectAsync(SelectedBike.LockInfo.Id, SelectedBike.LockInfo.Guid);
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<ReservedClosed>().Error("Lock can not be disconnected. {Exception}", exception);
+			// Disconnect lock.
+			BikesViewModel.ActionText = AppResources.ActivityTextDisconnectingLock;
+			try
+			{
+				SelectedBike.LockInfo.State = await LockService.DisconnectAsync(SelectedBike.LockInfo.Id, SelectedBike.LockInfo.Guid);
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<ReservedClosed>().Error("Lock can not be disconnected. {Exception}", exception);
 
-                BikesViewModel.ActionText = AppResources.ActivityTextErrorDisconnect;
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextErrorDisconnect;
+			}
 
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true; // Unlock GUI                
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true; // Unlock GUI                
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
 
-        /// <summary> Manage sound/ alarm settings. </summary>
-        /// <returns></returns>
-        public async Task<IRequestHandler> ManageLockSettings()
-        {
-            // Stop polling before requesting bike.
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
+		/// <summary> Manage sound/ alarm settings. </summary>
+		/// <returns></returns>
+		public async Task<IRequestHandler> ManageLockSettings()
+		{
+			// Stop polling before requesting bike.
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            // Close lock
-            Log.ForContext<ReservedOpen>().Information("User selected disposable bike {bike} in order to manage sound/ alarm settings.", SelectedBike);
+			// Close lock
+			Log.ForContext<ReservedOpen>().Information("User selected disposable bike {bike} in order to manage sound/ alarm settings.", SelectedBike);
 
-            // Alarm and sounds are on, toggle to off.
-            // Switch off sound.
-            BikesViewModel.ActionText = "Abschalten der Sounds...";
-            try
-            {
-                await LockService[SelectedBike.LockInfo.Id].SetSoundAsync(SoundSettings.Warn);
-            }
-            catch (OutOfReachException exception)
-            {
-                Log.ForContext<ReservedOpen>().Debug("Can not turn off sounds. {Exception}", exception);
+			// Alarm and sounds are on, toggle to off.
+			// Switch off sound.
+			BikesViewModel.ActionText = "Abschalten der Sounds...";
+			try
+			{
+				await LockService[SelectedBike.LockInfo.Id].SetSoundAsync(SoundSettings.Warn);
+			}
+			catch (OutOfReachException exception)
+			{
+				Log.ForContext<ReservedOpen>().Debug("Can not turn off sounds. {Exception}", exception);
 
-                BikesViewModel.ActionText = string.Empty;
-                await ViewService.DisplayAlert(
-                    "Fehler beim Abschalten der Sounds!",
-                    "Sounds können erst abgeschalten werden, wenn Rad in der Nähe ist.",
-                    "OK");
+				BikesViewModel.ActionText = string.Empty;
+				await ViewService.DisplayAlert(
+					"Fehler beim Abschalten der Sounds!",
+					"Sounds können erst abgeschalten werden, wenn Rad in der Nähe ist.",
+					"OK");
 
-                return this;
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<ReservedOpen>().Error("Can not turn off sounds. {Exception}", exception);
+				return this;
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<ReservedOpen>().Error("Can not turn off sounds. {Exception}", exception);
 
-                BikesViewModel.ActionText = string.Empty;
-                await ViewService.DisplayAlert(
-                    "Fehler beim Abschalten der Sounds!",
-                    exception.Message,
-                    "OK");
+				BikesViewModel.ActionText = string.Empty;
+				await ViewService.DisplayAlert(
+					"Fehler beim Abschalten der Sounds!",
+					exception.Message,
+					"OK");
 
-                return this;
-            }
+				return this;
+			}
 
-            // Lower alarm sensivity.
-            BikesViewModel.ActionText = "Setzen Alarm-Einstellungen...";
-            try
-            {
-                await LockService[SelectedBike.LockInfo.Id].SetAlarmSettingsAsync(AlarmSettings.SmallSensivitySilent);
-            }
-            catch (OutOfReachException exception)
-            {
-                Log.ForContext<ReservedOpen>().Debug("Can not set alarm settings. {Exception}", exception);
+			// Lower alarm sensivity.
+			BikesViewModel.ActionText = "Setzen Alarm-Einstellungen...";
+			try
+			{
+				await LockService[SelectedBike.LockInfo.Id].SetAlarmSettingsAsync(AlarmSettings.SmallSensivitySilent);
+			}
+			catch (OutOfReachException exception)
+			{
+				Log.ForContext<ReservedOpen>().Debug("Can not set alarm settings. {Exception}", exception);
 
-                BikesViewModel.ActionText = string.Empty;
-                await ViewService.DisplayAlert(
-                    "Fehler beim Setzen der Alarm-Einstellungen!",
-                    "Alarm kann erst eingestellt werden, wenn Rad in der Nähe ist.",
-                    "OK");
+				BikesViewModel.ActionText = string.Empty;
+				await ViewService.DisplayAlert(
+					"Fehler beim Setzen der Alarm-Einstellungen!",
+					"Alarm kann erst eingestellt werden, wenn Rad in der Nähe ist.",
+					"OK");
 
-                return this;
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<ReservedOpen>().Error("Can not set alarm settings. {Exception}", exception);
+				return this;
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<ReservedOpen>().Error("Can not set alarm settings. {Exception}", exception);
 
-                BikesViewModel.ActionText = string.Empty;
-                await ViewService.DisplayAlert(
-                    "Fehler beim Setzen der Alarms-Einstellungen!",
-                    exception.Message,
-                    "OK");
+				BikesViewModel.ActionText = string.Empty;
+				await ViewService.DisplayAlert(
+					"Fehler beim Setzen der Alarms-Einstellungen!",
+					exception.Message,
+					"OK");
 
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            // Switch off alarm.
-            BikesViewModel.ActionText = "Abschalten von Alarm...";
-            try
-            {
-                await LockService[SelectedBike.LockInfo.Id].SetIsAlarmOffAsync(true);
-            }
-            catch (OutOfReachException exception)
-            {
-                Log.ForContext<ReservedOpen>().Debug("Can not turn off alarm settings. {Exception}", exception);
+			// Switch off alarm.
+			BikesViewModel.ActionText = "Abschalten von Alarm...";
+			try
+			{
+				await LockService[SelectedBike.LockInfo.Id].SetIsAlarmOffAsync(true);
+			}
+			catch (OutOfReachException exception)
+			{
+				Log.ForContext<ReservedOpen>().Debug("Can not turn off alarm settings. {Exception}", exception);
 
-                BikesViewModel.ActionText = string.Empty;
-                await ViewService.DisplayAlert(
-                    "Fehler beim Abschalten des Alarms!",
-                    "Alarm kann erst abgeschalten werden, wenn Rad in der Nähe ist.",
-                    "OK");
+				BikesViewModel.ActionText = string.Empty;
+				await ViewService.DisplayAlert(
+					"Fehler beim Abschalten des Alarms!",
+					"Alarm kann erst abgeschalten werden, wenn Rad in der Nähe ist.",
+					"OK");
 
-                return this;
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<ReservedOpen>().Error("Can not turn off alarm. {Exception}", exception);
+				return this;
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<ReservedOpen>().Error("Can not turn off alarm. {Exception}", exception);
 
-                BikesViewModel.ActionText = string.Empty;
-                await ViewService.DisplayAlert(
-                    "Fehler beim Abschalten des Alarms!",
-                    exception.Message,
-                    "OK");
+				BikesViewModel.ActionText = string.Empty;
+				await ViewService.DisplayAlert(
+					"Fehler beim Abschalten des Alarms!",
+					exception.Message,
+					"OK");
 
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
-            finally
-            {
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true; // Unlock GUI                
-            }
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
+			finally
+			{
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true; // Unlock GUI                
+			}
 
-            await ViewService.DisplayAlert(
-                "Hinweis",
-                "Alarm und Sounds erfolgreich abgeschalten.",
-                "OK");
+			await ViewService.DisplayAlert(
+				"Hinweis",
+				"Alarm und Sounds erfolgreich abgeschalten.",
+				"OK");
 
-            return this;
-        }
-    }
+			return this;
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedUnknown.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedUnknown.cs
index a2a34b5..8ac0a50 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedUnknown.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedUnknown.cs
@@ -18,352 +18,352 @@ using Xamarin.Essentials;
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    public class ReservedUnknown : Base, IRequestHandler
-    {
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public ReservedUnknown(
-           IBikeInfoMutable selectedBike,
-           Func<bool> isConnectedDelegate,
-           Func<bool, IConnector> connectorFactory,
-           IGeolocation geolocation,
-           ILocksService lockService,
-           Func<IPollingUpdateTaskManager> viewUpdateManager,
-           ISmartDevice smartDevice,
-           IViewService viewService,
-           IBikesViewModel bikesViewModel,
-           IUser activeUser) : base(
-               selectedBike,
-               AppResources.ActionOpenAndBook, // BT button text "Schloss öffnen und Rad mieten."               
-               false, // Show button to enabled returning of bike.
-               isConnectedDelegate,
-               connectorFactory,
-               geolocation,
-               lockService,
-               viewUpdateManager,
-               smartDevice,
-               viewService,
-               bikesViewModel,
-               activeUser)
-        {
-            LockitButtonText = AppResources.ActionClose; // BT button text "Schließen"
-            IsLockitButtonVisible = true; // Show button to enable opening lock in case user took a pause and does not want to return the bike.
-        }
+	public class ReservedUnknown : Base, IRequestHandler
+	{
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public ReservedUnknown(
+		   IBikeInfoMutable selectedBike,
+		   Func<bool> isConnectedDelegate,
+		   Func<bool, IConnector> connectorFactory,
+		   IGeolocation geolocation,
+		   ILocksService lockService,
+		   Func<IPollingUpdateTaskManager> viewUpdateManager,
+		   ISmartDevice smartDevice,
+		   IViewService viewService,
+		   IBikesViewModel bikesViewModel,
+		   IUser activeUser) : base(
+			   selectedBike,
+			   AppResources.ActionOpenAndBook, // BT button text "Schloss öffnen und Rad mieten."               
+			   false, // Show button to enabled returning of bike.
+			   isConnectedDelegate,
+			   connectorFactory,
+			   geolocation,
+			   lockService,
+			   viewUpdateManager,
+			   smartDevice,
+			   viewService,
+			   bikesViewModel,
+			   activeUser)
+		{
+			LockitButtonText = AppResources.ActionClose; // BT button text "Schließen"
+			IsLockitButtonVisible = true; // Show button to enable opening lock in case user took a pause and does not want to return the bike.
+		}
 
-        /// <summary> Open bike and update COPRI lock state. </summary>
-        public async Task<IRequestHandler> HandleRequestOption1() => await OpenLock();
+		/// <summary> Open bike and update COPRI lock state. </summary>
+		public async Task<IRequestHandler> HandleRequestOption1() => await OpenLock();
 
-        /// <summary> Open bike and update COPRI lock state. </summary>
-        public async Task<IRequestHandler> OpenLock()
-        {
-            // Unlock bike.
-            Log.ForContext<ReservedUnknown>().Information("User request to unlock bike {bike}.", SelectedBike);
+		/// <summary> Open bike and update COPRI lock state. </summary>
+		public async Task<IRequestHandler> OpenLock()
+		{
+			// Unlock bike.
+			Log.ForContext<ReservedUnknown>().Information("User request to unlock bike {bike}.", SelectedBike);
 
-            // Stop polling before returning bike.
-            BikesViewModel.IsIdle = false;
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before returning bike.
+			BikesViewModel.IsIdle = false;
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            BikesViewModel.ActionText = AppResources.ActivityTextOpeningLock;
-            try
-            {
-                SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].OpenAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.ActionText = AppResources.ActivityTextOpeningLock;
+			try
+			{
+				SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].OpenAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                if (exception is OutOfReachException)
-                {
-                    Log.ForContext<ReservedUnknown>().Debug("Lock can not be opened. {Exception}", exception);
+				if (exception is OutOfReachException)
+				{
+					Log.ForContext<ReservedUnknown>().Debug("Lock can not be opened. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        AppResources.ErrorOpenLockOutOfReachMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntOpenBoldIsBlockedException)
-                {
-                    Log.ForContext<ReservedUnknown>().Debug("Lock can not be opened. Bold is blocked. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockOutOfReachMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntOpenBoldIsBlockedException)
+				{
+					Log.ForContext<ReservedUnknown>().Debug("Lock can not be opened. Bold is blocked. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        AppResources.ErrorOpenLockBoldBlockedMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntOpenBoldWasBlockedException)
-                {
-                    Log.ForContext<ReservedUnknown>().Debug("Lock can not be opened. Bold was or is blocked. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockBoldBlockedMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntOpenBoldWasBlockedException)
+				{
+					Log.ForContext<ReservedUnknown>().Debug("Lock can not be opened. Bold was or is blocked. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockStillOpenTitle,
-                        AppResources.ErrorOpenLockBoldWasBlockedMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntOpenInconsistentStateExecption inconsistentState
-                        && inconsistentState.State == LockingState.Closed)
-                {
-                    Log.ForContext<ReservedUnknown>().Debug("Lock can not be opened. lock reports state closed. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockStillOpenTitle,
+						AppResources.ErrorOpenLockBoldWasBlockedMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntOpenInconsistentStateExecption inconsistentState
+						&& inconsistentState.State == LockingState.Closed)
+				{
+					Log.ForContext<ReservedUnknown>().Debug("Lock can not be opened. lock reports state closed. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        AppResources.ErrorOpenLockStillClosedMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<ReservedUnknown>().Error("Lock can not be opened. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockStillClosedMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<ReservedUnknown>().Error("Lock can not be opened. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
 
-                // When bold is blocked lock is still closed even if exception occurres.
-                // In all other cases state is supposed to be unknown. Example: Lock is out of reach and no more bluetooth connected.
-                SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
-                    ? stateAwareException.State
-                    : LockingState.UnknownDisconnected;
+				// When bold is blocked lock is still closed even if exception occurres.
+				// In all other cases state is supposed to be unknown. Example: Lock is out of reach and no more bluetooth connected.
+				SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
+					? stateAwareException.State
+					: LockingState.UnknownDisconnected;
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            BikesViewModel.ActionText = AppResources.ActivityTextReadingChargingLevel;
-            try
-            {
-                SelectedBike.LockInfo.BatteryPercentage = await LockService[SelectedBike.LockInfo.Id].GetBatteryPercentageAsync();
-            }
-            catch (Exception exception)
-            {
-                if (exception is OutOfReachException)
-                {
-                    Log.ForContext<ReservedUnknown>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
+			BikesViewModel.ActionText = AppResources.ActivityTextReadingChargingLevel;
+			try
+			{
+				SelectedBike.LockInfo.BatteryPercentage = await LockService[SelectedBike.LockInfo.Id].GetBatteryPercentageAsync();
+			}
+			catch (Exception exception)
+			{
+				if (exception is OutOfReachException)
+				{
+					Log.ForContext<ReservedUnknown>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
-                }
-                else
-                {
-                    Log.ForContext<ReservedUnknown>().Error("Akkustate can not be read. {Exception}", exception);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
+				}
+				else
+				{
+					Log.ForContext<ReservedUnknown>().Error("Akkustate can not be read. {Exception}", exception);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
-                }
-            }
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
+				}
+			}
 
-            // Lock list to avoid multiple taps while copri action is pending.
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
+			// Lock list to avoid multiple taps while copri action is pending.
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
 
-            IsConnected = IsConnectedDelegate();
+			IsConnected = IsConnectedDelegate();
 
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(SelectedBike);
-            }
-            catch (Exception exception)
-            {
-                if (exception is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<ReservedUnknown>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", SelectedBike);
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(SelectedBike);
+			}
+			catch (Exception exception)
+			{
+				if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<ReservedUnknown>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", SelectedBike);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
-                }
-                else if (exception is ResponseException copriException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<ReservedUnknown>().Information("User locked bike {bike} in order to pause ride but updating failed. {response}.", SelectedBike, copriException.Response);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
+				}
+				else if (exception is ResponseException copriException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<ReservedUnknown>().Information("User locked bike {bike} in order to pause ride but updating failed. {response}.", SelectedBike, copriException.Response);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
-                }
-                else
-                {
-                    Log.ForContext<ReservedUnknown>().Error("User locked bike {bike} in order to pause ride but updating failed . {@l_oException}", SelectedBike.Id, exception);
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
-                }
-            }
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
+				}
+				else
+				{
+					Log.ForContext<ReservedUnknown>().Error("User locked bike {bike} in order to pause ride but updating failed . {@l_oException}", SelectedBike.Id, exception);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
+				}
+			}
 
-            Log.ForContext<ReservedUnknown>().Information("User paused ride using {bike} successfully.", SelectedBike);
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically();
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true;
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
+			Log.ForContext<ReservedUnknown>().Information("User paused ride using {bike} successfully.", SelectedBike);
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically();
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true;
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
 
-        /// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
-        public async Task<IRequestHandler> HandleRequestOption2() => await CloseLock();
+		/// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
+		public async Task<IRequestHandler> HandleRequestOption2() => await CloseLock();
 
 
-        /// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
-        public async Task<IRequestHandler> CloseLock()
-        {
-            // Unlock bike.
-            BikesViewModel.IsIdle = false;
+		/// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
+		public async Task<IRequestHandler> CloseLock()
+		{
+			// Unlock bike.
+			BikesViewModel.IsIdle = false;
 
-            Log.ForContext<ReservedUnknown>().Information("User request to lock bike {bike} in order to pause ride.", SelectedBike);
+			Log.ForContext<ReservedUnknown>().Information("User request to lock bike {bike} in order to pause ride.", SelectedBike);
 
-            // Start getting geolocation.
-            BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationStart;
-            var ctsLocation = new CancellationTokenSource();
-            Task<Location> currentLocationTask = null;
-            var timeStamp = DateTime.Now;
-            try
-            {
-                currentLocationTask = Geolocation.GetAsync(ctsLocation.Token, timeStamp);
-            }
-            catch (Exception ex)
-            {
-                // No location information available.
-                Log.ForContext<ReservedUnknown>().Information("Returning bike {Bike} is not possible. Start query location failed. {Exception}", SelectedBike, ex);
+			// Start getting geolocation.
+			BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationStart;
+			var ctsLocation = new CancellationTokenSource();
+			Task<Location> currentLocationTask = null;
+			var timeStamp = DateTime.Now;
+			try
+			{
+				currentLocationTask = Geolocation.GetAsync(ctsLocation.Token, timeStamp);
+			}
+			catch (Exception ex)
+			{
+				// No location information available.
+				Log.ForContext<ReservedUnknown>().Information("Returning bike {Bike} is not possible. Start query location failed. {Exception}", SelectedBike, ex);
 
-                BikesViewModel.ActionText = AppResources.ActivityTextErrorQueryLocationQuery;
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextErrorQueryLocationQuery;
+			}
 
-            // Stop polling before returning bike.
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before returning bike.
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            // Close lock
-            BikesViewModel.ActionText = AppResources.ActivityTextClosingLock;
-            try
-            {
-                SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
+			// Close lock
+			BikesViewModel.ActionText = AppResources.ActivityTextClosingLock;
+			try
+			{
+				SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                // Signal cts to  cancel getting geolocation.
-                ctsLocation.Cancel();
+				// Signal cts to  cancel getting geolocation.
+				ctsLocation.Cancel();
 
-                if (exception is OutOfReachException)
-                {
-                    Log.ForContext<ReservedUnknown>().Debug("Lock can not be closed. {Exception}", exception);
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorCloseLockTitle,
-                        AppResources.ErrorCloseLockOutOfReachMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntCloseMovingException)
-                {
-                    Log.ForContext<ReservedUnknown>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
+				if (exception is OutOfReachException)
+				{
+					Log.ForContext<ReservedUnknown>().Debug("Lock can not be closed. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						AppResources.ErrorCloseLockOutOfReachMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntCloseMovingException)
+				{
+					Log.ForContext<ReservedUnknown>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorCloseLockTitle,
-                        AppResources.ErrorCloseLockMovingMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is CouldntCloseBoldBlockedException)
-                {
-                    Log.ForContext<ReservedUnknown>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						AppResources.ErrorCloseLockMovingMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is CouldntCloseBoldBlockedException)
+				{
+					Log.ForContext<ReservedUnknown>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorCloseLockTitle,
-                        AppResources.ErrorCloseLockBoldBlockedMessage,
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<ReservedUnknown>().Error("Lock can not be closed. {Exception}", exception);
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorCloseLockTitle,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						AppResources.ErrorCloseLockBoldBlockedMessage,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<ReservedUnknown>().Error("Lock can not be closed. {Exception}", exception);
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
 
-                SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
-                    ? stateAwareException.State
-                    : LockingState.UnknownDisconnected;
+				SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
+					? stateAwareException.State
+					: LockingState.UnknownDisconnected;
 
-                // Wait until cancel getting geolocation has completed.
-                BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationCancelWait;
-                try
-                {
-                    await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
-                }
-                catch (Exception ex)
-                {
-                    // No location information available.
-                    Log.ForContext<ReservedUnknown>().Information("Canceling query location failed on closing lock error. {Exception}", SelectedBike, ex);
-                }
+				// Wait until cancel getting geolocation has completed.
+				BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationCancelWait;
+				try
+				{
+					await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
+				}
+				catch (Exception ex)
+				{
+					// No location information available.
+					Log.ForContext<ReservedUnknown>().Information("Canceling query location failed on closing lock error. {Exception}", SelectedBike, ex);
+				}
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
 
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            // Get geoposition.
-            BikesViewModel.ActionText = AppResources.ActivityTextQueryLocation;
-            Location currentLocation = null;
-            try
-            {
-                await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
-                currentLocation = currentLocationTask?.Result ?? null;
-            }
-            catch (Exception ex)
-            {
-                // No location information available.
-                Log.ForContext<ReservedUnknown>().Information("Returning bike {Bike} is not possible. {Exception}", SelectedBike, ex);
+			// Get geoposition.
+			BikesViewModel.ActionText = AppResources.ActivityTextQueryLocation;
+			Location currentLocation = null;
+			try
+			{
+				await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
+				currentLocation = currentLocationTask?.Result ?? null;
+			}
+			catch (Exception ex)
+			{
+				// No location information available.
+				Log.ForContext<ReservedUnknown>().Information("Returning bike {Bike} is not possible. {Exception}", SelectedBike, ex);
 
-                BikesViewModel.ActionText = AppResources.ActivityTextErrorQueryLocationWhenAny;
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextErrorQueryLocationWhenAny;
+			}
 
-            // Lock list to avoid multiple taps while copri action is pending.
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
+			// Lock list to avoid multiple taps while copri action is pending.
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
 
-            IsConnected = IsConnectedDelegate();
+			IsConnected = IsConnectedDelegate();
 
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(
-                    SelectedBike,
-                    currentLocation != null
-                        ? new LocationDto.Builder
-                        {
-                            Latitude = currentLocation.Latitude,
-                            Longitude = currentLocation.Longitude,
-                            Accuracy = currentLocation.Accuracy ?? double.NaN,
-                            Age = timeStamp.Subtract(currentLocation.Timestamp.DateTime),
-                        }.Build()
-                        : null);
-            }
-            catch (Exception exception)
-            {
-                if (exception is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<ReservedUnknown>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", SelectedBike);
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(
+					SelectedBike,
+					currentLocation != null
+						? new LocationDto.Builder
+						{
+							Latitude = currentLocation.Latitude,
+							Longitude = currentLocation.Longitude,
+							Accuracy = currentLocation.Accuracy ?? double.NaN,
+							Age = timeStamp.Subtract(currentLocation.Timestamp.DateTime),
+						}.Build()
+						: null);
+			}
+			catch (Exception exception)
+			{
+				if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<ReservedUnknown>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", SelectedBike);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
-                }
-                else if (exception is ResponseException copriException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<ReservedUnknown>().Information("User locked bike {bike} in order to pause ride but updating failed. Message: {Message} Details: {Details}", SelectedBike, copriException.Message, copriException.Response);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
+				}
+				else if (exception is ResponseException copriException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<ReservedUnknown>().Information("User locked bike {bike} in order to pause ride but updating failed. Message: {Message} Details: {Details}", SelectedBike, copriException.Message, copriException.Response);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
-                }
-                else
-                {
-                    Log.ForContext<ReservedUnknown>().Error("User locked bike {bike} in order to pause ride but updating failed. {@l_oException}", SelectedBike.Id, exception);
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
+				}
+				else
+				{
+					Log.ForContext<ReservedUnknown>().Error("User locked bike {bike} in order to pause ride but updating failed. {@l_oException}", SelectedBike.Id, exception);
 
-                    BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
-                }
-            }
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
+				}
+			}
 
-            Log.ForContext<ReservedUnknown>().Information("User paused ride using {bike} successfully.", SelectedBike);
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically();
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true;
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
-    }
+			Log.ForContext<ReservedUnknown>().Information("User paused ride using {bike} successfully.", SelectedBike);
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically();
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true;
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, Geolocation, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandlerFactory.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandlerFactory.cs
index 062fe39..75999e3 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandlerFactory.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandlerFactory.cs
@@ -12,231 +12,231 @@ using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock
 {
-    public static class RequestHandlerFactory
-    {
-        /// <summary> Creates a request handler.</summary>
-        /// <param name="selectedBike"></param>
-        /// <param name="isConnectedDelegate"></param>
-        /// <param name="connectorFactory"></param>
-        /// <param name="bikeRemoveDelegate"></param>
-        /// <param name="viewUpdateManager"></param>
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-        /// <param name="viewService"></param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        /// <returns>Request handler.</returns>
-        public static IRequestHandler Create(
-            Model.Bikes.BikeInfoNS.BC.IBikeInfoMutable selectedBike,
-            Func<bool> isConnectedDelegate,
-            Func<bool, IConnector> connectorFactory,
-            IGeolocation geolocation,
-            ILocksService lockService,
-            Func<IPollingUpdateTaskManager> viewUpdateManager,
-            ISmartDevice smartDevice,
-            IViewService viewService,
-            IBikesViewModel bikesViewModel,
-            IUser activeUser)
-        {
-            if (!(selectedBike is Model.Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMutable selectedBluetoothLockBike))
-                return null;
+	public static class RequestHandlerFactory
+	{
+		/// <summary> Creates a request handler.</summary>
+		/// <param name="selectedBike"></param>
+		/// <param name="isConnectedDelegate"></param>
+		/// <param name="connectorFactory"></param>
+		/// <param name="bikeRemoveDelegate"></param>
+		/// <param name="viewUpdateManager"></param>
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
+		/// <param name="viewService"></param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		/// <returns>Request handler.</returns>
+		public static IRequestHandler Create(
+			Model.Bikes.BikeInfoNS.BC.IBikeInfoMutable selectedBike,
+			Func<bool> isConnectedDelegate,
+			Func<bool, IConnector> connectorFactory,
+			IGeolocation geolocation,
+			ILocksService lockService,
+			Func<IPollingUpdateTaskManager> viewUpdateManager,
+			ISmartDevice smartDevice,
+			IViewService viewService,
+			IBikesViewModel bikesViewModel,
+			IUser activeUser)
+		{
+			if (!(selectedBike is Model.Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMutable selectedBluetoothLockBike))
+				return null;
 
-            switch (selectedBluetoothLockBike.State.Value)
-            {
-                case Model.State.InUseStateEnum.Disposable:
+			switch (selectedBluetoothLockBike.State.Value)
+			{
+				case Model.State.InUseStateEnum.Disposable:
 
-                    // Bike is reserved, selecte action depending on lock state.
-                    switch (selectedBluetoothLockBike.LockInfo.State)
-                    {
-                        case LockingState.Closed:
-                            // Unexepected state detected.
-                            // This state is unexpected because connection is closed
-                            // - when reservation is canceled or 
-                            // - when bike is returned.
-                            Log.Error("Unexpected state {BookingState}/ {LockingState} detected.", selectedBluetoothLockBike.State.Value, selectedBluetoothLockBike.LockInfo.State);
-                            return new InvalidState(
-                                bikesViewModel,
-                                selectedBluetoothLockBike.State.Value,
-                                selectedBluetoothLockBike.LockInfo.State,
-                                string.Format(AppResources.MarkingBikeInfoErrorStateDisposableClosedDetected, selectedBluetoothLockBike.Description));
+					// Bike is reserved, selecte action depending on lock state.
+					switch (selectedBluetoothLockBike.LockInfo.State)
+					{
+						case LockingState.Closed:
+							// Unexepected state detected.
+							// This state is unexpected because connection is closed
+							// - when reservation is canceled or 
+							// - when bike is returned.
+							Log.Error("Unexpected state {BookingState}/ {LockingState} detected.", selectedBluetoothLockBike.State.Value, selectedBluetoothLockBike.LockInfo.State);
+							return new InvalidState(
+								bikesViewModel,
+								selectedBluetoothLockBike.State.Value,
+								selectedBluetoothLockBike.LockInfo.State,
+								string.Format(AppResources.MarkingBikeInfoErrorStateDisposableClosedDetected, selectedBluetoothLockBike.Description));
 
-                        case LockingState.Open:
-                        case LockingState.UnknownFromHardwareError:
-                            // Unexepected state detected.
-                            /// This state is unexpected because
-                            /// - app does not allow to return bike/ cancel reservation when lock is closed
-                            /// - as long as app is connected to lock
-                            ///     - lock can not be opened manually
-                            ///     - no other device can access lock 
-                            /// Nevetheless this state is not expected let user either
-                            /// - close lock or
-                            /// - rent bike
-                            /// </remarks>
-                            Log.Error("Unexpected state {BookingState}/ {LockingState} detected.", selectedBluetoothLockBike.State.Value, selectedBluetoothLockBike.LockInfo.State);
-                            return new DisposableOpen(
-                                selectedBluetoothLockBike,
-                                isConnectedDelegate,
-                                connectorFactory,
-                                geolocation,
-                                lockService,
-                                viewUpdateManager,
-                                smartDevice,
-                                viewService,
-                                bikesViewModel,
-                                activeUser);
+						case LockingState.Open:
+						case LockingState.UnknownFromHardwareError:
+							// Unexepected state detected.
+							/// This state is unexpected because
+							/// - app does not allow to return bike/ cancel reservation when lock is closed
+							/// - as long as app is connected to lock
+							///     - lock can not be opened manually
+							///     - no other device can access lock 
+							/// Nevetheless this state is not expected let user either
+							/// - close lock or
+							/// - rent bike
+							/// </remarks>
+							Log.Error("Unexpected state {BookingState}/ {LockingState} detected.", selectedBluetoothLockBike.State.Value, selectedBluetoothLockBike.LockInfo.State);
+							return new DisposableOpen(
+								selectedBluetoothLockBike,
+								isConnectedDelegate,
+								connectorFactory,
+								geolocation,
+								lockService,
+								viewUpdateManager,
+								smartDevice,
+								viewService,
+								bikesViewModel,
+								activeUser);
 
-                        default:
-                            // Do not allow interaction with lock before reserving bike.
-                            return new DisposableDisconnected(
-                                selectedBluetoothLockBike,
-                                isConnectedDelegate,
-                                connectorFactory,
-                                geolocation,
-                                lockService,
-                                viewUpdateManager,
-                                smartDevice,
-                                viewService,
-                                bikesViewModel,
-                                activeUser);
-                    }
+						default:
+							// Do not allow interaction with lock before reserving bike.
+							return new DisposableDisconnected(
+								selectedBluetoothLockBike,
+								isConnectedDelegate,
+								connectorFactory,
+								geolocation,
+								lockService,
+								viewUpdateManager,
+								smartDevice,
+								viewService,
+								bikesViewModel,
+								activeUser);
+					}
 
-                case Model.State.InUseStateEnum.Reserved:
+				case Model.State.InUseStateEnum.Reserved:
 
-                    // Bike is reserved, selecte action depending on lock state.
-                    switch (selectedBluetoothLockBike.LockInfo.State)
-                    {
-                        case LockingState.Closed:
-                            // Lock could not be opened after reserving bike.
-                            return new ReservedClosed(
-                                selectedBluetoothLockBike,
-                                isConnectedDelegate,
-                                connectorFactory,
-                                geolocation,
-                                lockService,
-                                viewUpdateManager,
-                                smartDevice,
-                                viewService,
-                                bikesViewModel,
-                                activeUser);
+					// Bike is reserved, selecte action depending on lock state.
+					switch (selectedBluetoothLockBike.LockInfo.State)
+					{
+						case LockingState.Closed:
+							// Lock could not be opened after reserving bike.
+							return new ReservedClosed(
+								selectedBluetoothLockBike,
+								isConnectedDelegate,
+								connectorFactory,
+								geolocation,
+								lockService,
+								viewUpdateManager,
+								smartDevice,
+								viewService,
+								bikesViewModel,
+								activeUser);
 
-                        case LockingState.UnknownDisconnected:
-                            return new ReservedDisconnected(
-                                selectedBluetoothLockBike,
-                                isConnectedDelegate,
-                                connectorFactory,
-                                geolocation,
-                                lockService,
-                                viewUpdateManager,
-                                smartDevice,
-                                viewService,
-                                bikesViewModel,
-                                activeUser);
+						case LockingState.UnknownDisconnected:
+							return new ReservedDisconnected(
+								selectedBluetoothLockBike,
+								isConnectedDelegate,
+								connectorFactory,
+								geolocation,
+								lockService,
+								viewUpdateManager,
+								smartDevice,
+								viewService,
+								bikesViewModel,
+								activeUser);
 
-                        case LockingState.Open:
-                            // Unwanted state detected.
-                            /// This state might occure when a ILOCKIT was manually opened (color code) and app connects afterwards.
-                            Log.Error("Unwanted state {BookingState}/ {LockingState} detected.", selectedBluetoothLockBike.State.Value, selectedBluetoothLockBike.LockInfo.State);
-                            return new ReservedOpen(
-                                selectedBluetoothLockBike,
-                                isConnectedDelegate,
-                                connectorFactory,
-                                geolocation,
-                                lockService,
-                                viewUpdateManager,
-                                smartDevice,
-                                viewService,
-                                bikesViewModel,
-                                activeUser);
+						case LockingState.Open:
+							// Unwanted state detected.
+							/// This state might occure when a ILOCKIT was manually opened (color code) and app connects afterwards.
+							Log.Error("Unwanted state {BookingState}/ {LockingState} detected.", selectedBluetoothLockBike.State.Value, selectedBluetoothLockBike.LockInfo.State);
+							return new ReservedOpen(
+								selectedBluetoothLockBike,
+								isConnectedDelegate,
+								connectorFactory,
+								geolocation,
+								lockService,
+								viewUpdateManager,
+								smartDevice,
+								viewService,
+								bikesViewModel,
+								activeUser);
 
-                        case LockingState.UnknownFromHardwareError:
-                            // User wants to return bike/ pause ride.
-                            return new ReservedUnknown(
-                                selectedBluetoothLockBike,
-                                isConnectedDelegate,
-                                connectorFactory,
-                                geolocation,
-                                lockService,
-                                viewUpdateManager,
-                                smartDevice,
-                                viewService,
-                                bikesViewModel,
-                                activeUser);
+						case LockingState.UnknownFromHardwareError:
+							// User wants to return bike/ pause ride.
+							return new ReservedUnknown(
+								selectedBluetoothLockBike,
+								isConnectedDelegate,
+								connectorFactory,
+								geolocation,
+								lockService,
+								viewUpdateManager,
+								smartDevice,
+								viewService,
+								bikesViewModel,
+								activeUser);
 
-                        default:
-                            // Invalid state detected. Lock must never be open if bike is reserved.
-                            throw new ArgumentException();
-                    }
+						default:
+							// Invalid state detected. Lock must never be open if bike is reserved.
+							throw new ArgumentException();
+					}
 
-                case Model.State.InUseStateEnum.Booked:
+				case Model.State.InUseStateEnum.Booked:
 
-                    // Bike is booked, selecte action depending on lock state.
-                    switch (selectedBluetoothLockBike.LockInfo.State)
-                    {
-                        case LockingState.Closed:
-                            // Ride was paused.
-                            return new BookedClosed(
-                                selectedBluetoothLockBike,
-                                isConnectedDelegate,
-                                connectorFactory,
-                                geolocation,
-                                lockService,
-                                viewUpdateManager,
-                                smartDevice,
-                                viewService,
-                                bikesViewModel,
-                                activeUser);
+					// Bike is booked, selecte action depending on lock state.
+					switch (selectedBluetoothLockBike.LockInfo.State)
+					{
+						case LockingState.Closed:
+							// Ride was paused.
+							return new BookedClosed(
+								selectedBluetoothLockBike,
+								isConnectedDelegate,
+								connectorFactory,
+								geolocation,
+								lockService,
+								viewUpdateManager,
+								smartDevice,
+								viewService,
+								bikesViewModel,
+								activeUser);
 
-                        case LockingState.Open:
-                            // User wants to return bike/ pause ride.
-                            return new BookedOpen(
-                                selectedBluetoothLockBike,
-                                isConnectedDelegate,
-                                connectorFactory,
-                                geolocation,
-                                lockService,
-                                viewUpdateManager,
-                                smartDevice,
-                                viewService,
-                                bikesViewModel,
-                                activeUser);
+						case LockingState.Open:
+							// User wants to return bike/ pause ride.
+							return new BookedOpen(
+								selectedBluetoothLockBike,
+								isConnectedDelegate,
+								connectorFactory,
+								geolocation,
+								lockService,
+								viewUpdateManager,
+								smartDevice,
+								viewService,
+								bikesViewModel,
+								activeUser);
 
-                        case LockingState.UnknownFromHardwareError:
-                            // User wants to return bike/ pause ride.
-                            return new BookedUnknown(
-                                selectedBluetoothLockBike,
-                                isConnectedDelegate,
-                                connectorFactory,
-                                geolocation,
-                                lockService,
-                                viewUpdateManager,
-                                smartDevice,
-                                viewService,
-                                bikesViewModel,
-                                activeUser);
+						case LockingState.UnknownFromHardwareError:
+							// User wants to return bike/ pause ride.
+							return new BookedUnknown(
+								selectedBluetoothLockBike,
+								isConnectedDelegate,
+								connectorFactory,
+								geolocation,
+								lockService,
+								viewUpdateManager,
+								smartDevice,
+								viewService,
+								bikesViewModel,
+								activeUser);
 
-                        default:
-                            // Invalid state detected. 
-                            // If bike is booked lock state must be querried before creating view model.
-                            return new BookedDisconnected(
-                                selectedBluetoothLockBike,
-                                isConnectedDelegate,
-                                connectorFactory,
-                                geolocation,
-                                lockService,
-                                viewUpdateManager,
-                                smartDevice,
-                                viewService,
-                                bikesViewModel,
-                                activeUser);
-                    }
+						default:
+							// Invalid state detected. 
+							// If bike is booked lock state must be querried before creating view model.
+							return new BookedDisconnected(
+								selectedBluetoothLockBike,
+								isConnectedDelegate,
+								connectorFactory,
+								geolocation,
+								lockService,
+								viewUpdateManager,
+								smartDevice,
+								viewService,
+								bikesViewModel,
+								activeUser);
+					}
 
-                default:
-                    // Unexpected copri state detected.
-                    Log.Error("Unexpected locking {BookingState}/ {LockingState} detected.", selectedBluetoothLockBike.State.Value, selectedBluetoothLockBike.LockInfo.State);
-                    return new InvalidState(
-                        bikesViewModel,
-                        selectedBluetoothLockBike.State.Value,
-                        selectedBluetoothLockBike.LockInfo.State,
-                        string.Format(AppResources.MarkingBikeInfoErrorStateUnknownDetected, selectedBluetoothLockBike.Description));
-            }
-        }
-    }
+				default:
+					// Unexpected copri state detected.
+					Log.Error("Unexpected locking {BookingState}/ {LockingState} detected.", selectedBluetoothLockBike.State.Value, selectedBluetoothLockBike.LockInfo.State);
+					return new InvalidState(
+						bikesViewModel,
+						selectedBluetoothLockBike.State.Value,
+						selectedBluetoothLockBike.LockInfo.State,
+						string.Format(AppResources.MarkingBikeInfoErrorStateUnknownDetected, selectedBluetoothLockBike.Description));
+			}
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/CopriLock/BikeViewModel.cs b/TINKLib/ViewModel/Bikes/Bike/CopriLock/BikeViewModel.cs
index a855bf4..5168e3a 100644
--- a/TINKLib/ViewModel/Bikes/Bike/CopriLock/BikeViewModel.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/CopriLock/BikeViewModel.cs
@@ -10,172 +10,172 @@ using BikeInfoMutable = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable;
 
 namespace TINK.ViewModel.Bikes.Bike.CopriLock
 {
-    using IRequestHandler = BluetoothLock.IRequestHandler;
+	using IRequestHandler = BluetoothLock.IRequestHandler;
 
-    /// <summary>
-    /// View model for a ILockIt bike.
-    /// Provides functionality for views
-    /// - MyBikes
-    /// - BikesAtStation
-    /// </summary>
-    public class BikeViewModel : BikeViewModelBase, INotifyPropertyChanged
-    {
-        /// <summary> Notifies GUI about changes. </summary>
-        public override event PropertyChangedEventHandler PropertyChanged;
+	/// <summary>
+	/// View model for a ILockIt bike.
+	/// Provides functionality for views
+	/// - MyBikes
+	/// - BikesAtStation
+	/// </summary>
+	public class BikeViewModel : BikeViewModelBase, INotifyPropertyChanged
+	{
+		/// <summary> Notifies GUI about changes. </summary>
+		public override event PropertyChangedEventHandler PropertyChanged;
 
-        /// <summary> Holds object which manages requests. </summary>
-        private IRequestHandler RequestHandler { get; set; }
+		/// <summary> Holds object which manages requests. </summary>
+		private IRequestHandler RequestHandler { get; set; }
 
-        /// <summary> Raises events in order to update GUI.</summary>
-        public override void RaisePropertyChanged(object sender, PropertyChangedEventArgs eventArgs) => PropertyChanged?.Invoke(sender, eventArgs);
+		/// <summary> Raises events in order to update GUI.</summary>
+		public override void RaisePropertyChanged(object sender, PropertyChangedEventArgs eventArgs) => PropertyChanged?.Invoke(sender, eventArgs);
 
-        /// <summary> Raises events if property values changed in order to update GUI.</summary>
-        private void RaisePropertyChangedEvent(
-            IRequestHandler lastHandler,
-            string lastStateText = null,
-            Xamarin.Forms.Color? lastStateColor = null)
-        {
-            if (lastHandler.ButtonText != ButtonText)
-            {
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ButtonText)));
-            }
+		/// <summary> Raises events if property values changed in order to update GUI.</summary>
+		private void RaisePropertyChangedEvent(
+			IRequestHandler lastHandler,
+			string lastStateText = null,
+			Xamarin.Forms.Color? lastStateColor = null)
+		{
+			if (lastHandler.ButtonText != ButtonText)
+			{
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ButtonText)));
+			}
 
-            if (lastHandler.IsButtonVisible != IsButtonVisible)
-            {
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsButtonVisible)));
-            }
+			if (lastHandler.IsButtonVisible != IsButtonVisible)
+			{
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsButtonVisible)));
+			}
 
-            if (lastHandler.LockitButtonText != LockitButtonText)
-            {
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(LockitButtonText)));
-            }
+			if (lastHandler.LockitButtonText != LockitButtonText)
+			{
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(LockitButtonText)));
+			}
 
-            if (lastHandler.IsLockitButtonVisible != IsLockitButtonVisible)
-            {
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLockitButtonVisible)));
-            }
+			if (lastHandler.IsLockitButtonVisible != IsLockitButtonVisible)
+			{
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLockitButtonVisible)));
+			}
 
-            if (RequestHandler.ErrorText != lastHandler.ErrorText)
-            {
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ErrorText)));
-            }
+			if (RequestHandler.ErrorText != lastHandler.ErrorText)
+			{
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ErrorText)));
+			}
 
-            if (!string.IsNullOrEmpty(lastStateText) && lastStateText != StateText)
-            {
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StateText)));
-            }
+			if (!string.IsNullOrEmpty(lastStateText) && lastStateText != StateText)
+			{
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StateText)));
+			}
 
-            if (lastStateColor != null && lastStateColor != StateColor)
-            {
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StateColor)));
-            }
-        }
+			if (lastStateColor != null && lastStateColor != StateColor)
+			{
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StateColor)));
+			}
+		}
 
-        /// <summary>
-        /// Constructs a bike view model object.
-        /// </summary>
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-        /// <param name="selectedBike">Bike to be displayed.</param>
-        /// <param name="user">Object holding logged in user or an empty user object.</param>
-        /// <param name="stateInfoProvider">Provides in use state information.</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        /// <param name="openUrlInBrowser">Delegate to open browser.</param>
-        public BikeViewModel(
-            Func<bool> isConnectedDelegate,
-            Func<bool, IConnector> connectorFactory,
-            Action<string> bikeRemoveDelegate,
-            Func<IPollingUpdateTaskManager> viewUpdateManager,
-            ISmartDevice smartDevice,
-            IViewService viewService,
-            BikeInfoMutable selectedBike,
-            IUser user,
-            IInUseStateInfoProvider stateInfoProvider,
-            IBikesViewModel bikesViewModel,
-            Action<string> openUrlInBrowser) : base(isConnectedDelegate, connectorFactory, bikeRemoveDelegate, viewUpdateManager, smartDevice, viewService, selectedBike, user, stateInfoProvider, bikesViewModel, openUrlInBrowser)
-        {
-            RequestHandler = user.IsLoggedIn
-                ? RequestHandlerFactory.Create(
-                    selectedBike,
-                    isConnectedDelegate,
-                    connectorFactory,
-                    viewUpdateManager,
-                    smartDevice,
-                    viewService,
-                    bikesViewModel,
-                    user)
-                : new BluetoothLock.NotLoggedIn(
-                    selectedBike.State.Value,
-                    viewService,
-                    bikesViewModel);
-        }
+		/// <summary>
+		/// Constructs a bike view model object.
+		/// </summary>
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
+		/// <param name="selectedBike">Bike to be displayed.</param>
+		/// <param name="user">Object holding logged in user or an empty user object.</param>
+		/// <param name="stateInfoProvider">Provides in use state information.</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		/// <param name="openUrlInBrowser">Delegate to open browser.</param>
+		public BikeViewModel(
+			Func<bool> isConnectedDelegate,
+			Func<bool, IConnector> connectorFactory,
+			Action<string> bikeRemoveDelegate,
+			Func<IPollingUpdateTaskManager> viewUpdateManager,
+			ISmartDevice smartDevice,
+			IViewService viewService,
+			BikeInfoMutable selectedBike,
+			IUser user,
+			IInUseStateInfoProvider stateInfoProvider,
+			IBikesViewModel bikesViewModel,
+			Action<string> openUrlInBrowser) : base(isConnectedDelegate, connectorFactory, bikeRemoveDelegate, viewUpdateManager, smartDevice, viewService, selectedBike, user, stateInfoProvider, bikesViewModel, openUrlInBrowser)
+		{
+			RequestHandler = user.IsLoggedIn
+				? RequestHandlerFactory.Create(
+					selectedBike,
+					isConnectedDelegate,
+					connectorFactory,
+					viewUpdateManager,
+					smartDevice,
+					viewService,
+					bikesViewModel,
+					user)
+				: new BluetoothLock.NotLoggedIn(
+					selectedBike.State.Value,
+					viewService,
+					bikesViewModel);
+		}
 
-        /// <summary>
-        /// Handles BikeInfoMutable events. 
-        /// Helper member to raise events. Maps model event change notification to view model events.
-        /// Todo: Check which events are received here and filter, to avoid event storm.
-        /// </summary>
-        public override void OnSelectedBikeStateChanged()
-        {
-            var lastHandler = RequestHandler;
-            RequestHandler = RequestHandlerFactory.Create(
-                Bike,
-                IsConnectedDelegate,
-                ConnectorFactory,
-                ViewUpdateManager,
-                SmartDevice,
-                ViewService,
-                BikesViewModel,
-                ActiveUser);
+		/// <summary>
+		/// Handles BikeInfoMutable events. 
+		/// Helper member to raise events. Maps model event change notification to view model events.
+		/// Todo: Check which events are received here and filter, to avoid event storm.
+		/// </summary>
+		public override void OnSelectedBikeStateChanged()
+		{
+			var lastHandler = RequestHandler;
+			RequestHandler = RequestHandlerFactory.Create(
+				Bike,
+				IsConnectedDelegate,
+				ConnectorFactory,
+				ViewUpdateManager,
+				SmartDevice,
+				ViewService,
+				BikesViewModel,
+				ActiveUser);
 
-            RaisePropertyChangedEvent(lastHandler);
-        }
+			RaisePropertyChangedEvent(lastHandler);
+		}
 
-        /// <summary> Gets visiblity of the copri command button. </summary>
-        public bool IsButtonVisible => RequestHandler.IsButtonVisible;
+		/// <summary> Gets visiblity of the copri command button. </summary>
+		public bool IsButtonVisible => RequestHandler.IsButtonVisible;
 
-        /// <summary> Gets the text of the copri command button. </summary>
-        public string ButtonText => RequestHandler.ButtonText;
+		/// <summary> Gets the text of the copri command button. </summary>
+		public string ButtonText => RequestHandler.ButtonText;
 
-        /// <summary> Gets visiblity of the ILockIt command button. </summary>
-        public bool IsLockitButtonVisible => RequestHandler.IsLockitButtonVisible;
+		/// <summary> Gets visiblity of the ILockIt command button. </summary>
+		public bool IsLockitButtonVisible => RequestHandler.IsLockitButtonVisible;
 
-        /// <summary> Gets the text of the ILockIt command button. </summary>
-        public string LockitButtonText => RequestHandler.LockitButtonText;
+		/// <summary> Gets the text of the ILockIt command button. </summary>
+		public string LockitButtonText => RequestHandler.LockitButtonText;
 
-        /// <summary> Processes request to perform a copri action (reserve bike and cancel reservation). </summary>
-        public System.Windows.Input.ICommand OnButtonClicked =>
-            new Xamarin.Forms.Command(async () => await ClickButton(RequestHandler.HandleRequestOption1()));
+		/// <summary> Processes request to perform a copri action (reserve bike and cancel reservation). </summary>
+		public System.Windows.Input.ICommand OnButtonClicked =>
+			new Xamarin.Forms.Command(async () => await ClickButton(RequestHandler.HandleRequestOption1()));
 
-        /// <summary> Processes request to perform a ILockIt action (unlock bike and lock bike). </summary>
-        public System.Windows.Input.ICommand OnLockitButtonClicked =>
-            new Xamarin.Forms.Command(async () => await ClickButton(RequestHandler.HandleRequestOption2()));
+		/// <summary> Processes request to perform a ILockIt action (unlock bike and lock bike). </summary>
+		public System.Windows.Input.ICommand OnLockitButtonClicked =>
+			new Xamarin.Forms.Command(async () => await ClickButton(RequestHandler.HandleRequestOption2()));
 
-        /// <summary> Processes request to perform a copri action (reserve bike and cancel reservation). </summary>
-        private async Task ClickButton(Task<IRequestHandler> handleRequest)
-        {
-            var lastHandler = RequestHandler;
-            var lastStateText = StateText;
-            var lastStateColor = StateColor;
+		/// <summary> Processes request to perform a copri action (reserve bike and cancel reservation). </summary>
+		private async Task ClickButton(Task<IRequestHandler> handleRequest)
+		{
+			var lastHandler = RequestHandler;
+			var lastStateText = StateText;
+			var lastStateColor = StateColor;
 
-            RequestHandler = await handleRequest;
+			RequestHandler = await handleRequest;
 
-            if (lastHandler.IsRemoveBikeRequired)
-            {
-                BikeRemoveDelegate(Id);
-            }
+			if (lastHandler.IsRemoveBikeRequired)
+			{
+				BikeRemoveDelegate(Id);
+			}
 
-            if (RuntimeHelpers.Equals(lastHandler, RequestHandler))
-            {
-                // No state change occurred (same instance is returned).
-                return;
-            }
+			if (RuntimeHelpers.Equals(lastHandler, RequestHandler))
+			{
+				// No state change occurred (same instance is returned).
+				return;
+			}
 
-            RaisePropertyChangedEvent(
-                lastHandler,
-                lastStateText,
-                lastStateColor);
-        }
+			RaisePropertyChangedEvent(
+				lastHandler,
+				lastStateText,
+				lastStateColor);
+		}
 
-        public string ErrorText => RequestHandler.ErrorText;
-    }
+		public string ErrorText => RequestHandler.ErrorText;
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/Base.cs b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/Base.cs
index 186eb4a..509aee8 100644
--- a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/Base.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/Base.cs
@@ -6,32 +6,32 @@ using TINK.View;
 
 namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 {
-    public abstract class Base : BC.RequestHandler.Base<Model.Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable>
-    {
-        /// <summary>
-        /// Constructs the reqest handler base.
-        /// </summary>
-        /// <param name="selectedBike">Bike which is reserved or for which reservation is canceled.</param>
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public Base(
-            Model.Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable selectedBike,
-            string buttonText,
-            bool isCopriButtonVisible,
-            Func<bool> isConnectedDelegate,
-            Func<bool, IConnector> connectorFactory,
-            Func<IPollingUpdateTaskManager> viewUpdateManager,
-            ISmartDevice smartDevice,
-            IViewService viewService,
-            IBikesViewModel bikesViewModel,
-            IUser activeUser) : base(selectedBike, buttonText, isCopriButtonVisible, isConnectedDelegate, connectorFactory, viewUpdateManager, smartDevice, viewService, bikesViewModel, activeUser)
-        {
-        }
+	public abstract class Base : BC.RequestHandler.Base<Model.Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable>
+	{
+		/// <summary>
+		/// Constructs the reqest handler base.
+		/// </summary>
+		/// <param name="selectedBike">Bike which is reserved or for which reservation is canceled.</param>
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public Base(
+			Model.Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable selectedBike,
+			string buttonText,
+			bool isCopriButtonVisible,
+			Func<bool> isConnectedDelegate,
+			Func<bool, IConnector> connectorFactory,
+			Func<IPollingUpdateTaskManager> viewUpdateManager,
+			ISmartDevice smartDevice,
+			IViewService viewService,
+			IBikesViewModel bikesViewModel,
+			IUser activeUser) : base(selectedBike, buttonText, isCopriButtonVisible, isConnectedDelegate, connectorFactory, viewUpdateManager, smartDevice, viewService, bikesViewModel, activeUser)
+		{
+		}
 
-        public string LockitButtonText { get; protected set; }
+		public string LockitButtonText { get; protected set; }
 
-        public bool IsLockitButtonVisible { get; protected set; }
+		public bool IsLockitButtonVisible { get; protected set; }
 
-        public string ErrorText => string.Empty;
-    }
+		public string ErrorText => string.Empty;
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedClosed.cs b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedClosed.cs
index 60b09d3..7866792 100644
--- a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedClosed.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedClosed.cs
@@ -11,104 +11,104 @@ using TINK.View;
 
 namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 {
-    using IRequestHandler = BluetoothLock.IRequestHandler;
+	using IRequestHandler = BluetoothLock.IRequestHandler;
 
-    public class BookedClosed : Base, IRequestHandler
-    {
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public BookedClosed(
-           IBikeInfoMutable selectedBike,
-           Func<bool> isConnectedDelegate,
-           Func<bool, IConnector> connectorFactory,
-           Func<IPollingUpdateTaskManager> viewUpdateManager,
-           ISmartDevice smartDevice,
-           IViewService viewService,
-           IBikesViewModel bikesViewModel,
-           IUser activeUser) : base(
-               selectedBike,
-               nameof(BookedClosed),
-               false, // Lock can only be closed manually and returning is performed by placing bike into the station.
-               isConnectedDelegate,
-               connectorFactory,
-               viewUpdateManager,
-               smartDevice,
-               viewService,
-               bikesViewModel,
-               activeUser)
-        {
-            LockitButtonText = AppResources.ActionOpenAndPause;
-            IsLockitButtonVisible = true; // Show button to enable opening lock in case user took a pause and does not want to return the bike.
-        }
+	public class BookedClosed : Base, IRequestHandler
+	{
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public BookedClosed(
+		   IBikeInfoMutable selectedBike,
+		   Func<bool> isConnectedDelegate,
+		   Func<bool, IConnector> connectorFactory,
+		   Func<IPollingUpdateTaskManager> viewUpdateManager,
+		   ISmartDevice smartDevice,
+		   IViewService viewService,
+		   IBikesViewModel bikesViewModel,
+		   IUser activeUser) : base(
+			   selectedBike,
+			   nameof(BookedClosed),
+			   false, // Lock can only be closed manually and returning is performed by placing bike into the station.
+			   isConnectedDelegate,
+			   connectorFactory,
+			   viewUpdateManager,
+			   smartDevice,
+			   viewService,
+			   bikesViewModel,
+			   activeUser)
+		{
+			LockitButtonText = AppResources.ActionOpenAndPause;
+			IsLockitButtonVisible = true; // Show button to enable opening lock in case user took a pause and does not want to return the bike.
+		}
 
-        /// <summary> Return bike. </summary>
-        public async Task<IRequestHandler> HandleRequestOption1() => await UnsupportedRequest();
+		/// <summary> Return bike. </summary>
+		public async Task<IRequestHandler> HandleRequestOption1() => await UnsupportedRequest();
 
-        /// <summary> Open bike and update COPRI lock state. </summary>
-        public async Task<IRequestHandler> HandleRequestOption2() => await OpenLock();
+		/// <summary> Open bike and update COPRI lock state. </summary>
+		public async Task<IRequestHandler> HandleRequestOption2() => await OpenLock();
 
-        /// <summary> Requst is not supported, button should be disabled. </summary>
-        public async Task<IRequestHandler> UnsupportedRequest()
-        {
-            Log.ForContext<BookedClosed>().Error("Click of unsupported button click detected.");
-            return await Task.FromResult<IRequestHandler>(this);
-        }
+		/// <summary> Requst is not supported, button should be disabled. </summary>
+		public async Task<IRequestHandler> UnsupportedRequest()
+		{
+			Log.ForContext<BookedClosed>().Error("Click of unsupported button click detected.");
+			return await Task.FromResult<IRequestHandler>(this);
+		}
 
-        /// <summary> Open bike. </summary>
-        public async Task<IRequestHandler> OpenLock()
-        {
-            // Unlock bike.
-            Log.ForContext<BookedClosed>().Information("User request to unlock bike {bike}.", SelectedBike);
+		/// <summary> Open bike. </summary>
+		public async Task<IRequestHandler> OpenLock()
+		{
+			// Unlock bike.
+			Log.ForContext<BookedClosed>().Information("User request to unlock bike {bike}.", SelectedBike);
 
-            // Stop polling before returning bike.
-            BikesViewModel.IsIdle = false;
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before returning bike.
+			BikesViewModel.IsIdle = false;
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            BikesViewModel.ActionText = AppResources.ActivityTextOpeningLock;
-            IsConnected = IsConnectedDelegate();
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.OpenLockAsync(SelectedBike);
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.ActionText = AppResources.ActivityTextOpeningLock;
+			IsConnected = IsConnectedDelegate();
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.OpenLockAsync(SelectedBike);
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                if (exception is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<BookedClosed>().Information("User selected bike {id} but opening lock failed (Copri server not reachable).", SelectedBike.Id);
+				if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<BookedClosed>().Information("User selected bike {id} but opening lock failed (Copri server not reachable).", SelectedBike.Id);
 
-                    await ViewService.DisplayAdvancedAlert(
-                        AppResources.MessageOpeningLockErrorConnectionTitle,
-                        WebConnectFailureException.GetHintToPossibleExceptionsReasons,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<BookedClosed>().Error("Lock can not be opened. {Exception}", exception);
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.MessageOpeningLockErrorConnectionTitle,
+						WebConnectFailureException.GetHintToPossibleExceptionsReasons,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<BookedClosed>().Error("Lock can not be opened. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            Log.ForContext<BookedClosed>().Information("User paused ride using {bike} successfully.", SelectedBike);
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically();
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true;
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
-    }
+			Log.ForContext<BookedClosed>().Information("User paused ride using {bike} successfully.", SelectedBike);
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically();
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true;
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedOpen.cs b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedOpen.cs
index 04c9b42..378e699 100644
--- a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedOpen.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedOpen.cs
@@ -11,105 +11,105 @@ using TINK.View;
 
 namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 {
-    using IRequestHandler = BluetoothLock.IRequestHandler;
+	using IRequestHandler = BluetoothLock.IRequestHandler;
 
-    public class BookedOpen : Base, IRequestHandler
+	public class BookedOpen : Base, IRequestHandler
 
-    {
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public BookedOpen(
-           IBikeInfoMutable selectedBike,
-           Func<bool> isConnectedDelegate,
-           Func<bool, IConnector> connectorFactory,
-           Func<IPollingUpdateTaskManager> viewUpdateManager,
-           ISmartDevice smartDevice,
-           IViewService viewService,
-           IBikesViewModel bikesViewModel,
-           IUser activeUser) : base(
-               selectedBike,
-               nameof(BookedOpen),
-               false, // Lock can only be closed manually and returning is performed by placing bike into the station.
-               isConnectedDelegate,
-               connectorFactory,
-               viewUpdateManager,
-               smartDevice,
-               viewService,
-               bikesViewModel,
-               activeUser)
-        {
-            LockitButtonText = AppResources.ActionOpenAndPause; // Lock is open but show button anyway to be less prone to errors.
-            IsLockitButtonVisible = true;
-        }
+	{
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public BookedOpen(
+		   IBikeInfoMutable selectedBike,
+		   Func<bool> isConnectedDelegate,
+		   Func<bool, IConnector> connectorFactory,
+		   Func<IPollingUpdateTaskManager> viewUpdateManager,
+		   ISmartDevice smartDevice,
+		   IViewService viewService,
+		   IBikesViewModel bikesViewModel,
+		   IUser activeUser) : base(
+			   selectedBike,
+			   nameof(BookedOpen),
+			   false, // Lock can only be closed manually and returning is performed by placing bike into the station.
+			   isConnectedDelegate,
+			   connectorFactory,
+			   viewUpdateManager,
+			   smartDevice,
+			   viewService,
+			   bikesViewModel,
+			   activeUser)
+		{
+			LockitButtonText = AppResources.ActionOpenAndPause; // Lock is open but show button anyway to be less prone to errors.
+			IsLockitButtonVisible = true;
+		}
 
-        /// <summary> Close lock and return bike.</summary>
-        public async Task<IRequestHandler> HandleRequestOption1() => await UnsupportedRequest();
+		/// <summary> Close lock and return bike.</summary>
+		public async Task<IRequestHandler> HandleRequestOption1() => await UnsupportedRequest();
 
-        /// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
-        public async Task<IRequestHandler> HandleRequestOption2() => await OpenLock();
+		/// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
+		public async Task<IRequestHandler> HandleRequestOption2() => await OpenLock();
 
-        /// <summary> Requst is not supported, button should be disabled. </summary>
-        public async Task<IRequestHandler> UnsupportedRequest()
-        {
-            Log.ForContext<BookedOpen>().Error("Click of unsupported button click detected.");
-            return await Task.FromResult<IRequestHandler>(this);
-        }
+		/// <summary> Requst is not supported, button should be disabled. </summary>
+		public async Task<IRequestHandler> UnsupportedRequest()
+		{
+			Log.ForContext<BookedOpen>().Error("Click of unsupported button click detected.");
+			return await Task.FromResult<IRequestHandler>(this);
+		}
 
-        /// <summary> Open bike. </summary>
-        public async Task<IRequestHandler> OpenLock()
-        {
-            // Unlock bike.
-            Log.ForContext<BookedOpen>().Information("User request to unlock bike {bike}. For locking state {state} this request is unexpected.", SelectedBike, SelectedBike?.LockInfo?.State);
+		/// <summary> Open bike. </summary>
+		public async Task<IRequestHandler> OpenLock()
+		{
+			// Unlock bike.
+			Log.ForContext<BookedOpen>().Information("User request to unlock bike {bike}. For locking state {state} this request is unexpected.", SelectedBike, SelectedBike?.LockInfo?.State);
 
-            // Stop polling before returning bike.
-            BikesViewModel.IsIdle = false;
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before returning bike.
+			BikesViewModel.IsIdle = false;
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            BikesViewModel.ActionText = AppResources.ActivityTextOpeningLock;
-            IsConnected = IsConnectedDelegate();
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.OpenLockAsync(SelectedBike);
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.ActionText = AppResources.ActivityTextOpeningLock;
+			IsConnected = IsConnectedDelegate();
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.OpenLockAsync(SelectedBike);
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                if (exception is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<BookedOpen>().Information("User selected bike {id} but opening lock failed (Copri server not reachable).", SelectedBike.Id);
+				if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<BookedOpen>().Information("User selected bike {id} but opening lock failed (Copri server not reachable).", SelectedBike.Id);
 
-                    await ViewService.DisplayAdvancedAlert(
-                        AppResources.MessageOpeningLockErrorConnectionTitle,
-                        WebConnectFailureException.GetHintToPossibleExceptionsReasons,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<BookedOpen>().Error("Lock can not be opened. {Exception}", exception);
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.MessageOpeningLockErrorConnectionTitle,
+						WebConnectFailureException.GetHintToPossibleExceptionsReasons,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<BookedOpen>().Error("Lock can not be opened. {Exception}", exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.ErrorOpenLockTitle,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAlert(
+						AppResources.ErrorOpenLockTitle,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            Log.ForContext<BookedOpen>().Information("User paused ride using {bike} successfully.", SelectedBike);
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically();
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true;
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
-    }
+			Log.ForContext<BookedOpen>().Information("User paused ride using {bike} successfully.", SelectedBike);
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically();
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true;
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/DisposableClosed.cs b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/DisposableClosed.cs
index 0a27df5..577a0fc 100644
--- a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/DisposableClosed.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/DisposableClosed.cs
@@ -12,199 +12,199 @@ using TINK.View;
 
 namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 {
-    using IRequestHandler = BluetoothLock.IRequestHandler;
+	using IRequestHandler = BluetoothLock.IRequestHandler;
 
-    public class DisposableClosed : Base, IRequestHandler
-    {
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public DisposableClosed(
-           IBikeInfoMutable selectedBike,
-           Func<bool> isConnectedDelegate,
-           Func<bool, IConnector> connectorFactory,
-           Func<IPollingUpdateTaskManager> viewUpdateManager,
-           ISmartDevice smartDevice,
-           IViewService viewService,
-           IBikesViewModel bikesViewModel,
-           IUser activeUser) : base(
-               selectedBike,
-               AppResources.ActionOpenAndBook, // Button text: "Schloss öffnen & Rad mieten"
-               true, // Show copri button to enable booking and opening
-               isConnectedDelegate,
-               connectorFactory,
-               viewUpdateManager,
-               smartDevice,
-               viewService,
-               bikesViewModel,
-               activeUser)
-        {
-            LockitButtonText = AppResources.ActionRequest; // Copri text: "Rad reservieren"
-            IsLockitButtonVisible = true;
-        }
+	public class DisposableClosed : Base, IRequestHandler
+	{
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public DisposableClosed(
+		   IBikeInfoMutable selectedBike,
+		   Func<bool> isConnectedDelegate,
+		   Func<bool, IConnector> connectorFactory,
+		   Func<IPollingUpdateTaskManager> viewUpdateManager,
+		   ISmartDevice smartDevice,
+		   IViewService viewService,
+		   IBikesViewModel bikesViewModel,
+		   IUser activeUser) : base(
+			   selectedBike,
+			   AppResources.ActionOpenAndBook, // Button text: "Schloss öffnen & Rad mieten"
+			   true, // Show copri button to enable booking and opening
+			   isConnectedDelegate,
+			   connectorFactory,
+			   viewUpdateManager,
+			   smartDevice,
+			   viewService,
+			   bikesViewModel,
+			   activeUser)
+		{
+			LockitButtonText = AppResources.ActionRequest; // Copri text: "Rad reservieren"
+			IsLockitButtonVisible = true;
+		}
 
-        /// <summary>Reserve bike and connect to lock.</summary>
-        public async Task<IRequestHandler> HandleRequestOption1() => await BookAndRelease();
+		/// <summary>Reserve bike and connect to lock.</summary>
+		public async Task<IRequestHandler> HandleRequestOption1() => await BookAndRelease();
 
-        public async Task<IRequestHandler> HandleRequestOption2() => await Reserve();
+		public async Task<IRequestHandler> HandleRequestOption2() => await Reserve();
 
-        /// <summary>Book bike and open lock.</summary>
-        public async Task<IRequestHandler> BookAndRelease()
-        {
-            BikesViewModel.IsIdle = false;
+		/// <summary>Book bike and open lock.</summary>
+		public async Task<IRequestHandler> BookAndRelease()
+		{
+			BikesViewModel.IsIdle = false;
 
-            // Ask whether to really book bike?
-            var alertResult = await ViewService.DisplayAlert(
-                string.Empty,
-                string.Format(AppResources.QuestionOpenLockAndBookBike, SelectedBike.GetFullDisplayName()),
-                AppResources.MessageAnswerYes,
-                AppResources.MessageAnswerNo);
+			// Ask whether to really book bike?
+			var alertResult = await ViewService.DisplayAlert(
+				string.Empty,
+				string.Format(AppResources.QuestionOpenLockAndBookBike, SelectedBike.GetFullDisplayName()),
+				AppResources.MessageAnswerYes,
+				AppResources.MessageAnswerNo);
 
-            if (alertResult == false)
-            {
-                // User aborted booking process
-                Log.ForContext<DisposableClosed>().Information("User selected bike {bike} in order to book and release bike from station but action was cancelled.", SelectedBike);
+			if (alertResult == false)
+			{
+				// User aborted booking process
+				Log.ForContext<DisposableClosed>().Information("User selected bike {bike} in order to book and release bike from station but action was cancelled.", SelectedBike);
 
-                BikesViewModel.IsIdle = true;
-                return this;
-            }
+				BikesViewModel.IsIdle = true;
+				return this;
+			}
 
-            // Book and release bike from station.
-            Log.ForContext<DisposableClosed>().Information("User selected bike {bike} in order to book and release bike from station.", SelectedBike);
+			// Book and release bike from station.
+			Log.ForContext<DisposableClosed>().Information("User selected bike {bike} in order to book and release bike from station.", SelectedBike);
 
-            // Stop polling before returning bike.
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before returning bike.
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            // Book bike prior to opening lock.
-            BikesViewModel.ActionText = AppResources.ActivityTextRentingBike;
-            IsConnected = IsConnectedDelegate();
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.BookAndOpenAync(SelectedBike);
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
+			// Book bike prior to opening lock.
+			BikesViewModel.ActionText = AppResources.ActivityTextRentingBike;
+			IsConnected = IsConnectedDelegate();
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.BookAndOpenAync(SelectedBike);
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                if (exception is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<DisposableClosed>().Information("User selected bike {id} but booking failed (Copri server not reachable).", SelectedBike.Id);
+				if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<DisposableClosed>().Information("User selected bike {id} but booking failed (Copri server not reachable).", SelectedBike.Id);
 
-                    await ViewService.DisplayAdvancedAlert(
-                        AppResources.MessageRentingBikeErrorConnectionTitle,
-                        WebConnectFailureException.GetHintToPossibleExceptionsReasons,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<DisposableClosed>().Error("User selected bike {id} but booking failed. {@exception}", SelectedBike.Id, exception);
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.MessageRentingBikeErrorConnectionTitle,
+						WebConnectFailureException.GetHintToPossibleExceptionsReasons,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<DisposableClosed>().Error("User selected bike {id} but booking failed. {@exception}", SelectedBike.Id, exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageRentingBikeErrorGeneralTitle,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAlert(
+						AppResources.MessageRentingBikeErrorGeneralTitle,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true; // Unlock GUI
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true; // Unlock GUI
 
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            Log.ForContext<DisposableClosed>().Information("User booked and released bike {bike} successfully.", SelectedBike);
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true; // Unlock GUI
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
+			Log.ForContext<DisposableClosed>().Information("User booked and released bike {bike} successfully.", SelectedBike);
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true; // Unlock GUI
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
 
-        /// <summary>Reserve bike.</summary>
-        public async Task<IRequestHandler> Reserve()
-        {
-            BikesViewModel.IsIdle = false;
+		/// <summary>Reserve bike.</summary>
+		public async Task<IRequestHandler> Reserve()
+		{
+			BikesViewModel.IsIdle = false;
 
-            // Ask whether to really reserve bike?
-            var alertResult = await ViewService.DisplayAlert(
-                string.Empty,
-                string.Format(AppResources.QuestionReserveBike, SelectedBike.GetFullDisplayName(), StateRequestedInfo.MaximumReserveTime.Minutes),
-                AppResources.MessageAnswerYes,
-                AppResources.MessageAnswerNo);
+			// Ask whether to really reserve bike?
+			var alertResult = await ViewService.DisplayAlert(
+				string.Empty,
+				string.Format(AppResources.QuestionReserveBike, SelectedBike.GetFullDisplayName(), StateRequestedInfo.MaximumReserveTime.Minutes),
+				AppResources.MessageAnswerYes,
+				AppResources.MessageAnswerNo);
 
-            if (alertResult == false)
-            {
-                // User aborted booking process
-                Log.ForContext<DisposableClosed>().Information("User selected availalbe bike {bike} in order to reserve but action was canceled.", SelectedBike);
-                BikesViewModel.IsIdle = true;
-                return this;
-            }
+			if (alertResult == false)
+			{
+				// User aborted booking process
+				Log.ForContext<DisposableClosed>().Information("User selected availalbe bike {bike} in order to reserve but action was canceled.", SelectedBike);
+				BikesViewModel.IsIdle = true;
+				return this;
+			}
 
-            Log.ForContext<DisposableClosed>().Information("Request to reserve for bike {bike} detected.", SelectedBike);
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			Log.ForContext<DisposableClosed>().Information("Request to reserve for bike {bike} detected.", SelectedBike);
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
 
-            // Stop polling before requesting bike.
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before requesting bike.
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            BikesViewModel.ActionText = AppResources.ActivityTextReservingBike;
-            IsConnected = IsConnectedDelegate();
+			BikesViewModel.ActionText = AppResources.ActivityTextReservingBike;
+			IsConnected = IsConnectedDelegate();
 
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.DoReserve(SelectedBike);
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.DoReserve(SelectedBike);
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                if (exception is BookingDeclinedException)
-                {
-                    // Too many bikes booked.
-                    Log.ForContext<DisposableClosed>().Information("Request declined because maximum count of bikes {l_oException.MaxBikesCount} already requested/ booked.", (exception as BookingDeclinedException).MaxBikesCount);
+				if (exception is BookingDeclinedException)
+				{
+					// Too many bikes booked.
+					Log.ForContext<DisposableClosed>().Information("Request declined because maximum count of bikes {l_oException.MaxBikesCount} already requested/ booked.", (exception as BookingDeclinedException).MaxBikesCount);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageTitleHint,
-                        string.Format(AppResources.MessageReservationBikeErrorTooManyReservationsRentals, SelectedBike.GetFullDisplayName(), (exception as BookingDeclinedException).MaxBikesCount),
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<DisposableClosed>().Information("User selected availalbe bike {bike} but reserving failed (Copri server not reachable).", SelectedBike);
+					await ViewService.DisplayAlert(
+						AppResources.MessageTitleHint,
+						string.Format(AppResources.MessageReservationBikeErrorTooManyReservationsRentals, SelectedBike.GetFullDisplayName(), (exception as BookingDeclinedException).MaxBikesCount),
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<DisposableClosed>().Information("User selected availalbe bike {bike} but reserving failed (Copri server not reachable).", SelectedBike);
 
-                    await ViewService.DisplayAdvancedAlert(
-                        AppResources.MessageReservingBikeErrorConnectionTitle,
-                        WebConnectFailureException.GetHintToPossibleExceptionsReasons,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<DisposableClosed>().Error("User selected availalbe bike {bike} but reserving failed. {@exception}", SelectedBike, exception);
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.MessageReservingBikeErrorConnectionTitle,
+						WebConnectFailureException.GetHintToPossibleExceptionsReasons,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<DisposableClosed>().Error("User selected availalbe bike {bike} but reserving failed. {@exception}", SelectedBike, exception);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageReservingBikeErrorGeneralTitle,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAlert(
+						AppResources.MessageReservingBikeErrorGeneralTitle,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
 
-                // Restart polling again.
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return this;
-            }
+				// Restart polling again.
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return this;
+			}
 
-            Log.ForContext<DisposableClosed>().Information("User reserved bike {bike} successfully.", SelectedBike);
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true; // Unlock GUI
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
-    }
+			Log.ForContext<DisposableClosed>().Information("User reserved bike {bike} successfully.", SelectedBike);
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true; // Unlock GUI
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/FeedbackPending.cs b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/FeedbackPending.cs
index 3c783eb..8b7966f 100644
--- a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/FeedbackPending.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/FeedbackPending.cs
@@ -10,115 +10,115 @@ using TINK.Repository.Exception;
 using TINK.View;
 namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 {
-    using IRequestHandler = BluetoothLock.IRequestHandler;
+	using IRequestHandler = BluetoothLock.IRequestHandler;
 
-    public class FeedbackPending : Base, IRequestHandler
-    {
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public FeedbackPending(
-           IBikeInfoMutable selectedBike,
-           Func<bool> isConnectedDelegate,
-           Func<bool, IConnector> connectorFactory,
-           Func<IPollingUpdateTaskManager> viewUpdateManager,
-           ISmartDevice smartDevice,
-           IViewService viewService,
-           IBikesViewModel bikesViewModel,
-           IUser activeUser) : base(
-               selectedBike,
-               nameof(FeedbackPending),
-               false, // No other action but give feedback allowed.
-               isConnectedDelegate,
-               connectorFactory,
-               viewUpdateManager,
-               smartDevice,
-               viewService,
-               bikesViewModel,
-               activeUser)
-        {
-            LockitButtonText = AppResources.ActionGiveFeedback;
-            IsLockitButtonVisible = true; // Show button to enable opening lock in case user took a pause and does not want to return the bike.
-        }
+	public class FeedbackPending : Base, IRequestHandler
+	{
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public FeedbackPending(
+		   IBikeInfoMutable selectedBike,
+		   Func<bool> isConnectedDelegate,
+		   Func<bool, IConnector> connectorFactory,
+		   Func<IPollingUpdateTaskManager> viewUpdateManager,
+		   ISmartDevice smartDevice,
+		   IViewService viewService,
+		   IBikesViewModel bikesViewModel,
+		   IUser activeUser) : base(
+			   selectedBike,
+			   nameof(FeedbackPending),
+			   false, // No other action but give feedback allowed.
+			   isConnectedDelegate,
+			   connectorFactory,
+			   viewUpdateManager,
+			   smartDevice,
+			   viewService,
+			   bikesViewModel,
+			   activeUser)
+		{
+			LockitButtonText = AppResources.ActionGiveFeedback;
+			IsLockitButtonVisible = true; // Show button to enable opening lock in case user took a pause and does not want to return the bike.
+		}
 
-        /// <summary> Return bike. </summary>
-        public async Task<IRequestHandler> HandleRequestOption1() => await UnsupportedRequest();
+		/// <summary> Return bike. </summary>
+		public async Task<IRequestHandler> HandleRequestOption1() => await UnsupportedRequest();
 
-        /// <summary> Open bike and update COPRI lock state. </summary>
-        public async Task<IRequestHandler> HandleRequestOption2() => await GiveFeedback();
+		/// <summary> Open bike and update COPRI lock state. </summary>
+		public async Task<IRequestHandler> HandleRequestOption2() => await GiveFeedback();
 
-        /// <summary> Requst is not supported, button should be disabled. </summary>
-        /// <returns></returns>
-        public async Task<IRequestHandler> UnsupportedRequest()
-        {
-            Log.ForContext<BookedClosed>().Error("Click of unsupported button click detected.");
-            return await Task.FromResult<IRequestHandler>(this);
-        }
+		/// <summary> Requst is not supported, button should be disabled. </summary>
+		/// <returns></returns>
+		public async Task<IRequestHandler> UnsupportedRequest()
+		{
+			Log.ForContext<BookedClosed>().Error("Click of unsupported button click detected.");
+			return await Task.FromResult<IRequestHandler>(this);
+		}
 
-        /// <summary> Open bike and update COPRI lock state. </summary>
-        public async Task<IRequestHandler> GiveFeedback()
-        {
-            BikesViewModel.IsIdle = false;
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
+		/// <summary> Open bike and update COPRI lock state. </summary>
+		public async Task<IRequestHandler> GiveFeedback()
+		{
+			BikesViewModel.IsIdle = false;
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            // Do get Feedback
-            var feedback = await ViewService.DisplayUserFeedbackPopup(SelectedBike.Drive?.Battery, SelectedBike?.BookingFinishedModel?.Co2Saving);
+			// Do get Feedback
+			var feedback = await ViewService.DisplayUserFeedbackPopup(SelectedBike.Drive?.Battery, SelectedBike?.BookingFinishedModel?.Co2Saving);
 
-            BikesViewModel.ActionText = AppResources.ActivityTextSubmittingFeedback;
-            IsConnected = IsConnectedDelegate();
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.DoSubmitFeedback(
-                     new UserFeedbackDto
-                     {
-                         BikeId = SelectedBike.Id,
-                         CurrentChargeBars = feedback.CurrentChargeBars,
-                         IsBikeBroken = feedback.IsBikeBroken,
-                         Message = feedback.Message
-                     },
-                    SelectedBike?.OperatorUri);
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.ActionText = AppResources.ActivityTextSubmittingFeedback;
+			IsConnected = IsConnectedDelegate();
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.DoSubmitFeedback(
+					 new UserFeedbackDto
+					 {
+						 BikeId = SelectedBike.Id,
+						 CurrentChargeBars = feedback.CurrentChargeBars,
+						 IsBikeBroken = feedback.IsBikeBroken,
+						 Message = feedback.Message
+					 },
+					SelectedBike?.OperatorUri);
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                if (exception is ResponseException copriException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<FeedbackPending>().Information("Submitting feedback for bike {bike} failed. COPRI returned an error.", SelectedBike);
-                }
-                else
-                {
-                    Log.ForContext<FeedbackPending>().Error("Submitting feedback for bike {bike} failed. {@Exception}", SelectedBike.Id, exception);
-                }
+				if (exception is ResponseException copriException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<FeedbackPending>().Information("Submitting feedback for bike {bike} failed. COPRI returned an error.", SelectedBike);
+				}
+				else
+				{
+					Log.ForContext<FeedbackPending>().Error("Submitting feedback for bike {bike} failed. {@Exception}", SelectedBike.Id, exception);
+				}
 
-                await ViewService.DisplayAlert(
-                    AppResources.ErrorReturnSubmitFeedbackTitle,
-                    AppResources.ErrorReturnSubmitFeedbackMessage,
-                    AppResources.MessageAnswerOk);
+				await ViewService.DisplayAlert(
+					AppResources.ErrorReturnSubmitFeedbackTitle,
+					AppResources.ErrorReturnSubmitFeedbackMessage,
+					AppResources.MessageAnswerOk);
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically();
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true;
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically();
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            // Feedback was given successfully.
-            // Set state from FeedbackPending to Available.
-            SelectedBike.State.Load(Model.State.InUseStateEnum.Disposable);
+			// Feedback was given successfully.
+			// Set state from FeedbackPending to Available.
+			SelectedBike.State.Load(Model.State.InUseStateEnum.Disposable);
 
-            if (SelectedBike?.BookingFinishedModel?.MiniSurvey?.Questions?.Count > 0)
-            {
-                // No need to restrart polling again because different page is shown.
-                await ViewService.PushModalAsync(ViewTypes.MiniSurvey);
-            }
+			if (SelectedBike?.BookingFinishedModel?.MiniSurvey?.Questions?.Count > 0)
+			{
+				// No need to restrart polling again because different page is shown.
+				await ViewService.PushModalAsync(ViewTypes.MiniSurvey);
+			}
 
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically();
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true;
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
-    }
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically();
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true;
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/ReservedClosed.cs b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/ReservedClosed.cs
index e45e138..ee539c9 100644
--- a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/ReservedClosed.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/ReservedClosed.cs
@@ -11,203 +11,203 @@ using TINK.View;
 
 namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 {
-    using IRequestHandler = BluetoothLock.IRequestHandler;
+	using IRequestHandler = BluetoothLock.IRequestHandler;
 
-    /// <summary> Bike is reserved, lock is closed and and connected to app. </summary>
-    /// <remarks> 
-    /// Occures when 
-    /// - biks was reserved out of reach and is in reach now
-    /// - bike is is reserved while in reach
-    /// </remarks>
-    public class ReservedClosed : Base, IRequestHandler
-    {
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        public ReservedClosed(
-           IBikeInfoMutable selectedBike,
-           Func<bool> isConnectedDelegate,
-           Func<bool, IConnector> connectorFactory,
-           Func<IPollingUpdateTaskManager> viewUpdateManager,
-           ISmartDevice smartDevice,
-           IViewService viewService,
-           IBikesViewModel bikesViewModel,
-           IUser activeUser) : base(
-               selectedBike,
-               AppResources.ActionCancelRequest, // Copri button text: "Reservierung abbrechen"
-               true, // Show button to enable canceling reservation.
-               isConnectedDelegate,
-               connectorFactory,
-               viewUpdateManager,
-               smartDevice,
-               viewService,
-               bikesViewModel,
-               activeUser)
-        {
-            LockitButtonText = AppResources.ActionOpenAndBook; // Button text: "Schloss öffnen & Rad mieten"
-            IsLockitButtonVisible = true; // Show "Öffnen" button to enable unlocking
-        }
+	/// <summary> Bike is reserved, lock is closed and and connected to app. </summary>
+	/// <remarks> 
+	/// Occures when 
+	/// - biks was reserved out of reach and is in reach now
+	/// - bike is is reserved while in reach
+	/// </remarks>
+	public class ReservedClosed : Base, IRequestHandler
+	{
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		public ReservedClosed(
+		   IBikeInfoMutable selectedBike,
+		   Func<bool> isConnectedDelegate,
+		   Func<bool, IConnector> connectorFactory,
+		   Func<IPollingUpdateTaskManager> viewUpdateManager,
+		   ISmartDevice smartDevice,
+		   IViewService viewService,
+		   IBikesViewModel bikesViewModel,
+		   IUser activeUser) : base(
+			   selectedBike,
+			   AppResources.ActionCancelRequest, // Copri button text: "Reservierung abbrechen"
+			   true, // Show button to enable canceling reservation.
+			   isConnectedDelegate,
+			   connectorFactory,
+			   viewUpdateManager,
+			   smartDevice,
+			   viewService,
+			   bikesViewModel,
+			   activeUser)
+		{
+			LockitButtonText = AppResources.ActionOpenAndBook; // Button text: "Schloss öffnen & Rad mieten"
+			IsLockitButtonVisible = true; // Show "Öffnen" button to enable unlocking
+		}
 
-        /// <summary> Cancel reservation. </summary>
-        public async Task<IRequestHandler> HandleRequestOption1() => await CancelReservation();
+		/// <summary> Cancel reservation. </summary>
+		public async Task<IRequestHandler> HandleRequestOption1() => await CancelReservation();
 
-        /// <summary> Open lock and book bike. </summary>
-        public async Task<IRequestHandler> HandleRequestOption2() => await OpenLockAndDoBook();
+		/// <summary> Open lock and book bike. </summary>
+		public async Task<IRequestHandler> HandleRequestOption2() => await OpenLockAndDoBook();
 
-        /// <summary> Cancel reservation. </summary>
-        public async Task<IRequestHandler> CancelReservation()
-        {
-            BikesViewModel.IsIdle = false; // Lock list to avoid multiple taps while copri action is pending.
+		/// <summary> Cancel reservation. </summary>
+		public async Task<IRequestHandler> CancelReservation()
+		{
+			BikesViewModel.IsIdle = false; // Lock list to avoid multiple taps while copri action is pending.
 
-            var result = await ViewService.DisplayAlert(
-                string.Empty,
-                string.Format(AppResources.QuestionCancelReservation, SelectedBike.GetFullDisplayName()),
-                AppResources.QuestionAnswerYes,
-                AppResources.QuestionAnswerNo);
+			var result = await ViewService.DisplayAlert(
+				string.Empty,
+				string.Format(AppResources.QuestionCancelReservation, SelectedBike.GetFullDisplayName()),
+				AppResources.QuestionAnswerYes,
+				AppResources.QuestionAnswerNo);
 
-            if (result == false)
-            {
-                // User aborted cancel process
-                Log.ForContext<ReservedClosed>().Information("User selected reserved bike {Id} in order to cancel reservation but action was canceled.", SelectedBike.Id);
-                BikesViewModel.IsIdle = true;
-                return this;
-            }
+			if (result == false)
+			{
+				// User aborted cancel process
+				Log.ForContext<ReservedClosed>().Information("User selected reserved bike {Id} in order to cancel reservation but action was canceled.", SelectedBike.Id);
+				BikesViewModel.IsIdle = true;
+				return this;
+			}
 
-            Log.ForContext<ReservedClosed>().Information("User selected reserved bike {Id} in order to cancel reservation.", SelectedBike.Id);
+			Log.ForContext<ReservedClosed>().Information("User selected reserved bike {Id} in order to cancel reservation.", SelectedBike.Id);
 
-            // Stop polling before cancel request.
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before cancel request.
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            BikesViewModel.ActionText = AppResources.ActivityTextCancelingReservation;
-            IsConnected = IsConnectedDelegate();
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.DoCancelReservation(SelectedBike);
+			BikesViewModel.ActionText = AppResources.ActivityTextCancelingReservation;
+			IsConnected = IsConnectedDelegate();
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.DoCancelReservation(SelectedBike);
 
-                // If canceling bike succedes remove bike because it is not ready to be booked again
-                IsRemoveBikeRequired = true;
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
+				// If canceling bike succedes remove bike because it is not ready to be booked again
+				IsRemoveBikeRequired = true;
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                if (exception is InvalidAuthorizationResponseException)
-                {
-                    // Copri response is invalid.
-                    Log.ForContext<BikesViewModel>().Error("User selected reserved bike {Id} but canceling reservation failed (Invalid auth. response).", SelectedBike.Id);
+				if (exception is InvalidAuthorizationResponseException)
+				{
+					// Copri response is invalid.
+					Log.ForContext<BikesViewModel>().Error("User selected reserved bike {Id} but canceling reservation failed (Invalid auth. response).", SelectedBike.Id);
 
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageCancelReservationBikeErrorGeneralTitle,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
-                else if (exception is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<BikesViewModel>().Information("User selected reserved bike {Id} but cancel reservation failed (Copri server not reachable).", SelectedBike.Id);
-                    await ViewService.DisplayAdvancedAlert(
-                        AppResources.MessageCancelReservationBikeErrorConnectionTitle,
-                        WebConnectFailureException.GetHintToPossibleExceptionsReasons,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<BikesViewModel>().Error("User selected reserved bike {Id} but cancel reservation failed. {@Exception}.", SelectedBike.Id, exception);
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageCancelReservationBikeErrorGeneralTitle,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAlert(
+						AppResources.MessageCancelReservationBikeErrorGeneralTitle,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<BikesViewModel>().Information("User selected reserved bike {Id} but cancel reservation failed (Copri server not reachable).", SelectedBike.Id);
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.MessageCancelReservationBikeErrorConnectionTitle,
+						WebConnectFailureException.GetHintToPossibleExceptionsReasons,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<BikesViewModel>().Error("User selected reserved bike {Id} but cancel reservation failed. {@Exception}.", SelectedBike.Id, exception);
+					await ViewService.DisplayAlert(
+						AppResources.MessageCancelReservationBikeErrorGeneralTitle,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.            
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true; // Unlock GUI                
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.            
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true; // Unlock GUI                
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            Log.ForContext<BikesViewModel>().Information("User canceled reservation of bike {Id} successfully.", SelectedBike.Id);
+			Log.ForContext<BikesViewModel>().Information("User canceled reservation of bike {Id} successfully.", SelectedBike.Id);
 
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.            
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true; // Unlock GUI
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.            
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true; // Unlock GUI
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
 
-        /// <summary> Open lock and book bike. </summary>
-        public async Task<IRequestHandler> OpenLockAndDoBook()
-        {
-            BikesViewModel.IsIdle = false;
+		/// <summary> Open lock and book bike. </summary>
+		public async Task<IRequestHandler> OpenLockAndDoBook()
+		{
+			BikesViewModel.IsIdle = false;
 
-            // Ask whether to really book bike?
-            var l_oResult = await ViewService.DisplayAlert(
-                string.Empty,
-                string.Format(AppResources.QuestionOpenLockAndBookBike, SelectedBike.GetFullDisplayName()),
-                AppResources.MessageAnswerYes,
-                AppResources.MessageAnswerNo);
+			// Ask whether to really book bike?
+			var l_oResult = await ViewService.DisplayAlert(
+				string.Empty,
+				string.Format(AppResources.QuestionOpenLockAndBookBike, SelectedBike.GetFullDisplayName()),
+				AppResources.MessageAnswerYes,
+				AppResources.MessageAnswerNo);
 
-            if (l_oResult == false)
-            {
-                // User aborted booking process
-                Log.ForContext<ReservedClosed>().Information("User selected requested bike {bike} in order to book but action was canceled.", SelectedBike);
-                BikesViewModel.IsIdle = true;
-                return this;
-            }
+			if (l_oResult == false)
+			{
+				// User aborted booking process
+				Log.ForContext<ReservedClosed>().Information("User selected requested bike {bike} in order to book but action was canceled.", SelectedBike);
+				BikesViewModel.IsIdle = true;
+				return this;
+			}
 
-            Log.ForContext<ReservedClosed>().Information("User selected requested bike {bike} in order to book.", SelectedBike);
+			Log.ForContext<ReservedClosed>().Information("User selected requested bike {bike} in order to book.", SelectedBike);
 
-            // Stop polling before cancel request.
-            BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-            await ViewUpdateManager().StopUpdatePeridically();
+			// Stop polling before cancel request.
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopUpdatePeridically();
 
-            // Book bike prior to opening lock.
-            BikesViewModel.ActionText = AppResources.ActivityTextRentingBike;
-            IsConnected = IsConnectedDelegate();
-            try
-            {
-                await ConnectorFactory(IsConnected).Command.BookAndOpenAync(SelectedBike);
-            }
-            catch (Exception exception)
-            {
-                BikesViewModel.ActionText = string.Empty;
+			// Book bike prior to opening lock.
+			BikesViewModel.ActionText = AppResources.ActivityTextRentingBike;
+			IsConnected = IsConnectedDelegate();
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.BookAndOpenAync(SelectedBike);
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
 
-                if (exception is WebConnectFailureException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<ReservedClosed>().Information("User selected requested bike {Id} but booking failed (Copri server not reachable).", SelectedBike.Id);
+				if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<ReservedClosed>().Information("User selected requested bike {Id} but booking failed (Copri server not reachable).", SelectedBike.Id);
 
-                    await ViewService.DisplayAdvancedAlert(
-                        AppResources.MessageRentingBikeErrorConnectionTitle,
-                        WebConnectFailureException.GetHintToPossibleExceptionsReasons,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                }
-                else
-                {
-                    Log.ForContext<ReservedClosed>().Error("User selected requested bike {Id} but reserving failed. {@Exception}", SelectedBike.Id, exception);
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.MessageRentingBikeErrorConnectionTitle,
+						WebConnectFailureException.GetHintToPossibleExceptionsReasons,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<ReservedClosed>().Error("User selected requested bike {Id} but reserving failed. {@Exception}", SelectedBike.Id, exception);
 
-                    await ViewService.DisplayAdvancedAlert(
-                        AppResources.MessageRentingBikeErrorGeneralTitle,
-                        exception.Message,
-                        string.Empty,
-                        AppResources.MessageAnswerOk);
-                }
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.MessageRentingBikeErrorGeneralTitle,
+						exception.Message,
+						string.Empty,
+						AppResources.MessageAnswerOk);
+				}
 
-                BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-                await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-                BikesViewModel.ActionText = string.Empty;
-                BikesViewModel.IsIdle = true; // Unlock GUI
-                return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-            }
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true; // Unlock GUI
+				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			}
 
-            Log.ForContext<ReservedClosed>().Information("User booked and opened bike {bike} successfully.", SelectedBike.Id);
-            BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-            await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-            BikesViewModel.ActionText = string.Empty;
-            BikesViewModel.IsIdle = true; // Unlock GUI
-            return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-        }
-    }
+			Log.ForContext<ReservedClosed>().Information("User booked and opened bike {bike} successfully.", SelectedBike.Id);
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.IsIdle = true; // Unlock GUI
+			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandlerFactory.cs b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandlerFactory.cs
index c1c29da..69c90e6 100644
--- a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandlerFactory.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandlerFactory.cs
@@ -9,121 +9,121 @@ using TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler;
 
 namespace TINK.ViewModel.Bikes.Bike.CopriLock
 {
-    public static class RequestHandlerFactory
-    {
-        /// <summary> Creates a request handler.</summary>
-        /// <param name="selectedBike"></param>
-        /// <param name="isConnectedDelegate"></param>
-        /// <param name="connectorFactory"></param>
-        /// <param name="bikeRemoveDelegate"></param>
-        /// <param name="viewUpdateManager"></param>
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-        /// <param name="viewService"></param>
-        /// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
-        /// <returns>Request handler.</returns>
-        public static BluetoothLock.IRequestHandler Create(
-            Model.Bikes.BikeInfoNS.BC.IBikeInfoMutable selectedBike,
-            Func<bool> isConnectedDelegate,
-            Func<bool, IConnector> connectorFactory,
-            Func<IPollingUpdateTaskManager> viewUpdateManager,
-            ISmartDevice smartDevice,
-            IViewService viewService,
-            IBikesViewModel bikesViewModel,
-            IUser activeUser)
-        {
-            if (!(selectedBike is IBikeInfoMutable selectedCopriLock))
-            {
-                Log.Error("Bike of unexpected type {type} detected.", selectedBike?.GetType());
-                return null;
-            }
+	public static class RequestHandlerFactory
+	{
+		/// <summary> Creates a request handler.</summary>
+		/// <param name="selectedBike"></param>
+		/// <param name="isConnectedDelegate"></param>
+		/// <param name="connectorFactory"></param>
+		/// <param name="bikeRemoveDelegate"></param>
+		/// <param name="viewUpdateManager"></param>
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
+		/// <param name="viewService"></param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		/// <returns>Request handler.</returns>
+		public static BluetoothLock.IRequestHandler Create(
+			Model.Bikes.BikeInfoNS.BC.IBikeInfoMutable selectedBike,
+			Func<bool> isConnectedDelegate,
+			Func<bool, IConnector> connectorFactory,
+			Func<IPollingUpdateTaskManager> viewUpdateManager,
+			ISmartDevice smartDevice,
+			IViewService viewService,
+			IBikesViewModel bikesViewModel,
+			IUser activeUser)
+		{
+			if (!(selectedBike is IBikeInfoMutable selectedCopriLock))
+			{
+				Log.Error("Bike of unexpected type {type} detected.", selectedBike?.GetType());
+				return null;
+			}
 
-            switch (selectedCopriLock.State.Value)
-            {
-                // User has rented this bike before. Bike is now available but feedback was not yet given.
-                case Model.State.InUseStateEnum.FeedbackPending:
+			switch (selectedCopriLock.State.Value)
+			{
+				// User has rented this bike before. Bike is now available but feedback was not yet given.
+				case Model.State.InUseStateEnum.FeedbackPending:
 
-                    return new FeedbackPending(
-                        selectedCopriLock,
-                        isConnectedDelegate,
-                        connectorFactory,
-                        viewUpdateManager,
-                        smartDevice,
-                        viewService,
-                        bikesViewModel,
-                        activeUser);
+					return new FeedbackPending(
+						selectedCopriLock,
+						isConnectedDelegate,
+						connectorFactory,
+						viewUpdateManager,
+						smartDevice,
+						viewService,
+						bikesViewModel,
+						activeUser);
 
-                case Model.State.InUseStateEnum.Disposable:
+				case Model.State.InUseStateEnum.Disposable:
 
-                    // Bike is reserved, selecte action depending on lock state.
-                    return new DisposableClosed(
-                        selectedCopriLock,
-                        isConnectedDelegate,
-                        connectorFactory,
-                        viewUpdateManager,
-                        smartDevice,
-                        viewService,
-                        bikesViewModel,
-                        activeUser);
+					// Bike is reserved, selecte action depending on lock state.
+					return new DisposableClosed(
+						selectedCopriLock,
+						isConnectedDelegate,
+						connectorFactory,
+						viewUpdateManager,
+						smartDevice,
+						viewService,
+						bikesViewModel,
+						activeUser);
 
-                case Model.State.InUseStateEnum.Reserved:
-                    // Lock could not be opened after reserving bike.
-                    return new ReservedClosed(
-                        selectedCopriLock,
-                        isConnectedDelegate,
-                        connectorFactory,
-                        viewUpdateManager,
-                        smartDevice,
-                        viewService,
-                        bikesViewModel,
-                        activeUser);
+				case Model.State.InUseStateEnum.Reserved:
+					// Lock could not be opened after reserving bike.
+					return new ReservedClosed(
+						selectedCopriLock,
+						isConnectedDelegate,
+						connectorFactory,
+						viewUpdateManager,
+						smartDevice,
+						viewService,
+						bikesViewModel,
+						activeUser);
 
-                case Model.State.InUseStateEnum.Booked:
+				case Model.State.InUseStateEnum.Booked:
 
-                    // Bike is booked, selecte action depending on lock state.
-                    var lockState = selectedCopriLock.LockInfo.State;
-                    switch (lockState)
-                    {
-                        case LockingState.Closed:
-                            // Frame lock is closed. User paused ride and closed lock.
-                            return new BookedClosed(
-                                 selectedCopriLock,
-                                 isConnectedDelegate,
-                                 connectorFactory,
-                                 viewUpdateManager,
-                                 smartDevice,
-                                 viewService,
-                                 bikesViewModel,
-                                 activeUser);
+					// Bike is booked, selecte action depending on lock state.
+					var lockState = selectedCopriLock.LockInfo.State;
+					switch (lockState)
+					{
+						case LockingState.Closed:
+							// Frame lock is closed. User paused ride and closed lock.
+							return new BookedClosed(
+								 selectedCopriLock,
+								 isConnectedDelegate,
+								 connectorFactory,
+								 viewUpdateManager,
+								 smartDevice,
+								 viewService,
+								 bikesViewModel,
+								 activeUser);
 
-                        default:
-                            if (lockState != LockingState.Open)
-                                Log.Error("Unexpected locking {LockingState} of a rented bike with copri lock bike detected.", selectedCopriLock.LockInfo.State);
+						default:
+							if (lockState != LockingState.Open)
+								Log.Error("Unexpected locking {LockingState} of a rented bike with copri lock bike detected.", selectedCopriLock.LockInfo.State);
 
-                            return new BookedOpen(
-                                selectedCopriLock,
-                                isConnectedDelegate,
-                                connectorFactory,
-                                viewUpdateManager,
-                                smartDevice,
-                                viewService,
-                                bikesViewModel,
-                                activeUser);
+							return new BookedOpen(
+								selectedCopriLock,
+								isConnectedDelegate,
+								connectorFactory,
+								viewUpdateManager,
+								smartDevice,
+								viewService,
+								bikesViewModel,
+								activeUser);
 
-                    }
+					}
 
-                default:
-                    // Unexpected copri state detected.
-                    Log.Error("Unexpected locking {BookingState}/ {LockingState} of a copri lock bike detected.", selectedCopriLock.State.Value, selectedCopriLock.LockInfo.State);
-                    return new DisposableClosed(
-                        selectedCopriLock,
-                        isConnectedDelegate,
-                        connectorFactory,
-                        viewUpdateManager,
-                        smartDevice,
-                        viewService,
-                        bikesViewModel,
-                        activeUser);
-            }
-        }
-    }
+				default:
+					// Unexpected copri state detected.
+					Log.Error("Unexpected locking {BookingState}/ {LockingState} of a copri lock bike detected.", selectedCopriLock.State.Value, selectedCopriLock.LockInfo.State);
+					return new DisposableClosed(
+						selectedCopriLock,
+						isConnectedDelegate,
+						connectorFactory,
+						viewUpdateManager,
+						smartDevice,
+						viewService,
+						bikesViewModel,
+						activeUser);
+			}
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/IRequestHandlerBase.cs b/TINKLib/ViewModel/Bikes/Bike/IRequestHandlerBase.cs
index 51784ae..a39a3ad 100644
--- a/TINKLib/ViewModel/Bikes/Bike/IRequestHandlerBase.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/IRequestHandlerBase.cs
@@ -1,28 +1,28 @@
 namespace TINK.ViewModel.Bikes.Bike
 {
-    /// <summary>
-    /// Base interface for Copri and ILockIt request handler.
-    /// Copri communication is used by both handlers.
-    /// </summary>
-    public interface IRequestHandlerBase
-    {
-        /// <summary>
-        /// Gets a value indicating whether the copri button which is managed by request handler is visible or not.
-        /// </summary>
-        bool IsButtonVisible { get; }
+	/// <summary>
+	/// Base interface for Copri and ILockIt request handler.
+	/// Copri communication is used by both handlers.
+	/// </summary>
+	public interface IRequestHandlerBase
+	{
+		/// <summary>
+		/// Gets a value indicating whether the copri button which is managed by request handler is visible or not.
+		/// </summary>
+		bool IsButtonVisible { get; }
 
-        /// <summary>View model to be used for progress report and unlocking/ locking view.</summary>
-        IBikesViewModel BikesViewModel { get; }
+		/// <summary>View model to be used for progress report and unlocking/ locking view.</summary>
+		IBikesViewModel BikesViewModel { get; }
 
-        /// <summary>
-        /// Gets the text of the copri button which is managed by request handler.
-        /// </summary>
-        string ButtonText { get; }
+		/// <summary>
+		/// Gets the text of the copri button which is managed by request handler.
+		/// </summary>
+		string ButtonText { get; }
 
-        /// <summary>Gets the is connected state. </summary>
-        bool IsConnected { get; }
+		/// <summary>Gets the is connected state. </summary>
+		bool IsConnected { get; }
 
-        /// <summary> Gets if the bike has to be remvoed after action has been completed. </summary>
-        bool IsRemoveBikeRequired { get; }
-    }
+		/// <summary> Gets if the bike has to be remvoed after action has been completed. </summary>
+		bool IsRemoveBikeRequired { get; }
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/TariffDescriptionViewModel.cs b/TINKLib/ViewModel/Bikes/Bike/TariffDescriptionViewModel.cs
index 34b6c1e..6d0d1c4 100644
--- a/TINKLib/ViewModel/Bikes/Bike/TariffDescriptionViewModel.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/TariffDescriptionViewModel.cs
@@ -4,64 +4,64 @@ using TINK.Model.Bikes.BikeInfoNS;
 
 namespace TINK.ViewModel.Bikes.Bike
 {
-    /// <summary>
-    /// View model for displaying tariff info.
-    /// </summary>
-    public class TariffDescriptionViewModel
-    {
-        private const string AGBKEY = "AGB";
+	/// <summary>
+	/// View model for displaying tariff info.
+	/// </summary>
+	public class TariffDescriptionViewModel
+	{
+		private const string AGBKEY = "AGB";
 
-        public TariffDescriptionViewModel(RentalDescription tariff)
-        {
-            Name = tariff?.Name ?? string.Empty;
+		public TariffDescriptionViewModel(RentalDescription tariff)
+		{
+			Name = tariff?.Name ?? string.Empty;
 
-            TariffEntries = tariff != null && tariff?.TariffEntries != null
-                ? new ObservableCollection<RentalDescription.TariffElement>(tariff.TariffEntries.OrderBy(x => x.Key).Select(x => x.Value))
-                : new ObservableCollection<RentalDescription.TariffElement>();
+			TariffEntries = tariff != null && tariff?.TariffEntries != null
+				? new ObservableCollection<RentalDescription.TariffElement>(tariff.TariffEntries.OrderBy(x => x.Key).Select(x => x.Value))
+				: new ObservableCollection<RentalDescription.TariffElement>();
 
-            InfoEntries = tariff != null && tariff?.InfoEntries != null
-                ? new ObservableCollection<string>(tariff.InfoEntries.OrderBy(x => x.Key).Where(x => x.Value.Key != AGBKEY).Select(x => x.Value.Value))
-                : new ObservableCollection<string>();
+			InfoEntries = tariff != null && tariff?.InfoEntries != null
+				? new ObservableCollection<string>(tariff.InfoEntries.OrderBy(x => x.Key).Where(x => x.Value.Key != AGBKEY).Select(x => x.Value.Value))
+				: new ObservableCollection<string>();
 
-            OperatorAgb = tariff?.InfoEntries != null
-                && tariff.InfoEntries.Select(x => x.Value.Key).Contains(AGBKEY)
-                ? tariff?.InfoEntries.FirstOrDefault(x => x.Value.Key == AGBKEY).Value.Value
-                : string.Empty;
-        }
+			OperatorAgb = tariff?.InfoEntries != null
+				&& tariff.InfoEntries.Select(x => x.Value.Key).Contains(AGBKEY)
+				? tariff?.InfoEntries.FirstOrDefault(x => x.Value.Key == AGBKEY).Value.Value
+				: string.Empty;
+		}
 
-        /// <summary>
-        /// Holds the name of the tariff.
-        /// </summary>
-        public string Name { get; set; }
+		/// <summary>
+		/// Holds the name of the tariff.
+		/// </summary>
+		public string Name { get; set; }
 
-        /// <summary>
-        /// Holds the tariff entries to display.
-        /// </summary>
-        public ObservableCollection<RentalDescription.TariffElement> TariffEntries { get; private set; }
+		/// <summary>
+		/// Holds the tariff entries to display.
+		/// </summary>
+		public ObservableCollection<RentalDescription.TariffElement> TariffEntries { get; private set; }
 
-        /// <summary>
-        /// Holds the info entries to display.
-        /// </summary>
-        public ObservableCollection<string> InfoEntries { get; private set; }
+		/// <summary>
+		/// Holds the info entries to display.
+		/// </summary>
+		public ObservableCollection<string> InfoEntries { get; private set; }
 
-        /// <summary> Info about operator agb as HTML (i.g. text and hyperlink). </summary>
-        public string OperatorAgb { get; set; }
+		/// <summary> Info about operator agb as HTML (i.g. text and hyperlink). </summary>
+		public string OperatorAgb { get; set; }
 
-        public RentalDescription.TariffElement TarifEntry1 => TariffEntries.Count > 0 ? TariffEntries[0] : new RentalDescription.TariffElement();
-        public RentalDescription.TariffElement TarifEntry2 => TariffEntries.Count > 1 ? TariffEntries[1] : new RentalDescription.TariffElement();
-        public RentalDescription.TariffElement TarifEntry3 => TariffEntries.Count > 2 ? TariffEntries[2] : new RentalDescription.TariffElement();
-        public RentalDescription.TariffElement TarifEntry4 => TariffEntries.Count > 3 ? TariffEntries[3] : new RentalDescription.TariffElement();
+		public RentalDescription.TariffElement TarifEntry1 => TariffEntries.Count > 0 ? TariffEntries[0] : new RentalDescription.TariffElement();
+		public RentalDescription.TariffElement TarifEntry2 => TariffEntries.Count > 1 ? TariffEntries[1] : new RentalDescription.TariffElement();
+		public RentalDescription.TariffElement TarifEntry3 => TariffEntries.Count > 2 ? TariffEntries[2] : new RentalDescription.TariffElement();
+		public RentalDescription.TariffElement TarifEntry4 => TariffEntries.Count > 3 ? TariffEntries[3] : new RentalDescription.TariffElement();
 
-        public RentalDescription.TariffElement TarifEntry5 => TariffEntries.Count > 4 ? TariffEntries[4] : new RentalDescription.TariffElement();
-        public RentalDescription.TariffElement TarifEntry6 => TariffEntries.Count > 5 ? TariffEntries[5] : new RentalDescription.TariffElement();
-        public RentalDescription.TariffElement TarifEntry7 => TariffEntries.Count > 6 ? TariffEntries[6] : new RentalDescription.TariffElement();
-        public RentalDescription.TariffElement TarifEntry8 => TariffEntries.Count > 7 ? TariffEntries[7] : new RentalDescription.TariffElement();
-        public RentalDescription.TariffElement TarifEntry9 => TariffEntries.Count > 8 ? TariffEntries[8] : new RentalDescription.TariffElement();
+		public RentalDescription.TariffElement TarifEntry5 => TariffEntries.Count > 4 ? TariffEntries[4] : new RentalDescription.TariffElement();
+		public RentalDescription.TariffElement TarifEntry6 => TariffEntries.Count > 5 ? TariffEntries[5] : new RentalDescription.TariffElement();
+		public RentalDescription.TariffElement TarifEntry7 => TariffEntries.Count > 6 ? TariffEntries[6] : new RentalDescription.TariffElement();
+		public RentalDescription.TariffElement TarifEntry8 => TariffEntries.Count > 7 ? TariffEntries[7] : new RentalDescription.TariffElement();
+		public RentalDescription.TariffElement TarifEntry9 => TariffEntries.Count > 8 ? TariffEntries[8] : new RentalDescription.TariffElement();
 
-        public string InfoEntry1 => InfoEntries.Count > 0 ? InfoEntries[0] : string.Empty;
-        public string InfoEntry2 => InfoEntries.Count > 1 ? InfoEntries[1] : string.Empty;
-        public string InfoEntry3 => InfoEntries.Count > 2 ? InfoEntries[2] : string.Empty;
-        public string InfoEntry4 => InfoEntries.Count > 3 ? InfoEntries[3] : string.Empty;
-        public string InfoEntry5 => InfoEntries.Count > 4 ? InfoEntries[4] : string.Empty;
-    }
+		public string InfoEntry1 => InfoEntries.Count > 0 ? InfoEntries[0] : string.Empty;
+		public string InfoEntry2 => InfoEntries.Count > 1 ? InfoEntries[1] : string.Empty;
+		public string InfoEntry3 => InfoEntries.Count > 2 ? InfoEntries[2] : string.Empty;
+		public string InfoEntry4 => InfoEntries.Count > 3 ? InfoEntries[3] : string.Empty;
+		public string InfoEntry5 => InfoEntries.Count > 4 ? InfoEntries[4] : string.Empty;
+	}
 }
diff --git a/TINKLib/ViewModel/Bikes/BikesViewModel.cs b/TINKLib/ViewModel/Bikes/BikesViewModel.cs
index 5e1228d..eb5ef70 100644
--- a/TINKLib/ViewModel/Bikes/BikesViewModel.cs
+++ b/TINKLib/ViewModel/Bikes/BikesViewModel.cs
@@ -18,457 +18,457 @@ using TINK.ViewModel.Bikes.Bike;
 
 namespace TINK.ViewModel.Bikes
 {
-    public abstract class BikesViewModel : ObservableCollection<BikeViewModelBase>, IBikesViewModel
-    {
-        /// <summary> Provides info about the smart device (phone, tablet, ...).</summary>
-        protected ISmartDevice SmartDevice;
+	public abstract class BikesViewModel : ObservableCollection<BikeViewModelBase>, IBikesViewModel
+	{
+		/// <summary> Provides info about the smart device (phone, tablet, ...).</summary>
+		protected ISmartDevice SmartDevice;
 
-        /// <summary>
-        /// Reference on view service to show modal notifications and to perform navigation.
-        /// </summary>
-        protected IViewService ViewService { get; }
+		/// <summary>
+		/// Reference on view service to show modal notifications and to perform navigation.
+		/// </summary>
+		protected IViewService ViewService { get; }
 
-        /// <summary>
-        /// Holds the exception which occurred getting bikes occupied information.
-        /// </summary>
-        private Exception m_oException;
+		/// <summary>
+		/// Holds the exception which occurred getting bikes occupied information.
+		/// </summary>
+		private Exception m_oException;
 
-        /// <summary> Provides a connector object.</summary>
-        protected Func<bool, IConnector> ConnectorFactory { get; }
+		/// <summary> Provides a connector object.</summary>
+		protected Func<bool, IConnector> ConnectorFactory { get; }
 
-        protected IGeolocation Geolocation { get; }
+		protected IGeolocation Geolocation { get; }
 
-        /// <summary> Provides a connector object.</summary>
-        protected ILocksService LockService { get; }
+		/// <summary> Provides a connector object.</summary>
+		protected ILocksService LockService { get; }
 
-        /// <summary> Delegate to retrieve connected state. </summary>
-        protected Func<bool> IsConnectedDelegate { get; }
+		/// <summary> Delegate to retrieve connected state. </summary>
+		protected Func<bool> IsConnectedDelegate { get; }
 
-        /// <summary>Holds whether to poll or not and the periode leght is polling is on.</summary>
-        private TINK.Settings.PollingParameters m_oPolling;
+		/// <summary>Holds whether to poll or not and the periode leght is polling is on.</summary>
+		private TINK.Settings.PollingParameters m_oPolling;
 
-        /// <summary> Object to manage update of view model objects from Copri.</summary>
-        protected IPollingUpdateTaskManager m_oViewUpdateManager;
+		/// <summary> Object to manage update of view model objects from Copri.</summary>
+		protected IPollingUpdateTaskManager m_oViewUpdateManager;
 
-        /// <summary> Action to post to GUI thread.</summary>
-        public Action<SendOrPostCallback, object> PostAction { get; }
+		/// <summary> Action to post to GUI thread.</summary>
+		public Action<SendOrPostCallback, object> PostAction { get; }
 
-        /// <summary> Delegate to open browser. </summary>
-        private Action<string> OpenUrlInBrowser { get; }
+		/// <summary> Delegate to open browser. </summary>
+		private Action<string> OpenUrlInBrowser { get; }
 
-        /// <summary>Enables derived class to fire property changed event. </summary>
-        /// <param name="p_oEventArgs"></param>
-        protected override void OnPropertyChanged(PropertyChangedEventArgs p_oEventArgs) => base.OnPropertyChanged(p_oEventArgs);
+		/// <summary>Enables derived class to fire property changed event. </summary>
+		/// <param name="p_oEventArgs"></param>
+		protected override void OnPropertyChanged(PropertyChangedEventArgs p_oEventArgs) => base.OnPropertyChanged(p_oEventArgs);
 
-        /// <summary>
-        /// Handles events from bike viewmodel which require GUI updates.
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void OnBikeRequestHandlerPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            OnPropertyChanged(e);
-        }
+		/// <summary>
+		/// Handles events from bike viewmodel which require GUI updates.
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void OnBikeRequestHandlerPropertyChanged(object sender, PropertyChangedEventArgs e)
+		{
+			OnPropertyChanged(e);
+		}
 
-        /// <summary>
-        /// Instantiates a new item.
-        /// </summary>
-        Func<IInUseStateInfoProvider> m_oItemFactory;
+		/// <summary>
+		/// Instantiates a new item.
+		/// </summary>
+		Func<IInUseStateInfoProvider> m_oItemFactory;
 
-        /// <summary>
-        /// Constructs bike collection view model.
-        /// </summary>
-        /// </param>
-        /// <param name="p_oUser">Mail address of active user.</param>
-        /// <param name="isReportLevelVerbose">True if report level is verbose, false if not.</param>
-        /// <param name="permissions">Holds object to query location permisions.</param>
-        /// <param name="bluetoothLE">Holds object to query bluetooth state.</param>
-        /// <param name="runtimPlatform">Specifies on which platform code is run.</param>
-        /// <param name="isConnectedDelegate">Returns if mobile is connected to web or not.</param>
-        /// <param name="connectorFactory">Connects system to copri for purposes of requesting a bike/ cancel request.</param>
-        /// <param name="lockService">Service to control lock retrieve info.</param>
-        /// <param name="p_oPolling"> Holds whether to poll or not and the periode leght is polling is on. </param>
-        /// <param name="postAction">Executes actions on GUI thread.</param>
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-        /// <param name="viewService">Interface to actuate methodes on GUI.</param>
-        /// <param name="openUrlInBrowser">Delegate to open browser.</param>
-        public BikesViewModel(
-            User user,
-            ILocationPermission permissions,
-            IBluetoothLE bluetoothLE,
-            string runtimPlatform,
-            Func<bool> isConnectedDelegate,
-            Func<bool, IConnector> connectorFactory,
-            IGeolocation geolocation,
-            ILocksService lockService,
-            TINK.Settings.PollingParameters polling,
-            Action<SendOrPostCallback, object> postAction,
-            ISmartDevice smartDevice,
-            IViewService viewService,
-            Action<string> openUrlInBrowser,
-            Func<IInUseStateInfoProvider> itemFactory)
-        {
-            User = user
-                ?? throw new ArgumentException("Can not instantiate bikes page view model- object. No user available.");
+		/// <summary>
+		/// Constructs bike collection view model.
+		/// </summary>
+		/// </param>
+		/// <param name="p_oUser">Mail address of active user.</param>
+		/// <param name="isReportLevelVerbose">True if report level is verbose, false if not.</param>
+		/// <param name="permissions">Holds object to query location permisions.</param>
+		/// <param name="bluetoothLE">Holds object to query bluetooth state.</param>
+		/// <param name="runtimPlatform">Specifies on which platform code is run.</param>
+		/// <param name="isConnectedDelegate">Returns if mobile is connected to web or not.</param>
+		/// <param name="connectorFactory">Connects system to copri for purposes of requesting a bike/ cancel request.</param>
+		/// <param name="lockService">Service to control lock retrieve info.</param>
+		/// <param name="p_oPolling"> Holds whether to poll or not and the periode leght is polling is on. </param>
+		/// <param name="postAction">Executes actions on GUI thread.</param>
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
+		/// <param name="viewService">Interface to actuate methodes on GUI.</param>
+		/// <param name="openUrlInBrowser">Delegate to open browser.</param>
+		public BikesViewModel(
+			User user,
+			ILocationPermission permissions,
+			IBluetoothLE bluetoothLE,
+			string runtimPlatform,
+			Func<bool> isConnectedDelegate,
+			Func<bool, IConnector> connectorFactory,
+			IGeolocation geolocation,
+			ILocksService lockService,
+			TINK.Settings.PollingParameters polling,
+			Action<SendOrPostCallback, object> postAction,
+			ISmartDevice smartDevice,
+			IViewService viewService,
+			Action<string> openUrlInBrowser,
+			Func<IInUseStateInfoProvider> itemFactory)
+		{
+			User = user
+				?? throw new ArgumentException("Can not instantiate bikes page view model- object. No user available.");
 
-            RuntimePlatform = runtimPlatform
-                ?? throw new ArgumentException("Can not instantiate bikes page view model- object. No runtime platform information available.");
+			RuntimePlatform = runtimPlatform
+				?? throw new ArgumentException("Can not instantiate bikes page view model- object. No runtime platform information available.");
 
-            PermissionsService = permissions
-                ?? throw new ArgumentException("Can not instantiate bikes page view model- object. No permissions available.");
+			PermissionsService = permissions
+				?? throw new ArgumentException("Can not instantiate bikes page view model- object. No permissions available.");
 
-            BluetoothService = bluetoothLE
-                ?? throw new ArgumentException("Can not instantiate bikes page view model- object. No bluetooth available.");
+			BluetoothService = bluetoothLE
+				?? throw new ArgumentException("Can not instantiate bikes page view model- object. No bluetooth available.");
 
-            ConnectorFactory = connectorFactory
-                ?? throw new ArgumentException("Can not instantiate bikes page view model- object. No connector available.");
+			ConnectorFactory = connectorFactory
+				?? throw new ArgumentException("Can not instantiate bikes page view model- object. No connector available.");
 
-            Geolocation = geolocation
-                ?? throw new ArgumentException("Can not instantiate bikes page view model- object. No geolocation object available.");
+			Geolocation = geolocation
+				?? throw new ArgumentException("Can not instantiate bikes page view model- object. No geolocation object available.");
 
-            LockService = lockService
-                ?? throw new ArgumentException("Can not instantiate bikes page view model- object. No lock service object available.");
+			LockService = lockService
+				?? throw new ArgumentException("Can not instantiate bikes page view model- object. No lock service object available.");
 
-            IsConnectedDelegate = isConnectedDelegate
-                ?? throw new ArgumentException("Can not instantiate bikes page view model- object. No is connected delegate available.");
+			IsConnectedDelegate = isConnectedDelegate
+				?? throw new ArgumentException("Can not instantiate bikes page view model- object. No is connected delegate available.");
 
-            m_oItemFactory = itemFactory
-                ?? throw new ArgumentException("Can not instantiate bikes page view model- object. No factory member available.");
+			m_oItemFactory = itemFactory
+				?? throw new ArgumentException("Can not instantiate bikes page view model- object. No factory member available.");
 
-            PostAction = postAction
-                ?? throw new ArgumentException("Can not instantiate bikes page view model- object. No post action available.");
+			PostAction = postAction
+				?? throw new ArgumentException("Can not instantiate bikes page view model- object. No post action available.");
 
-            SmartDevice = smartDevice
-                ?? throw new ArgumentException("Can not instantiate bikes page view model- object. No smart device object available.");
+			SmartDevice = smartDevice
+				?? throw new ArgumentException("Can not instantiate bikes page view model- object. No smart device object available.");
 
-            ViewService = viewService
-                ?? throw new ArgumentException("Can not instantiate bikes page view model- object. No view available.");
+			ViewService = viewService
+				?? throw new ArgumentException("Can not instantiate bikes page view model- object. No view available.");
 
-            m_oViewUpdateManager = new IdlePollingUpdateTaskManager();
+			m_oViewUpdateManager = new IdlePollingUpdateTaskManager();
 
-            BikeCollection = new BikeCollectionMutable();
+			BikeCollection = new BikeCollectionMutable();
 
-            BikeCollection.CollectionChanged += OnDecoratedCollectionChanged;
+			BikeCollection.CollectionChanged += OnDecoratedCollectionChanged;
 
-            m_oPolling = polling;
+			m_oPolling = polling;
 
-            isConnected = IsConnectedDelegate();
+			isConnected = IsConnectedDelegate();
 
-            OpenUrlInBrowser = openUrlInBrowser;
+			OpenUrlInBrowser = openUrlInBrowser;
 
-            CollectionChanged += (sender, eventargs) =>
-            {
-                // Notify about bikes occuring/ vanishing from list.
-                OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsBikesListVisible)));
-            };
-        }
+			CollectionChanged += (sender, eventargs) =>
+			{
+				// Notify about bikes occuring/ vanishing from list.
+				OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsBikesListVisible)));
+			};
+		}
 
-        /// <summary>
-        /// Is invoked if decorated bike collection changes. 
-        /// Collection of view model objects has to be synced.
-        /// </summary>
-        /// <param name="p_oSender">Sender of the event.</param>
-        /// <param name="p_oEventArgs">Event arguments.</param>
-        private void OnDecoratedCollectionChanged(object p_oSender, System.Collections.Specialized.NotifyCollectionChangedEventArgs p_oEventArgs)
-        {
-            switch (p_oEventArgs.Action)
-            {
-                case System.Collections.Specialized.NotifyCollectionChangedAction.Add:
+		/// <summary>
+		/// Is invoked if decorated bike collection changes. 
+		/// Collection of view model objects has to be synced.
+		/// </summary>
+		/// <param name="p_oSender">Sender of the event.</param>
+		/// <param name="p_oEventArgs">Event arguments.</param>
+		private void OnDecoratedCollectionChanged(object p_oSender, System.Collections.Specialized.NotifyCollectionChangedEventArgs p_oEventArgs)
+		{
+			switch (p_oEventArgs.Action)
+			{
+				case System.Collections.Specialized.NotifyCollectionChangedAction.Add:
 
-                    // New bike avaialbe (new arrived at station or bike wased booked on a different device)
-                    foreach (var bike in BikeCollection)
-                    {
-                        if (Contains(bike.Id))
-                            continue;
+					// New bike avaialbe (new arrived at station or bike wased booked on a different device)
+					foreach (var bike in BikeCollection)
+					{
+						if (Contains(bike.Id))
+							continue;
 
-                        var bikeViewModel = BikeViewModelFactory.Create(
-                            IsConnectedDelegate,
-                            ConnectorFactory,
-                            Geolocation,
-                            LockService,
-                            (id) => Remove(id),
-                            () => m_oViewUpdateManager,
-                            SmartDevice,
-                            ViewService,
-                            bike,
-                            User,
-                            m_oItemFactory(),
-                            this,
-                            OpenUrlInBrowser);
+						var bikeViewModel = BikeViewModelFactory.Create(
+							IsConnectedDelegate,
+							ConnectorFactory,
+							Geolocation,
+							LockService,
+							(id) => Remove(id),
+							() => m_oViewUpdateManager,
+							SmartDevice,
+							ViewService,
+							bike,
+							User,
+							m_oItemFactory(),
+							this,
+							OpenUrlInBrowser);
 
-                        bikeViewModel.PropertyChanged += OnBikeRequestHandlerPropertyChanged;
+						bikeViewModel.PropertyChanged += OnBikeRequestHandlerPropertyChanged;
 
-                        Add(bikeViewModel);
-                    }
+						Add(bikeViewModel);
+					}
 
-                    break;
+					break;
 
-                case System.Collections.Specialized.NotifyCollectionChangedAction.Remove:
+				case System.Collections.Specialized.NotifyCollectionChangedAction.Remove:
 
-                    // Bike was removed (either a different user requested/ booked a bike or request expired or bike was returned.)
-                    foreach (BikeViewModelBase l_oBike in Items)
-                    {
-                        if (!BikeCollection.ContainsKey(l_oBike.Id))
-                        {
-                            l_oBike.PropertyChanged -= OnBikeRequestHandlerPropertyChanged;
+					// Bike was removed (either a different user requested/ booked a bike or request expired or bike was returned.)
+					foreach (BikeViewModelBase l_oBike in Items)
+					{
+						if (!BikeCollection.ContainsKey(l_oBike.Id))
+						{
+							l_oBike.PropertyChanged -= OnBikeRequestHandlerPropertyChanged;
 
-                            Remove(l_oBike);
-                            break;
-                        }
-                    }
+							Remove(l_oBike);
+							break;
+						}
+					}
 
-                    break;
-            }
-        }
+					break;
+			}
+		}
 
-        /// <summary> All bikes to be displayed. </summary>
-        protected BikeCollectionMutable BikeCollection { get; private set; }
+		/// <summary> All bikes to be displayed. </summary>
+		protected BikeCollectionMutable BikeCollection { get; private set; }
 
-        protected User User { get; private set; }
+		protected User User { get; private set; }
 
 #if USCSHARP9
         public bool IsReportLevelVerbose { get; init; }
 #else
-        public bool IsReportLevelVerbose { get; set; }
+		public bool IsReportLevelVerbose { get; set; }
 #endif
 
-        /// <summary> Specified whether code is run under iOS or Android.</summary>
-        protected string RuntimePlatform { get; private set; }
+		/// <summary> Specified whether code is run under iOS or Android.</summary>
+		protected string RuntimePlatform { get; private set; }
 
-        /// <summary>
-        /// Service to manage permissions (location) of the app.
-        /// </summary>
-        protected ILocationPermission PermissionsService { get; private set; }
+		/// <summary>
+		/// Service to manage permissions (location) of the app.
+		/// </summary>
+		protected ILocationPermission PermissionsService { get; private set; }
 
-        /// <summary>
-        /// Service to manage bluetooth stack.
-        /// </summary>
-        protected IBluetoothLE BluetoothService { get; private set; }
+		/// <summary>
+		/// Service to manage bluetooth stack.
+		/// </summary>
+		protected IBluetoothLE BluetoothService { get; private set; }
 
-        /// <summary>
-        /// User which is logged in.
-        /// </summary>
-        public User ActiveUser
-        {
-            get
-            {
-                return User;
-            }
-        }
+		/// <summary>
+		/// User which is logged in.
+		/// </summary>
+		public User ActiveUser
+		{
+			get
+			{
+				return User;
+			}
+		}
 
-        /// <summary>
-        /// Exception which occurred getting bike information.
-        /// </summary>
-        protected Exception Exception
-        {
-            get
-            {
-                return m_oException;
-            }
+		/// <summary>
+		/// Exception which occurred getting bike information.
+		/// </summary>
+		protected Exception Exception
+		{
+			get
+			{
+				return m_oException;
+			}
 
-            set
-            {
-                var l_oException = m_oException;
-                var statusInfoText = StatusInfoText;
-                m_oException = value;
-                if ((m_oException != null && l_oException == null)
-                    || (m_oException == null && l_oException != null))
-                {
-                    // Because an error occurred non error related info must be hidden.
-                    OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsIdle)));
-                    OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsBikesListVisible)));
-                }
+			set
+			{
+				var l_oException = m_oException;
+				var statusInfoText = StatusInfoText;
+				m_oException = value;
+				if ((m_oException != null && l_oException == null)
+					|| (m_oException == null && l_oException != null))
+				{
+					// Because an error occurred non error related info must be hidden.
+					OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsIdle)));
+					OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsBikesListVisible)));
+				}
 
-                if (statusInfoText != StatusInfoText)
-                {
-                    OnPropertyChanged(new PropertyChangedEventArgs(nameof(StatusInfoText)));
-                }
-            }
-        }
+				if (statusInfoText != StatusInfoText)
+				{
+					OnPropertyChanged(new PropertyChangedEventArgs(nameof(StatusInfoText)));
+				}
+			}
+		}
 
-        /// <summary>
-        /// Bike selected in list of bikes, null if no bike is selected.
-        /// Binds to GUI.
-        /// </summary>
-        public BikeViewModelBase SelectedBike { get; set; }
+		/// <summary>
+		/// Bike selected in list of bikes, null if no bike is selected.
+		/// Binds to GUI.
+		/// </summary>
+		public BikeViewModelBase SelectedBike { get; set; }
 
-        /// <summary>
-        /// True if bikes list has to be displayed.
-        /// </summary>
-        public bool IsBikesListVisible
-        {
-            get
-            {
-                // If an exception occurred there is no information about occupied bikes available.
-                return Count > 0;
-            }
-        }
+		/// <summary>
+		/// True if bikes list has to be displayed.
+		/// </summary>
+		public bool IsBikesListVisible
+		{
+			get
+			{
+				// If an exception occurred there is no information about occupied bikes available.
+				return Count > 0;
+			}
+		}
 
-        /// <summary> Used to block more than on copri requests at a given time.</summary>
-        private bool isIdle = false;
+		/// <summary> Used to block more than on copri requests at a given time.</summary>
+		private bool isIdle = false;
 
-        /// <summary>
-        /// True if any action can be performed (request and cancel request)
-        /// </summary>
-        public virtual bool IsIdle
-        {
-            get => isIdle;
-            set
-            {
-                if (value == isIdle)
-                    return;
+		/// <summary>
+		/// True if any action can be performed (request and cancel request)
+		/// </summary>
+		public virtual bool IsIdle
+		{
+			get => isIdle;
+			set
+			{
+				if (value == isIdle)
+					return;
 
-                Log.ForContext<BikesViewModel>().Debug($"Switch value of {nameof(IsIdle)} to {value}.");
-                isIdle = value;
-                base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsIdle)));
-                base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsRunning)));
-            }
-        }
+				Log.ForContext<BikesViewModel>().Debug($"Switch value of {nameof(IsIdle)} to {value}.");
+				isIdle = value;
+				base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsIdle)));
+				base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsRunning)));
+			}
+		}
 
-        public bool IsRunning => !isIdle;
+		public bool IsRunning => !isIdle;
 
-        /// <summary> Holds info about current action. </summary>
-        private string actionText;
+		/// <summary> Holds info about current action. </summary>
+		private string actionText;
 
-        /// <summary> Holds info about current action. </summary>
-        public string ActionText
-        {
-            get => actionText;
-            set
-            {
-                var statusInfoText = StatusInfoText;
-                actionText = value;
+		/// <summary> Holds info about current action. </summary>
+		public string ActionText
+		{
+			get => actionText;
+			set
+			{
+				var statusInfoText = StatusInfoText;
+				actionText = value;
 
-                if (statusInfoText == StatusInfoText)
-                {
-                    // Nothing to do because value did not change.
-                    Log.ForContext<BikesViewModel>().Debug($"Property {nameof(ActionText)} set to value \"{actionText}\" but {nameof(StatusInfoText)} did not change.");
-                    return;
-                }
+				if (statusInfoText == StatusInfoText)
+				{
+					// Nothing to do because value did not change.
+					Log.ForContext<BikesViewModel>().Debug($"Property {nameof(ActionText)} set to value \"{actionText}\" but {nameof(StatusInfoText)} did not change.");
+					return;
+				}
 
-                Log.ForContext<BikesViewModel>().Debug($"Property {nameof(ActionText)} set to value \"{actionText}\" .");
-                OnPropertyChanged(new PropertyChangedEventArgs(nameof(StatusInfoText)));
-            }
-        }
+				Log.ForContext<BikesViewModel>().Debug($"Property {nameof(ActionText)} set to value \"{actionText}\" .");
+				OnPropertyChanged(new PropertyChangedEventArgs(nameof(StatusInfoText)));
+			}
+		}
 
-        /// <summary> Holds information whether app is connected to web or not. </summary>
-        protected bool? isConnected = null;
+		/// <summary> Holds information whether app is connected to web or not. </summary>
+		protected bool? isConnected = null;
 
-        /// <summary>Exposes the is connected state. </summary>
-        protected bool IsConnected
-        {
-            get => isConnected ?? false;
-            set
-            {
-                var statusInfoText = StatusInfoText;
-                isConnected = value;
-                if (statusInfoText == StatusInfoText)
-                {
-                    // Nothing to do.
-                    return;
-                }
+		/// <summary>Exposes the is connected state. </summary>
+		protected bool IsConnected
+		{
+			get => isConnected ?? false;
+			set
+			{
+				var statusInfoText = StatusInfoText;
+				isConnected = value;
+				if (statusInfoText == StatusInfoText)
+				{
+					// Nothing to do.
+					return;
+				}
 
-                OnPropertyChanged(new PropertyChangedEventArgs(nameof(StatusInfoText)));
-            }
-        }
+				OnPropertyChanged(new PropertyChangedEventArgs(nameof(StatusInfoText)));
+			}
+		}
 
-        /// <summary> Holds the status information text. </summary>
-        public string StatusInfoText
-        {
-            get
-            {
-                if (Exception != null)
-                {
-                    // An error occurred getting data from copri.
-                    return Exception.GetShortErrorInfoText(IsReportLevelVerbose);
-                }
+		/// <summary> Holds the status information text. </summary>
+		public string StatusInfoText
+		{
+			get
+			{
+				if (Exception != null)
+				{
+					// An error occurred getting data from copri.
+					return Exception.GetShortErrorInfoText(IsReportLevelVerbose);
+				}
 
-                if (!IsConnected)
-                {
-                    return AppResources.ActivityTextConnectionStateOffline;
-                }
+				if (!IsConnected)
+				{
+					return AppResources.ActivityTextConnectionStateOffline;
+				}
 
-                return ActionText ?? string.Empty;
-            }
-        }
+				return ActionText ?? string.Empty;
+			}
+		}
 
-        /// <summary>
-        /// Removes a bike view model by id.
-        /// </summary>
-        /// <param name="id">Id of bike to removed.</param>
-        public void Remove(string id)
-        {
-            foreach (var bike in BikeCollection)
-            {
-                if (bike.Id == id)
-                {
-                    BikeCollection.Remove(bike);
-                    return;
-                }
-            }
-        }
+		/// <summary>
+		/// Removes a bike view model by id.
+		/// </summary>
+		/// <param name="id">Id of bike to removed.</param>
+		public void Remove(string id)
+		{
+			foreach (var bike in BikeCollection)
+			{
+				if (bike.Id == id)
+				{
+					BikeCollection.Remove(bike);
+					return;
+				}
+			}
+		}
 
-        /// <summary>
-        /// Gets whether a bike is contained in collection of bikes.
-        /// </summary>
-        /// <param name="id">Id of bike to check existance.</param>
-        /// <returns>True if bike exists.</returns>
-        private bool Contains(string id)
-        {
-            foreach (var l_oBike in Items)
-            {
-                if (l_oBike.Id == id)
-                {
-                    return true;
-                }
-            }
+		/// <summary>
+		/// Gets whether a bike is contained in collection of bikes.
+		/// </summary>
+		/// <param name="id">Id of bike to check existance.</param>
+		/// <returns>True if bike exists.</returns>
+		private bool Contains(string id)
+		{
+			foreach (var l_oBike in Items)
+			{
+				if (l_oBike.Id == id)
+				{
+					return true;
+				}
+			}
 
-            return false;
-        }
+			return false;
+		}
 
-        /// <summary>
-        /// Transforms bikes view model object to string.
-        /// </summary>
-        /// <returns></returns>
-        public new string ToString()
-        {
-            var l_oToString = string.Empty;
-            foreach (var item in Items)
-            {
-                l_oToString += item.ToString();
-            }
+		/// <summary>
+		/// Transforms bikes view model object to string.
+		/// </summary>
+		/// <returns></returns>
+		public new string ToString()
+		{
+			var l_oToString = string.Empty;
+			foreach (var item in Items)
+			{
+				l_oToString += item.ToString();
+			}
 
-            return l_oToString;
-        }
+			return l_oToString;
+		}
 
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        /// <param name="updateAction"> Update fuction passed as argument by child class.</param>
-        protected async Task OnAppearing(Action updateAction)
-        {
-            m_oViewUpdateManager = new PollingUpdateTaskManager(updateAction);
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		/// <param name="updateAction"> Update fuction passed as argument by child class.</param>
+		protected async Task OnAppearing(Action updateAction)
+		{
+			m_oViewUpdateManager = new PollingUpdateTaskManager(updateAction);
 
-            try
-            {
-                // Update bikes at station or my bikes depending on context.
-                await m_oViewUpdateManager.StartUpdateAyncPeridically(m_oPolling);
-            }
-            catch (Exception l_oExcetion)
-            {
-                Exception = l_oExcetion;
-            }
-        }
+			try
+			{
+				// Update bikes at station or my bikes depending on context.
+				await m_oViewUpdateManager.StartUpdateAyncPeridically(m_oPolling);
+			}
+			catch (Exception l_oExcetion)
+			{
+				Exception = l_oExcetion;
+			}
+		}
 
-        /// <summary> 
-        /// Invoked when page is shutdown. 
-        /// Currently invoked by code behind, would be nice if called by XAML in future versions.
-        /// </summary>
-        public async Task OnDisappearing()
-        {
+		/// <summary> 
+		/// Invoked when page is shutdown. 
+		/// Currently invoked by code behind, would be nice if called by XAML in future versions.
+		/// </summary>
+		public async Task OnDisappearing()
+		{
 
-            await m_oViewUpdateManager.StopUpdatePeridically();
-        }
-    }
+			await m_oViewUpdateManager.StopUpdatePeridically();
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINKLib/ViewModel/Bikes/IBikesViewModel.cs b/TINKLib/ViewModel/Bikes/IBikesViewModel.cs
index d4f38a9..ca73d3f 100644
--- a/TINKLib/ViewModel/Bikes/IBikesViewModel.cs
+++ b/TINKLib/ViewModel/Bikes/IBikesViewModel.cs
@@ -1,13 +1,13 @@
 namespace TINK.ViewModel.Bikes
 {
-    public interface IBikesViewModel
-    {
-        /// <summary> Holds info about current action. </summary>
-        string ActionText { get; set; }
+	public interface IBikesViewModel
+	{
+		/// <summary> Holds info about current action. </summary>
+		string ActionText { get; set; }
 
-        /// <summary>
-        /// True if any action can be performed (request and cancel request)
-        /// </summary>
-        bool IsIdle { get; set; }
-    }
+		/// <summary>
+		/// True if any action can be performed (request and cancel request)
+		/// </summary>
+		bool IsIdle { get; set; }
+	}
 }
diff --git a/TINKLib/ViewModel/BikesAtStation/BikeAtStationInUseStateInfoProvider.cs b/TINKLib/ViewModel/BikesAtStation/BikeAtStationInUseStateInfoProvider.cs
index bde2000..7d0edb7 100644
--- a/TINKLib/ViewModel/BikesAtStation/BikeAtStationInUseStateInfoProvider.cs
+++ b/TINKLib/ViewModel/BikesAtStation/BikeAtStationInUseStateInfoProvider.cs
@@ -5,55 +5,55 @@ using TINK.ViewModel.Bikes.Bike;
 
 namespace TINK.ViewModel
 {
-    public class BikeAtStationInUseStateInfoProvider : IInUseStateInfoProvider
-    {
-        /// <summary> Gets reserved into display text. </summary>
-        /// <todo>Log unexpeced states.</todo>
-        /// <returns>Display text</returns>
-        public string GetReservedInfo(
-            TimeSpan? remainingTime,
-            string station = null,
-            string code = null)
-        {
-            if (remainingTime == null)
-            {
-                // Remaining time not available.
-                if (string.IsNullOrEmpty(code))
-                {
-                    // Reservation code not available
-                    return string.Format(AppResources.StatusTextReservationExpiredMaximumReservationTime, StateRequestedInfo.MaximumReserveTime.Minutes);
-                }
+	public class BikeAtStationInUseStateInfoProvider : IInUseStateInfoProvider
+	{
+		/// <summary> Gets reserved into display text. </summary>
+		/// <todo>Log unexpeced states.</todo>
+		/// <returns>Display text</returns>
+		public string GetReservedInfo(
+			TimeSpan? remainingTime,
+			string station = null,
+			string code = null)
+		{
+			if (remainingTime == null)
+			{
+				// Remaining time not available.
+				if (string.IsNullOrEmpty(code))
+				{
+					// Reservation code not available
+					return string.Format(AppResources.StatusTextReservationExpiredMaximumReservationTime, StateRequestedInfo.MaximumReserveTime.Minutes);
+				}
 
-                return string.Format(AppResources.StatusTextReservationExpiredCodeMaxReservationTime, code, StateRequestedInfo.MaximumReserveTime.Minutes);
-            }
+				return string.Format(AppResources.StatusTextReservationExpiredCodeMaxReservationTime, code, StateRequestedInfo.MaximumReserveTime.Minutes);
+			}
 
-            if (!string.IsNullOrEmpty(code))
-            {
-                return string.Format(AppResources.StatusTextReservationExpiredCodeRemaining, code, remainingTime.Value.Minutes);
-            }
+			if (!string.IsNullOrEmpty(code))
+			{
+				return string.Format(AppResources.StatusTextReservationExpiredCodeRemaining, code, remainingTime.Value.Minutes);
+			}
 
-            return string.Format(AppResources.StatusTextReservationExpiredRemaining, remainingTime.Value.Minutes);
-        }
+			return string.Format(AppResources.StatusTextReservationExpiredRemaining, remainingTime.Value.Minutes);
+		}
 
-        /// <summary> Gets booked into display text. </summary>
-        /// <todo>Log unexpeced states.</todo>
-        /// <returns>Display text</returns>
-        public string GetBookedInfo(
-            DateTime? from,
-            string station = null,
-            string code = null)
-        {
-            if (from == null)
-            {
-                return AppResources.StatusTextBooked;
-            }
+		/// <summary> Gets booked into display text. </summary>
+		/// <todo>Log unexpeced states.</todo>
+		/// <returns>Display text</returns>
+		public string GetBookedInfo(
+			DateTime? from,
+			string station = null,
+			string code = null)
+		{
+			if (from == null)
+			{
+				return AppResources.StatusTextBooked;
+			}
 
-            if (!string.IsNullOrEmpty(code))
-            {
-                return string.Format(AppResources.StatusTextBookedCodeSince, code, from.Value.ToString(BikeViewModelBase.TIMEFORMAT));
-            }
+			if (!string.IsNullOrEmpty(code))
+			{
+				return string.Format(AppResources.StatusTextBookedCodeSince, code, from.Value.ToString(BikeViewModelBase.TIMEFORMAT));
+			}
 
-            return string.Format(AppResources.StatusTextBookedSince, from.Value.ToString(BikeViewModelBase.TIMEFORMAT));
-        }
-    }
+			return string.Format(AppResources.StatusTextBookedSince, from.Value.ToString(BikeViewModelBase.TIMEFORMAT));
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/BikesAtStation/BikesAtStationPageViewModel.cs b/TINKLib/ViewModel/BikesAtStation/BikesAtStationPageViewModel.cs
index d68d787..d88488d 100644
--- a/TINKLib/ViewModel/BikesAtStation/BikesAtStationPageViewModel.cs
+++ b/TINKLib/ViewModel/BikesAtStation/BikesAtStationPageViewModel.cs
@@ -26,358 +26,358 @@ using Xamarin.Forms;
 
 namespace TINK.ViewModel.BikesAtStation
 {
-    /// <summary>
-    /// Manages one or more bikes which are located at a single station.
-    /// </summary>
-    public class BikesAtStationPageViewModel : BikesViewModel, INotifyCollectionChanged, INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Holds the selected station;
-        /// </summary>
-        private IStation Station { get; }
+	/// <summary>
+	/// Manages one or more bikes which are located at a single station.
+	/// </summary>
+	public class BikesAtStationPageViewModel : BikesViewModel, INotifyCollectionChanged, INotifyPropertyChanged
+	{
+		/// <summary>
+		/// Holds the selected station;
+		/// </summary>
+		private IStation Station { get; }
 
-        /// <summary>
-        /// Constructs bike collection view model.
-        /// </summary>
-        /// <param name="user">Mail address of active user.</param>
-        /// <param name="permissions">Holds object to query location permisions.</param>
-        /// <param name="bluetoothLE">Holds object to query bluetooth state.</param>
-        /// <param name="runtimPlatform">Specifies on which platform code is run.</param>
-        /// <param name="isConnectedDelegate">Returns if mobile is connected to web or not.</param>
-        /// <param name="connectorFactory">Connects system to copri.</param>
-        /// <param name="lockService">Service to control lock retrieve info.</param>
-        /// <param name="polling"> Holds whether to poll or not and the periode leght is polling is on. </param>
-        /// <param name="openUrlInExternalBrowser">Action to open an external browser.</param>
-        /// <param name="postAction">Executes actions on GUI thread.</param>
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
-        /// <param name="viewService">Interface to actuate methodes on GUI.</param>
-        public BikesAtStationPageViewModel(
-            User user,
-            ILocationPermission permissions,
-            IBluetoothLE bluetoothLE,
-            string runtimPlatform,
-            IStation selectedStation,
-            Func<bool> isConnectedDelegate,
-            Func<bool, IConnector> connectorFactory,
-            IGeolocation geolocation,
-            ILocksService lockService,
-            PollingParameters polling,
-            Action<string> openUrlInExternalBrowser,
-            Action<SendOrPostCallback, object> postAction,
-            ISmartDevice smartDevice,
-            IViewService viewService) : base(user, permissions, bluetoothLE, runtimPlatform, isConnectedDelegate, connectorFactory, geolocation, lockService, polling, postAction, smartDevice, viewService, openUrlInExternalBrowser, () => new BikeAtStationInUseStateInfoProvider())
-        {
-            Station = selectedStation ?? new NullStation();
+		/// <summary>
+		/// Constructs bike collection view model.
+		/// </summary>
+		/// <param name="user">Mail address of active user.</param>
+		/// <param name="permissions">Holds object to query location permisions.</param>
+		/// <param name="bluetoothLE">Holds object to query bluetooth state.</param>
+		/// <param name="runtimPlatform">Specifies on which platform code is run.</param>
+		/// <param name="isConnectedDelegate">Returns if mobile is connected to web or not.</param>
+		/// <param name="connectorFactory">Connects system to copri.</param>
+		/// <param name="lockService">Service to control lock retrieve info.</param>
+		/// <param name="polling"> Holds whether to poll or not and the periode leght is polling is on. </param>
+		/// <param name="openUrlInExternalBrowser">Action to open an external browser.</param>
+		/// <param name="postAction">Executes actions on GUI thread.</param>
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
+		/// <param name="viewService">Interface to actuate methodes on GUI.</param>
+		public BikesAtStationPageViewModel(
+			User user,
+			ILocationPermission permissions,
+			IBluetoothLE bluetoothLE,
+			string runtimPlatform,
+			IStation selectedStation,
+			Func<bool> isConnectedDelegate,
+			Func<bool, IConnector> connectorFactory,
+			IGeolocation geolocation,
+			ILocksService lockService,
+			PollingParameters polling,
+			Action<string> openUrlInExternalBrowser,
+			Action<SendOrPostCallback, object> postAction,
+			ISmartDevice smartDevice,
+			IViewService viewService) : base(user, permissions, bluetoothLE, runtimPlatform, isConnectedDelegate, connectorFactory, geolocation, lockService, polling, postAction, smartDevice, viewService, openUrlInExternalBrowser, () => new BikeAtStationInUseStateInfoProvider())
+		{
+			Station = selectedStation ?? new NullStation();
 
-            Title = Station.StationName;
+			Title = Station.StationName;
 
-            StationDetailText = Station.Id != null
-                ? string.Format(AppResources.MarkingBikesAtStationStationId, Station.Id)
-                : string.Empty;
+			StationDetailText = Station.Id != null
+				? string.Format(AppResources.MarkingBikesAtStationStationId, Station.Id)
+				: string.Empty;
 
-            CollectionChanged += (sender, eventargs) =>
-            {
-                OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsNoBikesAtStationVisible)));
-                OnPropertyChanged(new PropertyChangedEventArgs(nameof(NoBikesAtStationText)));
-                OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsLoginRequiredHintVisible)));
-            };
-        }
+			CollectionChanged += (sender, eventargs) =>
+			{
+				OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsNoBikesAtStationVisible)));
+				OnPropertyChanged(new PropertyChangedEventArgs(nameof(NoBikesAtStationText)));
+				OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsLoginRequiredHintVisible)));
+			};
+		}
 
-        /// <summary>
-        /// Name of the station which is displayed as title of the page.
-        /// </summary>
-        public string Title
-        {
-            get; private set;
-        }
+		/// <summary>
+		/// Name of the station which is displayed as title of the page.
+		/// </summary>
+		public string Title
+		{
+			get; private set;
+		}
 
-        /// <summary>
-        /// Informs about need to log in before requesting an bike.
-        /// </summary>
-        public bool IsLoginRequiredHintVisible
-        {
-            get
-            {
-                return Count > 0
-                    && !ActiveUser.IsLoggedIn;
-            }
-        }
+		/// <summary>
+		/// Informs about need to log in before requesting an bike.
+		/// </summary>
+		public bool IsLoginRequiredHintVisible
+		{
+			get
+			{
+				return Count > 0
+					&& !ActiveUser.IsLoggedIn;
+			}
+		}
 
-        /// <summary>
-        /// Informs about need to log in before requesting an bike.
-        /// </summary>
-        public string LoginRequiredHintText
-            => ActiveUser.IsLoggedIn
-                    ? string.Empty
-                    : AppResources.MarkingLoginRequiredToRerserve;
+		/// <summary>
+		/// Informs about need to log in before requesting an bike.
+		/// </summary>
+		public string LoginRequiredHintText
+			=> ActiveUser.IsLoggedIn
+					? string.Empty
+					: AppResources.MarkingLoginRequiredToRerserve;
 
-        public string ContactSupportHintText
-            => string.Format(AppResources.MarkingContactSupport, Station.OperatorData?.Name ?? "Operator");
+		public string ContactSupportHintText
+			=> string.Format(AppResources.MarkingContactSupport, Station.OperatorData?.Name ?? "Operator");
 
-        /// <summary> 
-        /// Returns if info about the fact that user did not request or book any bikes is visible or not. 
-        /// </summary>
-        public bool IsNoBikesAtStationVisible
-        {
-            get
-            {
-                return Count <= 0 && IsIdle == true;
-            }
-        }
+		/// <summary> 
+		/// Returns if info about the fact that user did not request or book any bikes is visible or not. 
+		/// </summary>
+		public bool IsNoBikesAtStationVisible
+		{
+			get
+			{
+				return Count <= 0 && IsIdle == true;
+			}
+		}
 
-        /// <summary> Info about the fact that user did not request or book any bikes. </summary>
-        public string NoBikesAtStationText
-        {
-            get
-            {
-                return IsNoBikesAtStationVisible
-                    ? $"Momentan sind keine Fahrräder an dieser Station verfügbar."
-                    : string.Empty;
-            }
-        }
+		/// <summary> Info about the fact that user did not request or book any bikes. </summary>
+		public string NoBikesAtStationText
+		{
+			get
+			{
+				return IsNoBikesAtStationVisible
+					? $"Momentan sind keine Fahrräder an dieser Station verfügbar."
+					: string.Empty;
+			}
+		}
 
-        /// <summary> Command object to bind login page redirect link to view model.</summary>
-        public System.Windows.Input.ICommand ContactSupportClickedCommand
+		/// <summary> Command object to bind login page redirect link to view model.</summary>
+		public System.Windows.Input.ICommand ContactSupportClickedCommand
 #if USEFLYOUT
                 => new Xamarin.Forms.Command(() => OpenSupportPageAsync());
 #else
-                => new Xamarin.Forms.Command(async () => await OpenSupportPageAsync());
+				=> new Xamarin.Forms.Command(async () => await OpenSupportPageAsync());
 #endif
 
-        /// <summary> Command object to bind login page redirect link to view model.</summary>
-        public System.Windows.Input.ICommand LoginRequiredHintClickedCommand
+		/// <summary> Command object to bind login page redirect link to view model.</summary>
+		public System.Windows.Input.ICommand LoginRequiredHintClickedCommand
 #if USEFLYOUT
                 => new Xamarin.Forms.Command(() => OpenLoginPageAsync());
 #else
-                => new Xamarin.Forms.Command(async () => await OpenLoginPageAsync());
+				=> new Xamarin.Forms.Command(async () => await OpenLoginPageAsync());
 #endif
 
-        /// <summary> Opens login page. </summary>
+		/// <summary> Opens login page. </summary>
 #if USEFLYOUT
         public void OpenLoginPageAsync()
 #else
-        public async Task OpenLoginPageAsync()
+		public async Task OpenLoginPageAsync()
 #endif
-        {
-            try
-            {
-                // Switch to map page
+		{
+			try
+			{
+				// Switch to map page
 
 #if USEFLYOUT
                 ViewService.ShowPage(ViewTypes.LoginPage);
 #else
-                await ViewService.ShowPage("//LoginPage");
+				await ViewService.ShowPage("//LoginPage");
 #endif
-            }
-            catch (Exception p_oException)
-            {
-                Log.Error("Ein unerwarteter Fehler ist in der Klasse BikesAtStationPageViewModel aufgetreten. Kontext: Klick auf Hinweistext auf Station N- seite ohne Anmeldung. {@Exception}", p_oException);
-                return;
-            }
-        }
+			}
+			catch (Exception p_oException)
+			{
+				Log.Error("Ein unerwarteter Fehler ist in der Klasse BikesAtStationPageViewModel aufgetreten. Kontext: Klick auf Hinweistext auf Station N- seite ohne Anmeldung. {@Exception}", p_oException);
+				return;
+			}
+		}
 
-        /// <summary> Opens support. </summary>
+		/// <summary> Opens support. </summary>
 #if USEFLYOUT
         public void OpenSupportPageAsync()
 #else
-        public async Task OpenSupportPageAsync()
+		public async Task OpenSupportPageAsync()
 #endif
-        {
-            try
-            {
-                // Switch to map page
+		{
+			try
+			{
+				// Switch to map page
 
 #if USEFLYOUT
                 ViewService.ShowPage(ViewTypes.ContactPage, AppResources.MarkingFeedbackAndContact);
 #else
-                await ViewService.ShowPage("//ContactPage");
+				await ViewService.ShowPage("//ContactPage");
 #endif
-            }
-            catch (Exception p_oException)
-            {
-                Log.Error("Ein unerwarteter Fehler ist auf der Seite Kontakt aufgetreten. Kontext: Klick auf Hinweistext auf Station N- seite ohne Anmeldung. {@Exception}", p_oException);
-                return;
-            }
-        }
+			}
+			catch (Exception p_oException)
+			{
+				Log.Error("Ein unerwarteter Fehler ist auf der Seite Kontakt aufgetreten. Kontext: Klick auf Hinweistext auf Station N- seite ohne Anmeldung. {@Exception}", p_oException);
+				return;
+			}
+		}
 
-        /// <summary> Returns detailed info about the station (station id).<summary>
-        public string StationDetailText { get; private set; }
+		/// <summary> Returns detailed info about the station (station id).<summary>
+		public string StationDetailText { get; private set; }
 
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        public async Task OnAppearing()
-        {
-            Log.ForContext<BikesAtStationPageViewModel>().Information($"Bikes at station {Station.StationName} is appearing, either due to tap on a station or to app being shown again.");
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		public async Task OnAppearing()
+		{
+			Log.ForContext<BikesAtStationPageViewModel>().Information($"Bikes at station {Station.StationName} is appearing, either due to tap on a station or to app being shown again.");
 
-            ActionText = "Einen Moment bitte...";
+			ActionText = "Einen Moment bitte...";
 
-            // Stop polling before getting bikes info.
-            await m_oViewUpdateManager.StopUpdatePeridically();
+			// Stop polling before getting bikes info.
+			await m_oViewUpdateManager.StopUpdatePeridically();
 
-            ActionText = AppResources.ActivityTextBikesAtStationGetBikes;
+			ActionText = AppResources.ActivityTextBikesAtStationGetBikes;
 
-            var bikesAll = await ConnectorFactory(IsConnected).Query.GetBikesAsync();
+			var bikesAll = await ConnectorFactory(IsConnected).Query.GetBikesAsync();
 
-            Exception = bikesAll.Exception; // Update communication error from query for bikes at station.
+			Exception = bikesAll.Exception; // Update communication error from query for bikes at station.
 
-            var bikesAtStation = bikesAll.Response.GetAtStation(Station.Id);
-            var lockIdList = bikesAtStation
-                .GetLockIt()
-                .Cast<Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo>()
-                .Select(x => x.LockInfo)
-                .ToList();
+			var bikesAtStation = bikesAll.Response.GetAtStation(Station.Id);
+			var lockIdList = bikesAtStation
+				.GetLockIt()
+				.Cast<Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo>()
+				.Select(x => x.LockInfo)
+				.ToList();
 
-            if (LockService is ILocksServiceFake serviceFake)
-            {
-                serviceFake.UpdateSimulation(bikesAtStation);
-            }
+			if (LockService is ILocksServiceFake serviceFake)
+			{
+				serviceFake.UpdateSimulation(bikesAtStation);
+			}
 
-            ActionText = AppResources.ActivityTextSearchBikes;
+			ActionText = AppResources.ActivityTextSearchBikes;
 
-            // Check location permissions.
-            if (bikesAtStation.GetLockIt().Count > 0
-                && RuntimePlatform == Device.Android)
-            {
-                var status = await PermissionsService.CheckStatusAsync();
-                if (status != Status.Granted)
-                {
-                    var permissionResult = await PermissionsService.RequestAsync();
+			// Check location permissions.
+			if (bikesAtStation.GetLockIt().Count > 0
+				&& RuntimePlatform == Device.Android)
+			{
+				var status = await PermissionsService.CheckStatusAsync();
+				if (status != Status.Granted)
+				{
+					var permissionResult = await PermissionsService.RequestAsync();
 
-                    if (permissionResult != Status.Granted)
-                    {
-                        var dialogResult = await ViewService.DisplayAlert(
-                            AppResources.MessageTitleHint,
-                            AppResources.MessageBikesManagementLocationPermissionOpenDialog,
-                            AppResources.MessageAnswerYes,
-                            AppResources.MessageAnswerNo);
+					if (permissionResult != Status.Granted)
+					{
+						var dialogResult = await ViewService.DisplayAlert(
+							AppResources.MessageTitleHint,
+							AppResources.MessageBikesManagementLocationPermissionOpenDialog,
+							AppResources.MessageAnswerYes,
+							AppResources.MessageAnswerNo);
 
-                        if (!dialogResult)
-                        {
-                            // User decided not to give access to locations permissions.
-                            BikeCollection.Update(bikesAtStation, new List<IStation> { Station });
+						if (!dialogResult)
+						{
+							// User decided not to give access to locations permissions.
+							BikeCollection.Update(bikesAtStation, new List<IStation> { Station });
 
-                            await OnAppearing(() => UpdateTask());
+							await OnAppearing(() => UpdateTask());
 
-                            ActionText = "";
-                            IsIdle = true;
-                            return;
-                        }
+							ActionText = "";
+							IsIdle = true;
+							return;
+						}
 
-                        // Open permissions dialog.
-                        PermissionsService.OpenAppSettings();
-                    }
-                }
+						// Open permissions dialog.
+						PermissionsService.OpenAppSettings();
+					}
+				}
 
-                if (Geolocation.IsGeolcationEnabled == false)
-                {
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageTitleHint,
-                        AppResources.MessageBikesManagementLocationActivation,
-                        AppResources.MessageAnswerOk);
+				if (Geolocation.IsGeolcationEnabled == false)
+				{
+					await ViewService.DisplayAlert(
+						AppResources.MessageTitleHint,
+						AppResources.MessageBikesManagementLocationActivation,
+						AppResources.MessageAnswerOk);
 
-                    BikeCollection.Update(bikesAtStation, new List<IStation> { Station });
+					BikeCollection.Update(bikesAtStation, new List<IStation> { Station });
 
-                    await OnAppearing(() => UpdateTask());
+					await OnAppearing(() => UpdateTask());
 
-                    ActionText = "";
-                    IsIdle = true;
-                }
+					ActionText = "";
+					IsIdle = true;
+				}
 
-                // Check if bluetooth is activated.
-                if (await BluetoothService.GetBluetoothState() != BluetoothState.On)
-                {
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageTitleHint,
-                        AppResources.MessageBikesManagementBluetoothActivation,
-                        AppResources.MessageAnswerOk);
+				// Check if bluetooth is activated.
+				if (await BluetoothService.GetBluetoothState() != BluetoothState.On)
+				{
+					await ViewService.DisplayAlert(
+						AppResources.MessageTitleHint,
+						AppResources.MessageBikesManagementBluetoothActivation,
+						AppResources.MessageAnswerOk);
 
-                    BikeCollection.Update(bikesAtStation, new List<IStation> { Station });
+					BikeCollection.Update(bikesAtStation, new List<IStation> { Station });
 
-                    await OnAppearing(() => UpdateTask());
+					await OnAppearing(() => UpdateTask());
 
-                    ActionText = "";
-                    IsIdle = true;
-                    return;
-                }
-            }
+					ActionText = "";
+					IsIdle = true;
+					return;
+				}
+			}
 
-            // Connect to bluetooth devices.
-            ActionText = AppResources.ActivityTextSearchBikes;
-            IEnumerable<LockInfoTdo> locksInfoTdo;
-            try
-            {
-                locksInfoTdo = await LockService.GetLocksStateAsync(
-                    lockIdList.Select(x => x.ToLockInfoTdo()).ToList(),
-                    LockService.TimeOut.MultiConnect);
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<BikesAtStationPageViewModel>().Error("Getting bluetooth state failed. {Exception}", exception);
-                locksInfoTdo = new List<LockInfoTdo>();
-            }
+			// Connect to bluetooth devices.
+			ActionText = AppResources.ActivityTextSearchBikes;
+			IEnumerable<LockInfoTdo> locksInfoTdo;
+			try
+			{
+				locksInfoTdo = await LockService.GetLocksStateAsync(
+					lockIdList.Select(x => x.ToLockInfoTdo()).ToList(),
+					LockService.TimeOut.MultiConnect);
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<BikesAtStationPageViewModel>().Error("Getting bluetooth state failed. {Exception}", exception);
+				locksInfoTdo = new List<LockInfoTdo>();
+			}
 
-            var locksInfo = lockIdList.UpdateById(locksInfoTdo);
+			var locksInfo = lockIdList.UpdateById(locksInfoTdo);
 
-            BikeCollection.Update(bikesAtStation.UpdateLockInfo(locksInfo), new List<IStation> { Station });
+			BikeCollection.Update(bikesAtStation.UpdateLockInfo(locksInfo), new List<IStation> { Station });
 
-            // Backup GUI synchronization context.
-            await OnAppearing(() => UpdateTask());
+			// Backup GUI synchronization context.
+			await OnAppearing(() => UpdateTask());
 
-            ActionText = "";
-            IsIdle = true;
-        }
+			ActionText = "";
+			IsIdle = true;
+		}
 
-        /// <summary> Create task which updates my bike view model.</summary>
-        private void UpdateTask()
-        {
-            PostAction(
-                unused =>
-                {
-                    Log.ForContext<BikesAtStationPageViewModel>().Debug("Updating action text...");
-                    ActionText = AppResources.ActivityTextUpdating;
-                    IsConnected = IsConnectedDelegate();
-                },
-                null);
+		/// <summary> Create task which updates my bike view model.</summary>
+		private void UpdateTask()
+		{
+			PostAction(
+				unused =>
+				{
+					Log.ForContext<BikesAtStationPageViewModel>().Debug("Updating action text...");
+					ActionText = AppResources.ActivityTextUpdating;
+					IsConnected = IsConnectedDelegate();
+				},
+				null);
 
-            var result = ConnectorFactory(IsConnected).Query.GetBikesAsync().Result;
+			var result = ConnectorFactory(IsConnected).Query.GetBikesAsync().Result;
 
-            BikeCollection bikes = result.Response.GetAtStation(Station.Id);
+			BikeCollection bikes = result.Response.GetAtStation(Station.Id);
 
-            var exception = result.Exception;
-            if (exception != null)
-            {
-                Log.ForContext<BikesAtStationPageViewModel>().Error("Getting all bikes bikes in polling context failed with exception {Exception}.", exception);
-            }
+			var exception = result.Exception;
+			if (exception != null)
+			{
+				Log.ForContext<BikesAtStationPageViewModel>().Error("Getting all bikes bikes in polling context failed with exception {Exception}.", exception);
+			}
 
-            PostAction(
-                unused =>
-                {
-                    Log.ForContext<BikesAtStationPageViewModel>().Debug("Updating bikes at station...");
-                    BikeCollection.Update(bikes, new List<IStation> { Station });
-                    Exception = result.Exception;
-                    ActionText = string.Empty;
-                },
-                null);
-        }
+			PostAction(
+				unused =>
+				{
+					Log.ForContext<BikesAtStationPageViewModel>().Debug("Updating bikes at station...");
+					BikeCollection.Update(bikes, new List<IStation> { Station });
+					Exception = result.Exception;
+					ActionText = string.Empty;
+				},
+				null);
+		}
 
-        /// <summary>
-        /// True if any action can be performed (request and cancel request)
-        /// </summary>
-        public override bool IsIdle
-        {
-            get => base.IsIdle;
-            set
-            {
-                if (value == base.IsIdle)
-                    return;
+		/// <summary>
+		/// True if any action can be performed (request and cancel request)
+		/// </summary>
+		public override bool IsIdle
+		{
+			get => base.IsIdle;
+			set
+			{
+				if (value == base.IsIdle)
+					return;
 
-                Log.ForContext<BikesViewModel>().Debug($"Switch value of {nameof(IsIdle)} to {value}.");
-                base.IsIdle = value;
-                base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsNoBikesAtStationVisible)));
-                base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(NoBikesAtStationText)));
-            }
-        }
-    }
+				Log.ForContext<BikesViewModel>().Debug($"Switch value of {nameof(IsIdle)} to {value}.");
+				base.IsIdle = value;
+				base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsNoBikesAtStationVisible)));
+				base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(NoBikesAtStationText)));
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/TINKLib/ViewModel/Contact/ContactPageViewModel.cs b/TINKLib/ViewModel/Contact/ContactPageViewModel.cs
index e8fc0fc..0dd5639 100644
--- a/TINKLib/ViewModel/Contact/ContactPageViewModel.cs
+++ b/TINKLib/ViewModel/Contact/ContactPageViewModel.cs
@@ -5,7 +5,6 @@ using System.Threading.Tasks;
 using System.Windows.Input;
 using Plugin.Messaging;
 using Serilog;
-using TINK.Model.Services.CopriApi.ServerUris;
 using TINK.Model.Station;
 using TINK.MultilingualResources;
 using TINK.View;
@@ -14,378 +13,347 @@ using Xamarin.Forms;
 
 namespace TINK.ViewModel.Info
 {
-    /// <summary> View model for contact page.</summary>
-    public class ContactPageViewModel : INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Mail address for app related support.
-        /// </summary>
-        public const string APPSUPPORTMAILADDRESS = "hotline@sharee.bike";
+	/// <summary> View model for contact page.</summary>
+	public class ContactPageViewModel : INotifyPropertyChanged
+	{
+		/// <summary>
+		/// Mail address for app related support.
+		/// </summary>
+		public const string APPSUPPORTMAILADDRESS = "hotline@sharee.bike";
 
-        /// <summary> Reference on view service to show modal notifications and to perform navigation. </summary>
-        private IViewService ViewService { get; }
+		/// <summary> Reference on view service to show modal notifications and to perform navigation. </summary>
+		private IViewService ViewService { get; }
 
-        /// <summary> Station selected by user. </summary>
-        private IStation SelectedStation { get; set; } = new NullStation();
+		/// <summary> Station selected by user. </summary>
+		private IStation SelectedStation { get; set; } = new NullStation();
 
-        Uri ActiveUri { get; }
+		/// <summary> Holds the name of the app (sharee.bike, Mein konrad, ...)</summary>
+		string AppFlavorName { get; }
 
-        /// <summary> Holds the name of the app (sharee.bike, Mein konrad, ...)</summary>
-        string AppName { get; }
+		/// <summary> Holds a reference to the external trigger service. </summary>
+		private Action OpenUrlInExternalBrowser { get; }
 
-        /// <summary> Holds a reference to the external trigger service. </summary>
-        private Action OpenUrlInExternalBrowser { get; }
+		Func<string> CreateAttachment { get; }
 
-        Func<string> CreateAttachment { get; }
+		/// <summary> Notifies view about changes. </summary>
+		public event PropertyChangedEventHandler PropertyChanged;
 
-        /// <summary> Notifies view about changes. </summary>
-        public event PropertyChangedEventHandler PropertyChanged;
+		/// <summary> Constructs a contact page view model. </summary>
+		/// <param name="appFlavorName">Holds the name of the app.</param>
+		/// <param name="openUrlInExternalBrowser">Action to open an external browser.</param>
+		/// <param name="viewService">View service to notify user.</param>
+		public ContactPageViewModel(
+			string appFlavorName,
+			Func<string> createAttachment,
+			Action openUrlInExternalBrowser,
+			IViewService viewService)
+		{
+			AppFlavorName = !string.IsNullOrEmpty(appFlavorName)
+				? appFlavorName
+				: throw new ArgumentException("Can not instantiate contact page view model- object. No app name availalbe.");
 
-        /// <summary> Constructs a contact page view model. </summary>
-        /// <param name="openUrlInExternalBrowser">Action to open an external browser.</param>
-        /// <param name="viewService">View service to notify user.</param>
-        public ContactPageViewModel(
-            Uri activeUri,
-            string appName,
-            Func<string> createAttachment,
-            Action openUrlInExternalBrowser,
-            IViewService viewService)
-        {
-            ActiveUri = activeUri
-                ?? throw new ArgumentException("Can not instantiate contact page view model- object. No active uri available.");
+			CreateAttachment = createAttachment
+				?? throw new ArgumentException("Can not instantiate contact page view model- object. No create attachment provider available.");
 
-            AppName = !string.IsNullOrEmpty(appName)
-                ? appName
-                : throw new ArgumentException("Can not instantiate contact page view model- object. No app name availalbe.");
+			ViewService = viewService
+				?? throw new ArgumentException("Can not instantiate contact page view model- object. No user view service available.");
 
-            CreateAttachment = createAttachment
-                ?? throw new ArgumentException("Can not instantiate contact page view model- object. No create attachment provider available.");
+			OpenUrlInExternalBrowser = openUrlInExternalBrowser
+				?? throw new ArgumentException("Can not instantiate contact page view model- object. No user external browse service available.");
+		}
 
-            ViewService = viewService
-                ?? throw new ArgumentException("Can not instantiate contact page view model- object. No user view service available.");
+		/// <summary> Is invoked when page is shown. </summary>
+		public async Task OnAppearing(
+			IStation selectedStation)
+		{
+			if (SelectedStation?.Id == selectedStation?.Id)
+			{
+				// Nothing to do because either both are null or of same id.
+				return;
+			}
 
-            OpenUrlInExternalBrowser = openUrlInExternalBrowser
-                ?? throw new ArgumentException("Can not instantiate contact page view model- object. No user external browse service available.");
-        }
+			SelectedStation = selectedStation;
 
-        /// <summary> Is invoked when page is shown. </summary>
-        public async Task OnAppearing(
-            IStation selectedStation)
-        {
-            if (SelectedStation?.Id == selectedStation?.Id)
-            {
-                // Nothing to do because either both are null or of same id.
-                return;
-            }
+			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(MailAddressText)));
+			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(OfficeHoursText)));
+			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PhoneNumberText)));
+			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ProviderNameText)));
+			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsOperatorInfoAvaliable)));
 
-            SelectedStation = selectedStation;
+			await Task.CompletedTask;
+		}
 
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(MailAddressText)));
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(OfficeHoursText)));
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PhoneNumberText)));
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ProviderNameText)));
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsOperatorInfoAvaliable)));
+		/// <summary> Command object to bind mail button to view model. </summary>
+		public ICommand OnMailToOperatorRequest
+			=> new Command(
+					async () => await DoSendMailToOperator(),
+					() => IsSendMailAvailable);
 
-            await Task.CompletedTask;
-        }
+		/// <summary> Command object to bind mail app releated button to model. </summary>
+		public ICommand OnMailAppRelatedRequest
+			=> new Command(
+					async () => await DoSendMailAppRelated(),
+					() => IsSendMailAvailable);
 
-        /// <summary> Command object to bind mail button to view model. </summary>
-        public ICommand OnMailRequest
-            => new Command(
-                    async () =>
-                    {
-                        if (await DoSendMailToOperator())
-                        {
-                            // Mail sent to operator or no mailer availble.
-                            return;
-                        }
-
-                        await DoSendMailAppRelated(
-                            new List<string> { MailAddressText },
-                            MailAddressText.ToUpper() != APPSUPPORTMAILADDRESS.ToUpper()
-                                ? new List<string> { APPSUPPORTMAILADDRESS }
-                                : new List<string>());
-                    },
-                    () => IsSendMailAvailable);
-
-        /// <summary> Command object to bind mail app releated button to model. </summary>
-        public ICommand OnSendAppFeedbackMailRequest
-            => new Command(
-                    async () => await DoSendMailToOperator(),
-                    () => IsSendMailAvailable);
-
-        /// <summary> Command object to bind mail app releated button to model. </summary>
-        public ICommand OnMailAppRelatedRequest
-            => new Command(
-                    async () => await DoSendMailAppRelated(new List<string> { APPSUPPORTMAILADDRESS }, new List<string>()),
-                    () => IsSendMailAvailable);
-
-        /// <summary>True if sending mail is possible.</summary>
-        public bool IsSendMailAvailable =>
-            CrossMessaging.Current.EmailMessenger.CanSendEmail;
+		/// <summary>True if sending mail is possible.</summary>
+		public bool IsSendMailAvailable =>
+			CrossMessaging.Current.EmailMessenger.CanSendEmail;
 
 
-        /// <summary>cTrue if doing a phone call is possible.</summary>
-        public bool IsDoPhoncallAvailable
-            => CrossMessaging.Current.PhoneDialer.CanMakePhoneCall;
+		/// <summary>cTrue if doing a phone call is possible.</summary>
+		public bool IsDoPhoncallAvailable
+			=> CrossMessaging.Current.PhoneDialer.CanMakePhoneCall;
 
-        /// <summary>Holds the mail address to mail to.</summary>
-        public string MailAddressText
-            => SelectedStation?.OperatorData?.MailAddressText ?? string.Empty;
+		/// <summary>Holds the mail address to mail to.</summary>
+		public string MailAddressText
+			=> SelectedStation?.OperatorData?.MailAddressText ?? string.Empty;
 
-        /// <summary>Holds the mail address to send mail to.</summary>
-        public string PhoneNumberText
-            => SelectedStation?.OperatorData?.PhoneNumberText ?? string.Empty;
+		/// <summary>Holds the mail address to send mail to.</summary>
+		public string PhoneNumberText
+			=> SelectedStation?.OperatorData?.PhoneNumberText ?? string.Empty;
 
-        /// <summary>Holds the mail address to send mail to.</summary>
-        public string OfficeHoursText
-            => SelectedStation?.OperatorData?.Hours ?? string.Empty;
+		/// <summary>Holds the mail address to send mail to.</summary>
+		public string OfficeHoursText
+			=> SelectedStation?.OperatorData?.Hours ?? string.Empty;
 
-        /// <summary> Gets whether any operator support info is avaliable. </summary>
-        public bool IsOperatorInfoAvaliable
-            => MailAddressText.Length > 0 || PhoneNumberText.Length > 0;
+		/// <summary> Gets whether any operator support info is avaliable. </summary>
+		public bool IsOperatorInfoAvaliable
+			=> MailAddressText.Length > 0 || PhoneNumberText.Length > 0;
 
-        /// <returns> Returns true if eithe mail was sent or if no mailer available.</returns>
-        public async Task<bool> DoSendMailToOperator()
-        {
-            try
-            {
-                if (!IsSendMailAvailable)
-                {
-                    // Nothing to do because email can not be sent.
-                    return true;
-                }
+		/// <returns> Returns true if eithe mail was sent or if no mailer available.</returns>
+		public async Task DoSendMailToOperator()
+		{
+			try
+			{
+				if (!IsSendMailAvailable)
+				{
+					// Nothing to do because email can not be sent.
+					return;
+				}
 
-                // Ask whether mail is operator or app specific.
-                var operatorRelatedMail = await ViewService.DisplayAlert(
-                        AppResources.QuestionTitle,
-                        string.Format(AppResources.QuestionSupportmailSubject, GetAppName(ActiveUri)),
-                        string.Format(AppResources.QuestionSupportmailAnswerOperator, GetAppName(ActiveUri)),
-                        string.Format(AppResources.QuestionSupportmailAnswerApp, GetAppName(ActiveUri)));
+				// Ask whether mail is operator or app specific.
+				var operatorRelatedMail = await ViewService.DisplayAlert(
+						AppResources.QuestionTitle,
+						string.Format(AppResources.QuestionSupportmailSubject, AppFlavorName),
+						string.Format(AppResources.QuestionSupportmailAnswerOperator, AppFlavorName),
+						string.Format(AppResources.QuestionSupportmailAnswerApp, AppFlavorName));
 
-                if (operatorRelatedMail)
-                {
-                    // Send operator related support mail.
-                    await Email.ComposeAsync(new EmailMessage { To = new List<string> { MailAddressText }, Subject = $"{GetAppName(ActiveUri)} Anfrage" });
-                    return true;
-                }
+				if (operatorRelatedMail)
+				{
+					// Send operator related support mail to operator.
+					await Email.ComposeAsync(new EmailMessage
+					{
+						To = new List<string> { MailAddressText },
+						Subject = string.Format(AppResources.SupportmailSubjectOperatormail, AppFlavorName)
+					});
+					return;
+				}
 
-                return false;
+				// Send app-related related support mail to operator.
+				await Email.ComposeAsync(new EmailMessage
+				{
+					To = new List<string> { MailAddressText },
+					Cc = APPSUPPORTMAILADDRESS.ToUpper() != MailAddressText.ToUpper() ? new List<string> { APPSUPPORTMAILADDRESS } : new List<string>(),
+					Subject = string.Format(AppResources.SupportmailSubjectAppmail, AppFlavorName)
+				});
 
-            }
-            catch (Exception exception)
-            {
-                Log.Error("An unexpected error occurred sending mail to operator. {@Exception}", exception);
-                await ViewService.DisplayAdvancedAlert(
-                    AppResources.MessageWaring,
-                    AppResources.ErrorSupportmailMailingFailed,
-                    exception.Message,
-                    AppResources.MessageAnswerOk);
-                return true;
-            }
-        }
+				return;
+			}
+			catch (Exception exception)
+			{
+				Log.Error("An unexpected error occurred sending mail to operator. {@Exception}", exception);
+				await ViewService.DisplayAdvancedAlert(
+					AppResources.MessageWaring,
+					AppResources.ErrorSupportmailMailingFailed,
+					exception.Message,
+					AppResources.MessageAnswerOk);
+				return;
+			}
+		}
 
-        /// <summary> Request to send a app related mail. </summary>
-        public async Task DoSendMailAppRelated(List<string> to, List<string> cc)
-        {
-            try
-            {
-                // Send app related mail
-                var appendFile = false;
-                appendFile = await ViewService.DisplayAlert(
-                    AppResources.QuestionTitle,
-                    AppResources.QuestionSupportmailAttachment,
-                    AppResources.QuestionAnswerYes,
-                    AppResources.QuestionAnswerNo);
+		/// <summary> Request to send a app related mail. </summary>
+		public async Task DoSendMailAppRelated()
+		{
+			try
+			{
+				// Ask for permission to append diagnostics.    
+				var appendFile = false;
+				appendFile = await ViewService.DisplayAlert(
+					AppResources.QuestionSupportmailTitle,
+					AppResources.QuestionSupportmailAttachment,
+					AppResources.QuestionAnswerYes,
+					AppResources.QuestionSupportmailAnswerNo);
 
-                var message = new EmailMessage
-                {
-                    To = to,
-                    Cc = cc,
-                    Subject = $"{GetAppName(ActiveUri)}-App Anfrage"
-                };
+				var message = new EmailMessage
+				{
+					To = new List<string> { APPSUPPORTMAILADDRESS },
+					Subject = string.Format(AppResources.SupportmailSubjectAppmail, AppFlavorName)
+				};
 
-                if (appendFile == false)
-                {
-                    // Send without attachment
-                    await Email.ComposeAsync(message);
-                    return;
-                }
+				if (appendFile == false)
+				{
+					// Send without attachment
+					await Email.ComposeAsync(message);
+					return;
+				}
 
-                // Send with attachment.
-                var logFileName = string.Empty;
-                try
-                {
-                    logFileName = CreateAttachment();
-                }
-                catch (Exception exception)
-                {
-                    await ViewService.DisplayAdvancedAlert(
-                        AppResources.MessageWaring,
-                        AppResources.ErrorSupportmailCreateAttachment,
-                        exception.Message,
-                        AppResources.MessageAnswerOk);
-                    Log.Error("An error occurred creating attachment. {@Exception)", exception);
-                }
+				// Send with attachment.
+				var logFileName = string.Empty;
+				try
+				{
+					logFileName = CreateAttachment();
+				}
+				catch (Exception exception)
+				{
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.MessageWaring,
+						AppResources.ErrorSupportmailCreateAttachment,
+						exception.Message,
+						AppResources.MessageAnswerOk);
 
-                if (!string.IsNullOrEmpty(logFileName))
-                {
-                    message.Attachments.Add(new Xamarin.Essentials.EmailAttachment(logFileName));
-                }
+					Log.ForContext<ContactPageViewModel>().Error("An error occurred creating attachment for app mail. {@Exception)", exception);
+				}
 
-                // Send a tink app related mail
-                await Email.ComposeAsync(message);
-            }
-            catch (Exception exception)
-            {
-                Log.Error("An unexpected error occurred sending mail. {@Exception}", exception);
-                await ViewService.DisplayAdvancedAlert(
-                    AppResources.MessageWaring,
-                    AppResources.ErrorSupportmailMailingFailed,
-                    exception.Message,
-                    AppResources.MessageAnswerOk);
-                return;
-            }
-        }
+				if (!string.IsNullOrEmpty(logFileName))
+				{
+					message.Attachments.Add(new Xamarin.Essentials.EmailAttachment(logFileName));
+				}
 
-        /// <summary> Command object to bind login button to view model. </summary>
-        public ICommand OnSelectStationRequest
+				// Send a tink app related mail
+				await Email.ComposeAsync(message);
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<ContactPageViewModel>().Error("An unexpected error occurred sending mail. {@Exception}", exception);
+				await ViewService.DisplayAdvancedAlert(
+					AppResources.MessageWaring,
+					AppResources.ErrorSupportmailMailingFailed,
+					exception.Message,
+					AppResources.MessageAnswerOk);
+				return;
+			}
+		}
+
+		/// <summary> Command object to bind login button to view model. </summary>
+		public ICommand OnSelectStationRequest
 #if USEFLYOUT
                 => new Xamarin.Forms.Command(() => OpenSelectStationPage());
 #else
-                => new Xamarin.Forms.Command(async () => await OpenSelectStationPageAsync());
+				=> new Xamarin.Forms.Command(async () => await OpenSelectStationPageAsync());
 #endif
 
-        /// <summary> Opens login page. </summary>
+		/// <summary> Opens login page. </summary>
 #if USEFLYOUT
         public void OpenSelectStationPage()
 #else
-        public async Task OpenSelectStationPageAsync()
+		public async Task OpenSelectStationPageAsync()
 #endif
-        {
-            try
-            {
-                // Switch to map page
+		{
+			try
+			{
+				// Switch to map page
 
 #if USEFLYOUT
                 ViewService.PushAsync(ViewTypes.SelectStationPage);
 #else
-                await ViewService.PushAsync(ViewTypes.SelectStationPage);
+				await ViewService.PushAsync(ViewTypes.SelectStationPage);
 #endif
-            }
-            catch (Exception p_oException)
-            {
-                Log.Error("Ein unerwarteter Fehler ist in der Klasse ContactPageViewModel aufgetreten. Kontext: Klick auf Hinweistext auf Station N- seite ohne Anmeldung. {@Exception}", p_oException);
-                return;
-            }
-        }
+			}
+			catch (Exception p_oException)
+			{
+				Log.Error("Ein unerwarteter Fehler ist in der Klasse ContactPageViewModel aufgetreten. Kontext: Klick auf Hinweistext auf Station N- seite ohne Anmeldung. {@Exception}", p_oException);
+				return;
+			}
+		}
 
 
-        /// <summary> Command object to bind phone call button. </summary>
-        public ICommand OnPhoneRequest
-            => new Command(
-                    async () => await DoPhoneCall(),
-                    () => IsDoPhoncallAvailable);
+		/// <summary> Command object to bind phone call button. </summary>
+		public ICommand OnPhoneRequest
+			=> new Command(
+					async () => await DoPhoneCall(),
+					() => IsDoPhoncallAvailable);
 
-        /// <summary> Request to do a phone call. </summary>
-        public async Task DoPhoneCall()
-        {
-            try
-            {
-                // Make Phone Call
-                if (IsDoPhoncallAvailable)
-                {
-                    CrossMessaging.Current.PhoneDialer.MakePhoneCall(PhoneNumberText);
-                }
-            }
-            catch (Exception exception)
-            {
-                Log.Error("An unexpected error occurred doing a phone call. {@Exception}", exception);
-                await ViewService.DisplayAdvancedAlert(
-                    AppResources.MessageWaring,
-                    AppResources.ErrorSupportmailPhoningFailed,
-                    exception.Message,
-                    AppResources.MessageAnswerOk);
-                return;
-            }
-        }
+		/// <summary> Request to do a phone call. </summary>
+		public async Task DoPhoneCall()
+		{
+			try
+			{
+				// Make Phone Call
+				if (IsDoPhoncallAvailable)
+				{
+					CrossMessaging.Current.PhoneDialer.MakePhoneCall(PhoneNumberText);
+				}
+			}
+			catch (Exception exception)
+			{
+				Log.Error("An unexpected error occurred doing a phone call. {@Exception}", exception);
+				await ViewService.DisplayAdvancedAlert(
+					AppResources.MessageWaring,
+					AppResources.ErrorSupportmailPhoningFailed,
+					exception.Message,
+					AppResources.MessageAnswerOk);
+				return;
+			}
+		}
 
 
 
-        /// <summary> Text providing mail address and possilbe reasons to contact. </summary>
-        public string ProviderNameText
-            => string.Format("Betreiber: {0}", SelectedStation?.OperatorData?.Name)
+		/// <summary> Text providing mail address and possilbe reasons to contact. </summary>
+		public string ProviderNameText
+			=> string.Format("Betreiber: {0}", SelectedStation?.OperatorData?.Name)
 ;
-        /// <summary> Text providing mail address and possilbe reasons to contact. </summary>
-        public FormattedString MailAddressAndMotivationsText
-        {
-            get
-            {
-                var hint = new FormattedString();
-                hint.Spans.Add(new Span { Text = AppResources.MessageContactMail });
-                return hint;
-            }
-        }
+		/// <summary> Text providing mail address and possilbe reasons to contact. </summary>
+		public FormattedString MailAddressAndMotivationsText
+		{
+			get
+			{
+				var hint = new FormattedString();
+				hint.Spans.Add(new Span { Text = AppResources.MessageContactMail });
+				return hint;
+			}
+		}
 
-        /// <summary> Invitation to rate app.</summary>
-        public FormattedString LikeTinkApp
-        {
-            get
-            {
-                var l_oHint = new FormattedString();
-                l_oHint.Spans.Add(new Span { Text = string.Format(AppResources.MessageRateMail, AppName) });
-                return l_oHint;
-            }
-        }
+		/// <summary> Invitation to rate app.</summary>
+		public FormattedString LikeTinkApp
+		{
+			get
+			{
+				var hint = new FormattedString();
+				hint.Spans.Add(new Span { Text = string.Format(AppResources.MessageRateMail, AppFlavorName) });
+				return hint;
+			}
+		}
 
-        /// <summary> User clicks rate button.</summary>
-        public ICommand OnRateRequest
-            => new Command(() => RegisterRequest());
+		/// <summary> User clicks rate button.</summary>
+		public ICommand OnRateRequest
+			=> new Command(() => RegisterRequest());
 
-        /// <summary> Opens login page.</summary>
-        public void RegisterRequest()
-        {
-            try
-            {
-                OpenUrlInExternalBrowser();
-            }
-            catch (Exception p_oException)
-            {
-                Log.Error("Ein unerwarteter Fehler ist auf der Login Seite beim Öffnen eines Browsers, Seite {url}, aufgetreten. {@Exception}", p_oException);
-                return;
-            }
-        }
+		/// <summary> Opens login page.</summary>
+		public void RegisterRequest()
+		{
+			try
+			{
+				OpenUrlInExternalBrowser();
+			}
+			catch (Exception p_oException)
+			{
+				Log.Error("Ein unerwarteter Fehler ist auf der Login Seite beim Öffnen eines Browsers, Seite {url}, aufgetreten. {@Exception}", p_oException);
+				return;
+			}
+		}
 
-        /// <summary> Invitation to rate app.</summary>
-        public FormattedString PhoneContactText
-        {
-            get
-            {
-                var l_oHint = new FormattedString();
-                l_oHint.Spans.Add(new Span
-                {
-                    Text = string.Format(AppResources.MessagePhoneMail, GetAppName(ActiveUri)) + $"{(OfficeHoursText.Length > 0 ? $" {OfficeHoursText}" : string.Empty)}"
-                });
-                return l_oHint;
-            }
-        }
-
-        /// <summary>Gets the application name.</summary>
-        public static string GetAppName(Uri activeUri)
-        {
-            switch (activeUri.AbsoluteUri)
-            {
-                case CopriServerUriList.TINK_DEVEL:
-                case CopriServerUriList.TINK_LIVE:
-                    return "TINK";
-
-                case CopriServerUriList.SHAREE_DEVEL:
-                case CopriServerUriList.SHAREE_LIVE:
-                    return "sharee.bike";
-
-                default:
-                    return "Teilrad";
-            }
-        }
-    }
+		/// <summary> Invitation to rate app.</summary>
+		public FormattedString PhoneContactText
+		{
+			get
+			{
+				var l_oHint = new FormattedString();
+				l_oHint.Spans.Add(new Span
+				{
+					Text = string.Format(AppResources.MessagePhoneMail, AppFlavorName) + $"{(OfficeHoursText.Length > 0 ? $" {OfficeHoursText}" : string.Empty)}"
+				});
+				return l_oHint;
+			}
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Contact/SelectStationPageViewModel.cs b/TINKLib/ViewModel/Contact/SelectStationPageViewModel.cs
index 62a1590..eaefd17 100644
--- a/TINKLib/ViewModel/Contact/SelectStationPageViewModel.cs
+++ b/TINKLib/ViewModel/Contact/SelectStationPageViewModel.cs
@@ -19,130 +19,129 @@ using TINK.Services.Permissions;
 using Xamarin.Essentials;
 using System.Threading;
 using TINK.MultilingualResources;
-using TINK.ViewModel.Info;
 using TINK.Repository;
 using TINK.Services.Geolocation;
 using TINK.Model.State;
 
 namespace TINK.ViewModel.Contact
 {
-    public class SelectStationPageViewModel : INotifyPropertyChanged
-    {
-        /// <summary> Holds the count of custom icons availalbe.</summary>
-        private const int CUSTOM_ICONS_COUNT = 30;
+	public class SelectStationPageViewModel : INotifyPropertyChanged
+	{
+		/// <summary> Holds the count of custom icons availalbe.</summary>
+		private const int CUSTOM_ICONS_COUNT = 30;
 
-        /// <summary> Reference on view service to show modal notifications and to perform navigation. </summary>
-        private IViewService ViewService { get; }
+		/// <summary> Reference on view service to show modal notifications and to perform navigation. </summary>
+		private IViewService ViewService { get; }
 
-        /// <summary>
-        /// Holds the exception which occurred getting bikes occupied information.
-        /// </summary>
-        private Exception m_oException;
+		/// <summary>
+		/// Holds the exception which occurred getting bikes occupied information.
+		/// </summary>
+		private Exception m_oException;
 
 
-        /// <summary>
-        /// Service to query/ manage permissions (location) of the app.
-        /// </summary>
-        private ILocationPermission PermissionsService { get; }
+		/// <summary>
+		/// Service to query/ manage permissions (location) of the app.
+		/// </summary>
+		private ILocationPermission PermissionsService { get; }
 
-        /// <summary>
-        /// Service to manage bluetooth stack.
-        /// </summary>
-        private Plugin.BLE.Abstractions.Contracts.IBluetoothLE BluetoothService { get; set; }
+		/// <summary>
+		/// Service to manage bluetooth stack.
+		/// </summary>
+		private Plugin.BLE.Abstractions.Contracts.IBluetoothLE BluetoothService { get; set; }
 
 
-        /// <summary> Notifies view about changes. </summary>
-        public event PropertyChangedEventHandler PropertyChanged;
+		/// <summary> Notifies view about changes. </summary>
+		public event PropertyChangedEventHandler PropertyChanged;
 
 
-        /// <summary> Reference on the tink app instance. </summary>
-        private ITinkApp TinkApp { get; }
+		/// <summary> Reference on the tink app instance. </summary>
+		private ITinkApp TinkApp { get; }
 
-        /// <summary>Delegate to perform navigation.</summary>
-        private INavigation m_oNavigation;
+		/// <summary>Delegate to perform navigation.</summary>
+		private INavigation m_oNavigation;
 
 #if USEFLYOUT
         /// <summary>Delegate to perform navigation.</summary>
         private INavigationMasterDetail m_oNavigationMasterDetail;
 #endif
-        private ObservableCollection<Pin> pins;
+		private ObservableCollection<Pin> pins;
 
-        public ObservableCollection<Pin> Pins
-        {
-            get
-            {
-                if (pins == null)
-                    pins = new ObservableCollection<Pin>(); // If view model is not binding context pins collection must be set programmatically.
+		public ObservableCollection<Pin> Pins
+		{
+			get
+			{
+				if (pins == null)
+					pins = new ObservableCollection<Pin>(); // If view model is not binding context pins collection must be set programmatically.
 
-                return pins;
-            }
+				return pins;
+			}
 
-            set => pins = value;
-        }
+			set => pins = value;
+		}
 
-        /// <summary>Delegate to move map to region.</summary>
-        private Action<MapSpan> m_oMoveToRegionDelegate;
+		/// <summary>Delegate to move map to region.</summary>
+		private Action<MapSpan> m_oMoveToRegionDelegate;
 
-        /// <summary> False if user tabed on station marker to show bikes at a given station.</summary>
-        private bool isMapPageEnabled = false;
+		/// <summary> False if user tabed on station marker to show bikes at a given station.</summary>
+		private bool isMapPageEnabled = false;
 
-        IGeolocation GeolocationService { get; }
+		IGeolocation GeolocationService { get; }
 
-        /// <summary> False if user tabed on station marker to show bikes at a given station.</summary>
-        public bool IsMapPageEnabled
-        {
-            get => isMapPageEnabled;
-            private set
-            {
-                if (isMapPageEnabled == value)
-                    return;
+		/// <summary> False if user tabed on station marker to show bikes at a given station.</summary>
+		public bool IsMapPageEnabled
+		{
+			get => isMapPageEnabled;
+			private set
+			{
+				if (isMapPageEnabled == value)
+					return;
 
-                isMapPageEnabled = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsMapPageEnabled)));
-            }
-        }
+				isMapPageEnabled = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsMapPageEnabled)));
+			}
+		}
 
-        /// <summary> Prevents an invalid instane to be created. </summary>
-        /// <param name="tinkApp"> Reference to tink app model.</param>
-        /// <param name="moveToRegionDelegate">Delegate to center map and set zoom level.</param>
-        /// <param name="viewService">View service to notify user.</param>
-        /// <param name="navigation">Interface to navigate.</param>
-        public SelectStationPageViewModel(
-            ITinkApp tinkApp,
-            ILocationPermission permissionsService,
-            Plugin.BLE.Abstractions.Contracts.IBluetoothLE bluetoothService,
-            IGeolocation geolocationService,
-            Action<MapSpan> moveToRegionDelegate,
-            IViewService viewService,
-            INavigation navigation)
-        {
-            TinkApp = tinkApp
-                ?? throw new ArgumentException("Can not instantiate map page view model- object. No tink app object available.");
+		/// <summary> Prevents an invalid instane to be created. </summary>
+		/// <param name="tinkApp"> Reference to tink app model.</param>
+		/// <param name="moveToRegionDelegate">Delegate to center map and set zoom level.</param>
+		/// <param name="viewService">View service to notify user.</param>
+		/// <param name="navigation">Interface to navigate.</param>
+		public SelectStationPageViewModel(
+			ITinkApp tinkApp,
+			ILocationPermission permissionsService,
+			Plugin.BLE.Abstractions.Contracts.IBluetoothLE bluetoothService,
+			IGeolocation geolocationService,
+			Action<MapSpan> moveToRegionDelegate,
+			IViewService viewService,
+			INavigation navigation)
+		{
+			TinkApp = tinkApp
+				?? throw new ArgumentException("Can not instantiate map page view model- object. No tink app object available.");
 
-            PermissionsService = permissionsService ??
-                throw new ArgumentException($"Can not instantiate {nameof(SelectStationPageViewModel)}. Permissions service object must never be null.");
+			PermissionsService = permissionsService ??
+				throw new ArgumentException($"Can not instantiate {nameof(SelectStationPageViewModel)}. Permissions service object must never be null.");
 
-            BluetoothService = bluetoothService ??
-                throw new ArgumentException($"Can not instantiate {nameof(SelectStationPageViewModel)}. Bluetooth service object must never be null.");
+			BluetoothService = bluetoothService ??
+				throw new ArgumentException($"Can not instantiate {nameof(SelectStationPageViewModel)}. Bluetooth service object must never be null.");
 
-            GeolocationService = geolocationService ??
-                throw new ArgumentException($"Can not instantiate {nameof(SelectStationPageViewModel)}. Geolocation service object must never be null.");
+			GeolocationService = geolocationService ??
+				throw new ArgumentException($"Can not instantiate {nameof(SelectStationPageViewModel)}. Geolocation service object must never be null.");
 
-            m_oMoveToRegionDelegate = moveToRegionDelegate
-                ?? throw new ArgumentException("Can not instantiate map page view model- object. No move delegate available.");
+			m_oMoveToRegionDelegate = moveToRegionDelegate
+				?? throw new ArgumentException("Can not instantiate map page view model- object. No move delegate available.");
 
-            ViewService = viewService
-                ?? throw new ArgumentException("Can not instantiate map page view model- object. No view available.");
+			ViewService = viewService
+				?? throw new ArgumentException("Can not instantiate map page view model- object. No view available.");
 
-            m_oNavigation = navigation
-                ?? throw new ArgumentException("Can not instantiate map page view model- object. No navigation service available.");
+			m_oNavigation = navigation
+				?? throw new ArgumentException("Can not instantiate map page view model- object. No navigation service available.");
 
 #if USEFLYOUT
             m_oNavigationMasterDetail = new EmptyNavigationMasterDetail();
 #endif
 
-            IsConnected = TinkApp.GetIsConnected();
-        }
+			IsConnected = TinkApp.GetIsConnected();
+		}
 
 #if USEFLYOUT
         /// <summary> Delegate to perform navigation.</summary>
@@ -152,313 +151,313 @@ namespace TINK.ViewModel.Contact
         }
 #endif
 
-        public Command<PinClickedEventArgs> PinClickedCommand => new Command<PinClickedEventArgs>(
-            args =>
-            {
-                OnStationClicked(args.Pin.Tag.ToString());
-                args.Handled = true; // Prevents map to be centered to selected pin.
-            });
+		public Command<PinClickedEventArgs> PinClickedCommand => new Command<PinClickedEventArgs>(
+			args =>
+			{
+				OnStationClicked(args.Pin.Tag.ToString());
+				args.Handled = true; // Prevents map to be centered to selected pin.
+			});
 
-        /// <summary>
-        /// One time setup: Sets pins into map and connects to events.
-        /// </summary>
-        private void InitializePins(StationDictionary stations)
-        {
-            // Add pins to stations.
-            Log.ForContext<SelectStationPageViewModel>().Debug($"Request to draw {stations.Count} pins.");
-            foreach (var station in stations)
-            {
-                if (station.Position == null)
-                {
-                    // There should be no reason for a position object to be null but this alreay occurred in past.
-                    Log.ForContext<SelectStationPageViewModel>().Error("Postion object of station {@l_oStation} is null.", station);
-                    continue;
-                }
+		/// <summary>
+		/// One time setup: Sets pins into map and connects to events.
+		/// </summary>
+		private void InitializePins(StationDictionary stations)
+		{
+			// Add pins to stations.
+			Log.ForContext<SelectStationPageViewModel>().Debug($"Request to draw {stations.Count} pins.");
+			foreach (var station in stations)
+			{
+				if (station.Position == null)
+				{
+					// There should be no reason for a position object to be null but this alreay occurred in past.
+					Log.ForContext<SelectStationPageViewModel>().Error("Postion object of station {@l_oStation} is null.", station);
+					continue;
+				}
 
-                var l_oPin = new Pin
-                {
+				var l_oPin = new Pin
+				{
 
-                    Position = new Xamarin.Forms.GoogleMaps.Position(station.Position.Latitude, station.Position.Longitude),
-                    Label = long.TryParse(station.Id, out long stationId) && stationId > CUSTOM_ICONS_COUNT
-                        ? station.GetStationName()
-                        : string.Empty, // Stations with custom icons have already a id marker. No need for a label.
+					Position = new Xamarin.Forms.GoogleMaps.Position(station.Position.Latitude, station.Position.Longitude),
+					Label = long.TryParse(station.Id, out long stationId) && stationId > CUSTOM_ICONS_COUNT
+						? station.GetStationName()
+						: string.Empty, // Stations with custom icons have already a id marker. No need for a label.
 
-                    Tag = station.Id,
-                    IsVisible = false, // Set to false to prevent showing default icons (flickering).
-                };
+					Tag = station.Id,
+					IsVisible = false, // Set to false to prevent showing default icons (flickering).
+				};
 
-                Pins.Add(l_oPin);
-            }
-        }
+				Pins.Add(l_oPin);
+			}
+		}
 
-        /// <summary> Update all stations from TINK. </summary>
-        /// <param name="stationsColorList">List of colors to apply.</param>
-        private void UpdatePinsColor(IList<Color> stationsColorList)
-        {
-            Log.ForContext<SelectStationPageViewModel>().Debug($"Starting update of stations pins color for {stationsColorList.Count} stations...");
+		/// <summary> Update all stations from TINK. </summary>
+		/// <param name="stationsColorList">List of colors to apply.</param>
+		private void UpdatePinsColor(IList<Color> stationsColorList)
+		{
+			Log.ForContext<SelectStationPageViewModel>().Debug($"Starting update of stations pins color for {stationsColorList.Count} stations...");
 
-            // Update colors of pins.
-            for (int pinIndex = 0; pinIndex < stationsColorList.Count; pinIndex++)
-            {
+			// Update colors of pins.
+			for (int pinIndex = 0; pinIndex < stationsColorList.Count; pinIndex++)
+			{
 
-                var indexPartPrefix = int.TryParse(Pins[pinIndex].Tag.ToString(), out int stationId)
-                    && stationId <= CUSTOM_ICONS_COUNT
-                    ? $"{stationId}" // there is a station marker with index letter for given station id
-                    : "Open"; // there is no station marker. Use open marker.
+				var indexPartPrefix = int.TryParse(Pins[pinIndex].Tag.ToString(), out int stationId)
+					&& stationId <= CUSTOM_ICONS_COUNT
+					? $"{stationId}" // there is a station marker with index letter for given station id
+					: "Open"; // there is no station marker. Use open marker.
 
-                var colorPartPrefix = GetRessourceNameColorPart(stationsColorList[pinIndex]);
+				var colorPartPrefix = GetRessourceNameColorPart(stationsColorList[pinIndex]);
 
-                var l_iName = $"{indexPartPrefix.ToString().PadLeft(2, '0')}_{colorPartPrefix}{(DeviceInfo.Platform == DevicePlatform.Android ? ".png" : string.Empty)}";
-                try
-                {
-                    Pins[pinIndex].Icon = BitmapDescriptorFactory.FromBundle(l_iName);
-                }
-                catch (Exception l_oException)
-                {
-                    Log.ForContext<SelectStationPageViewModel>().Error("Station icon {l_strName} can not be loaded. {@l_oException}.", l_oException);
-                    Pins[pinIndex].Label = stationId.ToString();
-                    Pins[pinIndex].Icon = BitmapDescriptorFactory.DefaultMarker(stationsColorList[pinIndex]);
-                }
+				var l_iName = $"{indexPartPrefix.ToString().PadLeft(2, '0')}_{colorPartPrefix}{(DeviceInfo.Platform == DevicePlatform.Android ? ".png" : string.Empty)}";
+				try
+				{
+					Pins[pinIndex].Icon = BitmapDescriptorFactory.FromBundle(l_iName);
+				}
+				catch (Exception l_oException)
+				{
+					Log.ForContext<SelectStationPageViewModel>().Error("Station icon {l_strName} can not be loaded. {@l_oException}.", l_oException);
+					Pins[pinIndex].Label = stationId.ToString();
+					Pins[pinIndex].Icon = BitmapDescriptorFactory.DefaultMarker(stationsColorList[pinIndex]);
+				}
 
-                Pins[pinIndex].IsVisible = true;
-            }
+				Pins[pinIndex].IsVisible = true;
+			}
 
-            var pinsCount = Pins.Count;
-            for (int pinIndex = stationsColorList.Count; pinIndex < pinsCount; pinIndex++)
-            {
-                Log.ForContext<SelectStationPageViewModel>().Error($"Unexpected count of pins detected. Expected {stationsColorList.Count} but is {pinsCount}.");
-                Pins[pinIndex].IsVisible = false;
-            }
+			var pinsCount = Pins.Count;
+			for (int pinIndex = stationsColorList.Count; pinIndex < pinsCount; pinIndex++)
+			{
+				Log.ForContext<SelectStationPageViewModel>().Error($"Unexpected count of pins detected. Expected {stationsColorList.Count} but is {pinsCount}.");
+				Pins[pinIndex].IsVisible = false;
+			}
 
-            Log.ForContext<SelectStationPageViewModel>().Debug("Update of stations pins color done.");
-        }
+			Log.ForContext<SelectStationPageViewModel>().Debug("Update of stations pins color done.");
+		}
 
-        /// <summary> Gets the color related part of the ressrouce name.</summary>
-        /// <param name="color">Color to get name for.</param>
-        /// <returns>Resource name.</returns>
-        private static string GetRessourceNameColorPart(Color color)
-        {
-            if (color == Color.Blue)
-            {
-                return "Blue";
-            }
+		/// <summary> Gets the color related part of the ressrouce name.</summary>
+		/// <param name="color">Color to get name for.</param>
+		/// <returns>Resource name.</returns>
+		private static string GetRessourceNameColorPart(Color color)
+		{
+			if (color == Color.Blue)
+			{
+				return "Blue";
+			}
 
-            if (color == Color.Green)
-            {
-                return "Green";
-            }
+			if (color == Color.Green)
+			{
+				return "Green";
+			}
 
-            if (color == Color.LightBlue)
-            {
-                return "LightBlue";
-            }
+			if (color == Color.LightBlue)
+			{
+				return "LightBlue";
+			}
 
-            if (color == Color.Red)
-            {
-                return "Red";
-            }
+			if (color == Color.Red)
+			{
+				return "Red";
+			}
 
-            return color.ToString();
-        }
+			return color.ToString();
+		}
 
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        /// <param name="p_oFilterDictionaryMapPage">Holds map page filter settings.</param>
-        /// <param name="p_oPolling">Holds polling management object.</param>
-        /// <param name="p_bIsShowWhatsNewRequired">If true whats new page will be shown.</param>
-        public async Task OnAppearing()
-        {
-            try
-            {
-                IsRunning = true;
-                // Process map page.
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		/// <param name="p_oFilterDictionaryMapPage">Holds map page filter settings.</param>
+		/// <param name="p_oPolling">Holds polling management object.</param>
+		/// <param name="p_bIsShowWhatsNewRequired">If true whats new page will be shown.</param>
+		public async Task OnAppearing()
+		{
+			try
+			{
+				IsRunning = true;
+				// Process map page.
 
-                Log.ForContext<SelectStationPageViewModel>().Information(
-                    $"Current UI language is {Thread.CurrentThread.CurrentUICulture.Name}.");
+				Log.ForContext<SelectStationPageViewModel>().Information(
+					$"Current UI language is {Thread.CurrentThread.CurrentUICulture.Name}.");
 
-                if (Pins.Count <= 0)
-                {
-                    ActionText = AppResources.ActivityTextRequestingLocationPermissions;
+				if (Pins.Count <= 0)
+				{
+					ActionText = AppResources.ActivityTextRequestingLocationPermissions;
 
-                    // Check location permission
-                    var status = await PermissionsService.CheckStatusAsync();
-                    if (TinkApp.CenterMapToCurrentLocation
-                        && !GeolocationService.IsSimulation
-                        && status != Status.Granted)
-                    {
-                        var permissionResult = await PermissionsService.RequestAsync();
+					// Check location permission
+					var status = await PermissionsService.CheckStatusAsync();
+					if (TinkApp.CenterMapToCurrentLocation
+						&& !GeolocationService.IsSimulation
+						&& status != Status.Granted)
+					{
+						var permissionResult = await PermissionsService.RequestAsync();
 
-                        if (permissionResult != Status.Granted)
-                        {
-                            var dialogResult = await ViewService.DisplayAlert(
-                                AppResources.MessageTitleHint,
-                                AppResources.MessageCenterMapLocationPermissionOpenDialog,
-                                AppResources.MessageAnswerYes,
-                                AppResources.MessageAnswerNo);
+						if (permissionResult != Status.Granted)
+						{
+							var dialogResult = await ViewService.DisplayAlert(
+								AppResources.MessageTitleHint,
+								AppResources.MessageCenterMapLocationPermissionOpenDialog,
+								AppResources.MessageAnswerYes,
+								AppResources.MessageAnswerNo);
 
-                            if (dialogResult)
-                            {
-                                // User decided to give access to locations permissions.
-                                PermissionsService.OpenAppSettings();
-                                ActionText = "";
-                                IsRunning = false;
-                                IsMapPageEnabled = true;
-                                return;
-                            }
-                        }
-                    }
+							if (dialogResult)
+							{
+								// User decided to give access to locations permissions.
+								PermissionsService.OpenAppSettings();
+								ActionText = "";
+								IsRunning = false;
+								IsMapPageEnabled = true;
+								return;
+							}
+						}
+					}
 
-                    // Move and scale before getting stations and bikes which takes some time.
-                    ActionText = AppResources.ActivityTextCenterMap;
-                    Location currentLocation = null;
-                    try
-                    {
-                        currentLocation = TinkApp.CenterMapToCurrentLocation
-                            ? await GeolocationService.GetAsync()
-                            : null;
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.ForContext<SelectStationPageViewModel>().Error("Getting location failed. {Exception}", ex);
-                    }
+					// Move and scale before getting stations and bikes which takes some time.
+					ActionText = AppResources.ActivityTextCenterMap;
+					Location currentLocation = null;
+					try
+					{
+						currentLocation = TinkApp.CenterMapToCurrentLocation
+							? await GeolocationService.GetAsync()
+							: null;
+					}
+					catch (Exception ex)
+					{
+						Log.ForContext<SelectStationPageViewModel>().Error("Getting location failed. {Exception}", ex);
+					}
 
-                    MoveAndScale(m_oMoveToRegionDelegate, TinkApp.Uris.ActiveUri, currentLocation);
-                }
+					MoveAndScale(m_oMoveToRegionDelegate, TinkApp.Uris.ActiveUri, currentLocation);
+				}
 
-                ActionText = AppResources.ActivityTextMapLoadingStationsAndBikes;
-                IsConnected = TinkApp.GetIsConnected();
-                var resultStationsAndBikes = await TinkApp.GetConnector(IsConnected).Query.GetBikesAndStationsAsync();
+				ActionText = AppResources.ActivityTextMapLoadingStationsAndBikes;
+				IsConnected = TinkApp.GetIsConnected();
+				var resultStationsAndBikes = await TinkApp.GetConnector(IsConnected).Query.GetBikesAndStationsAsync();
 
-                TinkApp.Stations = resultStationsAndBikes.Response.StationsAll;
-                TinkApp.ResourceUrls = resultStationsAndBikes.GeneralData.ResourceUrls;
+				TinkApp.Stations = resultStationsAndBikes.Response.StationsAll;
+				TinkApp.ResourceUrls = resultStationsAndBikes.GeneralData.ResourceUrls;
 
-                if (Pins.Count > 0 && Pins.Count != resultStationsAndBikes.Response.StationsAll.Count)
-                {
-                    // Either
-                    // - user logged in/ logged out which might lead to more/ less stations beeing available
-                    // - new stations were added/ existing ones remove
-                    Pins.Clear();
-                }
+				if (Pins.Count > 0 && Pins.Count != resultStationsAndBikes.Response.StationsAll.Count)
+				{
+					// Either
+					// - user logged in/ logged out which might lead to more/ less stations beeing available
+					// - new stations were added/ existing ones remove
+					Pins.Clear();
+				}
 
-                // Check if there are alreay any pins to the map 
-                // i.e detecte first call of member OnAppearing after construction
-                if (Pins.Count <= 0)
-                {
-                    // Map was not yet initialized.
-                    // Get stations from Copri
-                    Log.ForContext<SelectStationPageViewModel>().Verbose("No pins detected on page.");
-                    if (resultStationsAndBikes.Response.StationsAll.CopriVersion < CopriCallsStatic.UnsupportedVersionLower)
-                    {
-                        await ViewService.DisplayAlert(
-                            AppResources.MessageWaring,
-                            string.Format(AppResources.MessageCopriVersionIsOutdated, ContactPageViewModel.GetAppName(TinkApp.Uris.ActiveUri)),
-                            AppResources.MessageAnswerOk);
+				// Check if there are alreay any pins to the map 
+				// i.e detecte first call of member OnAppearing after construction
+				if (Pins.Count <= 0)
+				{
+					// Map was not yet initialized.
+					// Get stations from Copri
+					Log.ForContext<SelectStationPageViewModel>().Verbose("No pins detected on page.");
+					if (resultStationsAndBikes.Response.StationsAll.CopriVersion < CopriCallsStatic.UnsupportedVersionLower)
+					{
+						await ViewService.DisplayAlert(
+							AppResources.MessageWaring,
+							string.Format(AppResources.MessageCopriVersionIsOutdated, TinkApp.Flavor.GetDisplayName()),
+							AppResources.MessageAnswerOk);
 
-                        Log.ForContext<SelectStationPageViewModel>().Error($"Outdated version of app detected. Version expected is {resultStationsAndBikes.Response.StationsAll.CopriVersion}.");
-                    }
+						Log.ForContext<SelectStationPageViewModel>().Error($"Outdated version of app detected. Version expected is {resultStationsAndBikes.Response.StationsAll.CopriVersion}.");
+					}
 
-                    if (resultStationsAndBikes.Response.StationsAll.CopriVersion >= CopriCallsStatic.UnsupportedVersionUpper)
-                    {
-                        await ViewService.DisplayAlert(
-                            AppResources.MessageWaring,
-                            string.Format(AppResources.MessageAppVersionIsOutdated, ContactPageViewModel.GetAppName(TinkApp.Uris.ActiveUri)),
-                            AppResources.MessageAnswerOk);
+					if (resultStationsAndBikes.Response.StationsAll.CopriVersion >= CopriCallsStatic.UnsupportedVersionUpper)
+					{
+						await ViewService.DisplayAlert(
+							AppResources.MessageWaring,
+							string.Format(AppResources.MessageAppVersionIsOutdated, TinkApp.Flavor.GetDisplayName()),
+							AppResources.MessageAnswerOk);
 
-                        Log.ForContext<SelectStationPageViewModel>().Error($"Outdated version of app detected. Version expected is {resultStationsAndBikes.Response.StationsAll.CopriVersion}.");
-                    }
+						Log.ForContext<SelectStationPageViewModel>().Error($"Outdated version of app detected. Version expected is {resultStationsAndBikes.Response.StationsAll.CopriVersion}.");
+					}
 
-                    // Set pins to their positions on map.
-                    InitializePins(resultStationsAndBikes.Response.StationsAll);
+					// Set pins to their positions on map.
+					InitializePins(resultStationsAndBikes.Response.StationsAll);
 
-                    Log.ForContext<SelectStationPageViewModel>().Verbose("Update of pins done.");
-                }
+					Log.ForContext<SelectStationPageViewModel>().Verbose("Update of pins done.");
+				}
 
 
-                if (resultStationsAndBikes.Exception?.GetType() == typeof(AuthcookieNotDefinedException))
-                {
-                    Log.ForContext<SelectStationPageViewModel>().Error("Map page is shown (probable for the first time after startup of app) and COPRI auth cookie is not defined. {@l_oException}", resultStationsAndBikes.Exception);
+				if (resultStationsAndBikes.Exception?.GetType() == typeof(AuthcookieNotDefinedException))
+				{
+					Log.ForContext<SelectStationPageViewModel>().Error("Map page is shown (probable for the first time after startup of app) and COPRI auth cookie is not defined. {@l_oException}", resultStationsAndBikes.Exception);
 
-                    // COPRI reports an auth cookie error.
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageWaring,
-                        AppResources.MessageMapPageErrorAuthcookieUndefined,
-                        AppResources.MessageAnswerOk);
+					// COPRI reports an auth cookie error.
+					await ViewService.DisplayAlert(
+						AppResources.MessageWaring,
+						AppResources.MessageMapPageErrorAuthcookieUndefined,
+						AppResources.MessageAnswerOk);
 
-                    IsConnected = TinkApp.GetIsConnected();
+					IsConnected = TinkApp.GetIsConnected();
 
-                    await TinkApp.GetConnector(IsConnected).Command.DoLogout();
-                    TinkApp.ActiveUser.Logout();
-                }
+					await TinkApp.GetConnector(IsConnected).Command.DoLogout();
+					TinkApp.ActiveUser.Logout();
+				}
 
-                // Update pin colors.
-                Log.ForContext<SelectStationPageViewModel>().Verbose("Starting update pins color...");
+				// Update pin colors.
+				Log.ForContext<SelectStationPageViewModel>().Verbose("Starting update pins color...");
 
-                var colors = GetStationColors(
-                     Pins.Select(x => x.Tag.ToString()).ToList(),
-                     resultStationsAndBikes.Response.Bikes);
+				var colors = GetStationColors(
+					 Pins.Select(x => x.Tag.ToString()).ToList(),
+					 resultStationsAndBikes.Response.Bikes);
 
-                // Update pins color form count of bikes located at station.
-                UpdatePinsColor(colors);
+				// Update pins color form count of bikes located at station.
+				UpdatePinsColor(colors);
 
 
-                Log.ForContext<SelectStationPageViewModel>().Verbose("Update pins color done.");
+				Log.ForContext<SelectStationPageViewModel>().Verbose("Update pins color done.");
 
-                Exception = resultStationsAndBikes.Exception;
-                ActionText = "";
-                IsRunning = false;
-                IsMapPageEnabled = true;
-            }
-            catch (Exception l_oException)
-            {
-                Log.ForContext<SelectStationPageViewModel>().Error($"An error occurred opening select station page.\r\n{l_oException.Message}");
+				Exception = resultStationsAndBikes.Exception;
+				ActionText = "";
+				IsRunning = false;
+				IsMapPageEnabled = true;
+			}
+			catch (Exception l_oException)
+			{
+				Log.ForContext<SelectStationPageViewModel>().Error($"An error occurred opening select station page.\r\n{l_oException.Message}");
 
-                IsRunning = false;
+				IsRunning = false;
 
-                await ViewService.DisplayAlert(
-                    "Fehler",
-                    $"Beim Anzeigen der Fahrradstandorte- Seite ist ein Fehler aufgetreten.\r\n{l_oException.Message}",
-                    "OK");
+				await ViewService.DisplayAlert(
+					"Fehler",
+					$"Beim Anzeigen der Fahrradstandorte- Seite ist ein Fehler aufgetreten.\r\n{l_oException.Message}",
+					"OK");
 
-                IsMapPageEnabled = true;
-            }
-        }
+				IsMapPageEnabled = true;
+			}
+		}
 
-        /// <summary> Moves map and scales visible region depending on active filter. </summary>
-        public static void MoveAndScale(
-            Action<MapSpan> moveToRegionDelegate,
-            Uri activeUri,
-            Location currentLocation = null)
-        {
-            if (currentLocation != null)
-            {
-                // Move to current location.
-                moveToRegionDelegate(MapSpan.FromCenterAndRadius(
-                    new Xamarin.Forms.GoogleMaps.Position(currentLocation.Latitude, currentLocation.Longitude),
-                    Distance.FromKilometers(1.0)));
-                return;
-            }
+		/// <summary> Moves map and scales visible region depending on active filter. </summary>
+		public static void MoveAndScale(
+			Action<MapSpan> moveToRegionDelegate,
+			Uri activeUri,
+			Location currentLocation = null)
+		{
+			if (currentLocation != null)
+			{
+				// Move to current location.
+				moveToRegionDelegate(MapSpan.FromCenterAndRadius(
+					new Xamarin.Forms.GoogleMaps.Position(currentLocation.Latitude, currentLocation.Longitude),
+					Distance.FromKilometers(1.0)));
+				return;
+			}
 
-            // Center map to Freiburg
-            moveToRegionDelegate(MapSpan.FromCenterAndRadius(
-                new Xamarin.Forms.GoogleMaps.Position(47.995865, 7.815086),
-                Distance.FromKilometers(2.9)));
-        }
+			// Center map to Freiburg
+			moveToRegionDelegate(MapSpan.FromCenterAndRadius(
+				new Xamarin.Forms.GoogleMaps.Position(47.995865, 7.815086),
+				Distance.FromKilometers(2.9)));
+		}
 
-        /// <summary> User clicked on a bike. </summary>
-        /// <param name="selectedStationId">Id of station user clicked on.</param>
-        public async void OnStationClicked(string selectedStationId)
-        {
-            try
-            {
-                Log.ForContext<SelectStationPageViewModel>().Information($"User taped station {selectedStationId}.");
+		/// <summary> User clicked on a bike. </summary>
+		/// <param name="selectedStationId">Id of station user clicked on.</param>
+		public async void OnStationClicked(string selectedStationId)
+		{
+			try
+			{
+				Log.ForContext<SelectStationPageViewModel>().Information($"User taped station {selectedStationId}.");
 
-                // Lock action to prevent multiple instances of "BikeAtStation" being opened.
-                IsMapPageEnabled = false;
+				// Lock action to prevent multiple instances of "BikeAtStation" being opened.
+				IsMapPageEnabled = false;
 
-                TinkApp.SelectedStation = TinkApp.Stations.FirstOrDefault(x => x.Id == selectedStationId)
-                    ?? new Station(selectedStationId, new List<string>(), null); // Station might not be in list StationDictinaly because this list is not updatd in background task.
+				TinkApp.SelectedStation = TinkApp.Stations.FirstOrDefault(x => x.Id == selectedStationId)
+					?? new Station(selectedStationId, new List<string>(), null); // Station might not be in list StationDictinaly because this list is not updatd in background task.
 
 #if TRYNOTBACKSTYLE
                 m_oNavigation.ShowPage(
@@ -469,179 +468,179 @@ namespace TINK.ViewModel.Contact
                 // Show page.
                 ViewService.ShowPage(ViewTypes.ContactPage, AppResources.MarkingContactPageTitle);
 #else
-                await ViewService.ShowPage("//ContactPage");
+				await ViewService.ShowPage("//ContactPage");
 #endif
-                IsMapPageEnabled = true;
-                ActionText = "";
-            }
-            catch (Exception exception)
-            {
-                IsMapPageEnabled = true;
-                ActionText = "";
+				IsMapPageEnabled = true;
+				ActionText = "";
+			}
+			catch (Exception exception)
+			{
+				IsMapPageEnabled = true;
+				ActionText = "";
 
-                Log.ForContext<SelectStationPageViewModel>().Error("Fehler beim Öffnen der Ansicht \"Fahrräder an Station\" aufgetreten. {Exception}", exception);
-                await ViewService.DisplayAlert(
-                     "Fehler",
-                     $"Fehler beim Öffnen der Ansicht \"Fahrräder an Station\" aufgetreten. {exception.Message}",
-                     "OK");
-            }
+				Log.ForContext<SelectStationPageViewModel>().Error("Fehler beim Öffnen der Ansicht \"Fahrräder an Station\" aufgetreten. {Exception}", exception);
+				await ViewService.DisplayAlert(
+					 "Fehler",
+					 $"Fehler beim Öffnen der Ansicht \"Fahrräder an Station\" aufgetreten. {exception.Message}",
+					 "OK");
+			}
 #endif
-        }
+		}
 
-        /// <summary>
-        /// Gets the list of station color for all stations.
-        /// </summary>
-        /// <param name="stationsId">Station id list to get color for.</param>
-        /// <returns></returns>
-        private static IList<Color> GetStationColors(
-        IEnumerable<string> stationsId,
-        BikeCollection bikesAll)
-        {
-            if (stationsId == null)
-            {
-                Log.ForContext<SelectStationPageViewModel>().Debug("No stations available to update color for.");
-                return new List<Color>();
-            }
+		/// <summary>
+		/// Gets the list of station color for all stations.
+		/// </summary>
+		/// <param name="stationsId">Station id list to get color for.</param>
+		/// <returns></returns>
+		private static IList<Color> GetStationColors(
+		IEnumerable<string> stationsId,
+		BikeCollection bikesAll)
+		{
+			if (stationsId == null)
+			{
+				Log.ForContext<SelectStationPageViewModel>().Debug("No stations available to update color for.");
+				return new List<Color>();
+			}
 
-            if (bikesAll == null)
-            {
-                // If object is null an error occurred querrying bikes availalbe or bikes occpied which results in an unknown state.
-                Log.ForContext<SelectStationPageViewModel>().Error("No bikes available to determine pins color.");
-                return new List<Color>(stationsId.Select(x => Color.Blue));
-            }
+			if (bikesAll == null)
+			{
+				// If object is null an error occurred querrying bikes availalbe or bikes occpied which results in an unknown state.
+				Log.ForContext<SelectStationPageViewModel>().Error("No bikes available to determine pins color.");
+				return new List<Color>(stationsId.Select(x => Color.Blue));
+			}
 
-            // Get state for each station.
-            var colors = new List<Color>();
-            foreach (var stationId in stationsId)
-            {
-                // Get color of given station.
-                var bikesAtStation = bikesAll.Where(x => x.StationId == stationId).ToList();
-                if (bikesAtStation.FirstOrDefault(x => x.State.Value.IsOccupied()) != null)
-                {
-                    // There is at least one requested or booked bike
-                    colors.Add(Color.LightBlue);
-                    continue;
-                }
+			// Get state for each station.
+			var colors = new List<Color>();
+			foreach (var stationId in stationsId)
+			{
+				// Get color of given station.
+				var bikesAtStation = bikesAll.Where(x => x.StationId == stationId).ToList();
+				if (bikesAtStation.FirstOrDefault(x => x.State.Value.IsOccupied()) != null)
+				{
+					// There is at least one requested or booked bike
+					colors.Add(Color.LightBlue);
+					continue;
+				}
 
-                if (bikesAtStation.ToList().Count > 0)
-                {
-                    // There is at least one bike available
-                    colors.Add(Color.Green);
-                    continue;
-                }
+				if (bikesAtStation.ToList().Count > 0)
+				{
+					// There is at least one bike available
+					colors.Add(Color.Green);
+					continue;
+				}
 
-                colors.Add(Color.Red);
-            }
+				colors.Add(Color.Red);
+			}
 
-            return colors;
-        }
+			return colors;
+		}
 
-        /// <summary>
-        /// Exception which occurred getting bike information.
-        /// </summary>
-        public Exception Exception
-        {
-            get
-            {
-                return m_oException;
-            }
+		/// <summary>
+		/// Exception which occurred getting bike information.
+		/// </summary>
+		public Exception Exception
+		{
+			get
+			{
+				return m_oException;
+			}
 
-            private set
-            {
-                var statusInfoText = StatusInfoText;
-                m_oException = value;
-                if (statusInfoText == StatusInfoText)
-                {
-                    // Nothing to do because value did not change.
-                    return;
-                }
+			private set
+			{
+				var statusInfoText = StatusInfoText;
+				m_oException = value;
+				if (statusInfoText == StatusInfoText)
+				{
+					// Nothing to do because value did not change.
+					return;
+				}
 
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StatusInfoText)));
-            }
-        }
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StatusInfoText)));
+			}
+		}
 
-        /// <summary> Holds info about current action. </summary>
-        private string actionText;
+		/// <summary> Holds info about current action. </summary>
+		private string actionText;
 
-        /// <summary> Holds info about current action. </summary>
-        private string ActionText
-        {
-            get => actionText;
-            set
-            {
-                var statusInfoText = StatusInfoText;
-                actionText = value;
-                if (statusInfoText == StatusInfoText)
-                {
-                    // Nothing to do because value did not change.
-                    return;
-                }
+		/// <summary> Holds info about current action. </summary>
+		private string ActionText
+		{
+			get => actionText;
+			set
+			{
+				var statusInfoText = StatusInfoText;
+				actionText = value;
+				if (statusInfoText == StatusInfoText)
+				{
+					// Nothing to do because value did not change.
+					return;
+				}
 
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StatusInfoText)));
-            }
-        }
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StatusInfoText)));
+			}
+		}
 
-        /// <summary> Used to block more than on copri requests at a given time.</summary>
-        private bool isRunning = false;
+		/// <summary> Used to block more than on copri requests at a given time.</summary>
+		private bool isRunning = false;
 
-        /// <summary>
-        /// True if any action can be performed (request and cancel request)
-        /// </summary>
-        public bool IsRunning
-        {
-            get => isRunning;
-            set
-            {
-                if (value == isRunning)
-                    return;
+		/// <summary>
+		/// True if any action can be performed (request and cancel request)
+		/// </summary>
+		public bool IsRunning
+		{
+			get => isRunning;
+			set
+			{
+				if (value == isRunning)
+					return;
 
-                Log.ForContext<SelectStationPageViewModel>().Debug($"Switch value of {nameof(isRunning)} to {value}.");
-                isRunning = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsRunning)));
-            }
-        }
+				Log.ForContext<SelectStationPageViewModel>().Debug($"Switch value of {nameof(isRunning)} to {value}.");
+				isRunning = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsRunning)));
+			}
+		}
 
 
-        /// <summary> Holds information whether app is connected to web or not. </summary>
-        private bool? isConnected = null;
+		/// <summary> Holds information whether app is connected to web or not. </summary>
+		private bool? isConnected = null;
 
-        /// <summary>Exposes the is connected state. </summary>
-        private bool IsConnected
-        {
-            get => isConnected ?? false;
-            set
-            {
-                var statusInfoText = StatusInfoText;
-                isConnected = value;
-                if (statusInfoText == StatusInfoText)
-                {
-                    // Nothing to do.
-                    return;
-                }
+		/// <summary>Exposes the is connected state. </summary>
+		private bool IsConnected
+		{
+			get => isConnected ?? false;
+			set
+			{
+				var statusInfoText = StatusInfoText;
+				isConnected = value;
+				if (statusInfoText == StatusInfoText)
+				{
+					// Nothing to do.
+					return;
+				}
 
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StatusInfoText)));
-            }
-        }
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StatusInfoText)));
+			}
+		}
 
-        /// <summary> Holds the status information text. </summary>
-        public string StatusInfoText
-        {
-            get
-            {
-                if (Exception != null)
-                {
-                    // An error occurred getting data from copri.
-                    return Exception.GetShortErrorInfoText(TinkApp.IsReportLevelVerbose);
+		/// <summary> Holds the status information text. </summary>
+		public string StatusInfoText
+		{
+			get
+			{
+				if (Exception != null)
+				{
+					// An error occurred getting data from copri.
+					return Exception.GetShortErrorInfoText(TinkApp.IsReportLevelVerbose);
 
-                }
+				}
 
-                if (!IsConnected)
-                {
-                    return AppResources.ActivityTextConnectionStateOffline;
-                }
+				if (!IsConnected)
+				{
+					return AppResources.ActivityTextConnectionStateOffline;
+				}
 
-                return ActionText ?? string.Empty;
-            }
-        }
-    }
+				return ActionText ?? string.Empty;
+			}
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/CopriWebView/ManageAccountViewModel.cs b/TINKLib/ViewModel/CopriWebView/ManageAccountViewModel.cs
index bfccd25..94a09fe 100644
--- a/TINKLib/ViewModel/CopriWebView/ManageAccountViewModel.cs
+++ b/TINKLib/ViewModel/CopriWebView/ManageAccountViewModel.cs
@@ -4,53 +4,53 @@ using TINK.Repository.Request;
 
 namespace TINK.ViewModel.Login
 {
-    /// <summary> Manages the copri web view when user is logged in. </summary>
-    public class ManageAccountViewModel
-    {
+	/// <summary> Manages the copri web view when user is logged in. </summary>
+	public class ManageAccountViewModel
+	{
 
-        /// <summary> Holds the auth cookie of the user logged in.</summary>
-        private string SessionCookie { get; }
+		/// <summary> Holds the auth cookie of the user logged in.</summary>
+		private string SessionCookie { get; }
 
-        /// <summary> Holds the merchant id.</summary>
-        private string MerchantId { get; }
+		/// <summary> Holds the merchant id.</summary>
+		private string MerchantId { get; }
 
-        /// <summary>
-        /// Holds the current ui two letter ISO language name.
-        /// </summary>
-        private string UiIsoLanguageName { get; }
+		/// <summary>
+		/// Holds the current ui two letter ISO language name.
+		/// </summary>
+		private string UiIsoLanguageName { get; }
 
-        /// <summary> Holds the name of the host.</summary>
-        private string HostName { get; }
+		/// <summary> Holds the name of the host.</summary>
+		private string HostName { get; }
 
-        /// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
-        public ManageAccountViewModel(
-            string sessionCookie,
-            string merchantId,
-            string uiIsoLangugageName,
-            string hostName)
-        {
-            SessionCookie = sessionCookie;
-            MerchantId = merchantId;
-            UiIsoLanguageName = uiIsoLangugageName;
-            HostName = hostName;
-        }
+		/// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
+		public ManageAccountViewModel(
+			string sessionCookie,
+			string merchantId,
+			string uiIsoLangugageName,
+			string hostName)
+		{
+			SessionCookie = sessionCookie;
+			MerchantId = merchantId;
+			UiIsoLanguageName = uiIsoLangugageName;
+			HostName = hostName;
+		}
 
-        /// <summary> Get Uri of web view managing user account. </summary>
-        public string Uri
-        {
-            get
-            {
-                var sessionIdQueryElement = QueryBuilderHelper.GetSessionIdQueryElement("?", MerchantId, SessionCookie);
+		/// <summary> Get Uri of web view managing user account. </summary>
+		public string Uri
+		{
+			get
+			{
+				var sessionIdQueryElement = QueryBuilderHelper.GetSessionIdQueryElement("?", MerchantId, SessionCookie);
 
-                string GetUriText()
-                    => !string.IsNullOrEmpty(sessionIdQueryElement)
-                        ? $"https://{HostName}{sessionIdQueryElement}{QueryBuilderHelper.GetLanguageQueryElement("&", UiIsoLanguageName)}"
-                        : $"https://{HostName}";
+				string GetUriText()
+					=> !string.IsNullOrEmpty(sessionIdQueryElement)
+						? $"https://{HostName}{sessionIdQueryElement}{QueryBuilderHelper.GetLanguageQueryElement("&", UiIsoLanguageName)}"
+						: $"https://{HostName}";
 
-                Log.ForContext<ManageAccountViewModel>().Debug($"Request to open url {GetUriText()} to get privacy info.");
+				Log.ForContext<ManageAccountViewModel>().Debug($"Request to open url {GetUriText()} to get privacy info.");
 
-                return GetUriText();
-            }
-        }
-    }
+				return GetUriText();
+			}
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/CopriWebView/PasswordForgottonViewModel.cs b/TINKLib/ViewModel/CopriWebView/PasswordForgottonViewModel.cs
index e9eeb5f..8d5a3d0 100644
--- a/TINKLib/ViewModel/CopriWebView/PasswordForgottonViewModel.cs
+++ b/TINKLib/ViewModel/CopriWebView/PasswordForgottonViewModel.cs
@@ -3,47 +3,47 @@ using TINK.Repository.Request;
 
 namespace TINK.ViewModel.CopriWebView
 {
-    /// <summary> Manages the copri web view for password forgotton use case. </summary>
-    public class PasswordForgottonViewModel
-    {
-        /// <summary> Holds the merchant id.</summary>
-        private string MerchantId { get; }
+	/// <summary> Manages the copri web view for password forgotton use case. </summary>
+	public class PasswordForgottonViewModel
+	{
+		/// <summary> Holds the merchant id.</summary>
+		private string MerchantId { get; }
 
-        /// <summary> Holds the name of the host.</summary>
-        private string HostName { get; }
+		/// <summary> Holds the name of the host.</summary>
+		private string HostName { get; }
 
-        /// <summary>
-        /// Holds the current ui two letter ISO language name.
-        /// </summary>
-        private string UiIsoLanguageName { get; }
+		/// <summary>
+		/// Holds the current ui two letter ISO language name.
+		/// </summary>
+		private string UiIsoLanguageName { get; }
 
-        /// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
-        public PasswordForgottonViewModel(
-            string merchantId,
-            string uiIsoLangugageName,
-            string hostName)
-        {
-            MerchantId = merchantId;
-            UiIsoLanguageName = uiIsoLangugageName;
-            HostName = hostName;
-        }
+		/// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
+		public PasswordForgottonViewModel(
+			string merchantId,
+			string uiIsoLangugageName,
+			string hostName)
+		{
+			MerchantId = merchantId;
+			UiIsoLanguageName = uiIsoLangugageName;
+			HostName = hostName;
+		}
 
-        /// <summary> Get Uri of web view providing password forgotton functionality. </summary>
-        public string Uri
-        {
-            get
-            {
-                var sessionIdQueryElement = QueryBuilderHelper.GetSessionIdQueryElement("?", MerchantId);
+		/// <summary> Get Uri of web view providing password forgotton functionality. </summary>
+		public string Uri
+		{
+			get
+			{
+				var sessionIdQueryElement = QueryBuilderHelper.GetSessionIdQueryElement("?", MerchantId);
 
-                string GetUriText()
-                    => !string.IsNullOrEmpty(sessionIdQueryElement)
-                        ? $"https://{HostName}/app/Account{sessionIdQueryElement}{QueryBuilderHelper.GetLanguageQueryElement("&", UiIsoLanguageName)}"
-                        : $"https://{HostName}/app/Account";
+				string GetUriText()
+					=> !string.IsNullOrEmpty(sessionIdQueryElement)
+						? $"https://{HostName}/app/Account{sessionIdQueryElement}{QueryBuilderHelper.GetLanguageQueryElement("&", UiIsoLanguageName)}"
+						: $"https://{HostName}/app/Account";
 
-                Log.ForContext<PasswordForgottonViewModel>().Debug($"Request to open url {GetUriText()} to get privacy info.");
+				Log.ForContext<PasswordForgottonViewModel>().Debug($"Request to open url {GetUriText()} to get privacy info.");
 
-                return GetUriText();
-            }
-        }
-    }
+				return GetUriText();
+			}
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/CopriWebView/RegisterPageViewModel.cs b/TINKLib/ViewModel/CopriWebView/RegisterPageViewModel.cs
index 07e6f48..07f743f 100644
--- a/TINKLib/ViewModel/CopriWebView/RegisterPageViewModel.cs
+++ b/TINKLib/ViewModel/CopriWebView/RegisterPageViewModel.cs
@@ -3,45 +3,45 @@ using TINK.Repository.Request;
 
 namespace TINK.ViewModel.CopriWebView
 {
-    public class RegisterPageViewModel
-    {
-        /// <summary> Holds the merchant id.</summary>
-        private string MerchantId { get; }
+	public class RegisterPageViewModel
+	{
+		/// <summary> Holds the merchant id.</summary>
+		private string MerchantId { get; }
 
-        /// <summary> Holds the name of the host.</summary>
-        private string HostName { get; }
+		/// <summary> Holds the name of the host.</summary>
+		private string HostName { get; }
 
-        /// <summary>
-        /// Holds the current ui two letter ISO language name.
-        /// </summary>
-        private string UiIsoLanguageName { get; }
+		/// <summary>
+		/// Holds the current ui two letter ISO language name.
+		/// </summary>
+		private string UiIsoLanguageName { get; }
 
-        /// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
-        public RegisterPageViewModel(
-            string merchantId,
-            string uiIsoLangugageName,
-            string hostName)
-        {
-            HostName = hostName;
-            UiIsoLanguageName = uiIsoLangugageName;
-            MerchantId = merchantId;
-        }
+		/// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
+		public RegisterPageViewModel(
+			string merchantId,
+			string uiIsoLangugageName,
+			string hostName)
+		{
+			HostName = hostName;
+			UiIsoLanguageName = uiIsoLangugageName;
+			MerchantId = merchantId;
+		}
 
-        /// <summary>Get Uri of web view for creating account.</summary>
-        public string Uri
-        {
-            get
-            {
-                var sessionIdQueryElement = QueryBuilderHelper.GetSessionIdQueryElement("?", MerchantId);
+		/// <summary>Get Uri of web view for creating account.</summary>
+		public string Uri
+		{
+			get
+			{
+				var sessionIdQueryElement = QueryBuilderHelper.GetSessionIdQueryElement("?", MerchantId);
 
-                string GetUriText()
-                    => !string.IsNullOrEmpty(sessionIdQueryElement)
-                        ? $"https://{HostName}/app/Account/1.%20Kundendaten{sessionIdQueryElement}{QueryBuilderHelper.GetLanguageQueryElement("&", UiIsoLanguageName)}"
-                        : $"https://{HostName}/app/Account/1.%20Kundendaten";
+				string GetUriText()
+					=> !string.IsNullOrEmpty(sessionIdQueryElement)
+						? $"https://{HostName}/app/Account/1.%20Kundendaten{sessionIdQueryElement}{QueryBuilderHelper.GetLanguageQueryElement("&", UiIsoLanguageName)}"
+						: $"https://{HostName}/app/Account/1.%20Kundendaten";
 
-                Log.ForContext<RegisterPageViewModel>().Debug($"Request to open url {GetUriText()} to get privacy info.");
-                return GetUriText();
-            }
-        }
-    }
+				Log.ForContext<RegisterPageViewModel>().Debug($"Request to open url {GetUriText()} to get privacy info.");
+				return GetUriText();
+			}
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/FeesAndBikes/FeesAndBikesPageViewModel.cs b/TINKLib/ViewModel/FeesAndBikes/FeesAndBikesPageViewModel.cs
index e83402b..8bf3d30 100644
--- a/TINKLib/ViewModel/FeesAndBikes/FeesAndBikesPageViewModel.cs
+++ b/TINKLib/ViewModel/FeesAndBikes/FeesAndBikesPageViewModel.cs
@@ -4,77 +4,77 @@ using Xamarin.Forms;
 
 namespace TINK.ViewModel.Contact
 {
-    public class FeesAndBikesPageViewModel : INotifyPropertyChanged
-    {
-        public event PropertyChangedEventHandler PropertyChanged;
+	public class FeesAndBikesPageViewModel : INotifyPropertyChanged
+	{
+		public event PropertyChangedEventHandler PropertyChanged;
 
 
-        /// <summary> Holds value wether site caching is on or off.</summary>
-        bool IsSiteCachingOn { get; }
+		/// <summary> Holds value wether site caching is on or off.</summary>
+		bool IsSiteCachingOn { get; }
 
-        private string FeesResourcePath { get; }
+		private string FeesResourcePath { get; }
 
-        private string BikesResourcePath { get; }
+		private string BikesResourcePath { get; }
 
 
-        /// <summary> Constructs view model.</summary>
-        /// <param name="isSiteCachingOn">Set of user permissions</param>
-        /// <param name="resourceProvider">Delegate to get an an embedded html ressource. Used as fallback if download from web page does not work and cache is empty.</param>
-        public FeesAndBikesPageViewModel(
-            string hostName,
-            string feesResourcePath,
-            string bikesResourcePath,
-            bool isSiteCachingOn)
-        {
-            HostName = hostName;
-            FeesResourcePath = feesResourcePath;
-            BikesResourcePath = bikesResourcePath;
-            IsSiteCachingOn = isSiteCachingOn;
-        }
+		/// <summary> Constructs view model.</summary>
+		/// <param name="isSiteCachingOn">Set of user permissions</param>
+		/// <param name="resourceProvider">Delegate to get an an embedded html ressource. Used as fallback if download from web page does not work and cache is empty.</param>
+		public FeesAndBikesPageViewModel(
+			string hostName,
+			string feesResourcePath,
+			string bikesResourcePath,
+			bool isSiteCachingOn)
+		{
+			HostName = hostName;
+			FeesResourcePath = feesResourcePath;
+			BikesResourcePath = bikesResourcePath;
+			IsSiteCachingOn = isSiteCachingOn;
+		}
 
-        /// <summary> Holds the name of the host.</summary>
-        private string HostName { get; }
+		/// <summary> Holds the name of the host.</summary>
+		private string HostName { get; }
 
-        /// <summary> Called when page is shown. </summary>
-        public async void OnAppearing()
-        {
-            RentBikeText = new HtmlWebViewSource
-            {
-                Html = !string.IsNullOrEmpty(FeesResourcePath)
-                    ? await ViewModelHelper.GetSource($"https://{HostName}/{FeesResourcePath}" /* "site/tariff_info_1.html" */, IsSiteCachingOn)
-                    : await Task.FromResult(ViewModelHelper.FromBody("No fees resource available. Resource path is null or empty."))
-            };
+		/// <summary> Called when page is shown. </summary>
+		public async void OnAppearing()
+		{
+			RentBikeText = new HtmlWebViewSource
+			{
+				Html = !string.IsNullOrEmpty(FeesResourcePath)
+					? await ViewModelHelper.GetSource($"https://{HostName}/{FeesResourcePath}" /* "site/tariff_info_1.html" */, IsSiteCachingOn)
+					: await Task.FromResult(ViewModelHelper.FromBody("No fees resource available. Resource path is null or empty."))
+			};
 
-            TypesOfBikesText = new HtmlWebViewSource
-            {
-                Html = !string.IsNullOrEmpty(BikesResourcePath)
-                    ? await ViewModelHelper.GetSource($"https://{HostName}/{BikesResourcePath}" /*"site/bike_info.html"*/, IsSiteCachingOn)
-                    : await Task.FromResult(ViewModelHelper.FromBody("No bikes instruction resource available. Resource path is null or empty."))
-            };
-        }
+			TypesOfBikesText = new HtmlWebViewSource
+			{
+				Html = !string.IsNullOrEmpty(BikesResourcePath)
+					? await ViewModelHelper.GetSource($"https://{HostName}/{BikesResourcePath}" /*"site/bike_info.html"*/, IsSiteCachingOn)
+					: await Task.FromResult(ViewModelHelper.FromBody("No bikes instruction resource available. Resource path is null or empty."))
+			};
+		}
 
-        private HtmlWebViewSource rentBikeText;
+		private HtmlWebViewSource rentBikeText;
 
-        private HtmlWebViewSource typesOfBikesText;
+		private HtmlWebViewSource typesOfBikesText;
 
-        public HtmlWebViewSource RentBikeText
-        {
-            get => rentBikeText;
-            set
-            {
-                rentBikeText = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(RentBikeText)));
-            }
-        }
+		public HtmlWebViewSource RentBikeText
+		{
+			get => rentBikeText;
+			set
+			{
+				rentBikeText = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(RentBikeText)));
+			}
+		}
 
-        public HtmlWebViewSource TypesOfBikesText
-        {
-            get => typesOfBikesText;
-            set
-            {
-                typesOfBikesText = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(TypesOfBikesText)));
-            }
-        }
-    }
+		public HtmlWebViewSource TypesOfBikesText
+		{
+			get => typesOfBikesText;
+			set
+			{
+				typesOfBikesText = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(TypesOfBikesText)));
+			}
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/FindBike/FindBikePageViewModel.cs b/TINKLib/ViewModel/FindBike/FindBikePageViewModel.cs
index 14be18c..7d2d805 100644
--- a/TINKLib/ViewModel/FindBike/FindBikePageViewModel.cs
+++ b/TINKLib/ViewModel/FindBike/FindBikePageViewModel.cs
@@ -27,291 +27,291 @@ using Xamarin.Forms;
 
 namespace TINK.ViewModel.FindBike
 {
-    public class FindBikePageViewModel : BikesViewModel, INotifyCollectionChanged, INotifyPropertyChanged
-    {
-        private string bikeIdUserInput = string.Empty;
+	public class FindBikePageViewModel : BikesViewModel, INotifyCollectionChanged, INotifyPropertyChanged
+	{
+		private string bikeIdUserInput = string.Empty;
 
-        /// <summary> Text entered by user to specify a bike.</summary>
-        public string BikeIdUserInput
-        {
-            get => bikeIdUserInput;
-            set
-            {
-                if (value == bikeIdUserInput)
-                {
-                    return;
-                }
+		/// <summary> Text entered by user to specify a bike.</summary>
+		public string BikeIdUserInput
+		{
+			get => bikeIdUserInput;
+			set
+			{
+				if (value == bikeIdUserInput)
+				{
+					return;
+				}
 
-                bikeIdUserInput = value;
-                base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsSelectBikeEnabled)));
-            }
-        }
+				bikeIdUserInput = value;
+				base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsSelectBikeEnabled)));
+			}
+		}
 
-        /// <summary>
-        /// True if any action can be performed (request and cancel request)
-        /// </summary>
-        public override bool IsIdle
-        {
-            get => base.IsIdle;
-            set
-            {
-                if (value == IsIdle)
-                    return;
+		/// <summary>
+		/// True if any action can be performed (request and cancel request)
+		/// </summary>
+		public override bool IsIdle
+		{
+			get => base.IsIdle;
+			set
+			{
+				if (value == IsIdle)
+					return;
 
-                Log.ForContext<FindBikePageViewModel>().Debug($"Switch value of {nameof(IsIdle)} to {value}.");
-                base.IsIdle = value;
-                OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsSelectBikeEnabled))); // Enable select bike button.
-            }
-        }
+				Log.ForContext<FindBikePageViewModel>().Debug($"Switch value of {nameof(IsIdle)} to {value}.");
+				base.IsIdle = value;
+				OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsSelectBikeEnabled))); // Enable select bike button.
+			}
+		}
 
-        /// <summary> Holds all bikes available.</summary>
-        public BikeCollection Bikes { get; set; }
+		/// <summary> Holds all bikes available.</summary>
+		public BikeCollection Bikes { get; set; }
 
-        /// <summary> Do not allow to select bike if id is not set.</summary>
-        public bool IsSelectBikeEnabled => IsIdle && BikeIdUserInput != null && BikeIdUserInput.Length > 0;
+		/// <summary> Do not allow to select bike if id is not set.</summary>
+		public bool IsSelectBikeEnabled => IsIdle && BikeIdUserInput != null && BikeIdUserInput.Length > 0;
 
-        /// <summary> Hide id input fields as soon as bike is found.</summary>
-        public bool IsSelectBikeVisible => BikeCollection != null && BikeCollection.Count == 0;
+		/// <summary> Hide id input fields as soon as bike is found.</summary>
+		public bool IsSelectBikeVisible => BikeCollection != null && BikeCollection.Count == 0;
 
-        /// <summary> Holds the stations to get station names form station ids. </summary>
-        private IEnumerable<IStation> Stations { get; }
+		/// <summary> Holds the stations to get station names form station ids. </summary>
+		private IEnumerable<IStation> Stations { get; }
 
-        /// <summary>
-        /// Constructs bike collection view model in case information about occupied bikes is available.
-        /// </summary>
-        /// <param name="p_oUser">Mail address of active user.</param>
-        /// <param name="isReportLevelVerbose">True if report level is verbose, false if not.</param>
-        /// <param name="permissions">Holds object to query location permisions.</param>
-        /// <param name="bluetoothLE">Holds object to query bluetooth state.</param>
-        /// <param name="runtimPlatform">Specifies on which platform code is run.</param>
-        /// <param name="isConnectedDelegate">Returns if mobile is connected to web or not.</param>
-        /// <param name="connectorFactory">Connects system to copri.</param>
-        /// <param name="lockService">Service to control lock retrieve info.</param>
-        /// <param name="stations">Stations to get station name from station id.</param>
-        /// <param name="polling"> Holds whether to poll or not and the periode leght is polling is on. </param>
-        /// <param name="postAction">Executes actions on GUI thread.</param>
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
-        /// <param name="viewService">Interface to actuate methodes on GUI.</param>
-        /// <param name="openUrlInBrowser">Delegate to open browser.</param>
-        public FindBikePageViewModel(
-            User p_oUser,
-            ILocationPermission permissions,
-            IBluetoothLE bluetoothLE,
-            string runtimPlatform,
-            Func<bool> isConnectedDelegate,
-            Func<bool, IConnector> connectorFactory,
-            IGeolocation geolocation,
-            ILocksService lockService,
-            IEnumerable<IStation> stations,
-            PollingParameters polling,
-            Action<SendOrPostCallback, object> postAction,
-            ISmartDevice smartDevice,
-            IViewService viewService,
-            Action<string> openUrlInBrowser) : base(p_oUser, permissions, bluetoothLE, runtimPlatform, isConnectedDelegate, connectorFactory, geolocation, lockService, polling, postAction, smartDevice, viewService, openUrlInBrowser, () => new MyBikeInUseStateInfoProvider())
-        {
-            CollectionChanged += (sender, eventargs) =>
-            {
-                OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsSelectBikeVisible)));
-            };
+		/// <summary>
+		/// Constructs bike collection view model in case information about occupied bikes is available.
+		/// </summary>
+		/// <param name="p_oUser">Mail address of active user.</param>
+		/// <param name="isReportLevelVerbose">True if report level is verbose, false if not.</param>
+		/// <param name="permissions">Holds object to query location permisions.</param>
+		/// <param name="bluetoothLE">Holds object to query bluetooth state.</param>
+		/// <param name="runtimPlatform">Specifies on which platform code is run.</param>
+		/// <param name="isConnectedDelegate">Returns if mobile is connected to web or not.</param>
+		/// <param name="connectorFactory">Connects system to copri.</param>
+		/// <param name="lockService">Service to control lock retrieve info.</param>
+		/// <param name="stations">Stations to get station name from station id.</param>
+		/// <param name="polling"> Holds whether to poll or not and the periode leght is polling is on. </param>
+		/// <param name="postAction">Executes actions on GUI thread.</param>
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
+		/// <param name="viewService">Interface to actuate methodes on GUI.</param>
+		/// <param name="openUrlInBrowser">Delegate to open browser.</param>
+		public FindBikePageViewModel(
+			User p_oUser,
+			ILocationPermission permissions,
+			IBluetoothLE bluetoothLE,
+			string runtimPlatform,
+			Func<bool> isConnectedDelegate,
+			Func<bool, IConnector> connectorFactory,
+			IGeolocation geolocation,
+			ILocksService lockService,
+			IEnumerable<IStation> stations,
+			PollingParameters polling,
+			Action<SendOrPostCallback, object> postAction,
+			ISmartDevice smartDevice,
+			IViewService viewService,
+			Action<string> openUrlInBrowser) : base(p_oUser, permissions, bluetoothLE, runtimPlatform, isConnectedDelegate, connectorFactory, geolocation, lockService, polling, postAction, smartDevice, viewService, openUrlInBrowser, () => new MyBikeInUseStateInfoProvider())
+		{
+			CollectionChanged += (sender, eventargs) =>
+			{
+				OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsSelectBikeVisible)));
+			};
 
-            Stations = stations ?? throw new ArgumentException(nameof(stations));
-        }
+			Stations = stations ?? throw new ArgumentException(nameof(stations));
+		}
 
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        public async Task OnAppearing()
-        {
-            Log.ForContext<FindBikePageViewModel>().Information("User request to show page FindBike- page re-appearing");
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		public async Task OnAppearing()
+		{
+			Log.ForContext<FindBikePageViewModel>().Information("User request to show page FindBike- page re-appearing");
 
-            ActionText = AppResources.ActivityTextFindBikeLoadingBikes;
+			ActionText = AppResources.ActivityTextFindBikeLoadingBikes;
 
-            var bikes = await ConnectorFactory(IsConnected).Query.GetBikesAsync();
+			var bikes = await ConnectorFactory(IsConnected).Query.GetBikesAsync();
 
-            Exception = bikes.Exception; // Update communication error from query for bikes occupied.
-            Bikes = bikes.Response;
+			Exception = bikes.Exception; // Update communication error from query for bikes occupied.
+			Bikes = bikes.Response;
 
-            ActionText = "";
-            IsIdle = true;
-        }
+			ActionText = "";
+			IsIdle = true;
+		}
 
-        /// <summary> Command object to bind select bike button to view model. </summary>
-        public System.Windows.Input.ICommand OnSelectBikeRequest => new Xamarin.Forms.Command(async () => await SelectBike(), () => IsSelectBikeEnabled);
+		/// <summary> Command object to bind select bike button to view model. </summary>
+		public System.Windows.Input.ICommand OnSelectBikeRequest => new Xamarin.Forms.Command(async () => await SelectBike(), () => IsSelectBikeEnabled);
 
-        /// <summary> Select a bike by ID</summary>
-        public async Task SelectBike()
-        {
-            try
-            {
-                var selectedBike = Bikes.FirstOrDefault(x => x.Id.Equals(BikeIdUserInput.Trim(), StringComparison.OrdinalIgnoreCase));
+		/// <summary> Select a bike by ID</summary>
+		public async Task SelectBike()
+		{
+			try
+			{
+				var selectedBike = Bikes.FirstOrDefault(x => x.Id.Equals(BikeIdUserInput.Trim(), StringComparison.OrdinalIgnoreCase));
 
-                if (selectedBike == null)
-                {
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageTitleHint,
-                        string.Format(AppResources.MessageErrorSelectBikeNoBikeFound, BikeIdUserInput),
-                        AppResources.MessageAnswerOk);
-                    return;
-                }
+				if (selectedBike == null)
+				{
+					await ViewService.DisplayAlert(
+						AppResources.MessageTitleHint,
+						string.Format(AppResources.MessageErrorSelectBikeNoBikeFound, BikeIdUserInput),
+						AppResources.MessageAnswerOk);
+					return;
+				}
 
-                var bikeCollection = new BikeCollection(new Dictionary<string, Model.Bikes.BikeInfoNS.BC.BikeInfo> { { selectedBike.Id, selectedBike } });
+				var bikeCollection = new BikeCollection(new Dictionary<string, Model.Bikes.BikeInfoNS.BC.BikeInfo> { { selectedBike.Id, selectedBike } });
 
-                var lockIdList = bikeCollection
-                    .GetLockIt()
-                    .Cast<Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo>()
-                    .Select(x => x.LockInfo)
-                    .ToList();
+				var lockIdList = bikeCollection
+					.GetLockIt()
+					.Cast<Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo>()
+					.Select(x => x.LockInfo)
+					.ToList();
 
-                if (LockService is ILocksServiceFake serviceFake)
-                {
-                    serviceFake.UpdateSimulation(bikeCollection);
-                }
+				if (LockService is ILocksServiceFake serviceFake)
+				{
+					serviceFake.UpdateSimulation(bikeCollection);
+				}
 
-                // Check bluetooth and location permission and states
-                ActionText = AppResources.ActivityTextCheckBluetoothState;
+				// Check bluetooth and location permission and states
+				ActionText = AppResources.ActivityTextCheckBluetoothState;
 
-                if (bikeCollection.FirstOrDefault(x => x is Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo btBike) != null
-                    && RuntimePlatform == Device.Android)
-                {
-                    // Check location permission
-                    var status = await PermissionsService.CheckStatusAsync();
-                    if (status != Status.Granted)
-                    {
-                        var permissionResult = await PermissionsService.RequestAsync();
+				if (bikeCollection.FirstOrDefault(x => x is Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo btBike) != null
+					&& RuntimePlatform == Device.Android)
+				{
+					// Check location permission
+					var status = await PermissionsService.CheckStatusAsync();
+					if (status != Status.Granted)
+					{
+						var permissionResult = await PermissionsService.RequestAsync();
 
-                        if (permissionResult != Status.Granted)
-                        {
-                            var dialogResult = await ViewService.DisplayAlert(
-                                AppResources.MessageTitleHint,
-                                AppResources.MessageBikesManagementLocationPermissionOpenDialog,
-                                AppResources.MessageAnswerYes,
-                                AppResources.MessageAnswerNo);
+						if (permissionResult != Status.Granted)
+						{
+							var dialogResult = await ViewService.DisplayAlert(
+								AppResources.MessageTitleHint,
+								AppResources.MessageBikesManagementLocationPermissionOpenDialog,
+								AppResources.MessageAnswerYes,
+								AppResources.MessageAnswerNo);
 
-                            if (!dialogResult)
-                            {
-                                // User decided not to give access to locations permissions.
-                                BikeCollection.Update(bikeCollection, Stations);
+							if (!dialogResult)
+							{
+								// User decided not to give access to locations permissions.
+								BikeCollection.Update(bikeCollection, Stations);
 
-                                //await OnAppearing(() => UpdateTask());
+								//await OnAppearing(() => UpdateTask());
 
-                                ActionText = "";
-                                IsIdle = true;
-                                return;
-                            }
+								ActionText = "";
+								IsIdle = true;
+								return;
+							}
 
-                            // Open permissions dialog.
-                            PermissionsService.OpenAppSettings();
-                        }
-                    }
+							// Open permissions dialog.
+							PermissionsService.OpenAppSettings();
+						}
+					}
 
-                    // Location state
-                    if (Geolocation.IsGeolcationEnabled == false)
-                    {
-                        await ViewService.DisplayAlert(
-                            AppResources.MessageTitleHint,
-                            AppResources.MessageBikesManagementLocationActivation,
-                            AppResources.MessageAnswerOk);
+					// Location state
+					if (Geolocation.IsGeolcationEnabled == false)
+					{
+						await ViewService.DisplayAlert(
+							AppResources.MessageTitleHint,
+							AppResources.MessageBikesManagementLocationActivation,
+							AppResources.MessageAnswerOk);
 
-                        BikeCollection.Update(bikeCollection, Stations);
+						BikeCollection.Update(bikeCollection, Stations);
 
-                        await OnAppearing(() => UpdateTask());
+						await OnAppearing(() => UpdateTask());
 
-                        ActionText = "";
-                        IsIdle = true;
-                        return;
-                    }
+						ActionText = "";
+						IsIdle = true;
+						return;
+					}
 
-                    // Bluetooth state
-                    if (await BluetoothService.GetBluetoothState() != BluetoothState.On)
-                    {
-                        await ViewService.DisplayAlert(
-                            AppResources.MessageTitleHint,
-                            AppResources.MessageBikesManagementBluetoothActivation,
-                            AppResources.MessageAnswerOk);
+					// Bluetooth state
+					if (await BluetoothService.GetBluetoothState() != BluetoothState.On)
+					{
+						await ViewService.DisplayAlert(
+							AppResources.MessageTitleHint,
+							AppResources.MessageBikesManagementBluetoothActivation,
+							AppResources.MessageAnswerOk);
 
-                        BikeCollection.Update(bikeCollection, Stations);
+						BikeCollection.Update(bikeCollection, Stations);
 
-                        await OnAppearing(() => UpdateTask());
+						await OnAppearing(() => UpdateTask());
 
-                        ActionText = "";
-                        IsIdle = true;
-                        return;
-                    }
-                }
+						ActionText = "";
+						IsIdle = true;
+						return;
+					}
+				}
 
-                // Connect to bluetooth devices.
-                ActionText = AppResources.ActivityTextSearchBikes;
-                IEnumerable<LockInfoTdo> locksInfoTdo;
-                try
-                {
-                    locksInfoTdo = await LockService.GetLocksStateAsync(
-                        lockIdList.Select(x => x.ToLockInfoTdo()).ToList(),
-                        LockService.TimeOut.MultiConnect);
-                }
-                catch (Exception exception)
-                {
-                    Log.ForContext<FindBikePageViewModel>().Error("Getting bluetooth state failed. {Exception}", exception);
-                    locksInfoTdo = new List<LockInfoTdo>();
-                }
+				// Connect to bluetooth devices.
+				ActionText = AppResources.ActivityTextSearchBikes;
+				IEnumerable<LockInfoTdo> locksInfoTdo;
+				try
+				{
+					locksInfoTdo = await LockService.GetLocksStateAsync(
+						lockIdList.Select(x => x.ToLockInfoTdo()).ToList(),
+						LockService.TimeOut.MultiConnect);
+				}
+				catch (Exception exception)
+				{
+					Log.ForContext<FindBikePageViewModel>().Error("Getting bluetooth state failed. {Exception}", exception);
+					locksInfoTdo = new List<LockInfoTdo>();
+				}
 
-                var locksInfo = lockIdList.UpdateById(locksInfoTdo);
+				var locksInfo = lockIdList.UpdateById(locksInfoTdo);
 
-                BikeCollection.Update(bikeCollection.UpdateLockInfo(locksInfo), Stations);
+				BikeCollection.Update(bikeCollection.UpdateLockInfo(locksInfo), Stations);
 
-                await OnAppearing(() => UpdateTask());
+				await OnAppearing(() => UpdateTask());
 
-                ActionText = "";
-                IsIdle = true;
-            }
-            catch (Exception exception)
-            {
-                await ViewService.DisplayAlert(
-                    AppResources.MessageErrorSelectBikeTitle,
-                    exception.Message,
-                    AppResources.MessageAnswerOk);
+				ActionText = "";
+				IsIdle = true;
+			}
+			catch (Exception exception)
+			{
+				await ViewService.DisplayAlert(
+					AppResources.MessageErrorSelectBikeTitle,
+					exception.Message,
+					AppResources.MessageAnswerOk);
 
-                Log.ForContext<FindBikePageViewModel>().Error("Running command to select bike failed. {Exception}", exception);
-                return;
-            }
-        }
+				Log.ForContext<FindBikePageViewModel>().Error("Running command to select bike failed. {Exception}", exception);
+				return;
+			}
+		}
 
-        /// <summary> Create task which updates my bike view model.</summary>
-        private void UpdateTask()
-        {
-            // Start task which periodically updates pins.
-            PostAction(
-                unused =>
-                {
-                    ActionText = AppResources.ActivityTextUpdating;
-                    IsConnected = IsConnectedDelegate();
-                },
-                null);
+		/// <summary> Create task which updates my bike view model.</summary>
+		private void UpdateTask()
+		{
+			// Start task which periodically updates pins.
+			PostAction(
+				unused =>
+				{
+					ActionText = AppResources.ActivityTextUpdating;
+					IsConnected = IsConnectedDelegate();
+				},
+				null);
 
-            var result = ConnectorFactory(IsConnected).Query.GetBikesAsync().Result;
+			var result = ConnectorFactory(IsConnected).Query.GetBikesAsync().Result;
 
-            var bikes = result.Response;
+			var bikes = result.Response;
 
-            var exception = result.Exception;
-            if (exception != null)
-            {
-                Log.ForContext<FindBikePageViewModel>().Error("Getting bikes occupied in polling context failed with exception {Exception}.", exception);
-            }
+			var exception = result.Exception;
+			if (exception != null)
+			{
+				Log.ForContext<FindBikePageViewModel>().Error("Getting bikes occupied in polling context failed with exception {Exception}.", exception);
+			}
 
-            var selectedBike = bikes.FirstOrDefault(x => x.Id.Equals(BikeIdUserInput.Trim(), StringComparison.OrdinalIgnoreCase));
+			var selectedBike = bikes.FirstOrDefault(x => x.Id.Equals(BikeIdUserInput.Trim(), StringComparison.OrdinalIgnoreCase));
 
-            bikes = selectedBike != null
-                ? new BikeCollection(new Dictionary<string, Model.Bikes.BikeInfoNS.BC.BikeInfo> { { selectedBike.Id, selectedBike } })
-                : new BikeCollection();
+			bikes = selectedBike != null
+				? new BikeCollection(new Dictionary<string, Model.Bikes.BikeInfoNS.BC.BikeInfo> { { selectedBike.Id, selectedBike } })
+				: new BikeCollection();
 
-            PostAction(
-                unused =>
-                {
-                    BikeCollection.Update(bikes, Stations); // Updating collection leads to update of GUI.
-                    Exception = result.Exception;
-                    ActionText = string.Empty;
-                },
-                null);
-        }
-    }
+			PostAction(
+				unused =>
+				{
+					BikeCollection.Update(bikes, Stations); // Updating collection leads to update of GUI.
+					Exception = result.Exception;
+					ActionText = string.Empty;
+				},
+				null);
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/IInUseStateInfoProvider.cs b/TINKLib/ViewModel/IInUseStateInfoProvider.cs
index 814c22f..4807ac3 100644
--- a/TINKLib/ViewModel/IInUseStateInfoProvider.cs
+++ b/TINKLib/ViewModel/IInUseStateInfoProvider.cs
@@ -2,24 +2,24 @@
 
 namespace TINK.ViewModel
 {
-    public interface IInUseStateInfoProvider
-    {
-        /// <summary>
-        /// Gets reserved info display text.
-        /// </summary>
-        /// <returns>Display text</returns>
-        string GetReservedInfo(
-            TimeSpan? p_oRemainingTime,
-            string p_strStation = null,
-            string p_strCode = null);
+	public interface IInUseStateInfoProvider
+	{
+		/// <summary>
+		/// Gets reserved info display text.
+		/// </summary>
+		/// <returns>Display text</returns>
+		string GetReservedInfo(
+			TimeSpan? p_oRemainingTime,
+			string p_strStation = null,
+			string p_strCode = null);
 
-        /// <summary>
-        /// Gets booked info display text.
-        /// </summary>
-        /// <returns>Display text</returns>
-        string GetBookedInfo(
-            DateTime? p_oFrom,
-            string p_strStation = null,
-            string p_strCode = null);
-    }
+		/// <summary>
+		/// Gets booked info display text.
+		/// </summary>
+		/// <returns>Display text</returns>
+		string GetBookedInfo(
+			DateTime? p_oFrom,
+			string p_strStation = null,
+			string p_strCode = null);
+	}
 }
diff --git a/TINKLib/ViewModel/IPollingUpdateTaskManager.cs b/TINKLib/ViewModel/IPollingUpdateTaskManager.cs
index e6faa3b..7488759 100644
--- a/TINKLib/ViewModel/IPollingUpdateTaskManager.cs
+++ b/TINKLib/ViewModel/IPollingUpdateTaskManager.cs
@@ -3,18 +3,18 @@ using TINK.Settings;
 
 namespace TINK.ViewModel
 {
-    public interface IPollingUpdateTaskManager
-    {
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Actuates and awaits the first update process and starts a task wich actuate the subseqent update tasks.
-        /// </summary>
-        Task StartUpdateAyncPeridically(PollingParameters p_oPolling = null);
+	public interface IPollingUpdateTaskManager
+	{
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Actuates and awaits the first update process and starts a task wich actuate the subseqent update tasks.
+		/// </summary>
+		Task StartUpdateAyncPeridically(PollingParameters p_oPolling = null);
 
-        /// <summary>
-        /// Invoked when pages is closed/ hidden. 
-        /// Stops update process.
-        /// </summary>
-        Task StopUpdatePeridically();
-    }
+		/// <summary>
+		/// Invoked when pages is closed/ hidden. 
+		/// Stops update process.
+		/// </summary>
+		Task StopUpdatePeridically();
+	}
 }
diff --git a/TINKLib/ViewModel/IdlePollingUpdateTaskManager.cs b/TINKLib/ViewModel/IdlePollingUpdateTaskManager.cs
index a84b5e2..e11b5c7 100644
--- a/TINKLib/ViewModel/IdlePollingUpdateTaskManager.cs
+++ b/TINKLib/ViewModel/IdlePollingUpdateTaskManager.cs
@@ -3,18 +3,18 @@ using TINK.Settings;
 
 namespace TINK.ViewModel
 {
-    /// <summary>Polling update task manager to handle calls if no update has to be performed.</summary>
-    /// <remarks> Object MapPage calls OnDisappearing for some reasons after first start after installation before OnAppearing. This requires a IdlePollingUpdateManager to exist.</remarks>
-    public class IdlePollingUpdateTaskManager : IPollingUpdateTaskManager
-    {
-        public async Task StartUpdateAyncPeridically(PollingParameters p_oPeriode)
-        {
-            await Task.CompletedTask;
-        }
+	/// <summary>Polling update task manager to handle calls if no update has to be performed.</summary>
+	/// <remarks> Object MapPage calls OnDisappearing for some reasons after first start after installation before OnAppearing. This requires a IdlePollingUpdateManager to exist.</remarks>
+	public class IdlePollingUpdateTaskManager : IPollingUpdateTaskManager
+	{
+		public async Task StartUpdateAyncPeridically(PollingParameters p_oPeriode)
+		{
+			await Task.CompletedTask;
+		}
 
-        public async Task StopUpdatePeridically()
-        {
-            await Task.CompletedTask;
-        }
-    }
+		public async Task StopUpdatePeridically()
+		{
+			await Task.CompletedTask;
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Info/BikeInfo/BikeInfoCarouselViewModel.cs b/TINKLib/ViewModel/Info/BikeInfo/BikeInfoCarouselViewModel.cs
index b35ce6e..850bd65 100644
--- a/TINKLib/ViewModel/Info/BikeInfo/BikeInfoCarouselViewModel.cs
+++ b/TINKLib/ViewModel/Info/BikeInfo/BikeInfoCarouselViewModel.cs
@@ -5,149 +5,149 @@ using Xamarin.Forms;
 
 namespace TINK.ViewModel.Info.BikeInfo
 {
-    public class BikeInfoViewModel
-    {
-        /// <summary>
-        /// Reference on view service to show modal notifications and to perform navigation.
-        /// </summary>
-        private readonly IViewService m_oViewService;
+	public class BikeInfoViewModel
+	{
+		/// <summary>
+		/// Reference on view service to show modal notifications and to perform navigation.
+		/// </summary>
+		private readonly IViewService m_oViewService;
 
 
-        /// <param name="p_oViewService">Interface to actuate methodes on GUI.</param>
-        public BikeInfoViewModel(Func<string, ImageSource> imageSourceFunc, IViewService p_oViewService)
-        {
-            m_oViewService = p_oViewService
-                ?? throw new ArgumentException("Can not instantiate bike info page view model- object. No view available.");
+		/// <param name="p_oViewService">Interface to actuate methodes on GUI.</param>
+		public BikeInfoViewModel(Func<string, ImageSource> imageSourceFunc, IViewService p_oViewService)
+		{
+			m_oViewService = p_oViewService
+				?? throw new ArgumentException("Can not instantiate bike info page view model- object. No view available.");
 
-            CarouselItems = new List<CourouselPageItemViewModel>();
+			CarouselItems = new List<CourouselPageItemViewModel>();
 
-            CarouselItems.Add(
-                new CourouselPageItemViewModel(
-                    "Anleitung Benutzung Lastenräder",
-                    $"Diese Anleitung wird einmalig nach der Anmeldung angezeigt.\r\nZum Blättern auf die nächste Seite bitte nach links wischen.\r\nNach Anzeige aller Seiten kann die Anleitung geschlossen werden.",
-                    CarouselItems.Count + 1,
-                    () => CarouselItems.Count,
-                    () => CloseAction()));
+			CarouselItems.Add(
+				new CourouselPageItemViewModel(
+					"Anleitung Benutzung Lastenräder",
+					$"Diese Anleitung wird einmalig nach der Anmeldung angezeigt.\r\nZum Blättern auf die nächste Seite bitte nach links wischen.\r\nNach Anzeige aller Seiten kann die Anleitung geschlossen werden.",
+					CarouselItems.Count + 1,
+					() => CarouselItems.Count,
+					() => CloseAction()));
 
-            CarouselItems.Add(
-                new CourouselPageItemViewModel(
-                    "Zweirädriges TINK Rad: Hochklappen des Fahrradständers (1/3)",
-                    "So abgestellt hat das zweirädrige Transportrad einen sicheren Stand.",
-                    CarouselItems.Count + 1,
-                    () => CarouselItems.Count,
-                    () => CloseAction(),
-                    imageSourceFunc("trike_stand1_image.4HJ5PY_679_382.png")));
+			CarouselItems.Add(
+				new CourouselPageItemViewModel(
+					"Zweirädriges TINK Rad: Hochklappen des Fahrradständers (1/3)",
+					"So abgestellt hat das zweirädrige Transportrad einen sicheren Stand.",
+					CarouselItems.Count + 1,
+					() => CarouselItems.Count,
+					() => CloseAction(),
+					imageSourceFunc("trike_stand1_image.4HJ5PY_679_382.png")));
 
-            CarouselItems.Add(
-                                new CourouselPageItemViewModel(
-                    "Zweirädriges TINK Rad: Hochklappen des Fahrradständers (2/3)",
-                    "Zum Weiterfahren das Transportrad nach vorne bewegen, bis kein Gewicht mehr auf dem Fahrradständer liegt.",
-                    CarouselItems.Count + 1,
-                    () => CarouselItems.Count,
-                    () => CloseAction(),
-                    imageSourceFunc("trike_stand2_image.RIX2PY_679_382.png")));
+			CarouselItems.Add(
+								new CourouselPageItemViewModel(
+					"Zweirädriges TINK Rad: Hochklappen des Fahrradständers (2/3)",
+					"Zum Weiterfahren das Transportrad nach vorne bewegen, bis kein Gewicht mehr auf dem Fahrradständer liegt.",
+					CarouselItems.Count + 1,
+					() => CarouselItems.Count,
+					() => CloseAction(),
+					imageSourceFunc("trike_stand2_image.RIX2PY_679_382.png")));
 
-            CarouselItems.Add(
-                new CourouselPageItemViewModel(
-                    "Zweirädriges TINK Rad: Hochklappen des Fahrradständers (3/3).",
-                    "Den Fahrradständer mit dem Fuß nach oben drücken, bis er hörbar am Magneten (Pfeil) einrastet. So fällt er unterwegs nicht herunter.",
-                    CarouselItems.Count + 1,
-                    () => CarouselItems.Count,
-                    () => CloseAction(),
-                    imageSourceFunc("trike_stand3_image.FDR7PY_679_382.png")));
+			CarouselItems.Add(
+				new CourouselPageItemViewModel(
+					"Zweirädriges TINK Rad: Hochklappen des Fahrradständers (3/3).",
+					"Den Fahrradständer mit dem Fuß nach oben drücken, bis er hörbar am Magneten (Pfeil) einrastet. So fällt er unterwegs nicht herunter.",
+					CarouselItems.Count + 1,
+					() => CarouselItems.Count,
+					() => CloseAction(),
+					imageSourceFunc("trike_stand3_image.FDR7PY_679_382.png")));
 
-            CarouselItems.Add(
-                new CourouselPageItemViewModel(
-                    "Dreirädriges TINK Rad: Lösen und Aktivieren der Feststellbremse (1/3).",
-                    "Die Feststellbremse ist der graue Stift, der aus der Bremse herausragt. Ist sie aktiv, kann das Dreirad nicht wegrollen.",
-                    CarouselItems.Count + 1,
-                    () => CarouselItems.Count,
-                    () => CloseAction(),
-                    imageSourceFunc("trike_brake1_image.HZ17PY_678_382.png")));
+			CarouselItems.Add(
+				new CourouselPageItemViewModel(
+					"Dreirädriges TINK Rad: Lösen und Aktivieren der Feststellbremse (1/3).",
+					"Die Feststellbremse ist der graue Stift, der aus der Bremse herausragt. Ist sie aktiv, kann das Dreirad nicht wegrollen.",
+					CarouselItems.Count + 1,
+					() => CarouselItems.Count,
+					() => CloseAction(),
+					imageSourceFunc("trike_brake1_image.HZ17PY_678_382.png")));
 
-            CarouselItems.Add(
-                new CourouselPageItemViewModel(
-                    "Dreirädriges TINK Rad: Lösen und Aktivieren der Feststellbremse (2/3).",
-                    "Lösen der Feststellbremse: Die Bremse vollständig anziehen, bis der Stift wieder auf seine ursprüngliche Position herausspringt.",
-                    CarouselItems.Count + 1,
-                    () => CarouselItems.Count,
-                    () => CloseAction(),
-                    imageSourceFunc("trike_brake2_image.1YBAQY_679_382.png")));
+			CarouselItems.Add(
+				new CourouselPageItemViewModel(
+					"Dreirädriges TINK Rad: Lösen und Aktivieren der Feststellbremse (2/3).",
+					"Lösen der Feststellbremse: Die Bremse vollständig anziehen, bis der Stift wieder auf seine ursprüngliche Position herausspringt.",
+					CarouselItems.Count + 1,
+					() => CarouselItems.Count,
+					() => CloseAction(),
+					imageSourceFunc("trike_brake2_image.1YBAQY_679_382.png")));
 
-            CarouselItems.Add(
-                new CourouselPageItemViewModel(
-                    "Dreirädriges TINK Rad: Lösen und Aktivieren der Feststellbremse (3/3).",
-                    "Aktivieren der Feststellbremse: Die Bremse vollständig anziehen und den Stift hineindrücken.",
-                    CarouselItems.Count + 1,
-                    () => CarouselItems.Count,
-                    () => CloseAction(),
-                    imageSourceFunc("trike_brake3_image.FJM2PY_679_382.png")));
+			CarouselItems.Add(
+				new CourouselPageItemViewModel(
+					"Dreirädriges TINK Rad: Lösen und Aktivieren der Feststellbremse (3/3).",
+					"Aktivieren der Feststellbremse: Die Bremse vollständig anziehen und den Stift hineindrücken.",
+					CarouselItems.Count + 1,
+					() => CarouselItems.Count,
+					() => CloseAction(),
+					imageSourceFunc("trike_brake3_image.FJM2PY_679_382.png")));
 
-            CarouselItems.Add(
-                new CourouselPageItemViewModel(
-                    "Höhenregulierung des Sattels (1/3).",
-                    "Hier im Bild ist der Hebel zum Einstellen des Sattels zu sehen.",
-                    CarouselItems.Count + 1,
-                    () => CarouselItems.Count,
-                    () => CloseAction(),
-                    imageSourceFunc("seat1_image.ZQ65PY_680_382.png")));
+			CarouselItems.Add(
+				new CourouselPageItemViewModel(
+					"Höhenregulierung des Sattels (1/3).",
+					"Hier im Bild ist der Hebel zum Einstellen des Sattels zu sehen.",
+					CarouselItems.Count + 1,
+					() => CarouselItems.Count,
+					() => CloseAction(),
+					imageSourceFunc("seat1_image.ZQ65PY_680_382.png")));
 
-            CarouselItems.Add(
-                new CourouselPageItemViewModel(
-                    "Höhenregulierung des Sattels (2/3).",
-                    "Durch Drücken des Hebels ist die Sattelhöhe frei verstellbar. Vergleichbar mit einem Bürostuhl bewegt sich der Sattel automatisch nach oben.",
-                    CarouselItems.Count + 1,
-                    () => CarouselItems.Count,
-                    () => CloseAction(),
-                    imageSourceFunc("seat2_image.QQZCQY_679_382.png")));
+			CarouselItems.Add(
+				new CourouselPageItemViewModel(
+					"Höhenregulierung des Sattels (2/3).",
+					"Durch Drücken des Hebels ist die Sattelhöhe frei verstellbar. Vergleichbar mit einem Bürostuhl bewegt sich der Sattel automatisch nach oben.",
+					CarouselItems.Count + 1,
+					() => CarouselItems.Count,
+					() => CloseAction(),
+					imageSourceFunc("seat2_image.QQZCQY_679_382.png")));
 
-            CarouselItems.Add(
-                new CourouselPageItemViewModel(
-                    "Höhenregulierung des Sattels (3/3).",
-                    "Durch kräftiges Herunterdrücken des Sattels (und gleichzeitigem Betätigen des Hebels) kann der Sattel nach unten verstellt werden. Tipp: Eventuell draufsetzen und dann den Hebel betätigen, um den Sattel nach unten zu drücken.",
-                    CarouselItems.Count + 1,
-                    () => CarouselItems.Count,
-                    () => CloseAction(),
-                    imageSourceFunc("seat3_image.NQ5FQY_679_382.png")));
+			CarouselItems.Add(
+				new CourouselPageItemViewModel(
+					"Höhenregulierung des Sattels (3/3).",
+					"Durch kräftiges Herunterdrücken des Sattels (und gleichzeitigem Betätigen des Hebels) kann der Sattel nach unten verstellt werden. Tipp: Eventuell draufsetzen und dann den Hebel betätigen, um den Sattel nach unten zu drücken.",
+					CarouselItems.Count + 1,
+					() => CarouselItems.Count,
+					() => CloseAction(),
+					imageSourceFunc("seat3_image.NQ5FQY_679_382.png")));
 
-            CarouselItems.Add(
-                new CourouselPageItemViewModel(
-                    "Verbinden des Kindergurts (1/3).",
-                    "Der Gurt besteht aus drei Einzelteilen. Zunächst die oberen beiden Einzelstücke nehmen.",
-                    CarouselItems.Count + 1,
-                    () => CarouselItems.Count,
-                    () => CloseAction(),
-                    imageSourceFunc("belt1_image.4XWCQY_679_382.png")));
+			CarouselItems.Add(
+				new CourouselPageItemViewModel(
+					"Verbinden des Kindergurts (1/3).",
+					"Der Gurt besteht aus drei Einzelteilen. Zunächst die oberen beiden Einzelstücke nehmen.",
+					CarouselItems.Count + 1,
+					() => CarouselItems.Count,
+					() => CloseAction(),
+					imageSourceFunc("belt1_image.4XWCQY_679_382.png")));
 
-            CarouselItems.Add(
-                new CourouselPageItemViewModel(
-                    "Verbinden des Kindergurts (2/3).",
-                    "Die beiden Einzelstücke zusammenfügen.",
-                    CarouselItems.Count + 1,
-                    () => CarouselItems.Count,
-                    () => CloseAction(),
-                    imageSourceFunc("belt2_image.X3F1PY_679_382.png")));
+			CarouselItems.Add(
+				new CourouselPageItemViewModel(
+					"Verbinden des Kindergurts (2/3).",
+					"Die beiden Einzelstücke zusammenfügen.",
+					CarouselItems.Count + 1,
+					() => CarouselItems.Count,
+					() => CloseAction(),
+					imageSourceFunc("belt2_image.X3F1PY_679_382.png")));
 
-            CarouselItems.Add(
-                new CourouselPageItemViewModel(
-                    "Verbinden des Kindergurts (3/3).",
-                    "Das obere und untere Teilstück verbinden (bis zum Einrasten). Lösen der Teilstücke durch Drücken auf den roten Knopf.",
-                    CarouselItems.Count + 1,
-                    () => CarouselItems.Count,
-                    () => CloseAction(),
-                    imageSourceFunc("belt3_image.DYOXPY_679_382.png")));
-        }
+			CarouselItems.Add(
+				new CourouselPageItemViewModel(
+					"Verbinden des Kindergurts (3/3).",
+					"Das obere und untere Teilstück verbinden (bis zum Einrasten). Lösen der Teilstücke durch Drücken auf den roten Knopf.",
+					CarouselItems.Count + 1,
+					() => CarouselItems.Count,
+					() => CloseAction(),
+					imageSourceFunc("belt3_image.DYOXPY_679_382.png")));
+		}
 
-        /// <summary> Gets the carousel page items</summary>
-        public IList<CourouselPageItemViewModel> CarouselItems { get; }
+		/// <summary> Gets the carousel page items</summary>
+		public IList<CourouselPageItemViewModel> CarouselItems { get; }
 
-        /// <summary> Command object to bind close button to view model. </summary>
+		/// <summary> Command object to bind close button to view model. </summary>
 #if USEFLYOUT
         private Action CloseAction
            => () => m_oViewService.ShowPage(ViewTypes.MapPage);
 #else
-        private Action CloseAction
-                => async () => await m_oViewService.ShowPage("//MapPage");
+		private Action CloseAction
+				=> async () => await m_oViewService.ShowPage("//MapPage");
 #endif
-    }
+	}
 }
diff --git a/TINKLib/ViewModel/Info/BikeInfo/BikeInfoCarouseltemViewModel.cs b/TINKLib/ViewModel/Info/BikeInfo/BikeInfoCarouseltemViewModel.cs
index e403909..7163835 100644
--- a/TINKLib/ViewModel/Info/BikeInfo/BikeInfoCarouseltemViewModel.cs
+++ b/TINKLib/ViewModel/Info/BikeInfo/BikeInfoCarouseltemViewModel.cs
@@ -4,76 +4,76 @@ using Xamarin.Forms;
 
 namespace TINK.ViewModel.Info.BikeInfo
 {
-    public class CourouselPageItemViewModel
-    {
-        public CourouselPageItemViewModel(
-            string p_strTitle,
-            string p_strLegend,
-            int p_iCurrentPageIndex,
-            Func<int> p_iPagesCountProvider,
-            Action p_oCloseAction,
-            ImageSource image = null)
-        {
-            Title = p_strTitle;
-            IsImageVisble = image != null;
-            if (IsImageVisble)
-            {
-                Image = image;
-            }
+	public class CourouselPageItemViewModel
+	{
+		public CourouselPageItemViewModel(
+			string p_strTitle,
+			string p_strLegend,
+			int p_iCurrentPageIndex,
+			Func<int> p_iPagesCountProvider,
+			Action p_oCloseAction,
+			ImageSource image = null)
+		{
+			Title = p_strTitle;
+			IsImageVisble = image != null;
+			if (IsImageVisble)
+			{
+				Image = image;
+			}
 
-            DescriptionText = p_strLegend;
-            CurrentPageIndex = p_iCurrentPageIndex;
-            PagesCountProvider = p_iPagesCountProvider;
-            CloseAction = p_oCloseAction;
-        }
+			DescriptionText = p_strLegend;
+			CurrentPageIndex = p_iCurrentPageIndex;
+			PagesCountProvider = p_iPagesCountProvider;
+			CloseAction = p_oCloseAction;
+		}
 
-        /// <summary> Gets the title of the navigation page. </summary>
-        public string Title { get; }
+		/// <summary> Gets the title of the navigation page. </summary>
+		public string Title { get; }
 
-        public bool IsImageVisble { get; }
+		public bool IsImageVisble { get; }
 
-        /// <summary> Gets the image. </summary>
-        public ImageSource Image { get; }
+		/// <summary> Gets the image. </summary>
+		public ImageSource Image { get; }
 
-        /// <summary> Gets the text which describes the image. </summary>
-        public string DescriptionText { get; }
+		/// <summary> Gets the text which describes the image. </summary>
+		public string DescriptionText { get; }
 
-        /// <summary> Get the progress of the carousselling progress.</summary>
-        public double ProgressValue
-        {
-            get
-            {
-                var l_oCount = PagesCountProvider();
+		/// <summary> Get the progress of the carousselling progress.</summary>
+		public double ProgressValue
+		{
+			get
+			{
+				var l_oCount = PagesCountProvider();
 
-                return l_oCount > 0 ? (double)CurrentPageIndex / l_oCount : 0;
-            }
-        }
+				return l_oCount > 0 ? (double)CurrentPageIndex / l_oCount : 0;
+			}
+		}
 
-        /// <summary> Gets if user can leave carousel page.</summary>
-        public bool IsCloseVisible
-        {
-            get
-            {
-                return PagesCountProvider() == CurrentPageIndex;
-            }
-        }
+		/// <summary> Gets if user can leave carousel page.</summary>
+		public bool IsCloseVisible
+		{
+			get
+			{
+				return PagesCountProvider() == CurrentPageIndex;
+			}
+		}
 
-        /// <summary> Command object to bind close button to view model. </summary>
-        public ICommand OnCloseRequest
-        {
-            get
-            {
-                return new Command(() => CloseAction());
-            }
-        }
+		/// <summary> Command object to bind close button to view model. </summary>
+		public ICommand OnCloseRequest
+		{
+			get
+			{
+				return new Command(() => CloseAction());
+			}
+		}
 
-        /// <summary> Returns one based index of the current page. </summary>
-        private int CurrentPageIndex { get; }
+		/// <summary> Returns one based index of the current page. </summary>
+		private int CurrentPageIndex { get; }
 
-        /// <summary> Gets the count of carousel pages. </summary>
-        private Func<int> PagesCountProvider { get; }
+		/// <summary> Gets the count of carousel pages. </summary>
+		private Func<int> PagesCountProvider { get; }
 
-        /// <summary> Action to actuate when close is invoked. </summary>
-        private Action CloseAction { get; }
-    }
+		/// <summary> Action to actuate when close is invoked. </summary>
+		private Action CloseAction { get; }
+	}
 }
diff --git a/TINKLib/ViewModel/Info/InfoPageViewModel.cs b/TINKLib/ViewModel/Info/InfoPageViewModel.cs
index 0b38d29..ba25576 100644
--- a/TINKLib/ViewModel/Info/InfoPageViewModel.cs
+++ b/TINKLib/ViewModel/Info/InfoPageViewModel.cs
@@ -8,199 +8,199 @@ using Xamarin.Forms;
 
 namespace TINK.ViewModel.Info
 {
-    /// <summary> Manges the tabbed info page. </summary>
-    public class InfoPageViewModel : INotifyPropertyChanged
-    {
-        /// <summary> Fired whenever a property changed.</summary>
-        public event PropertyChangedEventHandler PropertyChanged;
+	/// <summary> Manges the tabbed info page. </summary>
+	public class InfoPageViewModel : INotifyPropertyChanged
+	{
+		/// <summary> Fired whenever a property changed.</summary>
+		public event PropertyChangedEventHandler PropertyChanged;
 
-        /// <summary> Holds the name of the host.</summary>
-        private string HostName { get; }
+		/// <summary> Holds the name of the host.</summary>
+		private string HostName { get; }
 
-        /// <summary> Holds value wether site caching is on or off.</summary>
-        bool IsSiteCachingOn { get; }
+		/// <summary> Holds value wether site caching is on or off.</summary>
+		bool IsSiteCachingOn { get; }
 
-        private string AgbResourcePath { get; }
+		private string AgbResourcePath { get; }
 
-        private string PrivacyResourcePath { get; }
+		private string PrivacyResourcePath { get; }
 
-        private string ImpressResourcePath { get; }
+		private string ImpressResourcePath { get; }
 
-        /// <summary>
-        /// Holds the current ui two letter ISO language name.
-        /// </summary>
-        private string UiIsoLanguageName { get; }
+		/// <summary>
+		/// Holds the current ui two letter ISO language name.
+		/// </summary>
+		private string UiIsoLanguageName { get; }
 
-        /// <summary> Constructs Info view model</summary>
-        /// <param name="isSiteCachingOn">Holds value wether site caching is on or off.</param>
-        /// <param name="agbResourcePath"> Agb resouce path received from backend.</param>
-        /// <param name="privacyResourcePath"> Privacy resouce path received from backend.</param>
-        /// <param name="impressResourcePath"> Impress resouce path received from backend.</param>
-        /// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
-        /// <param name="resourceProvider">Delegate to get an an embedded html ressource. Used as fallback if download from web page does not work and cache is empty.</param>
-        public InfoPageViewModel(
-            string hostName,
-            string agbResourcePath,
-            string privacyResourcePath,
-            string impressResourcePath,
-            bool isSiteCachingOn,
-            string uiIsoLangugageName,
-            Func<string, string> resourceProvider)
-        {
-            HostName = hostName;
-            AgbResourcePath = agbResourcePath;
-            PrivacyResourcePath = privacyResourcePath;
-            ImpressResourcePath = impressResourcePath;
-            IsSiteCachingOn = isSiteCachingOn;
-            UiIsoLanguageName = uiIsoLangugageName;
+		/// <summary> Constructs Info view model</summary>
+		/// <param name="isSiteCachingOn">Holds value wether site caching is on or off.</param>
+		/// <param name="agbResourcePath"> Agb resouce path received from backend.</param>
+		/// <param name="privacyResourcePath"> Privacy resouce path received from backend.</param>
+		/// <param name="impressResourcePath"> Impress resouce path received from backend.</param>
+		/// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
+		/// <param name="resourceProvider">Delegate to get an an embedded html ressource. Used as fallback if download from web page does not work and cache is empty.</param>
+		public InfoPageViewModel(
+			string hostName,
+			string agbResourcePath,
+			string privacyResourcePath,
+			string impressResourcePath,
+			bool isSiteCachingOn,
+			string uiIsoLangugageName,
+			Func<string, string> resourceProvider)
+		{
+			HostName = hostName;
+			AgbResourcePath = agbResourcePath;
+			PrivacyResourcePath = privacyResourcePath;
+			ImpressResourcePath = impressResourcePath;
+			IsSiteCachingOn = isSiteCachingOn;
+			UiIsoLanguageName = uiIsoLangugageName;
 
-            InfoAgb = new HtmlWebViewSource { Html = "<html>Loading...</html>" };
+			InfoAgb = new HtmlWebViewSource { Html = "<html>Loading...</html>" };
 
-            ResourceProvider = resourceProvider
-                ?? throw new ArgumentException($"Can not instantiate {typeof(InfoPageViewModel)}-object. No ressource provider availalbe.");
-        }
+			ResourceProvider = resourceProvider
+				?? throw new ArgumentException($"Can not instantiate {typeof(InfoPageViewModel)}-object. No ressource provider availalbe.");
+		}
 
-        /// <summary> Called when page is shown. </summary>
-        public async void OnAppearing()
-        {
-            // Gets privacy info from server.
-            async Task<HtmlWebViewSource> GetInfoPrivacy()
-            {
-                string GetUriText()
-                    => $"https://{HostName}/{PrivacyResourcePath}";
+		/// <summary> Called when page is shown. </summary>
+		public async void OnAppearing()
+		{
+			// Gets privacy info from server.
+			async Task<HtmlWebViewSource> GetInfoPrivacy()
+			{
+				string GetUriText()
+					=> $"https://{HostName}/{PrivacyResourcePath}";
 
-                if (string.IsNullOrEmpty(PrivacyResourcePath))
-                {
-                    // Information to access ressource is missing
-                    return new HtmlWebViewSource
-                    {
-                        Html = await Task.FromResult(ViewModelHelper.FromBody("No privacy resource available. Resource path is null or empty."))
-                    };
-                }
+				if (string.IsNullOrEmpty(PrivacyResourcePath))
+				{
+					// Information to access ressource is missing
+					return new HtmlWebViewSource
+					{
+						Html = await Task.FromResult(ViewModelHelper.FromBody("No privacy resource available. Resource path is null or empty."))
+					};
+				}
 
-                Log.Debug($"Request to open url {GetUriText()} to get privacy info.");
+				Log.Debug($"Request to open url {GetUriText()} to get privacy info.");
 
-                return new HtmlWebViewSource
-                {
-                    Html = await ViewModelHelper.GetSource(
-                           GetUriText(), // "site/privacy.html"
-                           IsSiteCachingOn)
-                };
-            }
+				return new HtmlWebViewSource
+				{
+					Html = await ViewModelHelper.GetSource(
+						   GetUriText(), // "site/privacy.html"
+						   IsSiteCachingOn)
+				};
+			}
 
-            // Gets impress info from server.
-            async Task<HtmlWebViewSource> GetImpressum()
-            {
-                string GetUriText()
-                    => $"https://{HostName}/{ImpressResourcePath}";
+			// Gets impress info from server.
+			async Task<HtmlWebViewSource> GetImpressum()
+			{
+				string GetUriText()
+					=> $"https://{HostName}/{ImpressResourcePath}";
 
-                if (string.IsNullOrEmpty(ImpressResourcePath))
-                {
-                    // Information to access ressource is missing
-                    return new HtmlWebViewSource
-                    {
-                        Html = await Task.FromResult(ViewModelHelper.FromBody("No impress resource available. Resource path is null or empty."))
-                    };
-                }
+				if (string.IsNullOrEmpty(ImpressResourcePath))
+				{
+					// Information to access ressource is missing
+					return new HtmlWebViewSource
+					{
+						Html = await Task.FromResult(ViewModelHelper.FromBody("No impress resource available. Resource path is null or empty."))
+					};
+				}
 
-                Log.Debug($"Request to open url {GetUriText()} to get impress info.");
+				Log.Debug($"Request to open url {GetUriText()} to get impress info.");
 
-                return new HtmlWebViewSource
-                {
-                    Html = await ViewModelHelper.GetSource(
-                           GetUriText(), // "site/privacy.html"
-                           IsSiteCachingOn)
-                };
-            }
+				return new HtmlWebViewSource
+				{
+					Html = await ViewModelHelper.GetSource(
+						   GetUriText(), // "site/privacy.html"
+						   IsSiteCachingOn)
+				};
+			}
 
-            InfoAgb = await GetAgb(HostName, AgbResourcePath, IsSiteCachingOn, UiIsoLanguageName);
+			InfoAgb = await GetAgb(HostName, AgbResourcePath, IsSiteCachingOn, UiIsoLanguageName);
 
-            InfoPrivacy = await GetInfoPrivacy();
+			InfoPrivacy = await GetInfoPrivacy();
 
-            InfoImpressum = await GetImpressum();
-        }
+			InfoImpressum = await GetImpressum();
+		}
 
-        /// <summary> Gets the AGBs</summary>
-        /// <param name="resourceProvider"></param>
-        /// <returns> AGBs</returns>
-        public static async Task<HtmlWebViewSource> GetAgb(
-            string hostName,
-            string agbResourcePath,
-            bool isSiteCachingOn,
-            string uiIsoLangugageName)
-        {
-            string GetUriText()
-                => $"https://{hostName}/{agbResourcePath}";
+		/// <summary> Gets the AGBs</summary>
+		/// <param name="resourceProvider"></param>
+		/// <returns> AGBs</returns>
+		public static async Task<HtmlWebViewSource> GetAgb(
+			string hostName,
+			string agbResourcePath,
+			bool isSiteCachingOn,
+			string uiIsoLangugageName)
+		{
+			string GetUriText()
+				=> $"https://{hostName}/{agbResourcePath}";
 
-            if (string.IsNullOrEmpty(agbResourcePath))
-            {
-                return new HtmlWebViewSource
-                {
-                    Html = await Task.FromResult(ViewModelHelper.FromBody("No terms resource available. Resource path is null or empty."))
-                };
-            }
+			if (string.IsNullOrEmpty(agbResourcePath))
+			{
+				return new HtmlWebViewSource
+				{
+					Html = await Task.FromResult(ViewModelHelper.FromBody("No terms resource available. Resource path is null or empty."))
+				};
+			}
 
-            Log.Debug($"Request to open url {GetUriText()} to get AGB infos.");
+			Log.Debug($"Request to open url {GetUriText()} to get AGB infos.");
 
-            return new HtmlWebViewSource
-            {
-                Html = await ViewModelHelper.GetSource(
-                            GetUriText(), // "agb.html"
-                            isSiteCachingOn)
-            };
-        }
+			return new HtmlWebViewSource
+			{
+				Html = await ViewModelHelper.GetSource(
+							GetUriText(), // "agb.html"
+							isSiteCachingOn)
+			};
+		}
 
-        /// <summary> Gets the platfrom specific prefix. </summary>
-        private Func<string, string> ResourceProvider { get; set; }
+		/// <summary> Gets the platfrom specific prefix. </summary>
+		private Func<string, string> ResourceProvider { get; set; }
 
-        /// <summary> Gets the app related information (app version and licenses). </summary>
-        public HtmlWebViewSource InfoLicenses => new HtmlWebViewSource
-        {
-            Html = ResourceProvider("HtmlResouces.V02.InfoLicenses.html")
-                .Replace("CURRENT_VERSION_TINKAPP", DependencyService.Get<IAppInfo>().Version.ToString())
-                .Replace("ACTIVE_APPNAME", AppInfo.Name)
-                .Replace("APPSUPPORTMAILADDRESS", ContactPageViewModel.APPSUPPORTMAILADDRESS)
-        };
+		/// <summary> Gets the app related information (app version and licenses). </summary>
+		public HtmlWebViewSource InfoLicenses => new HtmlWebViewSource
+		{
+			Html = ResourceProvider("HtmlResouces.V02.InfoLicenses.html")
+				.Replace("CURRENT_VERSION_TINKAPP", DependencyService.Get<IAppInfo>().Version.ToString())
+				.Replace("ACTIVE_APPNAME", AppInfo.Name)
+				.Replace("APPSUPPORTMAILADDRESS", ContactPageViewModel.APPSUPPORTMAILADDRESS)
+		};
 
-        /// <summary> Privacy text.</summary>
-        private HtmlWebViewSource infoImpress;
-        /// <summary> Gets the privacy related information. </summary>
-        public HtmlWebViewSource InfoImpressum
-        {
-            get => infoImpress;
-            set
-            {
-                infoImpress = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(InfoImpressum)));
-            }
-        }
+		/// <summary> Privacy text.</summary>
+		private HtmlWebViewSource infoImpress;
+		/// <summary> Gets the privacy related information. </summary>
+		public HtmlWebViewSource InfoImpressum
+		{
+			get => infoImpress;
+			set
+			{
+				infoImpress = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(InfoImpressum)));
+			}
+		}
 
-        /// <summary> Agb information text.</summary>
-        private HtmlWebViewSource infoAgb;
+		/// <summary> Agb information text.</summary>
+		private HtmlWebViewSource infoAgb;
 
-        /// <summary> Privacy text.</summary>
-        private HtmlWebViewSource infoPrivacy;
+		/// <summary> Privacy text.</summary>
+		private HtmlWebViewSource infoPrivacy;
 
-        /// <summary> Agb information text.</summary>
-        public HtmlWebViewSource InfoAgb
-        {
-            get => infoAgb;
-            set
-            {
-                infoAgb = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(InfoAgb)));
-            }
-        }
+		/// <summary> Agb information text.</summary>
+		public HtmlWebViewSource InfoAgb
+		{
+			get => infoAgb;
+			set
+			{
+				infoAgb = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(InfoAgb)));
+			}
+		}
 
-        /// <summary> Agb information text.</summary>
-        public HtmlWebViewSource InfoPrivacy
-        {
-            get => infoPrivacy;
-            set
-            {
-                infoPrivacy = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(InfoPrivacy)));
-            }
-        }
-    }
+		/// <summary> Agb information text.</summary>
+		public HtmlWebViewSource InfoPrivacy
+		{
+			get => infoPrivacy;
+			set
+			{
+				infoPrivacy = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(InfoPrivacy)));
+			}
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Login/LoginPageViewModel.cs b/TINKLib/ViewModel/Login/LoginPageViewModel.cs
index fba7b66..d07427a 100644
--- a/TINKLib/ViewModel/Login/LoginPageViewModel.cs
+++ b/TINKLib/ViewModel/Login/LoginPageViewModel.cs
@@ -12,369 +12,370 @@ using TINK.Model.User.Account;
 using TINK.MultilingualResources;
 using TINK.Repository.Exception;
 using TINK.View;
-using TINK.ViewModel.Info;
 using TINK.ViewModel.Map;
 using Xamarin.Forms;
 
 namespace TINK.ViewModel
 {
-    public class LoginPageViewModel : INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Reference on view service to show modal notifications and to perform navigation.
-        /// </summary>
-        private readonly IViewService m_oViewService;
+	public class LoginPageViewModel : INotifyPropertyChanged
+	{
+		/// <summary>
+		/// Reference on view service to show modal notifications and to perform navigation.
+		/// </summary>
+		private readonly IViewService m_oViewService;
 
 #if BACKSTYLE
         /// <summary> Reference to naviagion object to navigate back to map page when login succeeded. </summary>
         private INavigation m_oNavigation;
 #endif
-        /// <summary> Reference on the tink app instance. </summary>
-        private ITinkApp TinkApp { get; }
+		/// <summary> Reference on the tink app instance. </summary>
+		private ITinkApp TinkApp { get; }
 
-        /// <summary>
-        /// Holds the mail address candidate being entered by user.
-        /// </summary>
-        private string m_strMailAddress;
+		/// <summary>
+		/// Holds the mail address candidate being entered by user.
+		/// </summary>
+		private string m_strMailAddress;
 
-        /// <summary>
-        /// Holds the password candidate being entered by user.
-        /// </summary>
-        private string m_strPassword;
+		/// <summary>
+		/// Holds the password candidate being entered by user.
+		/// </summary>
+		private string m_strPassword;
 
-        private bool m_bMailAndPasswordCandidatesOk = false;
+		private bool m_bMailAndPasswordCandidatesOk = false;
 
-        /// <summary> Holds a reference to the external trigger service. </summary>
-        private Action<string> OpenUrlInExternalBrowser { get; }
+		/// <summary> Holds a reference to the external trigger service. </summary>
+		private Action<string> OpenUrlInExternalBrowser { get; }
 
-        /// <summary>
-        /// Event which notifies clients about changed properties.
-        /// </summary>
-        public event PropertyChangedEventHandler PropertyChanged;
+		/// <summary>
+		/// Event which notifies clients about changed properties.
+		/// </summary>
+		public event PropertyChangedEventHandler PropertyChanged;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="p_oSetCredentials">Delegate to set new mail address and password to model.</param>
-        /// <param name="p_oUser">Mail address of user if login succeeded.</param>
-        /// <param name="openUrlInExternalBrowser">Action to open an external browser.</param>
-        /// <param name="p_oViewService">Interface to actuate methodes on GUI.</param>
-        /// <param name="p_oNavigation">Interface to navigate.</param>
-        public LoginPageViewModel(
-            ITinkApp tinkApp,
-            Action<string> openUrlInExternalBrowser,
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="p_oSetCredentials">Delegate to set new mail address and password to model.</param>
+		/// <param name="p_oUser">Mail address of user if login succeeded.</param>
+		/// <param name="openUrlInExternalBrowser">Action to open an external browser.</param>
+		/// <param name="p_oViewService">Interface to actuate methodes on GUI.</param>
+		/// <param name="p_oNavigation">Interface to navigate.</param>
+		public LoginPageViewModel(
+			ITinkApp tinkApp,
+			Action<string> openUrlInExternalBrowser,
 #if !BACKSTYLE
-            IViewService p_oViewService)
+			IViewService p_oViewService)
 #else
             IViewService p_oViewService,
             INavigation p_oNavigation)
 #endif
-        {
-            TinkApp = tinkApp
-                ?? throw new ArgumentException("Can not instantiate map page view model- object. No tink app object available.");
+		{
+			TinkApp = tinkApp
+				?? throw new ArgumentException("Can not instantiate map page view model- object. No tink app object available.");
 
-            OpenUrlInExternalBrowser = openUrlInExternalBrowser
-                ?? throw new ArgumentException("Can not instantiate login page view model- object. No user external browse service available.");
+			OpenUrlInExternalBrowser = openUrlInExternalBrowser
+				?? throw new ArgumentException("Can not instantiate login page view model- object. No user external browse service available.");
 
-            m_oViewService = p_oViewService
-                ?? throw new ArgumentException("Can not instantiate login page view model- object. No view available.");
+			m_oViewService = p_oViewService
+				?? throw new ArgumentException("Can not instantiate login page view model- object. No view available.");
 #if BACKSTYLE
             m_oNavigation = p_oNavigation
                 ?? throw new ArgumentException("Can not instantiate login page view model- object. No navigation service available.");
 #endif
 
-            m_strMailAddress = tinkApp.ActiveUser.Mail;
-            m_strPassword = tinkApp.ActiveUser.Password;
+			m_strMailAddress = tinkApp.ActiveUser.Mail;
+			m_strPassword = tinkApp.ActiveUser.Password;
 
-            IsRegisterTargetsInfoVisible = new List<string> { Model.Services.CopriApi.ServerUris.CopriServerUriList.TINK_LIVE, Model.Services.CopriApi.ServerUris.CopriServerUriList.TINK_DEVEL }.Contains(tinkApp.Uris.ActiveUri.AbsoluteUri);
+			IsRegisterTargetsInfoVisible = new List<string> { Model.Services.CopriApi.ServerUris.CopriServerUriList.TINK_LIVE, Model.Services.CopriApi.ServerUris.CopriServerUriList.TINK_DEVEL }.Contains(tinkApp.Uris.ActiveUri.AbsoluteUri);
 
-            tinkApp.ActiveUser.StateChanged += OnStateChanged;
-        }
+			tinkApp.ActiveUser.StateChanged += OnStateChanged;
+		}
 
-        /// <summary>
-        /// Login state changed.
-        /// </summary>
-        /// <param name="p_oSender"></param>
-        /// <param name="p_oEventArgs"></param>
-        private void OnStateChanged(object p_oSender, EventArgs p_oEventArgs)
-        {
-            var l_oPropertyChanged = PropertyChanged;
-            if (l_oPropertyChanged != null)
-            {
-                l_oPropertyChanged(this, new PropertyChangedEventArgs(nameof(IsLoggedOut)));
-                l_oPropertyChanged(this, new PropertyChangedEventArgs(nameof(IsLoginRequestAllowed)));
-            }
-        }
+		/// <summary>
+		/// Login state changed.
+		/// </summary>
+		/// <param name="p_oSender"></param>
+		/// <param name="p_oEventArgs"></param>
+		private void OnStateChanged(object p_oSender, EventArgs p_oEventArgs)
+		{
+			var l_oPropertyChanged = PropertyChanged;
+			if (l_oPropertyChanged != null)
+			{
+				l_oPropertyChanged(this, new PropertyChangedEventArgs(nameof(IsLoggedOut)));
+				l_oPropertyChanged(this, new PropertyChangedEventArgs(nameof(IsLoginRequestAllowed)));
+			}
+		}
 
-        /// <summary> Gets a value indicating whether user is logged out or not.</summary>
-        public bool IsLoggedOut { get { return !TinkApp.ActiveUser.IsLoggedIn; } }
+		/// <summary> Gets a value indicating whether user is logged out or not.</summary>
+		public bool IsLoggedOut { get { return !TinkApp.ActiveUser.IsLoggedIn; } }
 
-        /// <summary> Gets a value indicating whether user can try to login.</summary>
-        public bool IsLoginRequestAllowed
-        {
-            get
-            {
-                return !TinkApp.ActiveUser.IsLoggedIn
-                    && m_bMailAndPasswordCandidatesOk;
-            }
-        }
+		/// <summary> Gets a value indicating whether user can try to login.</summary>
+		public bool IsLoginRequestAllowed
+		{
+			get
+			{
+				return !TinkApp.ActiveUser.IsLoggedIn
+					&& m_bMailAndPasswordCandidatesOk;
+			}
+		}
 
-        /// <summary> Gets mail address of user.</summary>
-        public string MailAddress
-        {
-            get
-            {
-                return m_strMailAddress;
-            }
+		/// <summary> Gets mail address of user.</summary>
+		public string MailAddress
+		{
+			get
+			{
+				return m_strMailAddress;
+			}
 
-            set
-            {
-                m_strMailAddress = value;
-                UpdateAndFireIfRequiredOnEnteringMailOrPwd();
-            }
-        }
+			set
+			{
+				m_strMailAddress = value;
+				UpdateAndFireIfRequiredOnEnteringMailOrPwd();
+			}
+		}
 
-        /// <summary> Gets password user.</summary>
-        public string Password
-        {
-            get
-            {
-                return m_strPassword;
-            }
+		/// <summary> Gets password user.</summary>
+		public string Password
+		{
+			get
+			{
+				return m_strPassword;
+			}
 
-            set
-            {
-                m_strPassword = value;
-                UpdateAndFireIfRequiredOnEnteringMailOrPwd();
-            }
-        }
+			set
+			{
+				m_strPassword = value;
+				UpdateAndFireIfRequiredOnEnteringMailOrPwd();
+			}
+		}
 
-        /// <summary>Update on password or mailaddress set. </summary>
-        private void UpdateAndFireIfRequiredOnEnteringMailOrPwd()
-        {
-            var l_bLastMailAndPasswordCandidatesOk = m_bMailAndPasswordCandidatesOk;
+		/// <summary>Update on password or mailaddress set. </summary>
+		private void UpdateAndFireIfRequiredOnEnteringMailOrPwd()
+		{
+			var l_bLastMailAndPasswordCandidatesOk = m_bMailAndPasswordCandidatesOk;
 
-            m_bMailAndPasswordCandidatesOk = Validator.ValidateMailAndPasswordDelegate(MailAddress, Password).ValidElement == Elements.Account;
+			m_bMailAndPasswordCandidatesOk = Validator.ValidateMailAndPasswordDelegate(MailAddress, Password).ValidElement == Elements.Account;
 
-            if (m_bMailAndPasswordCandidatesOk != l_bLastMailAndPasswordCandidatesOk)
-            {
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLoginRequestAllowed)));
-            }
-        }
+			if (m_bMailAndPasswordCandidatesOk != l_bLastMailAndPasswordCandidatesOk)
+			{
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLoginRequestAllowed)));
+			}
+		}
 
-        /// <summary>
-        /// Command object to bind login button to view model.
-        /// </summary>
-        public ICommand OnLoginRequest
-        {
-            get
-            {
-                return new Command(async () => await Login());
-            }
-        }
+		/// <summary>
+		/// Command object to bind login button to view model.
+		/// </summary>
+		public ICommand OnLoginRequest
+		{
+			get
+			{
+				return new Command(async () => await Login());
+			}
+		}
 
-        /// <summary> Processes request to register a new user. </summary>
-        public ICommand OnRegisterRequest => new Command(async () =>
-        {
-            if (CrossConnectivity.Current.IsConnected)
-            {
-                await m_oViewService.PushAsync(ViewTypes.RegisterPage);
-            }
-            else
-            {
-                await m_oViewService.DisplayAlert(
-                    AppResources.MessageTitleHint,
-                    AppResources.MessageLoginRegisterNoNet,
-                    AppResources.MessageAnswerOk);
-            }
-        });
+		/// <summary> Processes request to register a new user. </summary>
+		public ICommand OnRegisterRequest => new Command(async () =>
+		{
+			if (CrossConnectivity.Current.IsConnected)
+			{
+				await m_oViewService.PushAsync(ViewTypes.RegisterPage);
+			}
+			else
+			{
+				await m_oViewService.DisplayAlert(
+					AppResources.MessageTitleHint,
+					AppResources.MessageLoginRegisterNoNet,
+					AppResources.MessageAnswerOk);
+			}
+		});
 
-        /// <summary> Processes request to recover password. </summary>
-        public ICommand OnPasswordForgottonRequest => new Command(async () =>
-        {
-            if (CrossConnectivity.Current.IsConnected)
-            {
-                await m_oViewService.PushAsync(ViewTypes.PasswordForgottenPage);
-            }
-            else
-            {
-                await m_oViewService.DisplayAlert(
-                    AppResources.MessageTitleHint,
-                    AppResources.MessageLoginRecoverPassword,
-                    AppResources.MessageAnswerOk);
-            }
-        });
+		/// <summary> Processes request to recover password. </summary>
+		public ICommand OnPasswordForgottonRequest => new Command(async () =>
+		{
+			if (CrossConnectivity.Current.IsConnected)
+			{
+				await m_oViewService.PushAsync(ViewTypes.PasswordForgottenPage);
+			}
+			else
+			{
+				await m_oViewService.DisplayAlert(
+					AppResources.MessageTitleHint,
+					AppResources.MessageLoginRecoverPassword,
+					AppResources.MessageAnswerOk);
+			}
+		});
 
-        /// <summary>
-        /// User request to log in.
-        /// </summary>
+		/// <summary>
+		/// User request to log in.
+		/// </summary>
 #if BACKSTYLE
         public async void Login()
 #else
-        public async Task Login()
+		public async Task Login()
 #endif
-        {
-            IAccount account = new EmptyAccount();
-            try
-            {
-                Log.ForContext<LoginPageViewModel>().Information("User taped login button.");
+		{
+			IAccount account = new EmptyAccount();
+			try
+			{
+				Log.ForContext<LoginPageViewModel>().Information("User taped login button.");
 
-                try
-                {
-                    TinkApp.ActiveUser.CheckIsPasswordValid(MailAddress, Password);
+				try
+				{
+					TinkApp.ActiveUser.CheckIsPasswordValid(MailAddress, Password);
 
-                    // Do login.
-                    account = await TinkApp.GetConnector(CrossConnectivity.Current.IsConnected).Command.DoLogin(MailAddress, Password, TinkApp.ActiveUser.DeviceId);
+					// Do login.
+					account = await TinkApp.GetConnector(CrossConnectivity.Current.IsConnected).Command.DoLogin(MailAddress, Password, TinkApp.ActiveUser.DeviceId);
 
-                    await TinkApp.ActiveUser.Login(account);
+					await TinkApp.ActiveUser.Login(account);
 
-                    // Update map page filter because user might be of both groups TINK an Konrad.
-                    TinkApp.GroupFilterMapPage =
-                        GroupFilterMapPageHelper.CreateUpdated(
-                            TinkApp.GroupFilterMapPage,
-                            TinkApp.ActiveUser.DoFilter(TinkApp.FilterGroupSetting.DoFilter()));
+					// Update map page filter because user might be of both groups TINK an Konrad.
+					TinkApp.GroupFilterMapPage =
+						GroupFilterMapPageHelper.CreateUpdated(
+							TinkApp.GroupFilterMapPage,
+							TinkApp.ActiveUser.DoFilter(TinkApp.FilterGroupSetting.DoFilter()));
 
-                    // Update settings page filter because user might be of both groups TINK an Konrad.
-                    TinkApp.FilterGroupSetting.DoFilter(TinkApp.ActiveUser.Group);
+					// Update settings page filter because user might be of both groups TINK an Konrad.
+					TinkApp.FilterGroupSetting.DoFilter(TinkApp.ActiveUser.Group);
 
-                    // Persist new settings.
-                    TinkApp.Save();
+					// Persist new settings.
+					TinkApp.Save();
 
-                    TinkApp.UpdateConnector();
-                }
-                catch (InvalidAuthorizationResponseException l_oException)
-                {
-                    // Copri response is invalid.
-                    Log.ForContext<LoginPageViewModel>().Error("Login failed (invalid. auth. response). {@l_oException}.", l_oException);
+					TinkApp.UpdateConnector();
+				}
+				catch (InvalidAuthorizationResponseException l_oException)
+				{
+					// Copri response is invalid.
+					Log.ForContext<LoginPageViewModel>().Error("Login failed (invalid. auth. response). {@l_oException}.", l_oException);
 
-                    await m_oViewService.DisplayAlert(
-                        AppResources.MessageLoginErrorTitle,
-                        l_oException.Message,
-                        AppResources.MessageAnswerOk);
+					await m_oViewService.DisplayAlert(
+						AppResources.MessageLoginErrorTitle,
+						l_oException.Message,
+						AppResources.MessageAnswerOk);
 
-                    return;
-                }
-                catch (UnsupportedCopriVersionDetectedException)
-                {
-                    await m_oViewService.DisplayAlert(
-                        AppResources.MessageLoginErrorTitle,
-                         string.Format(AppResources.MessageAppVersionIsOutdated, ContactPageViewModel.GetAppName(TinkApp.Uris.ActiveUri)),
-                        AppResources.MessageAnswerOk);
+					return;
+				}
+				catch (UnsupportedCopriVersionDetectedException)
+				{
+					await m_oViewService.DisplayAlert(
+						AppResources.MessageLoginErrorTitle,
+						 string.Format(
+							 AppResources.MessageAppVersionIsOutdated,
+							 TinkApp.Flavor.GetDisplayName()),
+						AppResources.MessageAnswerOk);
 
-                    return;
-                }
-                catch (Exception l_oException)
-                {
-                    // Copri server is not reachable.
-                    if (l_oException is WebConnectFailureException)
-                    {
-                        Log.ForContext<LoginPageViewModel>().Information("Login failed (web communication exception). {@l_oException}.", l_oException);
+					return;
+				}
+				catch (Exception l_oException)
+				{
+					// Copri server is not reachable.
+					if (l_oException is WebConnectFailureException)
+					{
+						Log.ForContext<LoginPageViewModel>().Information("Login failed (web communication exception). {@l_oException}.", l_oException);
 
-                        await m_oViewService.DisplayAlert(
-                            AppResources.MessageLoginConnectionErrorTitle,
-                            string.Format("{0}\r\n{1}", l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
-                            AppResources.MessageAnswerOk);
-                    }
-                    else if (l_oException is UsernamePasswordInvalidException)
-                    {
-                        // Cookie is empty.
-                        Log.ForContext<LoginPageViewModel>().Error("Login failed (empty cookie). {@l_oException}.", l_oException);
-                        await m_oViewService.DisplayAlert(
-                            AppResources.MessageLoginErrorTitle,
-                            string.Format(AppResources.MessageLoginConnectionErrorMessage, l_oException.Message),
-                            "OK");
-                    }
-                    else
-                    {
-                        Log.ForContext<LoginPageViewModel>().Error("Login failed. {@l_oException}.", l_oException);
-                        await m_oViewService.DisplayAlert(
-                            AppResources.MessageLoginErrorTitle,
-                            l_oException.Message,
-                            AppResources.MessageAnswerOk);
-                    }
+						await m_oViewService.DisplayAlert(
+							AppResources.MessageLoginConnectionErrorTitle,
+							string.Format("{0}\r\n{1}", l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+							AppResources.MessageAnswerOk);
+					}
+					else if (l_oException is UsernamePasswordInvalidException)
+					{
+						// Cookie is empty.
+						Log.ForContext<LoginPageViewModel>().Error("Login failed (empty cookie). {@l_oException}.", l_oException);
+						await m_oViewService.DisplayAlert(
+							AppResources.MessageLoginErrorTitle,
+							string.Format(AppResources.MessageLoginConnectionErrorMessage, l_oException.Message),
+							"OK");
+					}
+					else
+					{
+						Log.ForContext<LoginPageViewModel>().Error("Login failed. {@l_oException}.", l_oException);
+						await m_oViewService.DisplayAlert(
+							AppResources.MessageLoginErrorTitle,
+							l_oException.Message,
+							AppResources.MessageAnswerOk);
+					}
 
-                    return;
-                }
+					return;
+				}
 
-                // Display information that login succeeded.
-                Log.ForContext<LoginPageViewModel>().Information("Login succeeded. {@tinkApp.ActiveUser}.", TinkApp.ActiveUser);
+				// Display information that login succeeded.
+				Log.ForContext<LoginPageViewModel>().Information("Login succeeded. {@tinkApp.ActiveUser}.", TinkApp.ActiveUser);
 
-                var title = TinkApp.ActiveUser.Group.Intersect(new List<string> { Model.Connector.FilterHelper.CARGOBIKE, Model.Connector.FilterHelper.CITYBIKE }).Any()
-                    ? string.Format(AppResources.MessageLoginWelcomeTitleGroup, TinkApp.ActiveUser.GetUserGroupDisplayName())
-                    : string.Format(AppResources.MessageLoginWelcomeTitle);
+				var title = TinkApp.ActiveUser.Group.Intersect(new List<string> { Model.Connector.FilterHelper.CARGOBIKE, Model.Connector.FilterHelper.CITYBIKE }).Any()
+					? string.Format(AppResources.MessageLoginWelcomeTitleGroup, TinkApp.ActiveUser.GetUserGroupDisplayName())
+					: string.Format(AppResources.MessageLoginWelcomeTitle);
 
-                await m_oViewService.DisplayAlert(
-                    title,
-                    string.Format(AppResources.MessageLoginWelcome, TinkApp.ActiveUser.Mail),
-                    AppResources.MessageAnswerOk);
-            }
-            catch (Exception p_oException)
-            {
-                Log.ForContext<LoginPageViewModel>().Error("An unexpected error occurred displaying log out page. {@Exception}", p_oException);
-                return;
-            }
+				await m_oViewService.DisplayAlert(
+					title,
+					string.Format(AppResources.MessageLoginWelcome, TinkApp.ActiveUser.Mail),
+					AppResources.MessageAnswerOk);
+			}
+			catch (Exception p_oException)
+			{
+				Log.ForContext<LoginPageViewModel>().Error("An unexpected error occurred displaying log out page. {@Exception}", p_oException);
+				return;
+			}
 
-            try
-            {
-                if (!TinkApp.ActiveUser.Group.Contains(Model.Connector.FilterHelper.CARGOBIKE))
-                {
-                    // No need to show "Anleitung TINK Räder" because user can not use tink.
+			try
+			{
+				if (!TinkApp.ActiveUser.Group.Contains(Model.Connector.FilterHelper.CARGOBIKE))
+				{
+					// No need to show "Anleitung TINK Räder" because user can not use tink.
 #if USEFLYOUT
 
                     m_oViewService.ShowPage(account.IsAgbAcknowledged ? ViewTypes.MapPage : ViewTypes.ManageAccountPage); 
 #else
-                    await m_oViewService.ShowPage("//MapPage");
+					await m_oViewService.ShowPage("//MapPage");
 #endif
-                    return;
-                }
+					return;
+				}
 
-                // Swich to map page
+				// Swich to map page
 #if USEFLYOUT
                 m_oViewService.ShowPage(ViewTypes.BikeInfoCarouselPage, AppResources.MarkingLoginInstructions);
 #else
-                await m_oViewService.ShowPage("//MapPage");
+				await m_oViewService.ShowPage("//MapPage");
 #endif
-            }
-            catch (Exception p_oException)
-            {
-                Log.ForContext<LoginPageViewModel>().Error("Ein unerwarteter Fehler ist auf der Seite Anleitung TINK Räder (nach Anmeldeseite) aufgetreten. {@Exception}", p_oException);
-                return;
-            }
+			}
+			catch (Exception p_oException)
+			{
+				Log.ForContext<LoginPageViewModel>().Error("Ein unerwarteter Fehler ist auf der Seite Anleitung TINK Räder (nach Anmeldeseite) aufgetreten. {@Exception}", p_oException);
+				return;
+			}
 
 #if BACKSTYLE
                 // Navigate back to map page.
                 await m_oNavigation.PopToRootAsync();
 #endif
-        }
+		}
 
-        /// <summary> Holds whether TINK/ Copri info is shown.</summary>
-        public bool IsRegisterTargetsInfoVisible { get; private set; }
+		/// <summary> Holds whether TINK/ Copri info is shown.</summary>
+		public bool IsRegisterTargetsInfoVisible { get; private set; }
 
-        /// <summary> Text providing info about TINK/ konrad registration. </summary>
-        public FormattedString RegisterTargetsInfo
-        {
-            get
-            {
-                var l_oHint = new FormattedString();
-                l_oHint.Spans.Add(new Span { Text = AppResources.MarkingLoginInstructionsTinkKonradTitle });
-                l_oHint.Spans.Add(new Span { Text = AppResources.MarkingLoginInstructionsTinkKonradMessage });
+		/// <summary> Text providing info about TINK/ konrad registration. </summary>
+		public FormattedString RegisterTargetsInfo
+		{
+			get
+			{
+				var l_oHint = new FormattedString();
+				l_oHint.Spans.Add(new Span { Text = AppResources.MarkingLoginInstructionsTinkKonradTitle });
+				l_oHint.Spans.Add(new Span { Text = AppResources.MarkingLoginInstructionsTinkKonradMessage });
 
-                return l_oHint;
-            }
-        }
+				return l_oHint;
+			}
+		}
 
-        /// <summary> Opens login page.</summary>
-        public void RegisterRequest(string url)
-        {
-            try
-            {
-                OpenUrlInExternalBrowser(url);
-            }
-            catch (Exception p_oException)
-            {
-                Log.Error("Ein unerwarteter Fehler ist auf der Login Seite beim Öffnen eines Browsers, Seite {url}, aufgetreten. {@Exception}", url, p_oException);
-                return;
-            }
-        }
-    }
+		/// <summary> Opens login page.</summary>
+		public void RegisterRequest(string url)
+		{
+			try
+			{
+				OpenUrlInExternalBrowser(url);
+			}
+			catch (Exception p_oException)
+			{
+				Log.Error("Ein unerwarteter Fehler ist auf der Login Seite beim Öffnen eines Browsers, Seite {url}, aufgetreten. {@Exception}", url, p_oException);
+				return;
+			}
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Map/EmptyToggleViewModel.cs b/TINKLib/ViewModel/Map/EmptyToggleViewModel.cs
index f4a0450..4692c06 100644
--- a/TINKLib/ViewModel/Map/EmptyToggleViewModel.cs
+++ b/TINKLib/ViewModel/Map/EmptyToggleViewModel.cs
@@ -2,30 +2,30 @@
 
 namespace TINK.ViewModel.Map
 {
-    /// <summary> Holds an empty filter object.</summary>
-    /// <remarks>Old name: EmptyMapPageFilter</remarks>
-    public class EmptyToggleViewModel : ITinkKonradToggleViewModel
-    {
-        /// <summary> Holds the map page filter.</summary>
-        public IGroupFilterMapPage FilterDictionary => new GroupFilterMapPage();
+	/// <summary> Holds an empty filter object.</summary>
+	/// <remarks>Old name: EmptyMapPageFilter</remarks>
+	public class EmptyToggleViewModel : ITinkKonradToggleViewModel
+	{
+		/// <summary> Holds the map page filter.</summary>
+		public IGroupFilterMapPage FilterDictionary => new GroupFilterMapPage();
 
-        /// <summary> Active filter</summary>
-        public string CurrentFitler => string.Empty;
+		/// <summary> Active filter</summary>
+		public string CurrentFitler => string.Empty;
 
-        public bool IsTinkEnabled => false;
+		public bool IsTinkEnabled => false;
 
-        public Color TinkColor => Color.Default;
+		public Color TinkColor => Color.Default;
 
-        public Color NoTinkColor => Color.Default;
+		public Color NoTinkColor => Color.Default;
 
-        public bool IsKonradEnabled => false;
+		public bool IsKonradEnabled => false;
 
-        public Color KonradColor => Color.Default;
+		public Color KonradColor => Color.Default;
 
-        public Color NoKonradColor => Color.Default;
+		public Color NoKonradColor => Color.Default;
 
-        public bool IsToggleVisible => false;
+		public bool IsToggleVisible => false;
 
-        public string CurrentFilter => string.Empty;
-    }
+		public string CurrentFilter => string.Empty;
+	}
 }
diff --git a/TINKLib/ViewModel/Map/GroupFilterMapPage.cs b/TINKLib/ViewModel/Map/GroupFilterMapPage.cs
index 3303c5d..a5ec7b3 100644
--- a/TINKLib/ViewModel/Map/GroupFilterMapPage.cs
+++ b/TINKLib/ViewModel/Map/GroupFilterMapPage.cs
@@ -6,62 +6,62 @@ using TINK.Model.Connector.Filter;
 
 namespace TINK.ViewModel.Map
 {
-    public class GroupFilterMapPage : IGroupFilterMapPage
-    {
-        public GroupFilterMapPage(IDictionary<string, FilterState> filterDictionary = null)
-        {
-            FilterDictionary = filterDictionary ?? new Dictionary<string, FilterState>();
-            Filter = filterDictionary != null
-                ? (IGroupFilter)new IntersectGroupFilter(FilterDictionary.Where(x => x.Value == FilterState.On).Select(x => x.Key))
-                : new NullGroupFilter();
-        }
+	public class GroupFilterMapPage : IGroupFilterMapPage
+	{
+		public GroupFilterMapPage(IDictionary<string, FilterState> filterDictionary = null)
+		{
+			FilterDictionary = filterDictionary ?? new Dictionary<string, FilterState>();
+			Filter = filterDictionary != null
+				? (IGroupFilter)new IntersectGroupFilter(FilterDictionary.Where(x => x.Value == FilterState.On).Select(x => x.Key))
+				: new NullGroupFilter();
+		}
 
-        private IGroupFilter Filter { get; }
+		private IGroupFilter Filter { get; }
 
-        /// <summary> Gets the active filters.</summary>
-        /// <param name="filterCollection">Filter collection to get group from.</param>
-        /// <returns>List of active filters.</returns>
-        /// <todo>Rename to ToFilterList</todo>
-        public IList<string> GetGroup()
-        {
-            return this.Where(x => x.Value == FilterState.On).Select(x => x.Key).ToList();
-        }
+		/// <summary> Gets the active filters.</summary>
+		/// <param name="filterCollection">Filter collection to get group from.</param>
+		/// <returns>List of active filters.</returns>
+		/// <todo>Rename to ToFilterList</todo>
+		public IList<string> GetGroup()
+		{
+			return this.Where(x => x.Value == FilterState.On).Select(x => x.Key).ToList();
+		}
 
-        /// <summary> Performs filtering on response-group. </summary>
-        public IEnumerable<string> DoFilter(IEnumerable<string> filter = null) => Filter.DoFilter(filter);
+		/// <summary> Performs filtering on response-group. </summary>
+		public IEnumerable<string> DoFilter(IEnumerable<string> filter = null) => Filter.DoFilter(filter);
 
-        private IDictionary<string, FilterState> FilterDictionary { get; }
+		private IDictionary<string, FilterState> FilterDictionary { get; }
 
-        public FilterState this[string key] { get => FilterDictionary[key]; set => FilterDictionary[key] = value; }
+		public FilterState this[string key] { get => FilterDictionary[key]; set => FilterDictionary[key] = value; }
 
-        public ICollection<string> Keys => FilterDictionary.Keys;
+		public ICollection<string> Keys => FilterDictionary.Keys;
 
-        public ICollection<FilterState> Values => FilterDictionary.Values;
+		public ICollection<FilterState> Values => FilterDictionary.Values;
 
-        public int Count => FilterDictionary.Count;
+		public int Count => FilterDictionary.Count;
 
-        public bool IsReadOnly => true;
+		public bool IsReadOnly => true;
 
-        public void Add(string key, FilterState value) => throw new System.NotImplementedException();
+		public void Add(string key, FilterState value) => throw new System.NotImplementedException();
 
-        public void Add(KeyValuePair<string, FilterState> item) => throw new System.NotImplementedException();
+		public void Add(KeyValuePair<string, FilterState> item) => throw new System.NotImplementedException();
 
-        public void Clear() => throw new System.NotImplementedException();
+		public void Clear() => throw new System.NotImplementedException();
 
-        public bool Contains(KeyValuePair<string, FilterState> item) => FilterDictionary.Contains(item);
+		public bool Contains(KeyValuePair<string, FilterState> item) => FilterDictionary.Contains(item);
 
-        public bool ContainsKey(string key) => FilterDictionary.ContainsKey(key);
+		public bool ContainsKey(string key) => FilterDictionary.ContainsKey(key);
 
-        public void CopyTo(KeyValuePair<string, FilterState>[] array, int arrayIndex) => FilterDictionary.CopyTo(array, arrayIndex);
+		public void CopyTo(KeyValuePair<string, FilterState>[] array, int arrayIndex) => FilterDictionary.CopyTo(array, arrayIndex);
 
-        public IEnumerator<KeyValuePair<string, FilterState>> GetEnumerator() => FilterDictionary.GetEnumerator();
+		public IEnumerator<KeyValuePair<string, FilterState>> GetEnumerator() => FilterDictionary.GetEnumerator();
 
-        public bool Remove(string key) => throw new System.NotImplementedException();
+		public bool Remove(string key) => throw new System.NotImplementedException();
 
-        public bool Remove(KeyValuePair<string, FilterState> item) => throw new System.NotImplementedException();
+		public bool Remove(KeyValuePair<string, FilterState> item) => throw new System.NotImplementedException();
 
-        public bool TryGetValue(string key, out FilterState value) => FilterDictionary.TryGetValue(key, out value);
+		public bool TryGetValue(string key, out FilterState value) => FilterDictionary.TryGetValue(key, out value);
 
-        IEnumerator IEnumerable.GetEnumerator() => FilterDictionary.GetEnumerator();
-    }
+		IEnumerator IEnumerable.GetEnumerator() => FilterDictionary.GetEnumerator();
+	}
 }
diff --git a/TINKLib/ViewModel/Map/GroupFilterMapPageHelper.cs b/TINKLib/ViewModel/Map/GroupFilterMapPageHelper.cs
index 9fceb21..ed44fcf 100644
--- a/TINKLib/ViewModel/Map/GroupFilterMapPageHelper.cs
+++ b/TINKLib/ViewModel/Map/GroupFilterMapPageHelper.cs
@@ -4,71 +4,71 @@ using TINK.Model;
 
 namespace TINK.ViewModel.Map
 {
-    /// <summary> Helper functionality. </summary>
-    /// <remarks> Former name: MapPageFilterFactory</remarks>
-    public static class GroupFilterMapPageHelper
-    {
-        /// <summary> Verifies that filters available are always consistent with filter configuration from settings page/ user group. </summary>
-        /// <param name="mapPageFilterDictionary">Last filter from map page. Might have to be updated.</param>
-        /// <param name="settingsAndUserFilter">Filter from settings page/ user group.</param>
-        public static IGroupFilterMapPage CreateUpdated(
-            this IGroupFilterMapPage mapPageFilterDictionary,
-            IEnumerable<string> settingsAndUserFilter)
-        {
-            if (settingsAndUserFilter == null)
-            {
-                // All filters are null filters no update has to be performed.
-                return mapPageFilterDictionary;
-            }
+	/// <summary> Helper functionality. </summary>
+	/// <remarks> Former name: MapPageFilterFactory</remarks>
+	public static class GroupFilterMapPageHelper
+	{
+		/// <summary> Verifies that filters available are always consistent with filter configuration from settings page/ user group. </summary>
+		/// <param name="mapPageFilterDictionary">Last filter from map page. Might have to be updated.</param>
+		/// <param name="settingsAndUserFilter">Filter from settings page/ user group.</param>
+		public static IGroupFilterMapPage CreateUpdated(
+			this IGroupFilterMapPage mapPageFilterDictionary,
+			IEnumerable<string> settingsAndUserFilter)
+		{
+			if (settingsAndUserFilter == null)
+			{
+				// All filters are null filters no update has to be performed.
+				return mapPageFilterDictionary;
+			}
 
-            if (mapPageFilterDictionary == null || mapPageFilterDictionary.Count <= 0)
-            {
-                return new GroupFilterMapPage();
-            }
+			if (mapPageFilterDictionary == null || mapPageFilterDictionary.Count <= 0)
+			{
+				return new GroupFilterMapPage();
+			}
 
-            // Filter dictionary by enumeration.
-            var updatedMapPageFilterDictionary = new Dictionary<string, FilterState>(mapPageFilterDictionary).Where(x => settingsAndUserFilter.Contains(x.Key)).ToDictionary(x => x.Key, x => x.Value);
+			// Filter dictionary by enumeration.
+			var updatedMapPageFilterDictionary = new Dictionary<string, FilterState>(mapPageFilterDictionary).Where(x => settingsAndUserFilter.Contains(x.Key)).ToDictionary(x => x.Key, x => x.Value);
 
-            // Get key of activated filter if there is still one.
-            var activatedFilter = updatedMapPageFilterDictionary.FirstOrDefault(x => x.Value == FilterState.On).Key
-                ?? string.Empty;
+			// Get key of activated filter if there is still one.
+			var activatedFilter = updatedMapPageFilterDictionary.FirstOrDefault(x => x.Value == FilterState.On).Key
+				?? string.Empty;
 
-            // Add entries which have become available.
-            var filterState = FilterState.On; // Set first filter added to on.
-            var filtersToAdd = settingsAndUserFilter.Except(updatedMapPageFilterDictionary.Select(x => x.Key));
-            foreach (var l_oEntry in filtersToAdd)
-            {
-                updatedMapPageFilterDictionary.Add(l_oEntry, filterState);
-                filterState = FilterState.Off;
-            }
+			// Add entries which have become available.
+			var filterState = FilterState.On; // Set first filter added to on.
+			var filtersToAdd = settingsAndUserFilter.Except(updatedMapPageFilterDictionary.Select(x => x.Key));
+			foreach (var l_oEntry in filtersToAdd)
+			{
+				updatedMapPageFilterDictionary.Add(l_oEntry, filterState);
+				filterState = FilterState.Off;
+			}
 
-            if (updatedMapPageFilterDictionary.Count <= 0)
-            {
-                return new GroupFilterMapPage(updatedMapPageFilterDictionary);
-            }
+			if (updatedMapPageFilterDictionary.Count <= 0)
+			{
+				return new GroupFilterMapPage(updatedMapPageFilterDictionary);
+			}
 
-            // Ensure that there is at least one element on.
-            if (updatedMapPageFilterDictionary.Where(x => x.Value == FilterState.On).Count() == 0)
-            {
-                // No element is active. Set one element active.
-                updatedMapPageFilterDictionary[updatedMapPageFilterDictionary.ToArray()[0].Key] = FilterState.On;
-                return new GroupFilterMapPage(updatedMapPageFilterDictionary);
-            }
+			// Ensure that there is at least one element on.
+			if (updatedMapPageFilterDictionary.Where(x => x.Value == FilterState.On).Count() == 0)
+			{
+				// No element is active. Set one element active.
+				updatedMapPageFilterDictionary[updatedMapPageFilterDictionary.ToArray()[0].Key] = FilterState.On;
+				return new GroupFilterMapPage(updatedMapPageFilterDictionary);
+			}
 
-            // Ensure that there is only one selected element.
-            if (updatedMapPageFilterDictionary.Where(x => x.Value == FilterState.On).Count() > 1)
-            {
-                // More than one element is active. Set element inactive.
-                if (updatedMapPageFilterDictionary.ContainsKey(activatedFilter))
-                {
-                    // Turn filter off.
-                    updatedMapPageFilterDictionary[activatedFilter] = FilterState.Off;
-                }
+			// Ensure that there is only one selected element.
+			if (updatedMapPageFilterDictionary.Where(x => x.Value == FilterState.On).Count() > 1)
+			{
+				// More than one element is active. Set element inactive.
+				if (updatedMapPageFilterDictionary.ContainsKey(activatedFilter))
+				{
+					// Turn filter off.
+					updatedMapPageFilterDictionary[activatedFilter] = FilterState.Off;
+				}
 
-                return new GroupFilterMapPage(updatedMapPageFilterDictionary);
-            }
+				return new GroupFilterMapPage(updatedMapPageFilterDictionary);
+			}
 
-            return new GroupFilterMapPage(updatedMapPageFilterDictionary);
-        }
-    }
+			return new GroupFilterMapPage(updatedMapPageFilterDictionary);
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Map/IGroupFilterMapPage.cs b/TINKLib/ViewModel/Map/IGroupFilterMapPage.cs
index 0b11152..d2da5f5 100644
--- a/TINKLib/ViewModel/Map/IGroupFilterMapPage.cs
+++ b/TINKLib/ViewModel/Map/IGroupFilterMapPage.cs
@@ -3,13 +3,13 @@ using TINK.Model;
 
 namespace TINK.ViewModel.Map
 {
-    /// <summary> Interface for filtering. </summary>
-    /// <remarks> Holds a dictionary of filters which might or might not be appield depending on filter state.</remarks>
-    public interface IGroupFilterMapPage : IDictionary<string /* Filter*/, FilterState /* on or off*/>
-    {
-        /// <summary> Performs filtering on response-group. </summary>
-        IEnumerable<string> DoFilter(IEnumerable<string> filter = null);
+	/// <summary> Interface for filtering. </summary>
+	/// <remarks> Holds a dictionary of filters which might or might not be appield depending on filter state.</remarks>
+	public interface IGroupFilterMapPage : IDictionary<string /* Filter*/, FilterState /* on or off*/>
+	{
+		/// <summary> Performs filtering on response-group. </summary>
+		IEnumerable<string> DoFilter(IEnumerable<string> filter = null);
 
-        IList<string> GetGroup();
-    }
+		IList<string> GetGroup();
+	}
 }
diff --git a/TINKLib/ViewModel/Map/ITinkKonradToggleViewModel.cs b/TINKLib/ViewModel/Map/ITinkKonradToggleViewModel.cs
index ecebf9a..c8953c7 100644
--- a/TINKLib/ViewModel/Map/ITinkKonradToggleViewModel.cs
+++ b/TINKLib/ViewModel/Map/ITinkKonradToggleViewModel.cs
@@ -2,24 +2,24 @@
 
 namespace TINK.ViewModel.Map
 {
-    public interface ITinkKonradToggleViewModel
-    {
-        IGroupFilterMapPage FilterDictionary { get; }
+	public interface ITinkKonradToggleViewModel
+	{
+		IGroupFilterMapPage FilterDictionary { get; }
 
-        string CurrentFilter { get; }
+		string CurrentFilter { get; }
 
-        bool IsTinkEnabled { get; }
+		bool IsTinkEnabled { get; }
 
-        Color TinkColor { get; }
+		Color TinkColor { get; }
 
-        Color NoTinkColor { get; }
+		Color NoTinkColor { get; }
 
-        bool IsKonradEnabled { get; }
+		bool IsKonradEnabled { get; }
 
-        Color KonradColor { get; }
+		Color KonradColor { get; }
 
-        Color NoKonradColor { get; }
+		Color NoKonradColor { get; }
 
-        bool IsToggleVisible { get; }
-    }
+		bool IsToggleVisible { get; }
+	}
 }
diff --git a/TINKLib/ViewModel/Map/MapPageViewModel.cs b/TINKLib/ViewModel/Map/MapPageViewModel.cs
index 860af26..c22dd43 100644
--- a/TINKLib/ViewModel/Map/MapPageViewModel.cs
+++ b/TINKLib/ViewModel/Map/MapPageViewModel.cs
@@ -23,7 +23,6 @@ using Xamarin.Essentials;
 using System.Threading;
 using TINK.MultilingualResources;
 using TINK.Services.BluetoothLock;
-using TINK.ViewModel.Info;
 using TINK.Repository;
 using TINK.Services.Geolocation;
 using TINK.Model.State;
@@ -33,153 +32,153 @@ using TINK.Model.State;
 
 namespace TINK.ViewModel.Map
 {
-    public class MapPageViewModel : INotifyPropertyChanged
-    {
-        /// <summary> True if message was already shown to user. </summary>
-        private static bool WasMerchantMessageAlreadyShown { get; set; } = false;
+	public class MapPageViewModel : INotifyPropertyChanged
+	{
+		/// <summary> True if message was already shown to user. </summary>
+		private static bool WasMerchantMessageAlreadyShown { get; set; } = false;
 
 
-        /// <summary> Holds the count of custom icons availalbe.</summary>
-        private const int CUSTOM_ICONS_COUNT = 30;
+		/// <summary> Holds the count of custom icons availalbe.</summary>
+		private const int CUSTOM_ICONS_COUNT = 30;
 
-        /// <summary> Reference on view service to show modal notifications and to perform navigation. </summary>
-        private IViewService ViewService { get; }
+		/// <summary> Reference on view service to show modal notifications and to perform navigation. </summary>
+		private IViewService ViewService { get; }
 
-        /// <summary>
-        /// Holds the exception which occurred getting bikes occupied information.
-        /// </summary>
-        private Exception m_oException;
+		/// <summary>
+		/// Holds the exception which occurred getting bikes occupied information.
+		/// </summary>
+		private Exception m_oException;
 
 
-        /// <summary>
-        /// Service to query/ manage permissions (location) of the app.
-        /// </summary>
-        private ILocationPermission PermissionsService { get; }
+		/// <summary>
+		/// Service to query/ manage permissions (location) of the app.
+		/// </summary>
+		private ILocationPermission PermissionsService { get; }
 
-        /// <summary>
-        /// Service to manage bluetooth stack.
-        /// </summary>
-        private Plugin.BLE.Abstractions.Contracts.IBluetoothLE BluetoothService { get; set; }
+		/// <summary>
+		/// Service to manage bluetooth stack.
+		/// </summary>
+		private Plugin.BLE.Abstractions.Contracts.IBluetoothLE BluetoothService { get; set; }
 
-        /// <summary> Notifies view about changes. </summary>
-        public event PropertyChangedEventHandler PropertyChanged;
+		/// <summary> Notifies view about changes. </summary>
+		public event PropertyChangedEventHandler PropertyChanged;
 
-        /// <summary> Object to manage update of view model objects from Copri.</summary>
-        private IPollingUpdateTaskManager m_oViewUpdateManager;
+		/// <summary> Object to manage update of view model objects from Copri.</summary>
+		private IPollingUpdateTaskManager m_oViewUpdateManager;
 
-        /// <summary>Holds whether to poll or not and the periode leght is polling is on.</summary>
-        private PollingParameters Polling { get; set; }
+		/// <summary>Holds whether to poll or not and the periode leght is polling is on.</summary>
+		private PollingParameters Polling { get; set; }
 
-        /// <summary> Reference on the tink app instance. </summary>
-        private ITinkApp TinkApp { get; }
+		/// <summary> Reference on the tink app instance. </summary>
+		private ITinkApp TinkApp { get; }
 
-        /// <summary>Delegate to perform navigation.</summary>
-        private INavigation m_oNavigation;
+		/// <summary>Delegate to perform navigation.</summary>
+		private INavigation m_oNavigation;
 
 #if USEFLYOUT
         /// <summary>Delegate to perform navigation.</summary>
         private INavigationMasterDetail m_oNavigationMasterDetail;
 #endif
-        private ObservableCollection<Pin> pins;
+		private ObservableCollection<Pin> pins;
 
-        public ObservableCollection<Pin> Pins
-        {
-            get
-            {
-                if (pins == null)
-                    pins = new ObservableCollection<Pin>(); // If view model is not binding context pins collection must be set programmatically.
+		public ObservableCollection<Pin> Pins
+		{
+			get
+			{
+				if (pins == null)
+					pins = new ObservableCollection<Pin>(); // If view model is not binding context pins collection must be set programmatically.
 
-                return pins;
-            }
+				return pins;
+			}
 
-            set => pins = value;
-        }
+			set => pins = value;
+		}
 
-        /// <summary>Delegate to move map to region.</summary>
-        private Action<MapSpan> m_oMoveToRegionDelegate;
+		/// <summary>Delegate to move map to region.</summary>
+		private Action<MapSpan> m_oMoveToRegionDelegate;
 
-        /// <summary> False if user tabed on station marker to show bikes at a given station.</summary>
-        private bool isMapPageEnabled = false;
+		/// <summary> False if user tabed on station marker to show bikes at a given station.</summary>
+		private bool isMapPageEnabled = false;
 
-        IGeolocation GeolocationService { get; }
+		IGeolocation GeolocationService { get; }
 
-        /// <summary> False if user tabed on station marker to show bikes at a given station.</summary>
-        public bool IsMapPageEnabled
-        {
-            get => isMapPageEnabled;
-            private set
-            {
-                if (isMapPageEnabled == value)
-                    return;
+		/// <summary> False if user tabed on station marker to show bikes at a given station.</summary>
+		public bool IsMapPageEnabled
+		{
+			get => isMapPageEnabled;
+			private set
+			{
+				if (isMapPageEnabled == value)
+					return;
 
-                isMapPageEnabled = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsMapPageEnabled)));
-            }
-        }
+				isMapPageEnabled = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsMapPageEnabled)));
+			}
+		}
 
-        /// <summary> Prevents an invalid instane to be created. </summary>
-        /// <param name="tinkApp"> Reference to tink app model.</param>
-        /// <param name="moveToRegionDelegate">Delegate to center map and set zoom level.</param>
-        /// <param name="viewService">View service to notify user.</param>
-        /// <param name="navigation">Interface to navigate.</param>
-        public MapPageViewModel(
-            ITinkApp tinkApp,
-            ILocationPermission permissionsService,
-            Plugin.BLE.Abstractions.Contracts.IBluetoothLE bluetoothService,
-            IGeolocation geolocationService,
-            Action<MapSpan> moveToRegionDelegate,
-            IViewService viewService,
-            INavigation navigation)
-        {
-            TinkApp = tinkApp
-                ?? throw new ArgumentException("Can not instantiate map page view model- object. No tink app object available.");
+		/// <summary> Prevents an invalid instane to be created. </summary>
+		/// <param name="tinkApp"> Reference to tink app model.</param>
+		/// <param name="moveToRegionDelegate">Delegate to center map and set zoom level.</param>
+		/// <param name="viewService">View service to notify user.</param>
+		/// <param name="navigation">Interface to navigate.</param>
+		public MapPageViewModel(
+			ITinkApp tinkApp,
+			ILocationPermission permissionsService,
+			Plugin.BLE.Abstractions.Contracts.IBluetoothLE bluetoothService,
+			IGeolocation geolocationService,
+			Action<MapSpan> moveToRegionDelegate,
+			IViewService viewService,
+			INavigation navigation)
+		{
+			TinkApp = tinkApp
+				?? throw new ArgumentException("Can not instantiate map page view model- object. No tink app object available.");
 
-            PermissionsService = permissionsService ??
-                throw new ArgumentException($"Can not instantiate {nameof(MapPageViewModel)}. Permissions service object must never be null.");
+			PermissionsService = permissionsService ??
+				throw new ArgumentException($"Can not instantiate {nameof(MapPageViewModel)}. Permissions service object must never be null.");
 
-            BluetoothService = bluetoothService ??
-                throw new ArgumentException($"Can not instantiate {nameof(MapPageViewModel)}. Bluetooth service object must never be null.");
+			BluetoothService = bluetoothService ??
+				throw new ArgumentException($"Can not instantiate {nameof(MapPageViewModel)}. Bluetooth service object must never be null.");
 
-            GeolocationService = geolocationService ??
-                throw new ArgumentException($"Can not instantiate {nameof(MapPageViewModel)}. Geolocation service object must never be null.");
+			GeolocationService = geolocationService ??
+				throw new ArgumentException($"Can not instantiate {nameof(MapPageViewModel)}. Geolocation service object must never be null.");
 
-            m_oMoveToRegionDelegate = moveToRegionDelegate
-                ?? throw new ArgumentException("Can not instantiate map page view model- object. No move delegate available.");
+			m_oMoveToRegionDelegate = moveToRegionDelegate
+				?? throw new ArgumentException("Can not instantiate map page view model- object. No move delegate available.");
 
-            ViewService = viewService
-                ?? throw new ArgumentException("Can not instantiate map page view model- object. No view available.");
+			ViewService = viewService
+				?? throw new ArgumentException("Can not instantiate map page view model- object. No view available.");
 
-            m_oNavigation = navigation
-                ?? throw new ArgumentException("Can not instantiate map page view model- object. No navigation service available.");
+			m_oNavigation = navigation
+				?? throw new ArgumentException("Can not instantiate map page view model- object. No navigation service available.");
 
-            m_oViewUpdateManager = new IdlePollingUpdateTaskManager();
+			m_oViewUpdateManager = new IdlePollingUpdateTaskManager();
 
 #if USEFLYOUT
             m_oNavigationMasterDetail = new EmptyNavigationMasterDetail();
 #endif
 
-            Polling = PollingParameters.NoPolling;
+			Polling = PollingParameters.NoPolling;
 
-            tinkKonradToggleViewModel = new EmptyToggleViewModel();
+			tinkKonradToggleViewModel = new EmptyToggleViewModel();
 
-            IsConnected = TinkApp.GetIsConnected();
-        }
+			IsConnected = TinkApp.GetIsConnected();
+		}
 
-        /// <summary>Sets the stations filter to to apply (Konrad or TINK). </summary>
-        public IGroupFilterMapPage ActiveFilterMap
-        {
-            get => tinkKonradToggleViewModel.FilterDictionary ?? new GroupFilterMapPage();
-            set
-            {
-                tinkKonradToggleViewModel = new TinkKonradToggleViewModel(value);
+		/// <summary>Sets the stations filter to to apply (Konrad or TINK). </summary>
+		public IGroupFilterMapPage ActiveFilterMap
+		{
+			get => tinkKonradToggleViewModel.FilterDictionary ?? new GroupFilterMapPage();
+			set
+			{
+				tinkKonradToggleViewModel = new TinkKonradToggleViewModel(value);
 
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(TinkColor)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(KonradColor)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(NoTinkColor)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(NoKonradColor)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsToggleVisible)));
-            }
-        }
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(TinkColor)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(KonradColor)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(NoTinkColor)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(NoKonradColor)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsToggleVisible)));
+			}
+		}
 
 #if USEFLYOUT
         /// <summary> Delegate to perform navigation.</summary>
@@ -189,844 +188,844 @@ namespace TINK.ViewModel.Map
         }
 #endif
 
-        public Command<PinClickedEventArgs> PinClickedCommand => new Command<PinClickedEventArgs>(
-            args =>
-            {
-                OnStationClicked(args.Pin.Tag.ToString());
-                args.Handled = true; // Prevents map to be centered to selected pin.
-            });
-
-        /// <summary>
-        /// One time setup: Sets pins into map and connects to events.
-        /// </summary>
-        private void InitializePins(StationDictionary stations)
-        {
-            // Add pins to stations.
-            Log.ForContext<MapPageViewModel>().Debug($"Request to draw {stations.Count} pins.");
-            foreach (var station in stations)
-            {
-                if (station.Position == null)
-                {
-                    // There should be no reason for a position object to be null but this alreay occurred in past.
-                    Log.ForContext<MapPageViewModel>().Error("Postion object of station {@l_oStation} is null.", station);
-                    continue;
-                }
-
-                var l_oPin = new Pin
-                {
-
-                    Position = new Xamarin.Forms.GoogleMaps.Position(station.Position.Latitude, station.Position.Longitude),
-                    Label = long.TryParse(station.Id, out long stationId) && stationId > CUSTOM_ICONS_COUNT
-                        ? station.GetStationName()
-                        : string.Empty, // Stations with custom icons have already a id marker. No need for a label.
-
-                    Tag = station.Id,
-                    IsVisible = false, // Set to false to prevent showing default icons (flickering).
-                };
-
-                Pins.Add(l_oPin);
-            }
-        }
-
-        /// <summary> Update all stations from TINK. </summary>
-        /// <param name="stationsColorList">List of colors to apply.</param>
-        private void UpdatePinsColor(IList<Color> stationsColorList)
-        {
-            Log.ForContext<MapPageViewModel>().Debug($"Starting update of stations pins color for {stationsColorList.Count} stations...");
-
-            // Update colors of pins.
-            for (int pinIndex = 0; pinIndex < stationsColorList.Count; pinIndex++)
-            {
-
-                var indexPartPrefix = int.TryParse(Pins[pinIndex].Tag.ToString(), out int stationId)
-                    && stationId <= CUSTOM_ICONS_COUNT
-                    ? $"{stationId}" // there is a station marker with index letter for given station id
-                    : "Open"; // there is no station marker. Use open marker.
-
-                var colorPartPrefix = GetRessourceNameColorPart(stationsColorList[pinIndex]);
-
-                var l_iName = $"{indexPartPrefix.ToString().PadLeft(2, '0')}_{colorPartPrefix}{(DeviceInfo.Platform == DevicePlatform.Android ? ".png" : string.Empty)}";
-                try
-                {
-                    Pins[pinIndex].Icon = BitmapDescriptorFactory.FromBundle(l_iName);
-                }
-                catch (Exception l_oException)
-                {
-                    Log.ForContext<MapPageViewModel>().Error("Station icon {l_strName} can not be loaded. {@l_oException}.", l_oException);
-                    Pins[pinIndex].Label = stationId.ToString();
-                    Pins[pinIndex].Icon = BitmapDescriptorFactory.DefaultMarker(stationsColorList[pinIndex]);
-                }
-
-                Pins[pinIndex].IsVisible = true;
-            }
-
-            var pinsCount = Pins.Count;
-            for (int pinIndex = stationsColorList.Count; pinIndex < pinsCount; pinIndex++)
-            {
-                Log.ForContext<MapPageViewModel>().Error($"Unexpected count of pins detected. Expected {stationsColorList.Count} but is {pinsCount}.");
-                Pins[pinIndex].IsVisible = false;
-            }
-
-            Log.ForContext<MapPageViewModel>().Debug("Update of stations pins color done.");
-        }
-
-        /// <summary> Gets the color related part of the ressrouce name.</summary>
-        /// <param name="color">Color to get name for.</param>
-        /// <returns>Resource name.</returns>
-        private static string GetRessourceNameColorPart(Color color)
-        {
-            if (color == Color.Blue)
-            {
-                return "Blue";
-            }
-
-            if (color == Color.Green)
-            {
-                return "Green";
-            }
-
-            if (color == Color.LightBlue)
-            {
-                return "LightBlue";
-            }
-
-            if (color == Color.Red)
-            {
-                return "Red";
-            }
-
-            return color.ToString();
-        }
-
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        public async Task OnAppearing()
-        {
-            try
-            {
-                IsRunning = true;
-                // Process map page.
-                Polling = TinkApp.Polling;
-
-                Log.ForContext<MapPageViewModel>().Information(
-                    $"{(Polling != null && Polling.IsActivated ? $"Map page is appearing. Update periode is {Polling.Periode.TotalSeconds} sec." : "Map page is appearing. Polling is off.")}" +
-                    $"Current UI language is {Thread.CurrentThread.CurrentUICulture.Name}.");
-
-                // Update map page filter 
-                ActiveFilterMap = TinkApp.GroupFilterMapPage;
-
-                ActionText = AppResources.ActivityTextRequestingLocationPermissions;
-                var status = await RequestLocationPermission();
-
-                ActionText = AppResources.ActivityTextMapLoadingStationsAndBikes;
-                IsConnected = TinkApp.GetIsConnected();
-                var resultStationsAndBikes = await TinkApp.GetConnector(IsConnected).Query.GetBikesAndStationsAsync();
-
-                TinkApp.Stations = resultStationsAndBikes.Response.StationsAll;
-                TinkApp.ResourceUrls = resultStationsAndBikes.GeneralData.ResourceUrls;
-
-                if (!string.IsNullOrEmpty(resultStationsAndBikes?.GeneralData?.MerchantMessage)
-                    && !WasMerchantMessageAlreadyShown)
-                {
-                    await ViewService.DisplayAlert(
-                        "Information",
-                        resultStationsAndBikes.GeneralData.MerchantMessage,
-                        AppResources.MessageAnswerOk);
-                    WasMerchantMessageAlreadyShown = true;
-                }
-
-                await SetStationsOnMap(resultStationsAndBikes.Response.StationsAll);
-                await HandleAuthCookieNotDefinedException(resultStationsAndBikes.Exception);
-
-                // Update pin colors.
-                Log.ForContext<MapPageViewModel>().Verbose("Starting update pins color...");
-
-                var colors = GetStationColors(
-                     Pins.Select(x => x.Tag.ToString()).ToList(),
-                     resultStationsAndBikes.Response.Bikes);
-
-                // Update pins color form count of bikes located at station.
-                UpdatePinsColor(colors);
-
-                Log.ForContext<MapPageViewModel>().Verbose("Update pins color done.");
-
-                // Move and scale before getting stations and bikes which takes some time.
-                ActionText = AppResources.ActivityTextCenterMap;
-
-                // Get map display area
-                Model.Map.IMapSpan mapSpan = null;
-                if (TinkApp.CenterMapToCurrentLocation && status == Status.Granted)
-                {
-                    // Get from smart device
-                    mapSpan = await GetFromLocationService(status);
-                }
-
-                if (mapSpan == null)
-                {
-                    // Use map display are from COPRI 
-                    mapSpan = resultStationsAndBikes.GeneralData.InitialMapSpan;
-                }
-
-                if (mapSpan.IsValid)
-                {
-                    TinkApp.UserMapSpan = MapSpan.FromCenterAndRadius(
-                        new Xamarin.Forms.GoogleMaps.Position(mapSpan.Center.Latitude, mapSpan.Center.Longitude),
-                        new Distance(mapSpan.Radius * 1000));
-                    TinkApp.Save();
-
-                    MoveAndScale(m_oMoveToRegionDelegate, TinkApp.ActiveMapSpan);
-                }
-
-                m_oViewUpdateManager = CreateUpdateTask();
-
-                Log.ForContext<MapPageViewModel>().Verbose("Update pins color done.");
-
-                try
-                {
-                    // Update bikes at station or my bikes depending on context.
-                    await m_oViewUpdateManager.StartUpdateAyncPeridically(Polling);
-                }
-                catch (Exception)
-                {
-                    // Excpetions are handled insde update task;
-                }
-
-                Exception = resultStationsAndBikes.Exception;
-                ActionText = "";
-                IsRunning = false;
-                IsMapPageEnabled = true;
-            }
-            catch (Exception l_oException)
-            {
-                Log.ForContext<MapPageViewModel>().Error($"An error occurred showing bike stations page.\r\n{l_oException.Message}");
-
-                IsRunning = false;
-
-                await ViewService.DisplayAlert(
-                    "Fehler",
-                    $"Beim Anzeigen der Fahrradstandorte- Seite ist ein Fehler aufgetreten.\r\n{l_oException.Message}",
-                    "OK");
-
-                IsMapPageEnabled = true;
-            }
-        }
-
-        /// <summary>
-        /// Invoked when the auth cookie is not defined.
-        /// </summary>
-        private async Task HandleAuthCookieNotDefinedException(Exception exception)
-        {
-            if (exception?.GetType() == typeof(AuthcookieNotDefinedException))
-            {
-                Log.ForContext<MapPageViewModel>().Error("Map page is shown (probable for the first time after startup of app) and COPRI auth cookie is not defined. {@l_oException}", exception);
-
-                // COPRI reports an auth cookie error.
-                await ViewService.DisplayAlert(
-                    AppResources.MessageWaring,
-                    AppResources.MessageMapPageErrorAuthcookieUndefined,
-                    AppResources.MessageAnswerOk);
-
-                IsConnected = TinkApp.GetIsConnected();
-                await TinkApp.GetConnector(IsConnected).Command.DoLogout();
-                TinkApp.ActiveUser.Logout();
-            }
-        }
-
-        /// <summary>
-        /// Sets the available stations on the map.
-        /// </summary>
-        private async Task SetStationsOnMap(StationDictionary stations)
-        {
-            if (Pins.Count > 0 && Pins.Count != stations.Count)
-            {
-                // Either
-                // - user logged in/ logged out which might lead to more/ less stations beeing available
-                // - new stations were added/ existing ones remove
-                Pins.Clear();
-            }
-
-            // Check if there are alreay any pins to the map
-            // i.e detecte first call of member OnAppearing after construction
-            if (Pins.Count <= 0)
-            {
-                Log.ForContext<MapPageViewModel>().Debug($"{(ActiveFilterMap.GetGroup().Any() ? $"Active map filter is {string.Join(",", ActiveFilterMap.GetGroup())}." : "Map filter is off.")}");
-
-                // Map was not yet initialized.
-                // Get stations from Copri
-                Log.ForContext<MapPageViewModel>().Verbose("No pins detected on page.");
-                if (stations.CopriVersion < CopriCallsStatic.UnsupportedVersionLower)
-                {
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageWaring,
-                        string.Format(AppResources.MessageCopriVersionIsOutdated, ContactPageViewModel.GetAppName(TinkApp.Uris.ActiveUri)),
-                        AppResources.MessageAnswerOk);
-
-                    Log.ForContext<MapPageViewModel>().Error($"Outdated version of app detected. Version expected is {stations.CopriVersion}.");
-                }
-
-                if (stations.CopriVersion >= CopriCallsStatic.UnsupportedVersionUpper)
-                {
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageWaring,
-                        string.Format(AppResources.MessageAppVersionIsOutdated, ContactPageViewModel.GetAppName(TinkApp.Uris.ActiveUri)),
-                        AppResources.MessageAnswerOk);
-
-                    Log.ForContext<MapPageViewModel>().Error($"Outdated version of app detected. Version expected is {stations.CopriVersion}.");
-                }
-
-                // Set pins to their positions on map.
-                InitializePins(stations);
-
-                Log.ForContext<MapPageViewModel>().Verbose("Update of pins done.");
-            }
-        }
-
-        /// <summary>
-        /// Moves the map to the current position of the user.
-        /// If location permission hasn't been granted, the position is not adjusted.
-        /// </summary>
-        private async Task<Model.Map.IMapSpan> GetFromLocationService(Status status)
-        {
-            Location currentLocation = null;
-            try
-            {
-                currentLocation = await GeolocationService.GetAsync();
-            }
-            catch (Exception ex)
-            {
-                Log.ForContext<MapPageViewModel>().Error("Getting location failed. {Exception}", ex);
-            }
-            if (currentLocation == null)
-                return null;
-
-            return Model.Map.MapSpanFactory.Create(
-                PositionFactory.Create(currentLocation.Latitude, currentLocation.Longitude),
-                TinkApp.ActiveMapSpan.Radius.Kilometers);
-        }
-
-        /// <summary>
-        /// Requests the location permission from the user.
-        /// If the user declines, a dialog prompot is shown, telling the user to toggle the permission in the device settings.
-        /// </summary>
-        /// <returns>The permission status.</returns>
-        private async Task<Status> RequestLocationPermission()
-        {
-            // Check location permission
-            var status = await PermissionsService.CheckStatusAsync();
-            if (TinkApp.CenterMapToCurrentLocation
-                && !GeolocationService.IsSimulation
-                && status != Status.Granted)
-            {
-                status = await PermissionsService.RequestAsync();
-
-                if (status != Status.Granted)
-                {
-                    var dialogResult = await ViewService.DisplayAlert(
-                        AppResources.MessageTitleHint,
-                        AppResources.MessageCenterMapLocationPermissionOpenDialog,
-                        AppResources.MessageAnswerYes,
-                        AppResources.MessageAnswerNo);
-
-                    if (dialogResult)
-                    {
-                        // User decided to give access to locations permissions.
-                        PermissionsService.OpenAppSettings();
-                        ActionText = "";
-                        IsRunning = false;
-                        IsMapPageEnabled = true;
-                    }
-                }
-            }
-            return status;
-        }
-
-        /// <summary> Moves map and scales visible region depending on active filter. </summary>
-        public static void MoveAndScale(
-            Action<MapSpan> moveToRegionDelegate,
-            MapSpan currentMapSpan = null)
-        {
-            if (currentMapSpan != null)
-            {
-                // Move to current location.
-                moveToRegionDelegate(currentMapSpan);
-                return;
-            }
-        }
-
-        /// <summary> Creates a update task object. </summary>
-        /// <param name="p_oSynchronizationContext">Object to use for synchronization.</param>
-        private PollingUpdateTaskManager CreateUpdateTask()
-        {
-            // Start task which periodically updates pins.
-            return new PollingUpdateTaskManager(
-                () =>
-                {
-                    try
-                    {
-                        Log.ForContext<MapPageViewModel>().Verbose("Entering update cycle.");
-                        Result<StationsAndBikesContainer> resultStationsAndBikes;
-
-                        TinkApp.PostAction(
-                            unused =>
-                            {
-                                ActionText = AppResources.ActivityTextUpdating;
-                                IsConnected = TinkApp.GetIsConnected();
-                            },
-                            null);
-
-                        resultStationsAndBikes = TinkApp.GetConnector(IsConnected).Query.GetBikesAndStationsAsync().Result;
-
-                        var exception = resultStationsAndBikes.Exception;
-                        if (exception != null)
-                        {
-                            Log.ForContext<MapPageViewModel>().Error("Getting bikes and stations in polling context failed with exception {Exception}.", exception);
-                        }
-
-                        // Check if there are alreay any pins to the map. 
-                        // If no initialze pins.
-                        if (Pins.Count <= 0)
-                        {
-                            // Set pins to their positions on map.
-                            TinkApp.PostAction(
-                                unused => { InitializePins(resultStationsAndBikes.Response.StationsAll); },
-                                null);
-                        }
-
-                        // Set/ update pins colors.
-                        var l_oColors = GetStationColors(
-                            Pins.Select(x => x.Tag.ToString()).ToList(),
-                            resultStationsAndBikes.Response.Bikes);
-
-                        // Update pins color form count of bikes located at station.
-                        TinkApp.PostAction(
-                            unused =>
-                            {
-                                UpdatePinsColor(l_oColors);
-                                ActionText = string.Empty;
-                                Exception = resultStationsAndBikes.Exception;
-                            },
-                            null);
-
-                        Log.ForContext<MapPageViewModel>().Verbose("Leaving update cycle.");
-                    }
-                    catch (Exception exception)
-                    {
-                        Log.ForContext<MapPageViewModel>().Error("Getting stations and bikes from update task failed. {Exception}", exception);
-                        TinkApp.PostAction(
-                            unused =>
-                            {
-                                Exception = exception;
-                                ActionText = string.Empty;
-                            },
-                             null);
-
-                        Log.ForContext<MapPageViewModel>().Verbose("Leaving update cycle.");
-                        return;
-                    }
-                });
-        }
-
-        /// <summary>
-        /// Invoked when pages is closed/ hidden. 
-        /// Stops update process.
-        /// </summary>
-        public async Task OnDisappearing()
-        {
-            Log.Information("Map page is disappearing...");
-
-            await m_oViewUpdateManager.StopUpdatePeridically();
-        }
-
-        /// <summary> User clicked on a bike. </summary>
-        /// <param name="selectedStationId">Id of station user clicked on.</param>
-        public async void OnStationClicked(string selectedStationId)
-        {
-            try
-            {
-                Log.ForContext<MapPageViewModel>().Information($"User taped station {selectedStationId}.");
-
-                // Lock action to prevent multiple instances of "BikeAtStation" being opened.
-                IsMapPageEnabled = false;
-
-                TinkApp.SelectedStation = TinkApp.Stations.FirstOrDefault(x => x.Id == selectedStationId)
-                    ?? new Station(selectedStationId, new List<string>(), null); // Station might not be in list StationDictinaly because this list is not updatd in background task.
+		public Command<PinClickedEventArgs> PinClickedCommand => new Command<PinClickedEventArgs>(
+			args =>
+			{
+				OnStationClicked(args.Pin.Tag.ToString());
+				args.Handled = true; // Prevents map to be centered to selected pin.
+			});
+
+		/// <summary>
+		/// One time setup: Sets pins into map and connects to events.
+		/// </summary>
+		private void InitializePins(StationDictionary stations)
+		{
+			// Add pins to stations.
+			Log.ForContext<MapPageViewModel>().Debug($"Request to draw {stations.Count} pins.");
+			foreach (var station in stations)
+			{
+				if (station.Position == null)
+				{
+					// There should be no reason for a position object to be null but this alreay occurred in past.
+					Log.ForContext<MapPageViewModel>().Error("Postion object of station {@l_oStation} is null.", station);
+					continue;
+				}
+
+				var l_oPin = new Pin
+				{
+
+					Position = new Xamarin.Forms.GoogleMaps.Position(station.Position.Latitude, station.Position.Longitude),
+					Label = long.TryParse(station.Id, out long stationId) && stationId > CUSTOM_ICONS_COUNT
+						? station.GetStationName()
+						: string.Empty, // Stations with custom icons have already a id marker. No need for a label.
+
+					Tag = station.Id,
+					IsVisible = false, // Set to false to prevent showing default icons (flickering).
+				};
+
+				Pins.Add(l_oPin);
+			}
+		}
+
+		/// <summary> Update all stations from TINK. </summary>
+		/// <param name="stationsColorList">List of colors to apply.</param>
+		private void UpdatePinsColor(IList<Color> stationsColorList)
+		{
+			Log.ForContext<MapPageViewModel>().Debug($"Starting update of stations pins color for {stationsColorList.Count} stations...");
+
+			// Update colors of pins.
+			for (int pinIndex = 0; pinIndex < stationsColorList.Count; pinIndex++)
+			{
+
+				var indexPartPrefix = int.TryParse(Pins[pinIndex].Tag.ToString(), out int stationId)
+					&& stationId <= CUSTOM_ICONS_COUNT
+					? $"{stationId}" // there is a station marker with index letter for given station id
+					: "Open"; // there is no station marker. Use open marker.
+
+				var colorPartPrefix = GetRessourceNameColorPart(stationsColorList[pinIndex]);
+
+				var l_iName = $"{indexPartPrefix.ToString().PadLeft(2, '0')}_{colorPartPrefix}{(DeviceInfo.Platform == DevicePlatform.Android ? ".png" : string.Empty)}";
+				try
+				{
+					Pins[pinIndex].Icon = BitmapDescriptorFactory.FromBundle(l_iName);
+				}
+				catch (Exception l_oException)
+				{
+					Log.ForContext<MapPageViewModel>().Error("Station icon {l_strName} can not be loaded. {@l_oException}.", l_oException);
+					Pins[pinIndex].Label = stationId.ToString();
+					Pins[pinIndex].Icon = BitmapDescriptorFactory.DefaultMarker(stationsColorList[pinIndex]);
+				}
+
+				Pins[pinIndex].IsVisible = true;
+			}
+
+			var pinsCount = Pins.Count;
+			for (int pinIndex = stationsColorList.Count; pinIndex < pinsCount; pinIndex++)
+			{
+				Log.ForContext<MapPageViewModel>().Error($"Unexpected count of pins detected. Expected {stationsColorList.Count} but is {pinsCount}.");
+				Pins[pinIndex].IsVisible = false;
+			}
+
+			Log.ForContext<MapPageViewModel>().Debug("Update of stations pins color done.");
+		}
+
+		/// <summary> Gets the color related part of the ressrouce name.</summary>
+		/// <param name="color">Color to get name for.</param>
+		/// <returns>Resource name.</returns>
+		private static string GetRessourceNameColorPart(Color color)
+		{
+			if (color == Color.Blue)
+			{
+				return "Blue";
+			}
+
+			if (color == Color.Green)
+			{
+				return "Green";
+			}
+
+			if (color == Color.LightBlue)
+			{
+				return "LightBlue";
+			}
+
+			if (color == Color.Red)
+			{
+				return "Red";
+			}
+
+			return color.ToString();
+		}
+
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		public async Task OnAppearing()
+		{
+			try
+			{
+				IsRunning = true;
+				// Process map page.
+				Polling = TinkApp.Polling;
+
+				Log.ForContext<MapPageViewModel>().Information(
+					$"{(Polling != null && Polling.IsActivated ? $"Map page is appearing. Update periode is {Polling.Periode.TotalSeconds} sec." : "Map page is appearing. Polling is off.")}" +
+					$"Current UI language is {Thread.CurrentThread.CurrentUICulture.Name}.");
+
+				// Update map page filter 
+				ActiveFilterMap = TinkApp.GroupFilterMapPage;
+
+				ActionText = AppResources.ActivityTextRequestingLocationPermissions;
+				var status = await RequestLocationPermission();
+
+				ActionText = AppResources.ActivityTextMapLoadingStationsAndBikes;
+				IsConnected = TinkApp.GetIsConnected();
+				var resultStationsAndBikes = await TinkApp.GetConnector(IsConnected).Query.GetBikesAndStationsAsync();
+
+				TinkApp.Stations = resultStationsAndBikes.Response.StationsAll;
+				TinkApp.ResourceUrls = resultStationsAndBikes.GeneralData.ResourceUrls;
+
+				if (!string.IsNullOrEmpty(resultStationsAndBikes?.GeneralData?.MerchantMessage)
+					&& !WasMerchantMessageAlreadyShown)
+				{
+					await ViewService.DisplayAlert(
+						"Information",
+						resultStationsAndBikes.GeneralData.MerchantMessage,
+						AppResources.MessageAnswerOk);
+					WasMerchantMessageAlreadyShown = true;
+				}
+
+				await SetStationsOnMap(resultStationsAndBikes.Response.StationsAll);
+				await HandleAuthCookieNotDefinedException(resultStationsAndBikes.Exception);
+
+				// Update pin colors.
+				Log.ForContext<MapPageViewModel>().Verbose("Starting update pins color...");
+
+				var colors = GetStationColors(
+					 Pins.Select(x => x.Tag.ToString()).ToList(),
+					 resultStationsAndBikes.Response.Bikes);
+
+				// Update pins color form count of bikes located at station.
+				UpdatePinsColor(colors);
+
+				Log.ForContext<MapPageViewModel>().Verbose("Update pins color done.");
+
+				// Move and scale before getting stations and bikes which takes some time.
+				ActionText = AppResources.ActivityTextCenterMap;
+
+				// Get map display area
+				Model.Map.IMapSpan mapSpan = null;
+				if (TinkApp.CenterMapToCurrentLocation && status == Status.Granted)
+				{
+					// Get from smart device
+					mapSpan = await GetFromLocationService(status);
+				}
+
+				if (mapSpan == null)
+				{
+					// Use map display are from COPRI 
+					mapSpan = resultStationsAndBikes.GeneralData.InitialMapSpan;
+				}
+
+				if (mapSpan.IsValid)
+				{
+					TinkApp.UserMapSpan = MapSpan.FromCenterAndRadius(
+						new Xamarin.Forms.GoogleMaps.Position(mapSpan.Center.Latitude, mapSpan.Center.Longitude),
+						new Distance(mapSpan.Radius * 1000));
+					TinkApp.Save();
+
+					MoveAndScale(m_oMoveToRegionDelegate, TinkApp.ActiveMapSpan);
+				}
+
+				m_oViewUpdateManager = CreateUpdateTask();
+
+				Log.ForContext<MapPageViewModel>().Verbose("Update pins color done.");
+
+				try
+				{
+					// Update bikes at station or my bikes depending on context.
+					await m_oViewUpdateManager.StartUpdateAyncPeridically(Polling);
+				}
+				catch (Exception)
+				{
+					// Excpetions are handled insde update task;
+				}
+
+				Exception = resultStationsAndBikes.Exception;
+				ActionText = "";
+				IsRunning = false;
+				IsMapPageEnabled = true;
+			}
+			catch (Exception l_oException)
+			{
+				Log.ForContext<MapPageViewModel>().Error($"An error occurred showing bike stations page.\r\n{l_oException.Message}");
+
+				IsRunning = false;
+
+				await ViewService.DisplayAlert(
+					"Fehler",
+					$"Beim Anzeigen der Fahrradstandorte- Seite ist ein Fehler aufgetreten.\r\n{l_oException.Message}",
+					"OK");
+
+				IsMapPageEnabled = true;
+			}
+		}
+
+		/// <summary>
+		/// Invoked when the auth cookie is not defined.
+		/// </summary>
+		private async Task HandleAuthCookieNotDefinedException(Exception exception)
+		{
+			if (exception?.GetType() == typeof(AuthcookieNotDefinedException))
+			{
+				Log.ForContext<MapPageViewModel>().Error("Map page is shown (probable for the first time after startup of app) and COPRI auth cookie is not defined. {@l_oException}", exception);
+
+				// COPRI reports an auth cookie error.
+				await ViewService.DisplayAlert(
+					AppResources.MessageWaring,
+					AppResources.MessageMapPageErrorAuthcookieUndefined,
+					AppResources.MessageAnswerOk);
+
+				IsConnected = TinkApp.GetIsConnected();
+				await TinkApp.GetConnector(IsConnected).Command.DoLogout();
+				TinkApp.ActiveUser.Logout();
+			}
+		}
+
+		/// <summary>
+		/// Sets the available stations on the map.
+		/// </summary>
+		private async Task SetStationsOnMap(StationDictionary stations)
+		{
+			if (Pins.Count > 0 && Pins.Count != stations.Count)
+			{
+				// Either
+				// - user logged in/ logged out which might lead to more/ less stations beeing available
+				// - new stations were added/ existing ones remove
+				Pins.Clear();
+			}
+
+			// Check if there are alreay any pins to the map
+			// i.e detecte first call of member OnAppearing after construction
+			if (Pins.Count <= 0)
+			{
+				Log.ForContext<MapPageViewModel>().Debug($"{(ActiveFilterMap.GetGroup().Any() ? $"Active map filter is {string.Join(",", ActiveFilterMap.GetGroup())}." : "Map filter is off.")}");
+
+				// Map was not yet initialized.
+				// Get stations from Copri
+				Log.ForContext<MapPageViewModel>().Verbose("No pins detected on page.");
+				if (stations.CopriVersion < CopriCallsStatic.UnsupportedVersionLower)
+				{
+					await ViewService.DisplayAlert(
+						AppResources.MessageWaring,
+						string.Format(AppResources.MessageCopriVersionIsOutdated, TinkApp.Flavor.GetDisplayName()),
+						AppResources.MessageAnswerOk);
+
+					Log.ForContext<MapPageViewModel>().Error($"Outdated version of app detected. Version expected is {stations.CopriVersion}.");
+				}
+
+				if (stations.CopriVersion >= CopriCallsStatic.UnsupportedVersionUpper)
+				{
+					await ViewService.DisplayAlert(
+						AppResources.MessageWaring,
+						string.Format(AppResources.MessageAppVersionIsOutdated, TinkApp.Flavor.GetDisplayName()),
+						AppResources.MessageAnswerOk);
+
+					Log.ForContext<MapPageViewModel>().Error($"Outdated version of app detected. Version expected is {stations.CopriVersion}.");
+				}
+
+				// Set pins to their positions on map.
+				InitializePins(stations);
+
+				Log.ForContext<MapPageViewModel>().Verbose("Update of pins done.");
+			}
+		}
+
+		/// <summary>
+		/// Moves the map to the current position of the user.
+		/// If location permission hasn't been granted, the position is not adjusted.
+		/// </summary>
+		private async Task<Model.Map.IMapSpan> GetFromLocationService(Status status)
+		{
+			Location currentLocation = null;
+			try
+			{
+				currentLocation = await GeolocationService.GetAsync();
+			}
+			catch (Exception ex)
+			{
+				Log.ForContext<MapPageViewModel>().Error("Getting location failed. {Exception}", ex);
+			}
+			if (currentLocation == null)
+				return null;
+
+			return Model.Map.MapSpanFactory.Create(
+				PositionFactory.Create(currentLocation.Latitude, currentLocation.Longitude),
+				TinkApp.ActiveMapSpan.Radius.Kilometers);
+		}
+
+		/// <summary>
+		/// Requests the location permission from the user.
+		/// If the user declines, a dialog prompot is shown, telling the user to toggle the permission in the device settings.
+		/// </summary>
+		/// <returns>The permission status.</returns>
+		private async Task<Status> RequestLocationPermission()
+		{
+			// Check location permission
+			var status = await PermissionsService.CheckStatusAsync();
+			if (TinkApp.CenterMapToCurrentLocation
+				&& !GeolocationService.IsSimulation
+				&& status != Status.Granted)
+			{
+				status = await PermissionsService.RequestAsync();
+
+				if (status != Status.Granted)
+				{
+					var dialogResult = await ViewService.DisplayAlert(
+						AppResources.MessageTitleHint,
+						AppResources.MessageCenterMapLocationPermissionOpenDialog,
+						AppResources.MessageAnswerYes,
+						AppResources.MessageAnswerNo);
+
+					if (dialogResult)
+					{
+						// User decided to give access to locations permissions.
+						PermissionsService.OpenAppSettings();
+						ActionText = "";
+						IsRunning = false;
+						IsMapPageEnabled = true;
+					}
+				}
+			}
+			return status;
+		}
+
+		/// <summary> Moves map and scales visible region depending on active filter. </summary>
+		public static void MoveAndScale(
+			Action<MapSpan> moveToRegionDelegate,
+			MapSpan currentMapSpan = null)
+		{
+			if (currentMapSpan != null)
+			{
+				// Move to current location.
+				moveToRegionDelegate(currentMapSpan);
+				return;
+			}
+		}
+
+		/// <summary> Creates a update task object. </summary>
+		/// <param name="p_oSynchronizationContext">Object to use for synchronization.</param>
+		private PollingUpdateTaskManager CreateUpdateTask()
+		{
+			// Start task which periodically updates pins.
+			return new PollingUpdateTaskManager(
+				() =>
+				{
+					try
+					{
+						Log.ForContext<MapPageViewModel>().Verbose("Entering update cycle.");
+						Result<StationsAndBikesContainer> resultStationsAndBikes;
+
+						TinkApp.PostAction(
+							unused =>
+							{
+								ActionText = AppResources.ActivityTextUpdating;
+								IsConnected = TinkApp.GetIsConnected();
+							},
+							null);
+
+						resultStationsAndBikes = TinkApp.GetConnector(IsConnected).Query.GetBikesAndStationsAsync().Result;
+
+						var exception = resultStationsAndBikes.Exception;
+						if (exception != null)
+						{
+							Log.ForContext<MapPageViewModel>().Error("Getting bikes and stations in polling context failed with exception {Exception}.", exception);
+						}
+
+						// Check if there are alreay any pins to the map. 
+						// If no initialze pins.
+						if (Pins.Count <= 0)
+						{
+							// Set pins to their positions on map.
+							TinkApp.PostAction(
+								unused => { InitializePins(resultStationsAndBikes.Response.StationsAll); },
+								null);
+						}
+
+						// Set/ update pins colors.
+						var l_oColors = GetStationColors(
+							Pins.Select(x => x.Tag.ToString()).ToList(),
+							resultStationsAndBikes.Response.Bikes);
+
+						// Update pins color form count of bikes located at station.
+						TinkApp.PostAction(
+							unused =>
+							{
+								UpdatePinsColor(l_oColors);
+								ActionText = string.Empty;
+								Exception = resultStationsAndBikes.Exception;
+							},
+							null);
+
+						Log.ForContext<MapPageViewModel>().Verbose("Leaving update cycle.");
+					}
+					catch (Exception exception)
+					{
+						Log.ForContext<MapPageViewModel>().Error("Getting stations and bikes from update task failed. {Exception}", exception);
+						TinkApp.PostAction(
+							unused =>
+							{
+								Exception = exception;
+								ActionText = string.Empty;
+							},
+							 null);
+
+						Log.ForContext<MapPageViewModel>().Verbose("Leaving update cycle.");
+						return;
+					}
+				});
+		}
+
+		/// <summary>
+		/// Invoked when pages is closed/ hidden. 
+		/// Stops update process.
+		/// </summary>
+		public async Task OnDisappearing()
+		{
+			Log.Information("Map page is disappearing...");
+
+			await m_oViewUpdateManager.StopUpdatePeridically();
+		}
+
+		/// <summary> User clicked on a bike. </summary>
+		/// <param name="selectedStationId">Id of station user clicked on.</param>
+		public async void OnStationClicked(string selectedStationId)
+		{
+			try
+			{
+				Log.ForContext<MapPageViewModel>().Information($"User taped station {selectedStationId}.");
+
+				// Lock action to prevent multiple instances of "BikeAtStation" being opened.
+				IsMapPageEnabled = false;
+
+				TinkApp.SelectedStation = TinkApp.Stations.FirstOrDefault(x => x.Id == selectedStationId)
+					?? new Station(selectedStationId, new List<string>(), null); // Station might not be in list StationDictinaly because this list is not updatd in background task.
 
 #if TRYNOTBACKSTYLE
                 m_oNavigation.ShowPage(
                     typeof(BikesAtStationPage),
                     p_strStationName);
 #else
-                // Show page.
-                await ViewService.PushAsync(ViewTypes.BikesAtStation);
+				// Show page.
+				await ViewService.PushAsync(ViewTypes.BikesAtStation);
 
-                IsMapPageEnabled = true;
-                ActionText = "";
-            }
-            catch (Exception exception)
-            {
-                IsMapPageEnabled = true;
-                ActionText = "";
+				IsMapPageEnabled = true;
+				ActionText = "";
+			}
+			catch (Exception exception)
+			{
+				IsMapPageEnabled = true;
+				ActionText = "";
 
-                Log.ForContext<MapPageViewModel>().Error("Fehler beim Öffnen der Ansicht \"Fahrräder an Station\" aufgetreten. {Exception}", exception);
-                await ViewService.DisplayAlert(
-                     "Fehler",
-                     $"Fehler beim Öffnen der Ansicht \"Fahrräder an Station\" aufgetreten. {exception.Message}",
-                     "OK");
-            }
+				Log.ForContext<MapPageViewModel>().Error("Fehler beim Öffnen der Ansicht \"Fahrräder an Station\" aufgetreten. {Exception}", exception);
+				await ViewService.DisplayAlert(
+					 "Fehler",
+					 $"Fehler beim Öffnen der Ansicht \"Fahrräder an Station\" aufgetreten. {exception.Message}",
+					 "OK");
+			}
 #endif
-        }
+		}
 
-        /// <summary>
-        /// Gets the list of station color for all stations.
-        /// </summary>
-        /// <param name="stationsId">Station id list to get color for.</param>
-        /// <returns></returns>
-        private static IList<Color> GetStationColors(
-            IEnumerable<string> stationsId,
-            BikeCollection bikesAll)
-        {
-            if (stationsId == null)
-            {
-                Log.ForContext<MapPageViewModel>().Debug("No stations available to update color for.");
-                return new List<Color>();
-            }
+		/// <summary>
+		/// Gets the list of station color for all stations.
+		/// </summary>
+		/// <param name="stationsId">Station id list to get color for.</param>
+		/// <returns></returns>
+		private static IList<Color> GetStationColors(
+			IEnumerable<string> stationsId,
+			BikeCollection bikesAll)
+		{
+			if (stationsId == null)
+			{
+				Log.ForContext<MapPageViewModel>().Debug("No stations available to update color for.");
+				return new List<Color>();
+			}
 
-            if (bikesAll == null)
-            {
-                // If object is null an error occurred querrying bikes availalbe or bikes occpied which results in an unknown state.
-                Log.ForContext<MapPageViewModel>().Error("No bikes available to determine pins color.");
-                return new List<Color>(stationsId.Select(x => Color.Blue));
-            }
+			if (bikesAll == null)
+			{
+				// If object is null an error occurred querrying bikes availalbe or bikes occpied which results in an unknown state.
+				Log.ForContext<MapPageViewModel>().Error("No bikes available to determine pins color.");
+				return new List<Color>(stationsId.Select(x => Color.Blue));
+			}
 
-            // Get state for each station.
-            var colors = new List<Color>();
-            foreach (var stationId in stationsId)
-            {
-                // Get color of given station.
-                var bikesAtStation = bikesAll.Where(x => x.StationId == stationId).ToList();
-                if (bikesAtStation.FirstOrDefault(x => x.State.Value.IsOccupied()) != null)
-                {
-                    // There is at least one requested or booked bike
-                    colors.Add(Color.LightBlue);
-                    continue;
-                }
+			// Get state for each station.
+			var colors = new List<Color>();
+			foreach (var stationId in stationsId)
+			{
+				// Get color of given station.
+				var bikesAtStation = bikesAll.Where(x => x.StationId == stationId).ToList();
+				if (bikesAtStation.FirstOrDefault(x => x.State.Value.IsOccupied()) != null)
+				{
+					// There is at least one requested or booked bike
+					colors.Add(Color.LightBlue);
+					continue;
+				}
 
-                if (bikesAtStation.ToList().Count > 0)
-                {
-                    // There is at least one bike available
-                    colors.Add(Color.Green);
-                    continue;
-                }
+				if (bikesAtStation.ToList().Count > 0)
+				{
+					// There is at least one bike available
+					colors.Add(Color.Green);
+					continue;
+				}
 
-                colors.Add(Color.Red);
-            }
+				colors.Add(Color.Red);
+			}
 
-            return colors;
-        }
+			return colors;
+		}
 
-        /// <summary>
-        /// Exception which occurred getting bike information.
-        /// </summary>
-        public Exception Exception
-        {
-            get
-            {
-                return m_oException;
-            }
+		/// <summary>
+		/// Exception which occurred getting bike information.
+		/// </summary>
+		public Exception Exception
+		{
+			get
+			{
+				return m_oException;
+			}
 
-            private set
-            {
-                var statusInfoText = StatusInfoText;
-                m_oException = value;
-                if (statusInfoText == StatusInfoText)
-                {
-                    // Nothing to do because value did not change.
-                    return;
-                }
+			private set
+			{
+				var statusInfoText = StatusInfoText;
+				m_oException = value;
+				if (statusInfoText == StatusInfoText)
+				{
+					// Nothing to do because value did not change.
+					return;
+				}
 
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StatusInfoText)));
-            }
-        }
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StatusInfoText)));
+			}
+		}
 
-        /// <summary> Holds info about current action. </summary>
-        private string actionText;
+		/// <summary> Holds info about current action. </summary>
+		private string actionText;
 
-        /// <summary> Holds info about current action. </summary>
-        private string ActionText
-        {
-            get => actionText;
-            set
-            {
-                var statusInfoText = StatusInfoText;
-                actionText = value;
-                if (statusInfoText == StatusInfoText)
-                {
-                    // Nothing to do because value did not change.
-                    return;
-                }
+		/// <summary> Holds info about current action. </summary>
+		private string ActionText
+		{
+			get => actionText;
+			set
+			{
+				var statusInfoText = StatusInfoText;
+				actionText = value;
+				if (statusInfoText == StatusInfoText)
+				{
+					// Nothing to do because value did not change.
+					return;
+				}
 
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StatusInfoText)));
-            }
-        }
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StatusInfoText)));
+			}
+		}
 
-        /// <summary> Used to block more than on copri requests at a given time.</summary>
-        private bool isRunning = false;
+		/// <summary> Used to block more than on copri requests at a given time.</summary>
+		private bool isRunning = false;
 
-        /// <summary>
-        /// True if any action can be performed (request and cancel request)
-        /// </summary>
-        public bool IsRunning
-        {
-            get => isRunning;
-            set
-            {
-                if (value == isRunning)
-                    return;
+		/// <summary>
+		/// True if any action can be performed (request and cancel request)
+		/// </summary>
+		public bool IsRunning
+		{
+			get => isRunning;
+			set
+			{
+				if (value == isRunning)
+					return;
 
-                Log.ForContext<MapPageViewModel>().Debug($"Switch value of {nameof(isRunning)} to {value}.");
-                isRunning = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsRunning)));
-            }
-        }
+				Log.ForContext<MapPageViewModel>().Debug($"Switch value of {nameof(isRunning)} to {value}.");
+				isRunning = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsRunning)));
+			}
+		}
 
 
-        /// <summary> Holds information whether app is connected to web or not. </summary>
-        private bool? isConnected = null;
+		/// <summary> Holds information whether app is connected to web or not. </summary>
+		private bool? isConnected = null;
 
-        /// <summary>Exposes the is connected state. </summary>
-        private bool IsConnected
-        {
-            get => isConnected ?? false;
-            set
-            {
-                var statusInfoText = StatusInfoText;
-                isConnected = value;
-                if (statusInfoText == StatusInfoText)
-                {
-                    // Nothing to do.
-                    return;
-                }
+		/// <summary>Exposes the is connected state. </summary>
+		private bool IsConnected
+		{
+			get => isConnected ?? false;
+			set
+			{
+				var statusInfoText = StatusInfoText;
+				isConnected = value;
+				if (statusInfoText == StatusInfoText)
+				{
+					// Nothing to do.
+					return;
+				}
 
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StatusInfoText)));
-            }
-        }
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StatusInfoText)));
+			}
+		}
 
-        /// <summary> Holds the status information text. </summary>
-        public string StatusInfoText
-        {
-            get
-            {
-                if (Exception != null)
-                {
-                    // An error occurred getting data from copri.
-                    return Exception.GetShortErrorInfoText(TinkApp.IsReportLevelVerbose);
-                }
+		/// <summary> Holds the status information text. </summary>
+		public string StatusInfoText
+		{
+			get
+			{
+				if (Exception != null)
+				{
+					// An error occurred getting data from copri.
+					return Exception.GetShortErrorInfoText(TinkApp.IsReportLevelVerbose);
+				}
 
-                if (!IsConnected)
-                {
-                    return AppResources.ActivityTextConnectionStateOffline;
-                }
+				if (!IsConnected)
+				{
+					return AppResources.ActivityTextConnectionStateOffline;
+				}
 
-                return ActionText ?? string.Empty;
-            }
-        }
+				return ActionText ?? string.Empty;
+			}
+		}
 
-        /// <summary> Command object to bind login button to view model.</summary>
-        public System.Windows.Input.ICommand OnToggleTinkToKonrad => new Xamarin.Forms.Command(async () => await ToggleTinkToKonrad());
+		/// <summary> Command object to bind login button to view model.</summary>
+		public System.Windows.Input.ICommand OnToggleTinkToKonrad => new Xamarin.Forms.Command(async () => await ToggleTinkToKonrad());
 
-        /// <summary> Command object to bind login button to view model.</summary>
-        public System.Windows.Input.ICommand OnToggleKonradToTink => new Xamarin.Forms.Command(async () => await ToggleKonradToTink());
+		/// <summary> Command object to bind login button to view model.</summary>
+		public System.Windows.Input.ICommand OnToggleKonradToTink => new Xamarin.Forms.Command(async () => await ToggleKonradToTink());
 
-        /// <summary> Manages toggle functionality. </summary>
-        private ITinkKonradToggleViewModel tinkKonradToggleViewModel;
+		/// <summary> Manages toggle functionality. </summary>
+		private ITinkKonradToggleViewModel tinkKonradToggleViewModel;
 
-        /// <summary> User request to toggle from TINK to Konrad. </summary>
-        public async Task ToggleTinkToKonrad()
-        {
-            if (tinkKonradToggleViewModel.CurrentFilter == FilterHelper.CITYBIKE)
-            {
-                // Konrad is already activated, nothing to do.
-                return;
-            }
+		/// <summary> User request to toggle from TINK to Konrad. </summary>
+		public async Task ToggleTinkToKonrad()
+		{
+			if (tinkKonradToggleViewModel.CurrentFilter == FilterHelper.CITYBIKE)
+			{
+				// Konrad is already activated, nothing to do.
+				return;
+			}
 
-            Log.ForContext<MapPageViewModel>().Information("User toggles to Konrad.");
-            await ActivateFilter(FilterHelper.CARGOBIKE);
-        }
+			Log.ForContext<MapPageViewModel>().Information("User toggles to Konrad.");
+			await ActivateFilter(FilterHelper.CARGOBIKE);
+		}
 
-        /// <summary> User request to toggle from TINK to Konrad. </summary>
-        public async Task ToggleKonradToTink()
-        {
-            if (tinkKonradToggleViewModel.CurrentFilter == FilterHelper.CARGOBIKE)
-            {
-                // Konrad is already activated, nothing to do.
-                return;
-            }
+		/// <summary> User request to toggle from TINK to Konrad. </summary>
+		public async Task ToggleKonradToTink()
+		{
+			if (tinkKonradToggleViewModel.CurrentFilter == FilterHelper.CARGOBIKE)
+			{
+				// Konrad is already activated, nothing to do.
+				return;
+			}
 
-            Log.ForContext<MapPageViewModel>().Information("User toggles to TINK.");
+			Log.ForContext<MapPageViewModel>().Information("User toggles to TINK.");
 
-            await ActivateFilter(FilterHelper.CITYBIKE);
-        }
+			await ActivateFilter(FilterHelper.CITYBIKE);
+		}
 
-        /// <summary> User request to toggle from TINK to Konrad. </summary>
-        private async Task ActivateFilter(string selectedFilter)
-        {
-            try
-            {
-                IsMapPageEnabled = false;
-                IsRunning = true;
+		/// <summary> User request to toggle from TINK to Konrad. </summary>
+		private async Task ActivateFilter(string selectedFilter)
+		{
+			try
+			{
+				IsMapPageEnabled = false;
+				IsRunning = true;
 
-                Log.ForContext<MapPageViewModel>().Information($"Request to toggle to \"{selectedFilter}\".");
+				Log.ForContext<MapPageViewModel>().Information($"Request to toggle to \"{selectedFilter}\".");
 
-                // Stop polling.
-                ActionText = AppResources.ActivityTextOneMomentPlease;
-                await m_oViewUpdateManager.StopUpdatePeridically();
+				// Stop polling.
+				ActionText = AppResources.ActivityTextOneMomentPlease;
+				await m_oViewUpdateManager.StopUpdatePeridically();
 
-                // Clear error info.
-                Exception = null;
+				// Clear error info.
+				Exception = null;
 
-                // Toggle view
-                tinkKonradToggleViewModel = new TinkKonradToggleViewModel(ActiveFilterMap).DoToggle();
+				// Toggle view
+				tinkKonradToggleViewModel = new TinkKonradToggleViewModel(ActiveFilterMap).DoToggle();
 
-                ActiveFilterMap = tinkKonradToggleViewModel.FilterDictionary;
-                TinkApp.GroupFilterMapPage = ActiveFilterMap;
-                TinkApp.Save();
+				ActiveFilterMap = tinkKonradToggleViewModel.FilterDictionary;
+				TinkApp.GroupFilterMapPage = ActiveFilterMap;
+				TinkApp.Save();
 
-                TinkApp.UpdateConnector();
+				TinkApp.UpdateConnector();
 
-                Pins.Clear();
+				Pins.Clear();
 
-                // Check location permission
-                ActionText = AppResources.ActivityTextRequestingLocationPermissions;
+				// Check location permission
+				ActionText = AppResources.ActivityTextRequestingLocationPermissions;
 
-                var status = await PermissionsService.CheckStatusAsync();
-                if (TinkApp.CenterMapToCurrentLocation
-                    && !GeolocationService.IsSimulation
-                    && status != Status.Granted)
-                {
-                    status = await PermissionsService.RequestAsync();
+				var status = await PermissionsService.CheckStatusAsync();
+				if (TinkApp.CenterMapToCurrentLocation
+					&& !GeolocationService.IsSimulation
+					&& status != Status.Granted)
+				{
+					status = await PermissionsService.RequestAsync();
 
-                    if (status != Status.Granted)
-                    {
-                        var dialogResult = await ViewService.DisplayAlert(
-                            AppResources.MessageTitleHint,
-                            AppResources.MessageCenterMapLocationPermissionOpenDialog,
-                            AppResources.MessageAnswerYes,
-                            AppResources.MessageAnswerNo);
-                        if (dialogResult)
-                        {
-                            // User decided to give access to locations permissions.
-                            PermissionsService.OpenAppSettings();
-                            ActionText = "";
-                            IsRunning = false;
-                            IsMapPageEnabled = true;
-                            return;
-                        }
-                    }
+					if (status != Status.Granted)
+					{
+						var dialogResult = await ViewService.DisplayAlert(
+							AppResources.MessageTitleHint,
+							AppResources.MessageCenterMapLocationPermissionOpenDialog,
+							AppResources.MessageAnswerYes,
+							AppResources.MessageAnswerNo);
+						if (dialogResult)
+						{
+							// User decided to give access to locations permissions.
+							PermissionsService.OpenAppSettings();
+							ActionText = "";
+							IsRunning = false;
+							IsMapPageEnabled = true;
+							return;
+						}
+					}
 
-                    // Do not use property .State to get bluetooth state due 
-                    // to issue https://hausource.visualstudio.com/TINK/_workitems/edit/116 / 
-                    // see https://github.com/xabre/xamarin-bluetooth-le/issues/112#issuecomment-380994887
-                    if (await BluetoothService.GetBluetoothState() != Plugin.BLE.Abstractions.Contracts.BluetoothState.On)
-                    {
-                        await ViewService.DisplayAlert(
-                            AppResources.MessageTitleHint,
-                            AppResources.MessageBikesManagementBluetoothActivation,
-                            AppResources.MessageAnswerOk);
-                        ActionText = "";
-                        IsRunning = false;
-                        IsMapPageEnabled = true;
-                        return;
-                    }
-                }
+					// Do not use property .State to get bluetooth state due 
+					// to issue https://hausource.visualstudio.com/TINK/_workitems/edit/116 / 
+					// see https://github.com/xabre/xamarin-bluetooth-le/issues/112#issuecomment-380994887
+					if (await BluetoothService.GetBluetoothState() != Plugin.BLE.Abstractions.Contracts.BluetoothState.On)
+					{
+						await ViewService.DisplayAlert(
+							AppResources.MessageTitleHint,
+							AppResources.MessageBikesManagementBluetoothActivation,
+							AppResources.MessageAnswerOk);
+						ActionText = "";
+						IsRunning = false;
+						IsMapPageEnabled = true;
+						return;
+					}
+				}
 
-                // Move and scale before getting stations and bikes which takes some time.
-                ActionText = AppResources.ActivityTextCenterMap;
+				// Move and scale before getting stations and bikes which takes some time.
+				ActionText = AppResources.ActivityTextCenterMap;
 
-                if (TinkApp.CenterMapToCurrentLocation)
-                {
-                    Location currentLocation = null;
-                    try
-                    {
-                        currentLocation = await GeolocationService.GetAsync();
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.ForContext<MapPageViewModel>().Error("Getting location failed. {Exception}", ex);
-                    }
+				if (TinkApp.CenterMapToCurrentLocation)
+				{
+					Location currentLocation = null;
+					try
+					{
+						currentLocation = await GeolocationService.GetAsync();
+					}
+					catch (Exception ex)
+					{
+						Log.ForContext<MapPageViewModel>().Error("Getting location failed. {Exception}", ex);
+					}
 
-                    if (currentLocation != null)
-                    {
-                        TinkApp.UserMapSpan = MapSpan.FromCenterAndRadius(
-                        new Xamarin.Forms.GoogleMaps.Position(currentLocation.Latitude, currentLocation.Longitude),
-                        TinkApp.ActiveMapSpan.Radius);
+					if (currentLocation != null)
+					{
+						TinkApp.UserMapSpan = MapSpan.FromCenterAndRadius(
+						new Xamarin.Forms.GoogleMaps.Position(currentLocation.Latitude, currentLocation.Longitude),
+						TinkApp.ActiveMapSpan.Radius);
 
-                        TinkApp.Save();
-                    }
-                }
+						TinkApp.Save();
+					}
+				}
 
-                // Update stations
-                MoveAndScale(m_oMoveToRegionDelegate, TinkApp.ActiveMapSpan);
+				// Update stations
+				MoveAndScale(m_oMoveToRegionDelegate, TinkApp.ActiveMapSpan);
 
-                ActionText = AppResources.ActivityTextMapLoadingStationsAndBikes;
-                IsConnected = TinkApp.GetIsConnected();
-                var resultStationsAndBikes = await TinkApp.GetConnector(IsConnected).Query.GetBikesAndStationsAsync();
+				ActionText = AppResources.ActivityTextMapLoadingStationsAndBikes;
+				IsConnected = TinkApp.GetIsConnected();
+				var resultStationsAndBikes = await TinkApp.GetConnector(IsConnected).Query.GetBikesAndStationsAsync();
 
-                // Set pins to their positions on map.
-                InitializePins(resultStationsAndBikes.Response.StationsAll);
-                Log.ForContext<MapPageViewModel>().Verbose("Update of  pins on toggle done...");
+				// Set pins to their positions on map.
+				InitializePins(resultStationsAndBikes.Response.StationsAll);
+				Log.ForContext<MapPageViewModel>().Verbose("Update of  pins on toggle done...");
 
-                // Update pin colors.
-                Log.ForContext<MapPageViewModel>().Verbose("Starting update pins color on toggle...");
-                var l_oColors = GetStationColors(
-                    Pins.Select(x => x.Tag.ToString()).ToList(),
-                    resultStationsAndBikes.Response.Bikes);
+				// Update pin colors.
+				Log.ForContext<MapPageViewModel>().Verbose("Starting update pins color on toggle...");
+				var l_oColors = GetStationColors(
+					Pins.Select(x => x.Tag.ToString()).ToList(),
+					resultStationsAndBikes.Response.Bikes);
 
-                // Update pins color form count of bikes located at station.
-                UpdatePinsColor(l_oColors);
+				// Update pins color form count of bikes located at station.
+				UpdatePinsColor(l_oColors);
 
-                Log.ForContext<MapPageViewModel>().Verbose("Update pins color done.");
+				Log.ForContext<MapPageViewModel>().Verbose("Update pins color done.");
 
-                try
-                {
-                    // Update bikes at station or my bikes depending on context.
-                    await m_oViewUpdateManager.StartUpdateAyncPeridically(Polling);
-                }
-                catch (Exception)
-                {
-                    // Excpetions are handled insde update task;
-                }
+				try
+				{
+					// Update bikes at station or my bikes depending on context.
+					await m_oViewUpdateManager.StartUpdateAyncPeridically(Polling);
+				}
+				catch (Exception)
+				{
+					// Excpetions are handled insde update task;
+				}
 
-                ActionText = "";
-                IsRunning = false;
-                IsMapPageEnabled = true;
-                Log.ForContext<MapPageViewModel>().Information($"Toggle to \"{selectedFilter}\" done.");
-            }
-            catch (Exception l_oException)
-            {
-                Log.ForContext<MapPageViewModel>().Error("An error occurred switching view Cargobike/ Citybike.{}");
-                ActionText = "";
-                IsRunning = false;
+				ActionText = "";
+				IsRunning = false;
+				IsMapPageEnabled = true;
+				Log.ForContext<MapPageViewModel>().Information($"Toggle to \"{selectedFilter}\" done.");
+			}
+			catch (Exception l_oException)
+			{
+				Log.ForContext<MapPageViewModel>().Error("An error occurred switching view Cargobike/ Citybike.{}");
+				ActionText = "";
+				IsRunning = false;
 
-                await ViewService.DisplayAlert(
-                    "Fehler",
-                    AppResources.MessageMapPageErrorSwitch,
-                    String.Format(AppResources.MessageMapPageErrorSwitch, l_oException.Message),
-                    AppResources.MessageAnswerOk);
+				await ViewService.DisplayAlert(
+					"Fehler",
+					AppResources.MessageMapPageErrorSwitch,
+					String.Format(AppResources.MessageMapPageErrorSwitch, l_oException.Message),
+					AppResources.MessageAnswerOk);
 
-                IsMapPageEnabled = true;
-            }
-        }
+				IsMapPageEnabled = true;
+			}
+		}
 
-        public Color TinkColor => tinkKonradToggleViewModel.TinkColor;
+		public Color TinkColor => tinkKonradToggleViewModel.TinkColor;
 
-        public Color KonradColor => tinkKonradToggleViewModel.KonradColor;
+		public Color KonradColor => tinkKonradToggleViewModel.KonradColor;
 
-        public Color NoTinkColor => tinkKonradToggleViewModel.NoTinkColor;
+		public Color NoTinkColor => tinkKonradToggleViewModel.NoTinkColor;
 
-        public Color NoKonradColor => tinkKonradToggleViewModel.NoKonradColor;
+		public Color NoKonradColor => tinkKonradToggleViewModel.NoKonradColor;
 
-        public bool IsToggleVisible => tinkKonradToggleViewModel.IsToggleVisible;
-    }
+		public bool IsToggleVisible => tinkKonradToggleViewModel.IsToggleVisible;
+	}
 }
\ No newline at end of file
diff --git a/TINKLib/ViewModel/Map/TinkKonradToggleViewModel.cs b/TINKLib/ViewModel/Map/TinkKonradToggleViewModel.cs
index 2479b81..6b1ed71 100644
--- a/TINKLib/ViewModel/Map/TinkKonradToggleViewModel.cs
+++ b/TINKLib/ViewModel/Map/TinkKonradToggleViewModel.cs
@@ -7,78 +7,78 @@ using Xamarin.Forms;
 
 namespace TINK.ViewModel.Map
 {
-    /// <remarks> Old name: MapPageFilter. </remarks>
-    public class TinkKonradToggleViewModel : ITinkKonradToggleViewModel
-    {
-        /// <summary> Constructs a map page filter view model object from values.</summary>
-        /// <param name="currentFilter">Filters and options dictionary.</param>
-        public TinkKonradToggleViewModel(IGroupFilterMapPage currentFilter)
-        {
-            FilterDictionary = currentFilter ?? new GroupFilterMapPage();
-        }
+	/// <remarks> Old name: MapPageFilter. </remarks>
+	public class TinkKonradToggleViewModel : ITinkKonradToggleViewModel
+	{
+		/// <summary> Constructs a map page filter view model object from values.</summary>
+		/// <param name="currentFilter">Filters and options dictionary.</param>
+		public TinkKonradToggleViewModel(IGroupFilterMapPage currentFilter)
+		{
+			FilterDictionary = currentFilter ?? new GroupFilterMapPage();
+		}
 
-        /// <summary> Gets the filter values.</summary>
-        public IGroupFilterMapPage FilterDictionary { get; }
+		/// <summary> Gets the filter values.</summary>
+		public IGroupFilterMapPage FilterDictionary { get; }
 
-        /// <summary> Gets the activated filter.</summary>
-        public string CurrentFilter
-        {
-            get
-            {
-                return FilterDictionary.FirstOrDefault(x => x.Value == FilterState.On).Key ?? string.Empty;
-            }
-        }
+		/// <summary> Gets the activated filter.</summary>
+		public string CurrentFilter
+		{
+			get
+			{
+				return FilterDictionary.FirstOrDefault(x => x.Value == FilterState.On).Key ?? string.Empty;
+			}
+		}
 
-        /// <summary> Gets value whether TINK is enabled or not. </summary>
-        public bool IsTinkEnabled => !string.IsNullOrEmpty(CurrentFilter) && CurrentFilter.GetBikeCategory() != FilterHelper.CARGOBIKE;
+		/// <summary> Gets value whether TINK is enabled or not. </summary>
+		public bool IsTinkEnabled => !string.IsNullOrEmpty(CurrentFilter) && CurrentFilter.GetBikeCategory() != FilterHelper.CARGOBIKE;
 
-        /// <summary> Gets color of the TINK button. </summary>
-        public Color TinkColor => CurrentFilter.GetBikeCategory() == FilterHelper.CARGOBIKE ? Color.White : Color.FromRgba(0, 0, 0, 0);
-        public Color NoTinkColor => CurrentFilter.GetBikeCategory() == FilterHelper.CARGOBIKE ? Color.FromRgb(210, 17, 20) : Color.White;
-        /// <summary> Gets value whether Konrad is enabled or not. </summary>
-        public bool IsKonradEnabled => !string.IsNullOrEmpty(CurrentFilter) && CurrentFilter.GetBikeCategory() != FilterHelper.CITYBIKE;
+		/// <summary> Gets color of the TINK button. </summary>
+		public Color TinkColor => CurrentFilter.GetBikeCategory() == FilterHelper.CARGOBIKE ? Color.White : Color.FromRgba(0, 0, 0, 0);
+		public Color NoTinkColor => CurrentFilter.GetBikeCategory() == FilterHelper.CARGOBIKE ? Color.FromRgb(210, 17, 20) : Color.White;
+		/// <summary> Gets value whether Konrad is enabled or not. </summary>
+		public bool IsKonradEnabled => !string.IsNullOrEmpty(CurrentFilter) && CurrentFilter.GetBikeCategory() != FilterHelper.CITYBIKE;
 
-        /// <summary> Gets color of the Konrad button. </summary>
-        public Color KonradColor => CurrentFilter.GetBikeCategory() == FilterHelper.CITYBIKE ? Color.White : Color.FromRgba(0, 0, 0, 0);
-        public Color NoKonradColor => CurrentFilter.GetBikeCategory() == FilterHelper.CITYBIKE ? Color.FromRgb(210, 17, 20) : Color.White;
+		/// <summary> Gets color of the Konrad button. </summary>
+		public Color KonradColor => CurrentFilter.GetBikeCategory() == FilterHelper.CITYBIKE ? Color.White : Color.FromRgba(0, 0, 0, 0);
+		public Color NoKonradColor => CurrentFilter.GetBikeCategory() == FilterHelper.CITYBIKE ? Color.FromRgb(210, 17, 20) : Color.White;
 
-        /// <summary> Gets whether toggle functionality is visible or not. </summary>
-        public bool IsToggleVisible =>
-            FilterDictionary.Select(x => x.Key).ContainsGroupId(FilterHelper.CITYBIKE)
-            && FilterDictionary.Select(x => x.Key).ContainsGroupId(FilterHelper.CARGOBIKE)
-            && (IsTinkEnabled || IsKonradEnabled);
+		/// <summary> Gets whether toggle functionality is visible or not. </summary>
+		public bool IsToggleVisible =>
+			FilterDictionary.Select(x => x.Key).ContainsGroupId(FilterHelper.CITYBIKE)
+			&& FilterDictionary.Select(x => x.Key).ContainsGroupId(FilterHelper.CARGOBIKE)
+			&& (IsTinkEnabled || IsKonradEnabled);
 
-        /// <summary>
-        /// Toggles from bike group TINK to Konrad or vice versa.
-        /// Toggling means one of 
-        /// - TINK => Konrad or
-        /// - TINK => Konrad.
-        /// </summary>
-        /// <param name="p_strCurrentFilterSet">Filter set to toggle.</param>
-        /// <returns></returns>
-        public TinkKonradToggleViewModel DoToggle()
-        {
-            var currentFilterSet = FilterDictionary.ToArray();
+		/// <summary>
+		/// Toggles from bike group TINK to Konrad or vice versa.
+		/// Toggling means one of 
+		/// - TINK => Konrad or
+		/// - TINK => Konrad.
+		/// </summary>
+		/// <param name="p_strCurrentFilterSet">Filter set to toggle.</param>
+		/// <returns></returns>
+		public TinkKonradToggleViewModel DoToggle()
+		{
+			var currentFilterSet = FilterDictionary.ToArray();
 
-            if (currentFilterSet.Length < 2)
-            {
-                // There is nothing to toggle because filter set contains only one element.
-                return new TinkKonradToggleViewModel(FilterDictionary);
-            }
+			if (currentFilterSet.Length < 2)
+			{
+				// There is nothing to toggle because filter set contains only one element.
+				return new TinkKonradToggleViewModel(FilterDictionary);
+			}
 
-            var currentState = currentFilterSet[currentFilterSet.Length - 1].Value == FilterState.On
-                ? FilterState.On
-                : FilterState.Off;
+			var currentState = currentFilterSet[currentFilterSet.Length - 1].Value == FilterState.On
+				? FilterState.On
+				: FilterState.Off;
 
-            var toggledFilterSet = new Dictionary<string, FilterState>();
+			var toggledFilterSet = new Dictionary<string, FilterState>();
 
-            foreach (var filterElement in currentFilterSet)
-            {
-                toggledFilterSet.Add(filterElement.Key, currentState);
-                currentState = filterElement.Value;
-            }
+			foreach (var filterElement in currentFilterSet)
+			{
+				toggledFilterSet.Add(filterElement.Key, currentState);
+				currentState = filterElement.Value;
+			}
 
-            return new TinkKonradToggleViewModel(new GroupFilterMapPage(toggledFilterSet));
-        }
-    }
+			return new TinkKonradToggleViewModel(new GroupFilterMapPage(toggledFilterSet));
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/MiniSurvey/MiniSurveyViewModel.cs b/TINKLib/ViewModel/MiniSurvey/MiniSurveyViewModel.cs
index a41d2ef..cab4e4f 100644
--- a/TINKLib/ViewModel/MiniSurvey/MiniSurveyViewModel.cs
+++ b/TINKLib/ViewModel/MiniSurvey/MiniSurveyViewModel.cs
@@ -12,142 +12,142 @@ using TINK.ViewModel.MiniSurvey.Question;
 
 namespace TINK.ViewModel.MiniSurvey
 {
-    public class MiniSurveyViewModel : ObservableCollection<IMiniSurveyQuestion>
-    {
-        /// <summary> Delegate to retrieve connected state. </summary>
-        protected Func<bool> IsConnectedDelegate { get; }
+	public class MiniSurveyViewModel : ObservableCollection<IMiniSurveyQuestion>
+	{
+		/// <summary> Delegate to retrieve connected state. </summary>
+		protected Func<bool> IsConnectedDelegate { get; }
 
-        /// <summary> Provides a connector object.</summary>
-        private Func<bool, IConnector> ConnectorFactory { get; }
+		/// <summary> Provides a connector object.</summary>
+		private Func<bool, IConnector> ConnectorFactory { get; }
 
-        /// <summary>
-        /// Reference on view service to show modal notifications and to perform navigation.
-        /// </summary>
-        private IViewService ViewService { get; }
+		/// <summary>
+		/// Reference on view service to show modal notifications and to perform navigation.
+		/// </summary>
+		private IViewService ViewService { get; }
 
-        private MiniSurveyModel MiniSurvey { get; }
+		private MiniSurveyModel MiniSurvey { get; }
 
-        /// <summary> Constructs mini survey view model.</summary>
-        /// <param name="connectorFactory">Connects system to copri for purposes of requesting a bike/ cancel request.</param>
-        /// <param name="viewService">Interface to actuate methodes on GUI.</param>
-        public MiniSurveyViewModel(
-            Func<bool> isConnectedDelegate,
-            Func<bool, IConnector> connectorFactory,
-            IViewService viewService)
-        {
-            IsConnectedDelegate = isConnectedDelegate
-                ?? throw new ArgumentException($"Can not instantiate {nameof(MiniSurveyViewModel)}-object. No connector available.");
+		/// <summary> Constructs mini survey view model.</summary>
+		/// <param name="connectorFactory">Connects system to copri for purposes of requesting a bike/ cancel request.</param>
+		/// <param name="viewService">Interface to actuate methodes on GUI.</param>
+		public MiniSurveyViewModel(
+			Func<bool> isConnectedDelegate,
+			Func<bool, IConnector> connectorFactory,
+			IViewService viewService)
+		{
+			IsConnectedDelegate = isConnectedDelegate
+				?? throw new ArgumentException($"Can not instantiate {nameof(MiniSurveyViewModel)}-object. No connector available.");
 
-            ConnectorFactory = connectorFactory
-                ?? throw new ArgumentException($"Can not instantiate {nameof(MiniSurveyViewModel)}-object. No connector available.");
+			ConnectorFactory = connectorFactory
+				?? throw new ArgumentException($"Can not instantiate {nameof(MiniSurveyViewModel)}-object. No connector available.");
 
-            ViewService = viewService
-                ?? throw new ArgumentException($"Can not instantiate {nameof(MiniSurveyViewModel)}-object. No view available.");
+			ViewService = viewService
+				?? throw new ArgumentException($"Can not instantiate {nameof(MiniSurveyViewModel)}-object. No view available.");
 
-            MiniSurvey = new MiniSurveyModel
-            {
-                Title = "Bitte unterstützen Sie unsere Begleitforschung",
-                Subtitle = "Ihre drei Antworten werden anonym gespeichert.",
-                Footer = "Herzlichen Dank und viel Spaß bei der nächsten Fahrt!"
-            };
+			MiniSurvey = new MiniSurveyModel
+			{
+				Title = "Bitte unterstützen Sie unsere Begleitforschung",
+				Subtitle = "Ihre drei Antworten werden anonym gespeichert.",
+				Footer = "Herzlichen Dank und viel Spaß bei der nächsten Fahrt!"
+			};
 
-            MiniSurvey.Questions.Add(
-                "q1",
-                new QuestionModel
-                {
-                    Text = "1. Was war der Hauptzweck dieser Ausleihe?",
-                    Type = MiniSurveyModel.Type.SingleAnswer
-                });
+			MiniSurvey.Questions.Add(
+				"q1",
+				new QuestionModel
+				{
+					Text = "1. Was war der Hauptzweck dieser Ausleihe?",
+					Type = MiniSurveyModel.Type.SingleAnswer
+				});
 
-            MiniSurvey.Questions.Add(
-                "q2",
-                new QuestionModel
-                {
-                    Text = "2. Welches Verkehrsmittel hätten Sie ansonsten benutzt?",
-                    Type = MiniSurveyModel.Type.SingleAnswer
-                });
+			MiniSurvey.Questions.Add(
+				"q2",
+				new QuestionModel
+				{
+					Text = "2. Welches Verkehrsmittel hätten Sie ansonsten benutzt?",
+					Type = MiniSurveyModel.Type.SingleAnswer
+				});
 
-            MiniSurvey.Questions.Add(
-                "q3",
-                new QuestionModel
-                {
-                    Text = "3. Haben Sie Anmerkungen oder Anregungen?",
-                    Type = MiniSurveyModel.Type.CustomText
-                });
+			MiniSurvey.Questions.Add(
+				"q3",
+				new QuestionModel
+				{
+					Text = "3. Haben Sie Anmerkungen oder Anregungen?",
+					Type = MiniSurveyModel.Type.CustomText
+				});
 
-            MiniSurvey.Questions["q1"].PossibleAnswers.Add("opt1", "a. Einkauf");
-            MiniSurvey.Questions["q1"].PossibleAnswers.Add("opt2", "b. Kinderbeförderung");
-            MiniSurvey.Questions["q1"].PossibleAnswers.Add("opt3", "c. Lastentransport");
-            MiniSurvey.Questions["q1"].PossibleAnswers.Add("opt4", "d. Freizeit");
-            MiniSurvey.Questions["q1"].PossibleAnswers.Add("opt5", "e. Ausprobieren");
-            MiniSurvey.Questions["q1"].PossibleAnswers.Add("opt6", "f. Sonstiges");
+			MiniSurvey.Questions["q1"].PossibleAnswers.Add("opt1", "a. Einkauf");
+			MiniSurvey.Questions["q1"].PossibleAnswers.Add("opt2", "b. Kinderbeförderung");
+			MiniSurvey.Questions["q1"].PossibleAnswers.Add("opt3", "c. Lastentransport");
+			MiniSurvey.Questions["q1"].PossibleAnswers.Add("opt4", "d. Freizeit");
+			MiniSurvey.Questions["q1"].PossibleAnswers.Add("opt5", "e. Ausprobieren");
+			MiniSurvey.Questions["q1"].PossibleAnswers.Add("opt6", "f. Sonstiges");
 
-            MiniSurvey.Questions["q2"].PossibleAnswers.Add("opt1", "a. Auto");
-            MiniSurvey.Questions["q2"].PossibleAnswers.Add("opt2", "b. Motorrad oder Motorroller");
-            MiniSurvey.Questions["q2"].PossibleAnswers.Add("opt3", "c. Bus oder Bahn");
-            MiniSurvey.Questions["q2"].PossibleAnswers.Add("opt4", "d. Eigenes Fahrrad");
-            MiniSurvey.Questions["q2"].PossibleAnswers.Add("opt5", "e. Zu Fuß");
-            MiniSurvey.Questions["q2"].PossibleAnswers.Add("opt6", "f. Keines (ich hätte die Fahrt sonst nicht gemacht)");
+			MiniSurvey.Questions["q2"].PossibleAnswers.Add("opt1", "a. Auto");
+			MiniSurvey.Questions["q2"].PossibleAnswers.Add("opt2", "b. Motorrad oder Motorroller");
+			MiniSurvey.Questions["q2"].PossibleAnswers.Add("opt3", "c. Bus oder Bahn");
+			MiniSurvey.Questions["q2"].PossibleAnswers.Add("opt4", "d. Eigenes Fahrrad");
+			MiniSurvey.Questions["q2"].PossibleAnswers.Add("opt5", "e. Zu Fuß");
+			MiniSurvey.Questions["q2"].PossibleAnswers.Add("opt6", "f. Keines (ich hätte die Fahrt sonst nicht gemacht)");
 
-            Title = MiniSurvey.Title;
-            Subtitle = MiniSurvey.Subtitle;
-            Footer = MiniSurvey.Footer;
+			Title = MiniSurvey.Title;
+			Subtitle = MiniSurvey.Subtitle;
+			Footer = MiniSurvey.Footer;
 
-            foreach (var question in MiniSurvey.Questions)
-            {
-                switch (question.Value.Type)
-                {
-                    case MiniSurveyModel.Type.SingleAnswer:
-                        Add(new CheckOneViewModel(
-                            new KeyValuePair<string, string>(question.Key, question.Value.Text),
-                            question.Value.PossibleAnswers));
-                        break;
+			foreach (var question in MiniSurvey.Questions)
+			{
+				switch (question.Value.Type)
+				{
+					case MiniSurveyModel.Type.SingleAnswer:
+						Add(new CheckOneViewModel(
+							new KeyValuePair<string, string>(question.Key, question.Value.Text),
+							question.Value.PossibleAnswers));
+						break;
 
-                    case MiniSurveyModel.Type.CustomText:
-                        Add(new FreeTextViewModel(new KeyValuePair<string, string>(question.Key, question.Value.Text)));
-                        break;
+					case MiniSurveyModel.Type.CustomText:
+						Add(new FreeTextViewModel(new KeyValuePair<string, string>(question.Key, question.Value.Text)));
+						break;
 
-                    default:
-                        break;
-                }
-            }
-        }
+					default:
+						break;
+				}
+			}
+		}
 
-        public string Title { get; set; }
+		public string Title { get; set; }
 
-        public string Subtitle { get; set; }
+		public string Subtitle { get; set; }
 
-        public string Footer { get; set; }
+		public string Footer { get; set; }
 
-        /// <summary> Processes request to perform a copri action (reserve bike and cancel reservation). </summary>
-        public System.Windows.Input.ICommand OnButtonClicked => new Xamarin.Forms.Command(async () =>
-        {
-            Log.ForContext<MiniSurveyViewModel>().Information($"User result {this[0].Answer.Value}, {this[1].Answer.Value}");
+		/// <summary> Processes request to perform a copri action (reserve bike and cancel reservation). </summary>
+		public System.Windows.Input.ICommand OnButtonClicked => new Xamarin.Forms.Command(async () =>
+		{
+			Log.ForContext<MiniSurveyViewModel>().Information($"User result {this[0].Answer.Value}, {this[1].Answer.Value}");
 
-            var isConnected = IsConnectedDelegate();
-            try
-            {
-                await ConnectorFactory(isConnected).Command.DoSubmitMiniSurvey(this.ToDictionary(x => x.Question.Key, x => x.Answer.Key));
-            }
-            catch (Exception exception)
-            {
-                if (exception is ResponseException copriException)
-                {
-                    // Copri server is not reachable.
-                    Log.ForContext<MiniSurveyViewModel>().Information("Submitting mini survay answer failed. COPRI returned an error.");
-                }
-                else
-                {
-                    Log.ForContext<MiniSurveyViewModel>().Error("Submitting mini survay answer failed. {@l_oException}", exception);
-                }
+			var isConnected = IsConnectedDelegate();
+			try
+			{
+				await ConnectorFactory(isConnected).Command.DoSubmitMiniSurvey(this.ToDictionary(x => x.Question.Key, x => x.Answer.Key));
+			}
+			catch (Exception exception)
+			{
+				if (exception is ResponseException copriException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<MiniSurveyViewModel>().Information("Submitting mini survay answer failed. COPRI returned an error.");
+				}
+				else
+				{
+					Log.ForContext<MiniSurveyViewModel>().Error("Submitting mini survay answer failed. {@l_oException}", exception);
+				}
 
-                await ViewService.DisplayAlert(
-                    AppResources.ErrorReturnSubmitFeedbackTitle,
-                    AppResources.ErrorReturnSubmitFeedbackMessage,
-                    AppResources.MessageAnswerOk);
-            }
+				await ViewService.DisplayAlert(
+					AppResources.ErrorReturnSubmitFeedbackTitle,
+					AppResources.ErrorReturnSubmitFeedbackMessage,
+					AppResources.MessageAnswerOk);
+			}
 
-            await ViewService.PopModalAsync();
-        });
-    }
+			await ViewService.PopModalAsync();
+		});
+	}
 }
diff --git a/TINKLib/ViewModel/MiniSurvey/Question/CheckOneViewModel.cs b/TINKLib/ViewModel/MiniSurvey/Question/CheckOneViewModel.cs
index d86acf1..436dce3 100644
--- a/TINKLib/ViewModel/MiniSurvey/Question/CheckOneViewModel.cs
+++ b/TINKLib/ViewModel/MiniSurvey/Question/CheckOneViewModel.cs
@@ -3,43 +3,43 @@ using System.Linq;
 
 namespace TINK.ViewModel.MiniSurvey.Question
 {
-    public class CheckOneViewModel : IMiniSurveyQuestion
-    {
-        /// <summary> Constructs object. </summary>
-        /// <param name="question">Holds the question with key asked to user.</param>
-        /// <param name="answers">Holds the list of possible answers with their option keys.</param>
-        public CheckOneViewModel(
-            KeyValuePair<string, string> question,
-            Dictionary<string, string> answers)
-        {
-            Question = question;
-            Answers = answers ?? new Dictionary<string, string>();
-        }
+	public class CheckOneViewModel : IMiniSurveyQuestion
+	{
+		/// <summary> Constructs object. </summary>
+		/// <param name="question">Holds the question with key asked to user.</param>
+		/// <param name="answers">Holds the list of possible answers with their option keys.</param>
+		public CheckOneViewModel(
+			KeyValuePair<string, string> question,
+			Dictionary<string, string> answers)
+		{
+			Question = question;
+			Answers = answers ?? new Dictionary<string, string>();
+		}
 
-        /// <summary> Holds the question with key asked to user. </summary>
-        public KeyValuePair<string, string> Question { get; }
+		/// <summary> Holds the question with key asked to user. </summary>
+		public KeyValuePair<string, string> Question { get; }
 
-        /// <summary> Holds the question with key asked to user exposed to GUI. </summary>
-        public string QuestionText => Question.Value;
+		/// <summary> Holds the question with key asked to user exposed to GUI. </summary>
+		public string QuestionText => Question.Value;
 
-        /// <summary> Holds the list of possible answers with their option keys. </summary>
-        public Dictionary<string, string> Answers { get; }
+		/// <summary> Holds the list of possible answers with their option keys. </summary>
+		public Dictionary<string, string> Answers { get; }
 
-        /// <summary> Holds the list of possible answers exposed to GUI. </summary>
-        public IEnumerable<string> AnswersText
-        {
-            get => Answers.Select(x => x.Value).ToList();
-            set => AnswersText = Answers.Select(x => x.Value).ToList();
-        }
+		/// <summary> Holds the list of possible answers exposed to GUI. </summary>
+		public IEnumerable<string> AnswersText
+		{
+			get => Answers.Select(x => x.Value).ToList();
+			set => AnswersText = Answers.Select(x => x.Value).ToList();
+		}
 
-        /// <summary> Holds the users selected answer (one of answers) with its option key. </summary>
-        public KeyValuePair<string, string> Answer { get; private set; }
+		/// <summary> Holds the users selected answer (one of answers) with its option key. </summary>
+		public KeyValuePair<string, string> Answer { get; private set; }
 
-        /// <summary> Holds the users selected answer (one of answers) in GUI. </summary>
-        public string AnswerText
-        {
-            get => Answer.Value;
-            set => Answer = Answers.FirstOrDefault(x => x.Value == value);
-        }
-    }
+		/// <summary> Holds the users selected answer (one of answers) in GUI. </summary>
+		public string AnswerText
+		{
+			get => Answer.Value;
+			set => Answer = Answers.FirstOrDefault(x => x.Value == value);
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/MiniSurvey/Question/FreeTextViewModel.cs b/TINKLib/ViewModel/MiniSurvey/Question/FreeTextViewModel.cs
index 7af607d..d557dc4 100644
--- a/TINKLib/ViewModel/MiniSurvey/Question/FreeTextViewModel.cs
+++ b/TINKLib/ViewModel/MiniSurvey/Question/FreeTextViewModel.cs
@@ -2,31 +2,31 @@
 
 namespace TINK.ViewModel.MiniSurvey.Question
 {
-    public class FreeTextViewModel : IMiniSurveyQuestion
-    {
-        /// <summary> Constructs object. </summary>
-        /// <param name="question">Holds the question with key asked to user.</param>
-        /// <param name="answers">Holds the list of possible answers with their option keys.</param>
-        public FreeTextViewModel(
-            KeyValuePair<string, string> question)
-        {
-            Question = question;
-        }
+	public class FreeTextViewModel : IMiniSurveyQuestion
+	{
+		/// <summary> Constructs object. </summary>
+		/// <param name="question">Holds the question with key asked to user.</param>
+		/// <param name="answers">Holds the list of possible answers with their option keys.</param>
+		public FreeTextViewModel(
+			KeyValuePair<string, string> question)
+		{
+			Question = question;
+		}
 
-        /// <summary> Holds the question with key asked to user. </summary>
-        public KeyValuePair<string, string> Question { get; }
+		/// <summary> Holds the question with key asked to user. </summary>
+		public KeyValuePair<string, string> Question { get; }
 
-        /// <summary> Holds the question with key asked to user exposed to GUI. </summary>
-        public string QuestionText => Question.Value;
+		/// <summary> Holds the question with key asked to user exposed to GUI. </summary>
+		public string QuestionText => Question.Value;
 
-        /// <summary> Holds the users selected answer with its option key. </summary>
-        public KeyValuePair<string, string> Answer { get; private set; }
+		/// <summary> Holds the users selected answer with its option key. </summary>
+		public KeyValuePair<string, string> Answer { get; private set; }
 
-        /// <summary> Holds the list of possible answers exposed to GUI. </summary>
-        public string AnswerText
-        {
-            get => null;
-            set => Answer = new KeyValuePair<string, string>(value, null);
-        }
-    }
+		/// <summary> Holds the list of possible answers exposed to GUI. </summary>
+		public string AnswerText
+		{
+			get => null;
+			set => Answer = new KeyValuePair<string, string>(value, null);
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/MiniSurvey/Question/IMiniSurveyQuestion.cs b/TINKLib/ViewModel/MiniSurvey/Question/IMiniSurveyQuestion.cs
index e15880b..7663df7 100644
--- a/TINKLib/ViewModel/MiniSurvey/Question/IMiniSurveyQuestion.cs
+++ b/TINKLib/ViewModel/MiniSurvey/Question/IMiniSurveyQuestion.cs
@@ -2,12 +2,12 @@
 
 namespace TINK.ViewModel.MiniSurvey.Question
 {
-    public interface IMiniSurveyQuestion
-    {
-        /// <summary> Holds the question with key asked to user. </summary>
-        KeyValuePair<string, string> Question { get; }
+	public interface IMiniSurveyQuestion
+	{
+		/// <summary> Holds the question with key asked to user. </summary>
+		KeyValuePair<string, string> Question { get; }
 
-        /// <summary> Holds the users selected answer with its option key. </summary>
-        KeyValuePair<string, string> Answer { get; }
-    }
+		/// <summary> Holds the users selected answer with its option key. </summary>
+		KeyValuePair<string, string> Answer { get; }
+	}
 }
diff --git a/TINKLib/ViewModel/MyBikes/MyBikeViewModel.cs b/TINKLib/ViewModel/MyBikes/MyBikeViewModel.cs
index 56756ae..2ec5a86 100644
--- a/TINKLib/ViewModel/MyBikes/MyBikeViewModel.cs
+++ b/TINKLib/ViewModel/MyBikes/MyBikeViewModel.cs
@@ -5,91 +5,91 @@ using TINK.ViewModel.Bikes.Bike;
 
 namespace TINK.ViewModel
 {
-    public class MyBikeInUseStateInfoProvider : IInUseStateInfoProvider
-    {
-        /// <summary> Gets reserved into display text. </summary>
-        /// <todo>Log unexpeced states.</todo>
-        /// <returns>Display text</returns>
-        public string GetReservedInfo(
-            TimeSpan? remainingTime,
-            string stationId = null,
-            string code = null)
-        {
-            if (remainingTime == null)
-            {
-                // Reamining time is not available.
-                if (stationId == null)
-                {
+	public class MyBikeInUseStateInfoProvider : IInUseStateInfoProvider
+	{
+		/// <summary> Gets reserved into display text. </summary>
+		/// <todo>Log unexpeced states.</todo>
+		/// <returns>Display text</returns>
+		public string GetReservedInfo(
+			TimeSpan? remainingTime,
+			string stationId = null,
+			string code = null)
+		{
+			if (remainingTime == null)
+			{
+				// Reamining time is not available.
+				if (stationId == null)
+				{
 
-                    if (string.IsNullOrEmpty(code))
-                    {
-                        // Code is not avilable
-                        return string.Format(AppResources.StatusTextReservationExpiredMaximumReservationTime, StateRequestedInfo.MaximumReserveTime.Minutes);
-                    }
+					if (string.IsNullOrEmpty(code))
+					{
+						// Code is not avilable
+						return string.Format(AppResources.StatusTextReservationExpiredMaximumReservationTime, StateRequestedInfo.MaximumReserveTime.Minutes);
+					}
 
-                    return string.Format(AppResources.StatusTextReservationExpiredCodeMaxReservationTime, code, StateRequestedInfo.MaximumReserveTime.Minutes);
-                }
+					return string.Format(AppResources.StatusTextReservationExpiredCodeMaxReservationTime, code, StateRequestedInfo.MaximumReserveTime.Minutes);
+				}
 
-                if (string.IsNullOrEmpty(code))
-                {
-                    return string.Format(AppResources.StatusTextReservationExpiredLocationMaxReservationTime, stationId, StateRequestedInfo.MaximumReserveTime.Minutes);
-                }
+				if (string.IsNullOrEmpty(code))
+				{
+					return string.Format(AppResources.StatusTextReservationExpiredLocationMaxReservationTime, stationId, StateRequestedInfo.MaximumReserveTime.Minutes);
+				}
 
-                return string.Format(AppResources.StatusTextReservationExpiredCodeLocationMaxReservationTime, code, stationId, StateRequestedInfo.MaximumReserveTime.Minutes);
-            }
+				return string.Format(AppResources.StatusTextReservationExpiredCodeLocationMaxReservationTime, code, stationId, StateRequestedInfo.MaximumReserveTime.Minutes);
+			}
 
-            if (!string.IsNullOrEmpty(stationId))
-            {
-                if (!string.IsNullOrEmpty(code))
-                {
-                    return string.Format(
-                        AppResources.StatusTextReservationExpiredCodeLocationReservationTime,
-                        code,
-                        ViewModelHelper.GetStationName(stationId),
-                        remainingTime.Value.Minutes);
-                }
+			if (!string.IsNullOrEmpty(stationId))
+			{
+				if (!string.IsNullOrEmpty(code))
+				{
+					return string.Format(
+						AppResources.StatusTextReservationExpiredCodeLocationReservationTime,
+						code,
+						ViewModelHelper.GetStationName(stationId),
+						remainingTime.Value.Minutes);
+				}
 
-                return string.Format(
-                    AppResources.StatusTextReservationExpiredLocationReservationTime,
-                    ViewModelHelper.GetStationName(stationId),
-                    remainingTime.Value.Minutes);
-            }
+				return string.Format(
+					AppResources.StatusTextReservationExpiredLocationReservationTime,
+					ViewModelHelper.GetStationName(stationId),
+					remainingTime.Value.Minutes);
+			}
 
-            return string.Format(
-                AppResources.StatusTextReservationExpiredRemaining,
-                remainingTime.Value.Minutes);
-        }
+			return string.Format(
+				AppResources.StatusTextReservationExpiredRemaining,
+				remainingTime.Value.Minutes);
+		}
 
-        /// <summary>
-        /// Gets booked into display text.
-        /// </summary>
-        /// <todo>Log unexpeced states.</todo>
-        /// <returns>Display text</returns>
-        public string GetBookedInfo(
-            DateTime? from,
-            string stationId = null,
-            string code = null)
-        {
-            if (from == null)
-            {
-                return AppResources.StatusTextBooked;
-            }
+		/// <summary>
+		/// Gets booked into display text.
+		/// </summary>
+		/// <todo>Log unexpeced states.</todo>
+		/// <returns>Display text</returns>
+		public string GetBookedInfo(
+			DateTime? from,
+			string stationId = null,
+			string code = null)
+		{
+			if (from == null)
+			{
+				return AppResources.StatusTextBooked;
+			}
 
-            if (!string.IsNullOrEmpty(code))
-            {
-                if (!string.IsNullOrEmpty(stationId))
-                {
-                    return string.Format(
-                        AppResources.StatusTextBookedCodeLocationSince,
-                        code,
-                        ViewModelHelper.GetStationName(stationId),
-                        from.Value.ToString(BikeViewModelBase.TIMEFORMAT));
-                }
+			if (!string.IsNullOrEmpty(code))
+			{
+				if (!string.IsNullOrEmpty(stationId))
+				{
+					return string.Format(
+						AppResources.StatusTextBookedCodeLocationSince,
+						code,
+						ViewModelHelper.GetStationName(stationId),
+						from.Value.ToString(BikeViewModelBase.TIMEFORMAT));
+				}
 
-                return string.Format(AppResources.StatusTextBookedCodeSince, code, from.Value.ToString(BikeViewModelBase.TIMEFORMAT));
-            }
+				return string.Format(AppResources.StatusTextBookedCodeSince, code, from.Value.ToString(BikeViewModelBase.TIMEFORMAT));
+			}
 
-            return string.Format(AppResources.StatusTextBookedSince, from.Value.ToString(BikeViewModelBase.TIMEFORMAT));
-        }
-    }
+			return string.Format(AppResources.StatusTextBookedSince, from.Value.ToString(BikeViewModelBase.TIMEFORMAT));
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/MyBikes/MyBikesPageViewModel.cs b/TINKLib/ViewModel/MyBikes/MyBikesPageViewModel.cs
index bb683ee..ae6e8f0 100644
--- a/TINKLib/ViewModel/MyBikes/MyBikesPageViewModel.cs
+++ b/TINKLib/ViewModel/MyBikes/MyBikesPageViewModel.cs
@@ -26,246 +26,246 @@ using Xamarin.Forms;
 
 namespace TINK.ViewModel.MyBikes
 {
-    public class MyBikesPageViewModel : BikesViewModel, INotifyCollectionChanged, INotifyPropertyChanged
-    {
-        /// <summary> Holds the stations to get station names form station ids. </summary>
-        private IEnumerable<IStation> Stations { get; }
+	public class MyBikesPageViewModel : BikesViewModel, INotifyCollectionChanged, INotifyPropertyChanged
+	{
+		/// <summary> Holds the stations to get station names form station ids. </summary>
+		private IEnumerable<IStation> Stations { get; }
 
-        /// <summary>
-        /// Constructs bike collection view model in case information about occupied bikes is available.
-        /// </summary>
-        /// <param name="p_oUser">Mail address of active user.</param>
-        /// <param name="isReportLevelVerbose">True if report level is verbose, false if not.</param>
-        /// <param name="permissions">Holds object to query location permisions.</param>
-        /// <param name="bluetoothLE">Holds object to query bluetooth state.</param>
-        /// <param name="runtimPlatform">Specifies on which platform code is run.</param>
-        /// <param name="isConnectedDelegate">Returns if mobile is connected to web or not.</param>
-        /// <param name="connectorFactory">Connects system to copri.</param>
-        /// <param name="lockService">Service to control lock retrieve info.</param>
-        /// <param name="stations">Stations to get station name from station id.</param>
-        /// <param name="p_oPolling"> Holds whether to poll or not and the periode leght is polling is on. </param>
-        /// <param name="postAction">Executes actions on GUI thread.</param>
-        /// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
-        /// <param name="viewService">Interface to actuate methodes on GUI.</param>
-        /// <param name="openUrlInBrowser">Delegate to open browser.</param>
-        public MyBikesPageViewModel(
-            User p_oUser,
-            ILocationPermission permissions,
-            IBluetoothLE bluetoothLE,
-            string runtimPlatform,
-            Func<bool> isConnectedDelegate,
-            Func<bool, IConnector> connectorFactory,
-            IGeolocation geolocation,
-            ILocksService lockService,
-            IEnumerable<IStation> stations,
-            PollingParameters p_oPolling,
-            Action<SendOrPostCallback, object> postAction,
-            ISmartDevice smartDevice,
-            IViewService viewService,
-            Action<string> openUrlInBrowser) : base(p_oUser, permissions, bluetoothLE, runtimPlatform, isConnectedDelegate, connectorFactory, geolocation, lockService, p_oPolling, postAction, smartDevice, viewService, openUrlInBrowser, () => new MyBikeInUseStateInfoProvider())
-        {
-            CollectionChanged += (sender, eventargs) =>
-            {
-                OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsNoBikesOccupiedVisible)));
-                OnPropertyChanged(new PropertyChangedEventArgs(nameof(NoBikesOccupiedText)));
-            };
+		/// <summary>
+		/// Constructs bike collection view model in case information about occupied bikes is available.
+		/// </summary>
+		/// <param name="p_oUser">Mail address of active user.</param>
+		/// <param name="isReportLevelVerbose">True if report level is verbose, false if not.</param>
+		/// <param name="permissions">Holds object to query location permisions.</param>
+		/// <param name="bluetoothLE">Holds object to query bluetooth state.</param>
+		/// <param name="runtimPlatform">Specifies on which platform code is run.</param>
+		/// <param name="isConnectedDelegate">Returns if mobile is connected to web or not.</param>
+		/// <param name="connectorFactory">Connects system to copri.</param>
+		/// <param name="lockService">Service to control lock retrieve info.</param>
+		/// <param name="stations">Stations to get station name from station id.</param>
+		/// <param name="p_oPolling"> Holds whether to poll or not and the periode leght is polling is on. </param>
+		/// <param name="postAction">Executes actions on GUI thread.</param>
+		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
+		/// <param name="viewService">Interface to actuate methodes on GUI.</param>
+		/// <param name="openUrlInBrowser">Delegate to open browser.</param>
+		public MyBikesPageViewModel(
+			User p_oUser,
+			ILocationPermission permissions,
+			IBluetoothLE bluetoothLE,
+			string runtimPlatform,
+			Func<bool> isConnectedDelegate,
+			Func<bool, IConnector> connectorFactory,
+			IGeolocation geolocation,
+			ILocksService lockService,
+			IEnumerable<IStation> stations,
+			PollingParameters p_oPolling,
+			Action<SendOrPostCallback, object> postAction,
+			ISmartDevice smartDevice,
+			IViewService viewService,
+			Action<string> openUrlInBrowser) : base(p_oUser, permissions, bluetoothLE, runtimPlatform, isConnectedDelegate, connectorFactory, geolocation, lockService, p_oPolling, postAction, smartDevice, viewService, openUrlInBrowser, () => new MyBikeInUseStateInfoProvider())
+		{
+			CollectionChanged += (sender, eventargs) =>
+			{
+				OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsNoBikesOccupiedVisible)));
+				OnPropertyChanged(new PropertyChangedEventArgs(nameof(NoBikesOccupiedText)));
+			};
 
-            Stations = stations ?? throw new ArgumentException(nameof(stations));
-        }
+			Stations = stations ?? throw new ArgumentException(nameof(stations));
+		}
 
-        /// <summary> Returns if info about the fact that user did not request or book any bikes is visible or not.<summary>
-        /// Gets message that logged in user has not booked any bikes.
-        /// </summary>
-        public bool IsNoBikesOccupiedVisible
-        {
-            get
-            {
-                return Count <= 0 && IsIdle == true;
-            }
-        }
+		/// <summary> Returns if info about the fact that user did not request or book any bikes is visible or not.<summary>
+		/// Gets message that logged in user has not booked any bikes.
+		/// </summary>
+		public bool IsNoBikesOccupiedVisible
+		{
+			get
+			{
+				return Count <= 0 && IsIdle == true;
+			}
+		}
 
-        /// <summary> Info about the fact that user did not request or book any bikes. </summary>
-        public string NoBikesOccupiedText
-        {
-            get
-            {
-                return IsNoBikesOccupiedVisible
-                    ? $"Momentan sind keine Fahrräder auf Benutzer {ActiveUser?.Mail} reserviert/ gebucht."
-                    : string.Empty;
-            }
-        }
+		/// <summary> Info about the fact that user did not request or book any bikes. </summary>
+		public string NoBikesOccupiedText
+		{
+			get
+			{
+				return IsNoBikesOccupiedVisible
+					? $"Momentan sind keine Fahrräder auf Benutzer {ActiveUser?.Mail} reserviert/ gebucht."
+					: string.Empty;
+			}
+		}
 
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Starts update process.
-        /// </summary>
-        public async Task OnAppearing()
-        {
-            // Get my bikes from COPRI
-            Log.ForContext<MyBikesPageViewModel>().Information("User request to show page MyBikes/ page re-appearing");
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Starts update process.
+		/// </summary>
+		public async Task OnAppearing()
+		{
+			// Get my bikes from COPRI
+			Log.ForContext<MyBikesPageViewModel>().Information("User request to show page MyBikes/ page re-appearing");
 
-            ActionText = AppResources.ActivityTextMyBikesLoadingBikes;
+			ActionText = AppResources.ActivityTextMyBikesLoadingBikes;
 
-            var bikesOccupied = await ConnectorFactory(IsConnected).Query.GetBikesOccupiedAsync();
+			var bikesOccupied = await ConnectorFactory(IsConnected).Query.GetBikesOccupiedAsync();
 
-            Exception = bikesOccupied.Exception; // Update communication error from query for bikes occupied.
+			Exception = bikesOccupied.Exception; // Update communication error from query for bikes occupied.
 
-            var lockIdList = bikesOccupied.Response
-                .GetLockIt()
-                .Cast<Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo>()
-                .Select(x => x.LockInfo)
-                .ToList();
+			var lockIdList = bikesOccupied.Response
+				.GetLockIt()
+				.Cast<Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo>()
+				.Select(x => x.LockInfo)
+				.ToList();
 
-            if (LockService is ILocksServiceFake serviceFake)
-            {
-                serviceFake.UpdateSimulation(bikesOccupied.Response);
-            }
+			if (LockService is ILocksServiceFake serviceFake)
+			{
+				serviceFake.UpdateSimulation(bikesOccupied.Response);
+			}
 
-            // Check bluetooth and location permission and states
-            ActionText = AppResources.ActivityTextCheckBluetoothState;
+			// Check bluetooth and location permission and states
+			ActionText = AppResources.ActivityTextCheckBluetoothState;
 
-            if (bikesOccupied.Response.FirstOrDefault(x => x is Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo btBike) != null
-                && RuntimePlatform == Device.Android)
-            {
-                // Check location permission
-                var status = await PermissionsService.CheckStatusAsync();
-                if (status != Status.Granted)
-                {
-                    var permissionResult = await PermissionsService.RequestAsync();
+			if (bikesOccupied.Response.FirstOrDefault(x => x is Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo btBike) != null
+				&& RuntimePlatform == Device.Android)
+			{
+				// Check location permission
+				var status = await PermissionsService.CheckStatusAsync();
+				if (status != Status.Granted)
+				{
+					var permissionResult = await PermissionsService.RequestAsync();
 
-                    if (permissionResult != Status.Granted)
-                    {
-                        var dialogResult = await ViewService.DisplayAlert(
-                            AppResources.MessageTitleHint,
-                            AppResources.MessageBikesManagementLocationPermissionOpenDialog,
-                            AppResources.MessageAnswerYes,
-                            AppResources.MessageAnswerNo);
+					if (permissionResult != Status.Granted)
+					{
+						var dialogResult = await ViewService.DisplayAlert(
+							AppResources.MessageTitleHint,
+							AppResources.MessageBikesManagementLocationPermissionOpenDialog,
+							AppResources.MessageAnswerYes,
+							AppResources.MessageAnswerNo);
 
-                        if (!dialogResult)
-                        {
-                            // User decided not to give access to locations permissions.
-                            BikeCollection.Update(bikesOccupied.Response, Stations);
+						if (!dialogResult)
+						{
+							// User decided not to give access to locations permissions.
+							BikeCollection.Update(bikesOccupied.Response, Stations);
 
-                            await OnAppearing(() => UpdateTask());
+							await OnAppearing(() => UpdateTask());
 
-                            ActionText = "";
-                            IsIdle = true;
-                            return;
-                        }
+							ActionText = "";
+							IsIdle = true;
+							return;
+						}
 
-                        // Open permissions dialog.
-                        PermissionsService.OpenAppSettings();
-                    }
-                }
+						// Open permissions dialog.
+						PermissionsService.OpenAppSettings();
+					}
+				}
 
-                // Location state
-                if (Geolocation.IsGeolcationEnabled == false)
-                {
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageTitleHint,
-                        AppResources.MessageBikesManagementLocationActivation,
-                        AppResources.MessageAnswerOk);
+				// Location state
+				if (Geolocation.IsGeolcationEnabled == false)
+				{
+					await ViewService.DisplayAlert(
+						AppResources.MessageTitleHint,
+						AppResources.MessageBikesManagementLocationActivation,
+						AppResources.MessageAnswerOk);
 
-                    BikeCollection.Update(bikesOccupied.Response, Stations);
+					BikeCollection.Update(bikesOccupied.Response, Stations);
 
-                    await OnAppearing(() => UpdateTask());
+					await OnAppearing(() => UpdateTask());
 
-                    ActionText = "";
-                    IsIdle = true;
-                    return;
-                }
+					ActionText = "";
+					IsIdle = true;
+					return;
+				}
 
-                // Bluetooth state
-                if (await BluetoothService.GetBluetoothState() != BluetoothState.On)
-                {
-                    await ViewService.DisplayAlert(
-                        AppResources.MessageTitleHint,
-                        AppResources.MessageBikesManagementBluetoothActivation,
-                        AppResources.MessageAnswerOk);
+				// Bluetooth state
+				if (await BluetoothService.GetBluetoothState() != BluetoothState.On)
+				{
+					await ViewService.DisplayAlert(
+						AppResources.MessageTitleHint,
+						AppResources.MessageBikesManagementBluetoothActivation,
+						AppResources.MessageAnswerOk);
 
-                    BikeCollection.Update(bikesOccupied.Response, Stations);
+					BikeCollection.Update(bikesOccupied.Response, Stations);
 
-                    await OnAppearing(() => UpdateTask());
+					await OnAppearing(() => UpdateTask());
 
-                    ActionText = "";
-                    IsIdle = true;
-                    return;
-                }
-            }
+					ActionText = "";
+					IsIdle = true;
+					return;
+				}
+			}
 
-            // Connect to bluetooth devices.
-            ActionText = AppResources.ActivityTextSearchBikes;
-            IEnumerable<LockInfoTdo> locksInfoTdo;
-            try
-            {
-                locksInfoTdo = await LockService.GetLocksStateAsync(
-                    lockIdList.Select(x => x.ToLockInfoTdo()).ToList(),
-                    LockService.TimeOut.MultiConnect);
-            }
-            catch (Exception exception)
-            {
-                Log.ForContext<MyBikesPageViewModel>().Error("Getting bluetooth state failed. {Exception}", exception);
-                locksInfoTdo = new List<LockInfoTdo>();
-            }
+			// Connect to bluetooth devices.
+			ActionText = AppResources.ActivityTextSearchBikes;
+			IEnumerable<LockInfoTdo> locksInfoTdo;
+			try
+			{
+				locksInfoTdo = await LockService.GetLocksStateAsync(
+					lockIdList.Select(x => x.ToLockInfoTdo()).ToList(),
+					LockService.TimeOut.MultiConnect);
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<MyBikesPageViewModel>().Error("Getting bluetooth state failed. {Exception}", exception);
+				locksInfoTdo = new List<LockInfoTdo>();
+			}
 
-            var locksInfo = lockIdList.UpdateById(locksInfoTdo);
+			var locksInfo = lockIdList.UpdateById(locksInfoTdo);
 
-            BikeCollection.Update(bikesOccupied.Response.UpdateLockInfo(locksInfo), Stations);
+			BikeCollection.Update(bikesOccupied.Response.UpdateLockInfo(locksInfo), Stations);
 
-            await OnAppearing(() => UpdateTask());
+			await OnAppearing(() => UpdateTask());
 
-            ActionText = "";
-            IsIdle = true;
-        }
+			ActionText = "";
+			IsIdle = true;
+		}
 
-        /// <summary>
-        /// True if any action can be performed (request and cancel request)
-        /// </summary>
-        public override bool IsIdle
-        {
-            get => base.IsIdle;
-            set
-            {
-                if (value == base.IsIdle)
-                    return;
+		/// <summary>
+		/// True if any action can be performed (request and cancel request)
+		/// </summary>
+		public override bool IsIdle
+		{
+			get => base.IsIdle;
+			set
+			{
+				if (value == base.IsIdle)
+					return;
 
-                Log.ForContext<BikesViewModel>().Debug($"Switch value of {nameof(IsIdle)} to {value}.");
-                base.IsIdle = value;
-                base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsNoBikesOccupiedVisible)));
-                base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(NoBikesOccupiedText)));
-            }
-        }
+				Log.ForContext<BikesViewModel>().Debug($"Switch value of {nameof(IsIdle)} to {value}.");
+				base.IsIdle = value;
+				base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsNoBikesOccupiedVisible)));
+				base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(NoBikesOccupiedText)));
+			}
+		}
 
-        /// <summary> Create task which updates my bike view model.</summary>
-        private void UpdateTask()
-        {
-            // Start task which periodically updates pins.
-            PostAction(
-                unused =>
-                {
-                    ActionText = AppResources.ActivityTextUpdating;
-                    IsConnected = IsConnectedDelegate();
-                },
-                null);
+		/// <summary> Create task which updates my bike view model.</summary>
+		private void UpdateTask()
+		{
+			// Start task which periodically updates pins.
+			PostAction(
+				unused =>
+				{
+					ActionText = AppResources.ActivityTextUpdating;
+					IsConnected = IsConnectedDelegate();
+				},
+				null);
 
-            var result = ConnectorFactory(IsConnected).Query.GetBikesOccupiedAsync().Result;
+			var result = ConnectorFactory(IsConnected).Query.GetBikesOccupiedAsync().Result;
 
-            var bikes = result.Response;
+			var bikes = result.Response;
 
-            var exception = result.Exception;
-            if (exception != null)
-            {
-                Log.ForContext<MyBikesPageViewModel>().Error("Getting bikes occupied in polling context failed with exception {Exception}.", exception);
-            }
+			var exception = result.Exception;
+			if (exception != null)
+			{
+				Log.ForContext<MyBikesPageViewModel>().Error("Getting bikes occupied in polling context failed with exception {Exception}.", exception);
+			}
 
-            PostAction(
-                unused =>
-                {
-                    BikeCollection.Update(bikes, Stations); // Updating collection leads to update of GUI.
-                    Exception = result.Exception;
-                    ActionText = string.Empty;
-                },
-                null);
-        }
-    }
+			PostAction(
+				unused =>
+				{
+					BikeCollection.Update(bikes, Stations); // Updating collection leads to update of GUI.
+					Exception = result.Exception;
+					ActionText = string.Empty;
+				},
+				null);
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/PollingUpdateTask.cs b/TINKLib/ViewModel/PollingUpdateTask.cs
index c16547d..1c54c6b 100644
--- a/TINKLib/ViewModel/PollingUpdateTask.cs
+++ b/TINKLib/ViewModel/PollingUpdateTask.cs
@@ -7,122 +7,125 @@ using TINK.Repository.Exception;
 
 namespace TINK.ViewModel
 {
-    /// <summary>
-    /// Object to periodically actuate an action.
-    /// </summary>
-    public class PollingUpdateTask
-    {
-        /// <summary> Object to control canelling. </summary>
-        private CancellationTokenSource CanellationTokenSource { get; }
+	/// <summary>
+	/// Object to periodically actuate an action.
+	/// </summary>
+	public class PollingUpdateTask
+	{
+		/// <summary> Object to control canelling. </summary>
+		private CancellationTokenSource CanellationTokenSource { get; }
 
-        /// <summary> Task to perform update. </summary>
-        private Task UpdateTask { get; }
+		/// <summary> Task to perform update. </summary>
+		private Task UpdateTask { get; }
 
-        /// <summary> Action which performs an update.</summary>
-        private Action UpdateAction { get; }
+		/// <summary> Action which performs an update.</summary>
+		private Action UpdateAction { get; }
 
-        /// <summary> Obects which does a periodic update. </summary>
-        /// <param name="updateAction">Update action to perform.</param>
-        /// <param name="polling"> Holds whether to poll or not and the periode leght is polling is on. </param>
-        public PollingUpdateTask(
-            Action updateAction,
-            TimeSpan? polling)
-        {
-            UpdateAction = updateAction
-                ?? throw new ArgumentException($"Can not construct {GetType().Name}- obect. Argument {nameof(updateAction)} must not be null.");
+		/// <summary> Obects which does a periodic update. </summary>
+		/// <param name="updateAction">Update action to perform.</param>
+		/// <param name="polling"> Holds whether to poll or not and the periode leght is polling is on. </param>
+		public PollingUpdateTask(
+			Action updateAction,
+			TimeSpan? polling)
+		{
+			UpdateAction = updateAction
+				?? throw new ArgumentException($"Can not construct {GetType().Name}- obect. Argument {nameof(updateAction)} must not be null.");
 
-            if (!polling.HasValue)
-            {
-                // Automatic update is switched off.
-                Log.ForContext<PollingUpdateTask>().Debug($"Automatic update is off, context {GetType().Name} at {DateTime.Now}.");
-                return;
-            }
+			if (!polling.HasValue)
+			{
+				// Automatic update is switched off.
+				Log.ForContext<PollingUpdateTask>().Debug($"Automatic update is off, context {GetType().Name} at {DateTime.Now}.");
+				return;
+			}
 
-            var updatePeriodeSet = polling.Value;
+			var updatePeriodeSet = polling.Value;
 
-            CanellationTokenSource = new CancellationTokenSource();
+			CanellationTokenSource = new CancellationTokenSource();
 
-            int cycleIndex = 2;
-            UpdateTask = Task.Run(
-                async () =>
-                {
-                    while (!CanellationTokenSource.IsCancellationRequested)
-                    {
-                        await Task.Delay(updatePeriodeSet, CanellationTokenSource.Token);
-                        {
-                            // N. update cycle
-                            Log.ForContext<PollingUpdateTask>().Information($"Actuating {cycleIndex} update cycle, context {GetType().Name} at {DateTime.Now}.");
+			int cycleIndex = 2;
+			UpdateTask = Task.Run(
+				async () =>
+				{
+					while (!CanellationTokenSource.IsCancellationRequested)
+					{
+						await Task.Delay(updatePeriodeSet, CanellationTokenSource.Token);
+						{
+							// N. update cycle
+							Log.ForContext<PollingUpdateTask>().Information($"Actuating {cycleIndex} update cycle, context {GetType().Name} at {DateTime.Now}.");
 
-                            UpdateAction();
+							UpdateAction();
 
-                            Log.ForContext<PollingUpdateTask>().Debug($"Update cycle {cycleIndex}, context {GetType().Name} finised at {DateTime.Now}.");
-                            cycleIndex = cycleIndex < int.MaxValue ? ++cycleIndex : 0;
-                        }
-                    }
-                },
-                CanellationTokenSource.Token);
-        }
+							Log.ForContext<PollingUpdateTask>().Debug($"Update cycle {cycleIndex}, context {GetType().Name} finised at {DateTime.Now}.");
+							cycleIndex = cycleIndex < int.MaxValue ? ++cycleIndex : 0;
+						}
+					}
+				},
+				CanellationTokenSource.Token);
+		}
 
-        /// <summary>
-        /// Invoked when pages is closed/ hidden. 
-        /// Stops update process.
-        /// </summary>
-        public async Task Terminate()
-        {
-            if (UpdateTask == null)
-            {
-                // Nothing to do if no task was created.
-                return;
-            }
+		/// <summary>
+		/// Invoked when pages is closed/ hidden. 
+		/// Stops update process.
+		/// </summary>
+		public async Task Terminate()
+		{
+			if (UpdateTask == null)
+			{
+				// Nothing to do if no task was created.
+				return;
+			}
 
-            // Cancel update task;
-            if (CanellationTokenSource == null)
-            {
-                throw new Exception($"Can not terminate periodical update task, context {GetType().Name} at {DateTime.Now}. No task running.");
-            }
+			// Cancel update task;
+			if (CanellationTokenSource == null)
+			{
+				throw new Exception($"Can not terminate periodical update task, context {GetType().Name} at {DateTime.Now}. No task running.");
+			}
 
-            Log.Information($"Request to terminate update cycle, context {GetType().Name} at {DateTime.Now}.");
-            CanellationTokenSource.Cancel();
+			Log.ForContext<PollingUpdateTask>().Information($"Request to terminate update cycle, context {GetType().Name} at {DateTime.Now}.");
+			CanellationTokenSource.Cancel();
 
-            try
-            {
-                await UpdateTask;
-            }
-            catch (TaskCanceledException)
-            {
-                // Polling update was canceled.
-                // Nothing to notice/ worry about.
-            }
-            catch (Exception exception)
-            {
-                // An error occurred updating pin.
-                var aggregateException = exception as AggregateException;
-                if (aggregateException == null)
-                {
-                    // Unexpected exception detected. Exception should alyways be of type AggregateException
-                    Log.Error("An/ several errors occurred on update task. {@Exceptions}.", exception);
-                }
-                else
-                {
-                    if (aggregateException.InnerExceptions.Count == 1
-                        && aggregateException.InnerExceptions[0].GetType() == typeof(TaskCanceledException))
-                    {
-                        // Polling update was canceled.
-                        // Nothing to notice/ worry about.
-                    }
-                    else if (aggregateException.InnerExceptions.Count() > 0 &&
-                        aggregateException.InnerExceptions.First(x => !x.GetIsConnectFailureException()) == null)  // There is no exception which is not of type connect failure.
-                    {
-                        // All exceptions were caused by communication error
-                        Log.Information("An/ several web related connect failure exceptions occurred on update task. {@Exceptions}.", exception);
-                    }
-                    else
-                    {
-                        // All exceptions were caused by communication errors.
-                        Log.Error("An/ several exceptions occurred on update task. {@Exception}.", exception);
-                    }
-                }
-            }
-        }
-    }
+			try
+			{
+				await UpdateTask;
+			}
+			catch (TaskCanceledException)
+			{
+				// Polling update was canceled.
+				// Nothing to notice/ worry about.
+			}
+			catch (Exception exception)
+			{
+				// An error occurred updating pin.
+				var aggregateException = exception as AggregateException;
+				if (aggregateException == null)
+				{
+					// Unexpected exception detected. Exception should alyways be of type AggregateException
+					Log.Error("An/ several errors occurred on update task. {@Exceptions}.", exception);
+				}
+				else
+				{
+					if (aggregateException.InnerExceptions.Count == 1
+						&& aggregateException.InnerExceptions[0].GetType() == typeof(TaskCanceledException))
+					{
+						// Polling update was canceled.
+						// Nothing to notice/ worry about.
+						Log.ForContext<PollingUpdateTask>().Debug($"Update cycle terminated.");
+					}
+					else if (aggregateException.InnerExceptions.Count() > 0 &&
+						aggregateException.InnerExceptions.First(x => !x.GetIsConnectFailureException()) == null)  // There is no exception which is not of type connect failure.
+					{
+						// All exceptions were caused by communication error
+						Log.Information("An/ several web related connect failure exceptions occurred on update task. {@Exceptions}.", exception);
+					}
+					else
+					{
+						// All exceptions were caused by communication errors.
+						Log.Error("An/ several exceptions occurred on update task. {@Exception}.", exception);
+					}
+				}
+			}
+
+			Log.ForContext<PollingUpdateTask>().Debug($"Update cycle terminated (not canceled).");
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/PollingUpdateTaskManager.cs b/TINKLib/ViewModel/PollingUpdateTaskManager.cs
index bfbe670..0f28dab 100644
--- a/TINKLib/ViewModel/PollingUpdateTaskManager.cs
+++ b/TINKLib/ViewModel/PollingUpdateTaskManager.cs
@@ -5,94 +5,94 @@ using TINK.Settings;
 
 namespace TINK.ViewModel
 {
-    /// <summary>
-    /// Performs a periodic update.
-    /// </summary>
-    public class PollingUpdateTaskManager : IPollingUpdateTaskManager
-    {
-        /// <summary> Action which performs an update.</summary>
-        private Action UpdateAction { get; }
+	/// <summary>
+	/// Performs a periodic update.
+	/// </summary>
+	public class PollingUpdateTaskManager : IPollingUpdateTaskManager
+	{
+		/// <summary> Action which performs an update.</summary>
+		private Action UpdateAction { get; }
 
-        /// <summary> Reference on the current polling task</summary>
-        private PollingUpdateTask UpdateTask { get; set; }
+		/// <summary> Reference on the current polling task</summary>
+		private PollingUpdateTask UpdateTask { get; set; }
 
-        /// <summary>
-        /// Gets or sets polling parameters.
-        /// </summary>
-        private PollingParameters PollingParameters { get; set; }
+		/// <summary>
+		/// Gets or sets polling parameters.
+		/// </summary>
+		private PollingParameters PollingParameters { get; set; }
 
-        /// <summary> Prevents an invalid instance to be created. </summary>
-        private PollingUpdateTaskManager()
-        { }
+		/// <summary> Prevents an invalid instance to be created. </summary>
+		private PollingUpdateTaskManager()
+		{ }
 
-        /// <summary>Constructs a update manager object. </summary>
-        /// <param name="p_oGetChildName">Name of the child class. For logging purposes.</param>
-        /// <param name="updateAction"></param>
-        public PollingUpdateTaskManager(
-            Action updateAction)
-        {
-            UpdateAction = updateAction ?? throw new ArgumentException(
-                $"Can not construct {GetType().Name}- obect. Argument {nameof(updateAction)} must not be null.");
-        }
+		/// <summary>Constructs a update manager object. </summary>
+		/// <param name="p_oGetChildName">Name of the child class. For logging purposes.</param>
+		/// <param name="updateAction"></param>
+		public PollingUpdateTaskManager(
+			Action updateAction)
+		{
+			UpdateAction = updateAction ?? throw new ArgumentException(
+				$"Can not construct {GetType().Name}- obect. Argument {nameof(updateAction)} must not be null.");
+		}
 
-        /// <summary>
-        /// Invoked when page is shown. 
-        /// Actuates and awaits the first update process and starts a task wich actuate the subseqent update tasks.
-        /// </summary>
-        /// <param name="pollingParameters">Parametes holding polling periode, if null last parameters are used if available.</param>
-        public async Task StartUpdateAyncPeridically(PollingParameters pollingParameters = null)
-        {
-            if (UpdateTask != null)
-            {
-                Log.Error($"Call to stop periodic update task missed in context {GetType().Name} at {DateTime.Now}.");
+		/// <summary>
+		/// Invoked when page is shown. 
+		/// Actuates and awaits the first update process and starts a task wich actuate the subseqent update tasks.
+		/// </summary>
+		/// <param name="pollingParameters">Parametes holding polling periode, if null last parameters are used if available.</param>
+		public async Task StartUpdateAyncPeridically(PollingParameters pollingParameters = null)
+		{
+			if (UpdateTask != null)
+			{
+				Log.Error($"Call to stop periodic update task missed in context {GetType().Name} at {DateTime.Now}.");
 
-                // Call of StopUpdatePeriodically missed. 
-                // Terminate running polling update task before starting a new one
-                await UpdateTask.Terminate();
-            }
+				// Call of StopUpdatePeriodically missed. 
+				// Terminate running polling update task before starting a new one
+				await UpdateTask.Terminate();
+			}
 
-            if (pollingParameters != null)
-            {
-                // Backup polling parameter for purposee of restart.
-                PollingParameters = pollingParameters;
-            }
+			if (pollingParameters != null)
+			{
+				// Backup polling parameter for purposee of restart.
+				PollingParameters = pollingParameters;
+			}
 
-            if (PollingParameters == null)
-            {
-                // No polling parameters avaialable.
-                Log.Error($"Can not start polling. No parameters available.");
-                return;
-            }
+			if (PollingParameters == null)
+			{
+				// No polling parameters avaialable.
+				Log.Error($"Can not start polling. No parameters available.");
+				return;
+			}
 
 
-            if (!PollingParameters.IsActivated)
-            {
-                // Automatic supdate is switched off.
-                Log.ForContext<PollingUpdateTask>().Debug($"Automatic update is off, context {GetType().Name} at {DateTime.Now}.");
-                return;
-            }
+			if (!PollingParameters.IsActivated)
+			{
+				// Automatic supdate is switched off.
+				Log.ForContext<PollingUpdateTask>().Debug($"Automatic update is off, context {GetType().Name} at {DateTime.Now}.");
+				return;
+			}
 
-            UpdateTask = new PollingUpdateTask(
-                UpdateAction,
-                PollingParameters.Periode);
-        }
+			UpdateTask = new PollingUpdateTask(
+				UpdateAction,
+				PollingParameters.Periode);
+		}
 
-        /// <summary>
-        /// Invoked when pages is closed/ hidden. 
-        /// Stops update process.
-        /// </summary>
-        public async Task StopUpdatePeridically()
-        {
-            if (UpdateTask == null)
-            {
-                // Nothing to do if there is no update task pending.
-                return;
-            }
+		/// <summary>
+		/// Invoked when pages is closed/ hidden. 
+		/// Stops update process.
+		/// </summary>
+		public async Task StopUpdatePeridically()
+		{
+			if (UpdateTask == null)
+			{
+				// Nothing to do if there is no update task pending.
+				return;
+			}
 
-            await UpdateTask.Terminate();
+			await UpdateTask.Terminate();
 
-            UpdateTask = null;
-        }
-    }
+			UpdateTask = null;
+		}
+	}
 }
 
diff --git a/TINKLib/ViewModel/Settings/CopriServerUriListViewModel.cs b/TINKLib/ViewModel/Settings/CopriServerUriListViewModel.cs
index bdd0e8c..6c0bed8 100644
--- a/TINKLib/ViewModel/Settings/CopriServerUriListViewModel.cs
+++ b/TINKLib/ViewModel/Settings/CopriServerUriListViewModel.cs
@@ -6,80 +6,80 @@ using TINK.Model.Services.CopriApi.ServerUris;
 
 namespace TINK.Model.Connector
 {
-    /// <summary> View model managing active uri and sets of uris. </summary>
-    public class CopriServerUriListViewModel : INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Object holding active uris.
-        /// </summary>
-        private CopriServerUriList m_oUris;
+	/// <summary> View model managing active uri and sets of uris. </summary>
+	public class CopriServerUriListViewModel : INotifyPropertyChanged
+	{
+		/// <summary>
+		/// Object holding active uris.
+		/// </summary>
+		private CopriServerUriList m_oUris;
 
-        /// <summary>
-        /// Fired whenever a property changes.
-        /// </summary>
-        public event PropertyChangedEventHandler PropertyChanged;
+		/// <summary>
+		/// Fired whenever a property changes.
+		/// </summary>
+		public event PropertyChangedEventHandler PropertyChanged;
 
-        /// <summary>Maps uris to user fiendly descriptions.</summary>
-        private Dictionary<string, string> uriToServerText;
+		/// <summary>Maps uris to user fiendly descriptions.</summary>
+		private Dictionary<string, string> uriToServerText;
 
-        /// <summary>Maps user fiendly descriptions to uris.</summary>
-        private Dictionary<string, string> serverTextToUri;
+		/// <summary>Maps user fiendly descriptions to uris.</summary>
+		private Dictionary<string, string> serverTextToUri;
 
-        public CopriServerUriListViewModel(CopriServerUriList p_oSource)
-        {
-            uriToServerText = new Dictionary<string, string> {
-                { CopriServerUriList.TINK_DEVEL, "TINK-Konrad-devellopment" },
-                { CopriServerUriList.TINK_LIVE, "TINK-Konrad-live" },
-                { CopriServerUriList.SHAREE_DEVEL, "Sharee-fr01-devellopment" },
-                { CopriServerUriList.SHAREE_LIVE, "Sharee-fr01-live" }
-            };
+		public CopriServerUriListViewModel(CopriServerUriList p_oSource)
+		{
+			uriToServerText = new Dictionary<string, string> {
+				{ CopriServerUriList.TINK_DEVEL, "TINK-Konrad-devellopment" },
+				{ CopriServerUriList.TINK_LIVE, "TINK-Konrad-live" },
+				{ CopriServerUriList.SHAREE_DEVEL, "Sharee-fr01-devellopment" },
+				{ CopriServerUriList.SHAREE_LIVE, "Sharee-fr01-live" }
+			};
 
-            serverTextToUri = uriToServerText.ToDictionary(x => x.Value, x => x.Key);
+			serverTextToUri = uriToServerText.ToDictionary(x => x.Value, x => x.Key);
 
-            m_oUris = new CopriServerUriList(p_oSource);
-            NextActiveUri = m_oUris.ActiveUri;
+			m_oUris = new CopriServerUriList(p_oSource);
+			NextActiveUri = m_oUris.ActiveUri;
 
-        }
+		}
 
 
-        /// <summary> Gets the known uris text, i.e. binds to picker ItemsSource. </summary>
-        public IList<string> ServerTextList
-        {
-            get
-            {
-                return m_oUris.Uris.Select(x => (uriToServerText.ContainsKey(x.AbsoluteUri) ? uriToServerText[x.AbsoluteUri] : x.AbsoluteUri)).OrderBy(x => x).ToList();
-            }
-        }
+		/// <summary> Gets the known uris text, i.e. binds to picker ItemsSource. </summary>
+		public IList<string> ServerTextList
+		{
+			get
+			{
+				return m_oUris.Uris.Select(x => (uriToServerText.ContainsKey(x.AbsoluteUri) ? uriToServerText[x.AbsoluteUri] : x.AbsoluteUri)).OrderBy(x => x).ToList();
+			}
+		}
 
-        /// <summary> Holds the uri which will be applied after restart of app. </summary>
-        public Uri NextActiveUri { get; private set; }
+		/// <summary> Holds the uri which will be applied after restart of app. </summary>
+		public Uri NextActiveUri { get; private set; }
 
-        /// <summary> Holds the active uri, i.e. binds to picker SelectedItem. </summary>
-        public string NextActiveServerText
-        {
-            get
-            {
-                return uriToServerText.ContainsKey(NextActiveUri.AbsoluteUri) ? uriToServerText[NextActiveUri.AbsoluteUri] : NextActiveUri.AbsoluteUri;
-            }
+		/// <summary> Holds the active uri, i.e. binds to picker SelectedItem. </summary>
+		public string NextActiveServerText
+		{
+			get
+			{
+				return uriToServerText.ContainsKey(NextActiveUri.AbsoluteUri) ? uriToServerText[NextActiveUri.AbsoluteUri] : NextActiveUri.AbsoluteUri;
+			}
 
-            set
-            {
-                NextActiveUri = new Uri(serverTextToUri.ContainsKey(value) ? serverTextToUri[value] : value);
+			set
+			{
+				NextActiveUri = new Uri(serverTextToUri.ContainsKey(value) ? serverTextToUri[value] : value);
 
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(CorpiServerUriDescription)));
-            }
-        }
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(CorpiServerUriDescription)));
+			}
+		}
 
-        /// <summary> Holds the description of the picker, i.e. binds to label Text.</summary>
-        public string CorpiServerUriDescription
-        {
-            get
-            {
-                return m_oUris.ActiveUri.AbsoluteUri == NextActiveUri.AbsoluteUri
-                    ? "Aktiver Copri- Server"
-                    : "Copri- Server.\r\nNeustart erforderlich für Wechsel!";
-            }
-        }
+		/// <summary> Holds the description of the picker, i.e. binds to label Text.</summary>
+		public string CorpiServerUriDescription
+		{
+			get
+			{
+				return m_oUris.ActiveUri.AbsoluteUri == NextActiveUri.AbsoluteUri
+					? "Aktiver Copri- Server"
+					: "Copri- Server.\r\nNeustart erforderlich für Wechsel!";
+			}
+		}
 
-    }
+	}
 }
diff --git a/TINKLib/ViewModel/Settings/FilterItemMutable.cs b/TINKLib/ViewModel/Settings/FilterItemMutable.cs
index 86bdc5e..c3e75f7 100644
--- a/TINKLib/ViewModel/Settings/FilterItemMutable.cs
+++ b/TINKLib/ViewModel/Settings/FilterItemMutable.cs
@@ -2,61 +2,61 @@
 
 namespace TINK.ViewModel.Settings
 {
-    /// <summary>Holds filter item incluting full state (avaialble, activated, name, ...). </summary>
-    public class FilterItemMutable
-    {
-        /// <summary> Switch value</summary>
-        private bool m_bIsActivatedSwitch;
+	/// <summary>Holds filter item incluting full state (avaialble, activated, name, ...). </summary>
+	public class FilterItemMutable
+	{
+		/// <summary> Switch value</summary>
+		private bool m_bIsActivatedSwitch;
 
-        /// <summary> Constructs a filter object. </summary>
-        /// <param name="key">Key of the filter state.</param>
-        /// <param name="filterState">State of filter, on or off.</param>
-        /// <param name="isEnabled">If filter does not apply because user does not belong to group (TINK, Konrad, ...) filter is deactivated.</param>
-        /// <param name="labelText">Text of the switch describing the filter.</param>
-        public FilterItemMutable(
-            string key,
-            FilterState filterState,
-            bool isEnabled,
-            string labelText)
-        {
-            Text = labelText;
-            IsEnabled = isEnabled;
-            State = filterState;
-            Key = key;
-            m_bIsActivatedSwitch = isEnabled && filterState == FilterState.On;
-        }
+		/// <summary> Constructs a filter object. </summary>
+		/// <param name="key">Key of the filter state.</param>
+		/// <param name="filterState">State of filter, on or off.</param>
+		/// <param name="isEnabled">If filter does not apply because user does not belong to group (TINK, Konrad, ...) filter is deactivated.</param>
+		/// <param name="labelText">Text of the switch describing the filter.</param>
+		public FilterItemMutable(
+			string key,
+			FilterState filterState,
+			bool isEnabled,
+			string labelText)
+		{
+			Text = labelText;
+			IsEnabled = isEnabled;
+			State = filterState;
+			Key = key;
+			m_bIsActivatedSwitch = isEnabled && filterState == FilterState.On;
+		}
 
-        /// <summary> Text describing the filter. </summary>
-        public string Text { get; }
+		/// <summary> Text describing the filter. </summary>
+		public string Text { get; }
 
-        /// <summary> True if switch can be toggeled.</summary>
-        public bool IsEnabled { get; }
+		/// <summary> True if switch can be toggeled.</summary>
+		public bool IsEnabled { get; }
 
-        /// <summary> True if switch is on.</summary>
-        public bool IsActivated
-        {
-            get
-            {
-                return m_bIsActivatedSwitch;
-            }
+		/// <summary> True if switch is on.</summary>
+		public bool IsActivated
+		{
+			get
+			{
+				return m_bIsActivatedSwitch;
+			}
 
-            set
-            {
-                m_bIsActivatedSwitch = value;
-                if (!IsEnabled)
-                {
-                    // Nothing to do if filter does not apply to user account.
-                    return;
-                }
+			set
+			{
+				m_bIsActivatedSwitch = value;
+				if (!IsEnabled)
+				{
+					// Nothing to do if filter does not apply to user account.
+					return;
+				}
 
-                State = m_bIsActivatedSwitch ? FilterState.On : FilterState.Off;
-            }
-        }
+				State = m_bIsActivatedSwitch ? FilterState.On : FilterState.Off;
+			}
+		}
 
-        /// <summary> Key of the filter.</summary>
-        public string Key { get; }
+		/// <summary> Key of the filter.</summary>
+		public string Key { get; }
 
-        /// <summary> State of the filter.</summary>
-        public FilterState State { get; private set; }
-    }
+		/// <summary> State of the filter.</summary>
+		public FilterState State { get; private set; }
+	}
 }
diff --git a/TINKLib/ViewModel/Settings/LocksServicesViewModel.cs b/TINKLib/ViewModel/Settings/LocksServicesViewModel.cs
index 11027a5..975fb85 100644
--- a/TINKLib/ViewModel/Settings/LocksServicesViewModel.cs
+++ b/TINKLib/ViewModel/Settings/LocksServicesViewModel.cs
@@ -3,34 +3,34 @@ using System.ComponentModel;
 
 namespace TINK.ViewModel.Settings
 {
-    /// <summary> Manages locks services and related parameters. </summary>
-    public class LocksServicesViewModel : INotifyPropertyChanged
-    {
-        private TimeSpan ConnectTimeout { get; set; }
+	/// <summary> Manages locks services and related parameters. </summary>
+	public class LocksServicesViewModel : INotifyPropertyChanged
+	{
+		private TimeSpan ConnectTimeout { get; set; }
 
-        public LocksServicesViewModel(
-            TimeSpan connectTimeout,
-            ServicesViewModel servicesViewModel)
-        {
-            ConnectTimeout = connectTimeout;
-            Services = servicesViewModel;
-        }
+		public LocksServicesViewModel(
+			TimeSpan connectTimeout,
+			ServicesViewModel servicesViewModel)
+		{
+			ConnectTimeout = connectTimeout;
+			Services = servicesViewModel;
+		}
 
-        public ServicesViewModel Services { get; }
+		public ServicesViewModel Services { get; }
 
-        public string ConnectTimeoutSecText { get => ConnectTimeout.TotalSeconds.ToString(); }
+		public string ConnectTimeoutSecText { get => ConnectTimeout.TotalSeconds.ToString(); }
 
-        public double ConnectTimeoutSec
-        {
-            get => ConnectTimeout.TotalSeconds;
+		public double ConnectTimeoutSec
+		{
+			get => ConnectTimeout.TotalSeconds;
 
-            set
-            {
-                ConnectTimeout = TimeSpan.FromSeconds(value);
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ConnectTimeoutSecText)));
-            }
-        }
+			set
+			{
+				ConnectTimeout = TimeSpan.FromSeconds(value);
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ConnectTimeoutSecText)));
+			}
+		}
 
-        public event PropertyChangedEventHandler PropertyChanged;
-    }
+		public event PropertyChangedEventHandler PropertyChanged;
+	}
 }
\ No newline at end of file
diff --git a/TINKLib/ViewModel/Settings/PollingViewModel.cs b/TINKLib/ViewModel/Settings/PollingViewModel.cs
index 9657452..e1cf6a9 100644
--- a/TINKLib/ViewModel/Settings/PollingViewModel.cs
+++ b/TINKLib/ViewModel/Settings/PollingViewModel.cs
@@ -4,107 +4,107 @@ using TINK.Settings;
 
 namespace TINK.ViewModel.Settings
 {
-    /// <summary> Polling relagted parameters</summary>
-    public class PollingViewModel : INotifyPropertyChanged
-    {
-        /// <summary>Holds the views polling parameters.</summary>
-        private PollingParameters m_oPolling = PollingParameters.Default;
+	/// <summary> Polling relagted parameters</summary>
+	public class PollingViewModel : INotifyPropertyChanged
+	{
+		/// <summary>Holds the views polling parameters.</summary>
+		private PollingParameters m_oPolling = PollingParameters.Default;
 
-        /// <summary> Current polling periode. Used to check whether values were modified or not.</summary>
-        private readonly PollingParameters m_oPollingActive;
+		/// <summary> Current polling periode. Used to check whether values were modified or not.</summary>
+		private readonly PollingParameters m_oPollingActive;
 
-        /// <summary> Constructs polling object. </summary>
-        /// <param name="p_oSource">Object to construct from</param>
-        public PollingViewModel(PollingParameters p_oSource)
-        {
-            m_oPollingActive = p_oSource
-                ?? throw new ArgumentException("Can not instantiate polling parameters view model- object. Polling parameter object is null.");
+		/// <summary> Constructs polling object. </summary>
+		/// <param name="p_oSource">Object to construct from</param>
+		public PollingViewModel(PollingParameters p_oSource)
+		{
+			m_oPollingActive = p_oSource
+				?? throw new ArgumentException("Can not instantiate polling parameters view model- object. Polling parameter object is null.");
 
-            m_oPolling = p_oSource;
-        }
+			m_oPolling = p_oSource;
+		}
 
-        /// <summary> Gets the immutable version of polling parameters.</summary>
-        /// <returns>Polling parameters object.</returns>
-        public PollingParameters ToImmutable() { return m_oPolling; }
+		/// <summary> Gets the immutable version of polling parameters.</summary>
+		/// <returns>Polling parameters object.</returns>
+		public PollingParameters ToImmutable() { return m_oPolling; }
 
-        /// <summary> Holds value whether polling is activated or not.</summary>
-        public bool IsActivated
-        {
-            get
-            {
-                return m_oPolling.IsActivated;
-            }
+		/// <summary> Holds value whether polling is activated or not.</summary>
+		public bool IsActivated
+		{
+			get
+			{
+				return m_oPolling.IsActivated;
+			}
 
-            set
-            {
-                if (value == m_oPolling.IsActivated)
-                {
-                    // Nothing to do.
-                    return;
-                }
+			set
+			{
+				if (value == m_oPolling.IsActivated)
+				{
+					// Nothing to do.
+					return;
+				}
 
-                m_oPolling = new PollingParameters(m_oPolling.Periode, value);
+				m_oPolling = new PollingParameters(m_oPolling.Periode, value);
 
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsActivated)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PeriodeTotalSeconds)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PeriodeTotalSecondsText)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PollingText)));
-            }
-        }
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsActivated)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PeriodeTotalSeconds)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PeriodeTotalSecondsText)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PollingText)));
+			}
+		}
 
-        /// <summary> Gests or sets the polling periode [sec]. </summary>
-        public int PeriodeTotalSeconds
-        {
-            get
-            {
-                return (int)m_oPolling.Periode.TotalSeconds;
-            }
+		/// <summary> Gests or sets the polling periode [sec]. </summary>
+		public int PeriodeTotalSeconds
+		{
+			get
+			{
+				return (int)m_oPolling.Periode.TotalSeconds;
+			}
 
-            set
-            {
-                if (value == (int)m_oPolling.Periode.TotalSeconds)
-                {
-                    // Nothing to do.
-                    return;
-                }
+			set
+			{
+				if (value == (int)m_oPolling.Periode.TotalSeconds)
+				{
+					// Nothing to do.
+					return;
+				}
 
-                m_oPolling = new PollingParameters(new TimeSpan(0, 0, value), IsActivated);
+				m_oPolling = new PollingParameters(new TimeSpan(0, 0, value), IsActivated);
 
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PeriodeTotalSeconds)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PeriodeTotalSecondsText)));
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PollingText)));
-            }
-        }
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PeriodeTotalSeconds)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PeriodeTotalSecondsText)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PollingText)));
+			}
+		}
 
-        /// <summary> Gets info about polling periode.</summary>
-        public string PeriodeTotalSecondsText
-        {
-            get
-            {
-                if (IsActivated)
-                {
-                    return $"Polling Periode: {PeriodeTotalSeconds} [Sek.]";
-                }
+		/// <summary> Gets info about polling periode.</summary>
+		public string PeriodeTotalSecondsText
+		{
+			get
+			{
+				if (IsActivated)
+				{
+					return $"Polling Periode: {PeriodeTotalSeconds} [Sek.]";
+				}
 
-                return $"Polling abgeschalten.";
-            }
-        }
+				return $"Polling abgeschalten.";
+			}
+		}
 
-        /// <summary> Gets the text of the polling related controls.</summary>
-        public string PollingText
-        {
-            get
-            {
-                if (m_oPolling == m_oPollingActive)
-                {
-                    return "Polling";
-                }
+		/// <summary> Gets the text of the polling related controls.</summary>
+		public string PollingText
+		{
+			get
+			{
+				if (m_oPolling == m_oPollingActive)
+				{
+					return "Polling";
+				}
 
-                return "Polling\r\nAnsicht verlassen um Änderungen anzuwenden.";
-            }
-        }
+				return "Polling\r\nAnsicht verlassen um Änderungen anzuwenden.";
+			}
+		}
 
-        /// <summary> Notifies GUI about modified values.</summary>
-        public event PropertyChangedEventHandler PropertyChanged;
-    }
+		/// <summary> Notifies GUI about modified values.</summary>
+		public event PropertyChangedEventHandler PropertyChanged;
+	}
 }
diff --git a/TINKLib/ViewModel/Settings/ServicesViewModel.cs b/TINKLib/ViewModel/Settings/ServicesViewModel.cs
index fdfce0b..9a59992 100644
--- a/TINKLib/ViewModel/Settings/ServicesViewModel.cs
+++ b/TINKLib/ViewModel/Settings/ServicesViewModel.cs
@@ -6,75 +6,75 @@ using Serilog;
 
 namespace TINK.ViewModel.Settings
 {
-    /// <summary> ViewModel for an active service plus a list of services which are not active.</summary>
-    /// <remarks> 
-    /// Example for services are lock services, geolocation services, ..., 
-    /// </remarks>
-    public class ServicesViewModel : INotifyPropertyChanged
-    {
-        /// <summary> Active service. </summary>
-        private string active;
+	/// <summary> ViewModel for an active service plus a list of services which are not active.</summary>
+	/// <remarks> 
+	/// Example for services are lock services, geolocation services, ..., 
+	/// </remarks>
+	public class ServicesViewModel : INotifyPropertyChanged
+	{
+		/// <summary> Active service. </summary>
+		private string active;
 
-        /// <summary> Holds the dictionary which maps services to service display texts.</summary>
-        private IDictionary<string, string> ServiceToText { get; }
+		/// <summary> Holds the dictionary which maps services to service display texts.</summary>
+		private IDictionary<string, string> ServiceToText { get; }
 
-        /// <summary> Holds the dictionary which maps service display texts to services.</summary>
-        private IDictionary<string, string> TextToService { get; }
+		/// <summary> Holds the dictionary which maps service display texts to services.</summary>
+		private IDictionary<string, string> TextToService { get; }
 
-        /// <summary>Constructs view model ensuring consistency. </summary>
-        /// <param name="services">List of available services.</param>
-        /// <param name="serviceToText"> Dictionary holding display text for services as values.</param>
-        /// <param name="active">Active service.</param>
-        public ServicesViewModel(
-            IEnumerable<string> services,
-            IDictionary<string, string> serviceToText,
-            string active)
-        {
-            if (!services.Contains(active))
-                throw new ArgumentException($"Can not instantiate {typeof(ServicesViewModel).Name}- object. Active lock service {active} must be contained in [{String.Join(",", services)}].");
+		/// <summary>Constructs view model ensuring consistency. </summary>
+		/// <param name="services">List of available services.</param>
+		/// <param name="serviceToText"> Dictionary holding display text for services as values.</param>
+		/// <param name="active">Active service.</param>
+		public ServicesViewModel(
+			IEnumerable<string> services,
+			IDictionary<string, string> serviceToText,
+			string active)
+		{
+			if (!services.Contains(active))
+				throw new ArgumentException($"Can not instantiate {typeof(ServicesViewModel).Name}- object. Active lock service {active} must be contained in [{String.Join(",", services)}].");
 
-            ServiceToText = services.Distinct().ToDictionary(
-                x => x,
-                x => serviceToText.ContainsKey(x) ? serviceToText[x] : x);
+			ServiceToText = services.Distinct().ToDictionary(
+				x => x,
+				x => serviceToText.ContainsKey(x) ? serviceToText[x] : x);
 
-            TextToService = ServiceToText.ToDictionary(x => x.Value, x => x.Key);
-            Active = active;
-        }
+			TextToService = ServiceToText.ToDictionary(x => x.Value, x => x.Key);
+			Active = active;
+		}
 
-        /// <summary> Fired whenever active service changes.</summary>
-        public event PropertyChangedEventHandler PropertyChanged;
+		/// <summary> Fired whenever active service changes.</summary>
+		public event PropertyChangedEventHandler PropertyChanged;
 
-        /// <summary> Holds active service.</summary>
-        public string Active
-        {
-            get => active;
-            set
-            {
-                if (active == value)
-                    return;
+		/// <summary> Holds active service.</summary>
+		public string Active
+		{
+			get => active;
+			set
+			{
+				if (active == value)
+					return;
 
-                active = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Active)));
-            }
-        }
+				active = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Active)));
+			}
+		}
 
-        /// <summary> List of display texts of services.</summary>
-        public IList<string> ServicesTextList => ServiceToText.Select(x => x.Value).OrderBy(x => x).ToList();
+		/// <summary> List of display texts of services.</summary>
+		public IList<string> ServicesTextList => ServiceToText.Select(x => x.Value).OrderBy(x => x).ToList();
 
-        /// <summary> Active locks service.</summary>
-        public string ActiveText
-        {
-            get => ServiceToText[Active];
-            set
-            {
-                if (!TextToService.ContainsKey(value))
-                {
-                    Log.ForContext<ServicesViewModel>().Error($"Can not set service {value} to services view model. List of services {{{string.Join(";", TextToService)}}} does not hold machting element.");
-                    throw new ArgumentException($"Can not set service {value} to services view model. List of services {{{string.Join(";", TextToService)}}} does not hold machting element.");
-                }
+		/// <summary> Active locks service.</summary>
+		public string ActiveText
+		{
+			get => ServiceToText[Active];
+			set
+			{
+				if (!TextToService.ContainsKey(value))
+				{
+					Log.ForContext<ServicesViewModel>().Error($"Can not set service {value} to services view model. List of services {{{string.Join(";", TextToService)}}} does not hold machting element.");
+					throw new ArgumentException($"Can not set service {value} to services view model. List of services {{{string.Join(";", TextToService)}}} does not hold machting element.");
+				}
 
-                Active = TextToService[value];
-            }
-        }
-    }
+				Active = TextToService[value];
+			}
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Settings/SettingsBikeFilterViewModel.cs b/TINKLib/ViewModel/Settings/SettingsBikeFilterViewModel.cs
index d3d7433..04979cb 100644
--- a/TINKLib/ViewModel/Settings/SettingsBikeFilterViewModel.cs
+++ b/TINKLib/ViewModel/Settings/SettingsBikeFilterViewModel.cs
@@ -7,59 +7,59 @@ using TINK.MultilingualResources;
 
 namespace TINK.ViewModel.Settings
 {
-    /// <summary> Holds the filters to display..</summary>
-    /// <remarks> Former name: FilterCollectionMutable.</remarks>
-    public class SettingsBikeFilterViewModel : ObservableCollection<FilterItemMutable>
-    {
-        /// <summary> Constructs a filter collection object.</summary>
-        /// <param name="filterSettings">All available filters.</param>
-        /// <param name="filterGroupUser">Filters which apply to logged in user.</param>
-        public SettingsBikeFilterViewModel(
-            IGroupFilterSettings filterSettings,
-            IEnumerable<string> filterGroupUser)
-        {
-            foreach (var filter in filterSettings)
-            {
-                if (filter.Key == FilterHelper.CARGOBIKE)
-                {
-                    Add(new FilterItemMutable(
-                        filter.Key,
-                        filter.Value,
-                        (filterGroupUser != null && filterGroupUser.Count() > 0) ? filterGroupUser.Contains(filter.Key) : true,
-                        AppResources.MarkingCargoBike));
-                    continue;
-                }
-                if (filter.Key == FilterHelper.CITYBIKE)
-                {
-                    Add(new FilterItemMutable(
-                        filter.Key,
-                            filter.Value,
-                            (filterGroupUser != null && filterGroupUser.Count() > 0) ? filterGroupUser.Contains(filter.Key) : true,
-                            AppResources.MarkingCityBike));
-                    continue;
-                }
+	/// <summary> Holds the filters to display..</summary>
+	/// <remarks> Former name: FilterCollectionMutable.</remarks>
+	public class SettingsBikeFilterViewModel : ObservableCollection<FilterItemMutable>
+	{
+		/// <summary> Constructs a filter collection object.</summary>
+		/// <param name="filterSettings">All available filters.</param>
+		/// <param name="filterGroupUser">Filters which apply to logged in user.</param>
+		public SettingsBikeFilterViewModel(
+			IGroupFilterSettings filterSettings,
+			IEnumerable<string> filterGroupUser)
+		{
+			foreach (var filter in filterSettings)
+			{
+				if (filter.Key == FilterHelper.CARGOBIKE)
+				{
+					Add(new FilterItemMutable(
+						filter.Key,
+						filter.Value,
+						(filterGroupUser != null && filterGroupUser.Count() > 0) ? filterGroupUser.Contains(filter.Key) : true,
+						AppResources.MarkingCargoBike));
+					continue;
+				}
+				if (filter.Key == FilterHelper.CITYBIKE)
+				{
+					Add(new FilterItemMutable(
+						filter.Key,
+							filter.Value,
+							(filterGroupUser != null && filterGroupUser.Count() > 0) ? filterGroupUser.Contains(filter.Key) : true,
+							AppResources.MarkingCityBike));
+					continue;
+				}
 
-                Add(new FilterItemMutable(
-                    filter.Key,
-                        filter.Value,
-                        filterGroupUser != null ? filterGroupUser.Contains(filter.Key) : true,
-                        filter.Key));
-            }
-        }
+				Add(new FilterItemMutable(
+					filter.Key,
+						filter.Value,
+						filterGroupUser != null ? filterGroupUser.Contains(filter.Key) : true,
+						filter.Key));
+			}
+		}
 
-        /// <summary> Get filter collection which might have been modified for serialization purposes.</summary>
-        public Dictionary<string, FilterState> FilterCollection
-        {
-            get
-            {
-                var dictionary = new Dictionary<string, FilterState>();
-                foreach (var entry in this)
-                {
-                    dictionary.Add(entry.Key, entry.State);
-                }
+		/// <summary> Get filter collection which might have been modified for serialization purposes.</summary>
+		public Dictionary<string, FilterState> FilterCollection
+		{
+			get
+			{
+				var dictionary = new Dictionary<string, FilterState>();
+				foreach (var entry in this)
+				{
+					dictionary.Add(entry.Key, entry.State);
+				}
 
-                return dictionary;
-            }
-        }
-    }
+				return dictionary;
+			}
+		}
+	}
 }
diff --git a/TINKLib/ViewModel/Settings/SettingsPageViewModel.cs b/TINKLib/ViewModel/Settings/SettingsPageViewModel.cs
index 11d58ac..f505615 100644
--- a/TINKLib/ViewModel/Settings/SettingsPageViewModel.cs
+++ b/TINKLib/ViewModel/Settings/SettingsPageViewModel.cs
@@ -20,383 +20,383 @@ using Xamarin.Forms;
 
 namespace TINK.ViewModel
 {
-    /// <summary>
-    /// View model for settings.
-    /// </summary>
-    public class SettingsPageViewModel : INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Reference on view service to show modal notifications and to perform navigation.
-        /// </summary>
-        private IViewService m_oViewService;
+	/// <summary>
+	/// View model for settings.
+	/// </summary>
+	public class SettingsPageViewModel : INotifyPropertyChanged
+	{
+		/// <summary>
+		/// Reference on view service to show modal notifications and to perform navigation.
+		/// </summary>
+		private IViewService m_oViewService;
 
-        /// <summary>
-        /// Fired if a property changes.
-        /// </summary>
-        public event PropertyChangedEventHandler PropertyChanged;
+		/// <summary>
+		/// Fired if a property changes.
+		/// </summary>
+		public event PropertyChangedEventHandler PropertyChanged;
 
-        /// <summary> Object to manage update of view model objects from Copri.</summary>
-        private IPollingUpdateTaskManager m_oViewUpdateManager;
+		/// <summary> Object to manage update of view model objects from Copri.</summary>
+		private IPollingUpdateTaskManager m_oViewUpdateManager;
 
-        /// <summary> List of copri server uris.</summary>
-        public CopriServerUriListViewModel CopriServerUriList { get; }
+		/// <summary> List of copri server uris.</summary>
+		public CopriServerUriListViewModel CopriServerUriList { get; }
 
-        /// <summary> Manages selection of locks services.</summary>
-        public LocksServicesViewModel LocksServices { get; }
+		/// <summary> Manages selection of locks services.</summary>
+		public LocksServicesViewModel LocksServices { get; }
 
-        /// <summary> Manages selection of geolocation services.</summary>
-        public ServicesViewModel GeolocationServices { get; }
+		/// <summary> Manages selection of geolocation services.</summary>
+		public ServicesViewModel GeolocationServices { get; }
 
-        /// <summary>
-        /// Object to switch logging level.
-        /// </summary>
-        private LogEventLevel m_oMinimumLogEventLevel;
+		/// <summary>
+		/// Object to switch logging level.
+		/// </summary>
+		private LogEventLevel m_oMinimumLogEventLevel;
 
-        /// <summary> Gets a value indicating whether reporting level is verbose or not.</summary>
-        public bool IsReportLevelVerbose { get; set; }
+		/// <summary> Gets a value indicating whether reporting level is verbose or not.</summary>
+		public bool IsReportLevelVerbose { get; set; }
 
-        /// <summary> List of copri server uris.</summary>
-        public ServicesViewModel Themes { get; }
+		/// <summary> List of copri server uris.</summary>
+		public ServicesViewModel Themes { get; }
 
-        /// <summary> Reference on the tink app instance. </summary>
-        private ITinkApp TinkApp { get; }
+		/// <summary> Reference on the tink app instance. </summary>
+		private ITinkApp TinkApp { get; }
 
-        IServicesContainer<IGeolocation> GeoloctionServicesContainer { get; }
+		IServicesContainer<IGeolocation> GeoloctionServicesContainer { get; }
 
-        /// <summary> Constructs a settings page view model object.</summary>
-        /// <param name="tinkApp"> Reference to tink app model.</param>
-        /// <param name="geoloctionServicesContainer"></param>
-        /// <param name="viewService">Interface to view</param>
-        public SettingsPageViewModel(
-            ITinkApp tinkApp,
-            IServicesContainer<IGeolocation> geoloctionServicesContainer,
-            IViewService viewService)
-        {
-            TinkApp = tinkApp
-                ?? throw new ArgumentException("Can not instantiate settings page view model- object. No tink app object available.");
+		/// <summary> Constructs a settings page view model object.</summary>
+		/// <param name="tinkApp"> Reference to tink app model.</param>
+		/// <param name="geoloctionServicesContainer"></param>
+		/// <param name="viewService">Interface to view</param>
+		public SettingsPageViewModel(
+			ITinkApp tinkApp,
+			IServicesContainer<IGeolocation> geoloctionServicesContainer,
+			IViewService viewService)
+		{
+			TinkApp = tinkApp
+				?? throw new ArgumentException("Can not instantiate settings page view model- object. No tink app object available.");
 
-            GeoloctionServicesContainer = geoloctionServicesContainer
-                ?? throw new ArgumentException($"Can not instantiate {nameof(SettingsPageViewModel)}- object. Geolocation services container object must not be null.");
+			GeoloctionServicesContainer = geoloctionServicesContainer
+				?? throw new ArgumentException($"Can not instantiate {nameof(SettingsPageViewModel)}- object. Geolocation services container object must not be null.");
 
-            m_oViewService = viewService
-                ?? throw new ArgumentException("Can not instantiate settings page view model- object. No user view service available.");
+			m_oViewService = viewService
+				?? throw new ArgumentException("Can not instantiate settings page view model- object. No user view service available.");
 
-            m_oMinimumLogEventLevel = TinkApp.MinimumLogEventLevel;
+			m_oMinimumLogEventLevel = TinkApp.MinimumLogEventLevel;
 
-            IsReportLevelVerbose = TinkApp.IsReportLevelVerbose;
+			IsReportLevelVerbose = TinkApp.IsReportLevelVerbose;
 
-            CenterMapToCurrentLocation = TinkApp.CenterMapToCurrentLocation;
+			CenterMapToCurrentLocation = TinkApp.CenterMapToCurrentLocation;
 
-            ExternalFolder = TinkApp.ExternalFolder;
+			ExternalFolder = TinkApp.ExternalFolder;
 
-            IsLogToExternalFolderVisible = !string.IsNullOrEmpty(ExternalFolder);
+			IsLogToExternalFolderVisible = !string.IsNullOrEmpty(ExternalFolder);
 
-            LogToExternalFolderDisplayValue = IsLogToExternalFolderVisible ? TinkApp.LogToExternalFolder : false;
+			LogToExternalFolderDisplayValue = IsLogToExternalFolderVisible ? TinkApp.LogToExternalFolder : false;
 
-            IsSiteCachingOnDisplayValue = TinkApp.IsSiteCachingOn;
+			IsSiteCachingOnDisplayValue = TinkApp.IsSiteCachingOn;
 
-            if (TinkApp.Uris == null
-                || TinkApp.Uris.Uris.Count <= 0)
-            {
-                throw new ArgumentException("Can not instantiate settings page view model- object. No uri- list available.");
-            }
+			if (TinkApp.Uris == null
+				|| TinkApp.Uris.Uris.Count <= 0)
+			{
+				throw new ArgumentException("Can not instantiate settings page view model- object. No uri- list available.");
+			}
 
-            if (string.IsNullOrEmpty(TinkApp.NextActiveUri.AbsoluteUri))
-            {
-                throw new ArgumentException("Can not instantiate settings page view model- object. Next active uri must not be null or empty.");
-            }
+			if (string.IsNullOrEmpty(TinkApp.NextActiveUri.AbsoluteUri))
+			{
+				throw new ArgumentException("Can not instantiate settings page view model- object. Next active uri must not be null or empty.");
+			}
 
-            GroupFilter = new SettingsBikeFilterViewModel(
-                TinkApp.FilterGroupSetting,
-                TinkApp.ActiveUser.IsLoggedIn ? TinkApp.ActiveUser.Group : null);
+			GroupFilter = new SettingsBikeFilterViewModel(
+				TinkApp.FilterGroupSetting,
+				TinkApp.ActiveUser.IsLoggedIn ? TinkApp.ActiveUser.Group : null);
 
-            m_oViewUpdateManager = new IdlePollingUpdateTaskManager();
+			m_oViewUpdateManager = new IdlePollingUpdateTaskManager();
 
-            Polling = new PollingViewModel(TinkApp.Polling);
+			Polling = new PollingViewModel(TinkApp.Polling);
 
-            ExpiresAfterTotalSeconds = Convert.ToInt32(TinkApp.ExpiresAfter.TotalSeconds);
+			ExpiresAfterTotalSeconds = Convert.ToInt32(TinkApp.ExpiresAfter.TotalSeconds);
 
-            CopriServerUriList = new CopriServerUriListViewModel(TinkApp.Uris);
+			CopriServerUriList = new CopriServerUriListViewModel(TinkApp.Uris);
 
-            Themes = new ServicesViewModel(
-                TinkApp.Themes.Select(x => x.GetType().FullName),
-                    new Dictionary<string, string> {
-                        { typeof(Themes.Konrad).FullName, "Mein konrad" /* display name in picker */},
-                        { typeof(Themes.ShareeBike).FullName, "sharee.bike" /* display name in picker */},
-                        { typeof(Themes.LastenradBayern).FullName, "LastenradBayern" /* display name in picker */}
-                    },
-                    TinkApp.Themes.Active.GetType().FullName);
+			Themes = new ServicesViewModel(
+				TinkApp.Themes.Select(x => x.GetType().FullName),
+					new Dictionary<string, string> {
+						{ typeof(Themes.Konrad).FullName, "Mein konrad" /* display name in picker */},
+						{ typeof(Themes.ShareeBike).FullName, "sharee.bike" /* display name in picker */},
+						{ typeof(Themes.LastenradBayern).FullName, "LastenradBayern" /* display name in picker */}
+					},
+					TinkApp.Themes.Active.GetType().FullName);
 
-            Themes.PropertyChanged += OnThemesChanged;
+			Themes.PropertyChanged += OnThemesChanged;
 
 
-            LocksServices = new LocksServicesViewModel(
-                TinkApp.LocksServices.Active.TimeOut.MultiConnect,
-                new ServicesViewModel(
-                    TinkApp.LocksServices,
-                    new Dictionary<string, string> {
-                        { typeof(LocksServiceInReach).FullName, "Simulation - AllLocksInReach" },
-                        { typeof(LocksServiceOutOfReach).FullName, "Simulation - AllLocksOutOfReach" },
-                        { typeof(Services.BluetoothLock.BLE.LockItByScanServiceEventBased).FullName, "Live - Scan" },
-                        { typeof(Services.BluetoothLock.BLE.LockItByScanServicePolling).FullName, "Live - Scan (Polling)" },
-                        { typeof(Services.BluetoothLock.BLE.LockItByGuidService).FullName, "Live - Guid" },
+			LocksServices = new LocksServicesViewModel(
+				TinkApp.LocksServices.Active.TimeOut.MultiConnect,
+				new ServicesViewModel(
+					TinkApp.LocksServices,
+					new Dictionary<string, string> {
+						{ typeof(LocksServiceInReach).FullName, "Simulation - AllLocksInReach" },
+						{ typeof(LocksServiceOutOfReach).FullName, "Simulation - AllLocksOutOfReach" },
+						{ typeof(Services.BluetoothLock.BLE.LockItByScanServiceEventBased).FullName, "Live - Scan" },
+						{ typeof(Services.BluetoothLock.BLE.LockItByScanServicePolling).FullName, "Live - Scan (Polling)" },
+						{ typeof(Services.BluetoothLock.BLE.LockItByGuidService).FullName, "Live - Guid" },
                         /* { typeof(Services.BluetoothLock.Arendi.LockItByGuidService).FullName, "Live - Guid (Arendi)" },
                         { typeof(Services.BluetoothLock.Arendi.LockItByScanService).FullName, "Live - Scan (Arendi)" },
                         { typeof(Services.BluetoothLock.Bluetoothle.LockItByGuidService).FullName, "Live - Guid (Ritchie)" }, */
                     },
-                    TinkApp.LocksServices.Active.GetType().FullName));
+					TinkApp.LocksServices.Active.GetType().FullName));
 
-            GeolocationServices = new ServicesViewModel(
-                GeoloctionServicesContainer.Select(x => x.GetType().FullName),
-                new Dictionary<string, string> {
-                    { typeof(LastKnownGeolocationService).FullName, "LastKnowGeolocation" },
-                    { typeof(GeolocationAccuracyMediumService).FullName, "Medium Accuracy" },
-                    { typeof(GeolocationAccuracyHighService).FullName, "High Accuracy" },
-                    { typeof(GeolocationAccuracyBestService).FullName, "Best Accuracy" },
-                    { typeof(SimulatedGeolocationService).FullName, "Simulation-AlwaysSamePosition" } },
-                GeoloctionServicesContainer.Active.GetType().FullName);
-        }
+			GeolocationServices = new ServicesViewModel(
+				GeoloctionServicesContainer.Select(x => x.GetType().FullName),
+				new Dictionary<string, string> {
+					{ typeof(LastKnownGeolocationService).FullName, "LastKnowGeolocation" },
+					{ typeof(GeolocationAccuracyMediumService).FullName, "Medium Accuracy" },
+					{ typeof(GeolocationAccuracyHighService).FullName, "High Accuracy" },
+					{ typeof(GeolocationAccuracyBestService).FullName, "Best Accuracy" },
+					{ typeof(SimulatedGeolocationService).FullName, "Simulation-AlwaysSamePosition" } },
+				GeoloctionServicesContainer.Active.GetType().FullName);
+		}
 
-        /// <summary>
-        /// User switches scheme.
-        /// </summary>
-        private void OnThemesChanged(object sender, PropertyChangedEventArgs e)
-        {
-            // Set active theme (leads to switch of title)
-            TinkApp.Themes.SetActive(Themes.Active);
+		/// <summary>
+		/// User switches scheme.
+		/// </summary>
+		private void OnThemesChanged(object sender, PropertyChangedEventArgs e)
+		{
+			// Set active theme (leads to switch of title)
+			TinkApp.Themes.SetActive(Themes.Active);
 
-            // Switch theme.
-            ICollection<ResourceDictionary> mergedDictionaries = Application.Current.Resources.MergedDictionaries;
-            if (mergedDictionaries == null)
-            {
-                Log.ForContext<SettingsPageViewModel>().Error("No merged dictionary available.");
-                return;
-            }
+			// Switch theme.
+			ICollection<ResourceDictionary> mergedDictionaries = Application.Current.Resources.MergedDictionaries;
+			if (mergedDictionaries == null)
+			{
+				Log.ForContext<SettingsPageViewModel>().Error("No merged dictionary available.");
+				return;
+			}
 
-            mergedDictionaries.Clear();
+			mergedDictionaries.Clear();
 
-            if (Themes.Active == typeof(Themes.Konrad).FullName)
-            {
-                mergedDictionaries.Add(new Themes.Konrad());
-            }
-            else if (Themes.Active == typeof(Themes.ShareeBike).FullName)
-            {
-                mergedDictionaries.Add(new Themes.ShareeBike());
-            }
-            else if (Themes.Active == typeof(Themes.LastenradBayern).FullName)
-            {
-                mergedDictionaries.Add(new Themes.LastenradBayern());
-            }
-            else
-            {
-                Log.ForContext<SettingsPageViewModel>().Debug($"No theme {Themes.Active} found.");
-            }
-        }
+			if (Themes.Active == typeof(Themes.Konrad).FullName)
+			{
+				mergedDictionaries.Add(new Themes.Konrad());
+			}
+			else if (Themes.Active == typeof(Themes.ShareeBike).FullName)
+			{
+				mergedDictionaries.Add(new Themes.ShareeBike());
+			}
+			else if (Themes.Active == typeof(Themes.LastenradBayern).FullName)
+			{
+				mergedDictionaries.Add(new Themes.LastenradBayern());
+			}
+			else
+			{
+				Log.ForContext<SettingsPageViewModel>().Debug($"No theme {Themes.Active} found.");
+			}
+		}
 
-        /// <summary> Holds information whether app is connected to web or not. </summary>
-        private bool? isConnected = null;
+		/// <summary> Holds information whether app is connected to web or not. </summary>
+		private bool? isConnected = null;
 
-        /// <summary>Exposes the is connected state. </summary>
-        private bool IsConnected
-        {
-            get => isConnected ?? false;
-            set
-            {
-                isConnected = value;
-            }
-        }
+		/// <summary>Exposes the is connected state. </summary>
+		private bool IsConnected
+		{
+			get => isConnected ?? false;
+			set
+			{
+				isConnected = value;
+			}
+		}
 
-        /// <summary> Holds a value indicating whether group filters GUI are visible or not</summary>
-        public bool IsGroupFilterVisible => GroupFilter.Count > 0;
+		/// <summary> Holds a value indicating whether group filters GUI are visible or not</summary>
+		public bool IsGroupFilterVisible => GroupFilter.Count > 0;
 
-        /// <summary> Holds the bike types to fade out or show</summary>
-        public SettingsBikeFilterViewModel GroupFilter { get; }
+		/// <summary> Holds the bike types to fade out or show</summary>
+		public SettingsBikeFilterViewModel GroupFilter { get; }
 
-        /// <summary> Gets the value to path were copri mock files are located (for debugging purposes).</summary>
-        public string ExternalFolder { get; }
+		/// <summary> Gets the value to path were copri mock files are located (for debugging purposes).</summary>
+		public string ExternalFolder { get; }
 
-        /// <summary>
-        /// Gets the value to path were copri mock files are located (for debugging purposes).
-        /// </summary>
-        public string InternalPath => TinkApp.SettingsFileFolder;
+		/// <summary>
+		/// Gets the value to path were copri mock files are located (for debugging purposes).
+		/// </summary>
+		public string InternalPath => TinkApp.SettingsFileFolder;
 
-        /// <summary>
-        /// Gets the value of device identifier (for debugging purposes).
-        /// </summary>
-        public string DeviceIdentifier
-        {
-            get { return TinkApp.SmartDevice.Identifier; }
-        }
+		/// <summary>
+		/// Gets the value of device identifier (for debugging purposes).
+		/// </summary>
+		public string DeviceIdentifier
+		{
+			get { return TinkApp.SmartDevice.Identifier; }
+		}
 
-        /// <summary> 
-        /// Invoked when page is shutdown. 
-        /// Currently invoked by code behind, would be nice if called by XAML in future versions.
-        /// </summary>
-        public async Task OnDisappearing()
-        {
-            try
-            {
-                Log.ForContext<SettingsPageViewModel>().Information($"Entering {nameof(OnDisappearing)}...");
+		/// <summary> 
+		/// Invoked when page is shutdown. 
+		/// Currently invoked by code behind, would be nice if called by XAML in future versions.
+		/// </summary>
+		public async Task OnDisappearing()
+		{
+			try
+			{
+				Log.ForContext<SettingsPageViewModel>().Information($"Entering {nameof(OnDisappearing)}...");
 
-                // Update model values.
-                TinkApp.NextActiveUri = CopriServerUriList.NextActiveUri;
+				// Update model values.
+				TinkApp.NextActiveUri = CopriServerUriList.NextActiveUri;
 
-                TinkApp.Polling = new PollingParameters(
-                    new TimeSpan(0, 0, Polling.PeriodeTotalSeconds),
-                    Polling.IsActivated);
+				TinkApp.Polling = new PollingParameters(
+					new TimeSpan(0, 0, Polling.PeriodeTotalSeconds),
+					Polling.IsActivated);
 
-                TinkApp.ExpiresAfter = TimeSpan.FromSeconds(ExpiresAfterTotalSeconds);
+				TinkApp.ExpiresAfter = TimeSpan.FromSeconds(ExpiresAfterTotalSeconds);
 
-                var filterGroup = GroupFilter.ToDictionary(x => x.Key, x => x.State);
-                TinkApp.FilterGroupSetting = new GroupFilterSettings(filterGroup.Count > 0 ? filterGroup : null);
+				var filterGroup = GroupFilter.ToDictionary(x => x.Key, x => x.State);
+				TinkApp.FilterGroupSetting = new GroupFilterSettings(filterGroup.Count > 0 ? filterGroup : null);
 
-                // Update map page filter. 
-                // Reasons for which map page filter has to be updated:
-                // - user activated/ deactivated a group (TINKCorpi/ TINKSms/ Konrad)
-                // - user logged off
-                TinkApp.GroupFilterMapPage =
-                    GroupFilterMapPageHelper.CreateUpdated(
-                        TinkApp.GroupFilterMapPage,
-                        TinkApp.ActiveUser.DoFilter(TinkApp.FilterGroupSetting.DoFilter()));
+				// Update map page filter. 
+				// Reasons for which map page filter has to be updated:
+				// - user activated/ deactivated a group (TINKCorpi/ TINKSms/ Konrad)
+				// - user logged off
+				TinkApp.GroupFilterMapPage =
+					GroupFilterMapPageHelper.CreateUpdated(
+						TinkApp.GroupFilterMapPage,
+						TinkApp.ActiveUser.DoFilter(TinkApp.FilterGroupSetting.DoFilter()));
 
-                TinkApp.CenterMapToCurrentLocation = CenterMapToCurrentLocation;
+				TinkApp.CenterMapToCurrentLocation = CenterMapToCurrentLocation;
 
-                if (IsLogToExternalFolderVisible)
-                {
-                    // If no external folder is available do not update model value.
-                    TinkApp.LogToExternalFolder = LogToExternalFolderDisplayValue;
-                }
+				if (IsLogToExternalFolderVisible)
+				{
+					// If no external folder is available do not update model value.
+					TinkApp.LogToExternalFolder = LogToExternalFolderDisplayValue;
+				}
 
-                TinkApp.IsSiteCachingOn = IsSiteCachingOnDisplayValue;
+				TinkApp.IsSiteCachingOn = IsSiteCachingOnDisplayValue;
 
-                TinkApp.MinimumLogEventLevel = m_oMinimumLogEventLevel; // Update value to be serialized.
-                TinkApp.UpdateLoggingLevel(m_oMinimumLogEventLevel); // Update logging server.
+				TinkApp.MinimumLogEventLevel = m_oMinimumLogEventLevel; // Update value to be serialized.
+				TinkApp.UpdateLoggingLevel(m_oMinimumLogEventLevel); // Update logging server.
 
-                TinkApp.IsReportLevelVerbose = IsReportLevelVerbose;
+				TinkApp.IsReportLevelVerbose = IsReportLevelVerbose;
 
-                TinkApp.LocksServices.SetActive(LocksServices.Services.Active);
+				TinkApp.LocksServices.SetActive(LocksServices.Services.Active);
 
-                GeoloctionServicesContainer.SetActive(GeolocationServices.Active);
+				GeoloctionServicesContainer.SetActive(GeolocationServices.Active);
 
-                TinkApp.LocksServices.SetTimeOut(TimeSpan.FromSeconds(LocksServices.ConnectTimeoutSec));
+				TinkApp.LocksServices.SetTimeOut(TimeSpan.FromSeconds(LocksServices.ConnectTimeoutSec));
 
-                // Persist settings in case app is closed directly.
-                TinkApp.Save();
+				// Persist settings in case app is closed directly.
+				TinkApp.Save();
 
-                TinkApp.UpdateConnector();
+				TinkApp.UpdateConnector();
 
-                await m_oViewUpdateManager.StopUpdatePeridically();
+				await m_oViewUpdateManager.StopUpdatePeridically();
 
-                Log.ForContext<SettingsPageViewModel>().Information($"{nameof(OnDisappearing)} done.");
-            }
-            catch (Exception l_oException)
-            {
-                await m_oViewService.DisplayAlert(
-                    "Fehler",
-                    $"Ein unerwarteter Fehler ist aufgetreten. \r\n{l_oException.Message}",
-                    "OK");
-            }
-        }
+				Log.ForContext<SettingsPageViewModel>().Information($"{nameof(OnDisappearing)} done.");
+			}
+			catch (Exception l_oException)
+			{
+				await m_oViewService.DisplayAlert(
+					"Fehler",
+					$"Ein unerwarteter Fehler ist aufgetreten. \r\n{l_oException.Message}",
+					"OK");
+			}
+		}
 
-        /// <summary> True if there is an error message to display.</summary>
+		/// <summary> True if there is an error message to display.</summary>
 
 
-        /// <summary>
-        /// Exception which occurred getting bike information.
-        /// </summary>
-        protected Exception Exception { get; set; }
+		/// <summary>
+		/// Exception which occurred getting bike information.
+		/// </summary>
+		protected Exception Exception { get; set; }
 
-        /// <summary>
-        /// If true debug controls are visible, false if not.
-        /// </summary>
-        public Permissions DebugLevel
-        {
-            get
-            {
-                return (Exception == null || Exception is WebConnectFailureException)
-                    ? TinkApp.ActiveUser.DebugLevel
-                    : Permissions.None;
-            }
-        }
+		/// <summary>
+		/// If true debug controls are visible, false if not.
+		/// </summary>
+		public Permissions DebugLevel
+		{
+			get
+			{
+				return (Exception == null || Exception is WebConnectFailureException)
+					? TinkApp.ActiveUser.DebugLevel
+					: Permissions.None;
+			}
+		}
 
-        /// <summary> Empty if no user is logged in session cookie otherwise. </summary>
-        public string SessionCookie => TinkApp.ActiveUser.IsLoggedIn ? TinkApp.ActiveUser.SessionCookie : "";
+		/// <summary> Empty if no user is logged in session cookie otherwise. </summary>
+		public string SessionCookie => TinkApp.ActiveUser.IsLoggedIn ? TinkApp.ActiveUser.SessionCookie : "";
 
-        /// <summary>Polling periode.</summary>
-        public PollingViewModel Polling { get; }
+		/// <summary>Polling periode.</summary>
+		public PollingViewModel Polling { get; }
 
-        /// <summary> Active logging level</summary>
-        public string SelectedLoggingLevel
-        {
-            get
-            {
-                return m_oMinimumLogEventLevel.ToString();
-            }
-            set
-            {
-                if (!Enum.TryParse(value, out LogEventLevel l_oNewLevel))
-                {
-                    return;
-                }
+		/// <summary> Active logging level</summary>
+		public string SelectedLoggingLevel
+		{
+			get
+			{
+				return m_oMinimumLogEventLevel.ToString();
+			}
+			set
+			{
+				if (!Enum.TryParse(value, out LogEventLevel l_oNewLevel))
+				{
+					return;
+				}
 
-                m_oMinimumLogEventLevel = l_oNewLevel;
-            }
-        }
+				m_oMinimumLogEventLevel = l_oNewLevel;
+			}
+		}
 
-        public bool CenterMapToCurrentLocation { get; set; }
+		public bool CenterMapToCurrentLocation { get; set; }
 
-        /// <summary> Holds either
-        /// - a value indicating whether to use external folder (e.g. SD card)/ or internal folder for storing log-files or
-        /// - is false if external folder is not available
-        /// </summary>
-        public bool LogToExternalFolderDisplayValue { get; set; }
+		/// <summary> Holds either
+		/// - a value indicating whether to use external folder (e.g. SD card)/ or internal folder for storing log-files or
+		/// - is false if external folder is not available
+		/// </summary>
+		public bool LogToExternalFolderDisplayValue { get; set; }
 
-        public bool IsSiteCachingOnDisplayValue { get; set; }
+		public bool IsSiteCachingOnDisplayValue { get; set; }
 
-        /// <summary> Holds a value indicating whether user can use external folder (e.g. SD card) for storing log-files.</summary>
-        public bool IsLogToExternalFolderVisible { get; }
+		/// <summary> Holds a value indicating whether user can use external folder (e.g. SD card) for storing log-files.</summary>
+		public bool IsLogToExternalFolderVisible { get; }
 
-        /// <summary>
-        ///  Holds the logging level serilog provides.
-        /// </summary>
-        public List<string> LoggingLevels
-        {
-            get
-            {
-                return new List<string>
-                {
-                    LogEventLevel.Verbose.ToString(),
-                    LogEventLevel.Debug.ToString(),
-                    LogEventLevel.Information.ToString(),
-                    LogEventLevel.Warning.ToString(),
-                    LogEventLevel.Error.ToString(),
-                    LogEventLevel.Fatal.ToString(),
-                };
-            }
-        }
+		/// <summary>
+		///  Holds the logging level serilog provides.
+		/// </summary>
+		public List<string> LoggingLevels
+		{
+			get
+			{
+				return new List<string>
+				{
+					LogEventLevel.Verbose.ToString(),
+					LogEventLevel.Debug.ToString(),
+					LogEventLevel.Information.ToString(),
+					LogEventLevel.Warning.ToString(),
+					LogEventLevel.Error.ToString(),
+					LogEventLevel.Fatal.ToString(),
+				};
+			}
+		}
 
-        double expiresAfterTotalSeconds;
+		double expiresAfterTotalSeconds;
 
-        public double ExpiresAfterTotalSeconds
-        {
-            get => expiresAfterTotalSeconds;
-            set
-            {
-                if (value == expiresAfterTotalSeconds)
-                {
-                    return;
-                }
+		public double ExpiresAfterTotalSeconds
+		{
+			get => expiresAfterTotalSeconds;
+			set
+			{
+				if (value == expiresAfterTotalSeconds)
+				{
+					return;
+				}
 
-                expiresAfterTotalSeconds = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ExpiresAfterTotalSecondsText)));
-            }
-        }
+				expiresAfterTotalSeconds = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ExpiresAfterTotalSecondsText)));
+			}
+		}
 
-        public string ExpiresAfterTotalSecondsText
-        {
-            get => expiresAfterTotalSeconds.ToString("0");
-        }
+		public string ExpiresAfterTotalSecondsText
+		{
+			get => expiresAfterTotalSeconds.ToString("0");
+		}
 
 
-    }
+	}
 }
diff --git a/TINKLib/ViewModel/ViewModelHelper.cs b/TINKLib/ViewModel/ViewModelHelper.cs
index 4d92754..043eaae 100644
--- a/TINKLib/ViewModel/ViewModelHelper.cs
+++ b/TINKLib/ViewModel/ViewModelHelper.cs
@@ -16,125 +16,125 @@ using Xamarin.Forms;
 
 namespace TINK.ViewModel
 {
-    public static class ViewModelHelper
-    {
-        /// <summary> First part of text making up a station name.</summary>
-        private const string USER_FIENDLY_STATIONNUMBER_PREFIX = "Station";
+	public static class ViewModelHelper
+	{
+		/// <summary> First part of text making up a station name.</summary>
+		private const string USER_FIENDLY_STATIONNUMBER_PREFIX = "Station";
 
-        /// <summary>Holds the color which marks link to TINK- app pages, web sites, ...</summary>
-        public static Color LINK_COLOR = Color.Blue;
+		/// <summary>Holds the color which marks link to TINK- app pages, web sites, ...</summary>
+		public static Color LINK_COLOR = Color.Blue;
 
-        /// <summary>
-        /// Gets station name from station object.
-        /// </summary>
-        /// <param name="station">Station to get id from</param>
-        /// <returns></returns>
-        public static string GetStationName(this IStation station)
-        {
-            if (station == null)
-            {
-                return string.Empty;
-            }
+		/// <summary>
+		/// Gets station name from station object.
+		/// </summary>
+		/// <param name="station">Station to get id from</param>
+		/// <returns></returns>
+		public static string GetStationName(this IStation station)
+		{
+			if (station == null)
+			{
+				return string.Empty;
+			}
 
-            if (!string.IsNullOrEmpty(station.StationName))
-            {
-                return $"{station.StationName}, Nr. {station.Id}.";
-            }
+			if (!string.IsNullOrEmpty(station.StationName))
+			{
+				return $"{station.StationName}, Nr. {station.Id}.";
+			}
 
-            return GetStationName(station.Id);
-        }
+			return GetStationName(station.Id);
+		}
 
-        /// <summary>
-        /// Gets station name from station object.
-        /// </summary>
-        /// <param name="p_oStation">Station to get id from</param>
-        /// <returns></returns>
-        public static string GetStationName(string station)
-        {
-            return string.Format("{0} {1}", USER_FIENDLY_STATIONNUMBER_PREFIX, station);
-        }
+		/// <summary>
+		/// Gets station name from station object.
+		/// </summary>
+		/// <param name="p_oStation">Station to get id from</param>
+		/// <returns></returns>
+		public static string GetStationName(string station)
+		{
+			return string.Format("{0} {1}", USER_FIENDLY_STATIONNUMBER_PREFIX, station);
+		}
 
-        /// <summary>
-        /// Gets station id from station name.
-        /// </summary>
-        /// <param name="p_oStation">Station to get id from</param>
-        /// <returns></returns>
-        public static int GetStationId(string stationName)
-        {
-            return int.Parse(stationName.Replace(USER_FIENDLY_STATIONNUMBER_PREFIX, "").Trim());
-        }
+		/// <summary>
+		/// Gets station id from station name.
+		/// </summary>
+		/// <param name="p_oStation">Station to get id from</param>
+		/// <returns></returns>
+		public static int GetStationId(string stationName)
+		{
+			return int.Parse(stationName.Replace(USER_FIENDLY_STATIONNUMBER_PREFIX, "").Trim());
+		}
 
-        /// <summary> Get full display name of a bike which includes id. </summary>
-        /// <remarks>
-        /// If name is empty return Id as name.
-        /// </remarks>
-        /// <param name="bike">bike to get name for.</param>
-        /// <returns>Display name of bike.</returns>
-        public static string GetFullDisplayName(this IBikeInfoMutable bike)
-            => $"{(!string.IsNullOrEmpty(bike.Description) ? $"{bike.Description}, " : string.Empty)}Nr. {bike.Id}";
+		/// <summary> Get full display name of a bike which includes id. </summary>
+		/// <remarks>
+		/// If name is empty return Id as name.
+		/// </remarks>
+		/// <param name="bike">bike to get name for.</param>
+		/// <returns>Display name of bike.</returns>
+		public static string GetFullDisplayName(this IBikeInfoMutable bike)
+			=> $"{(!string.IsNullOrEmpty(bike.Description) ? $"{bike.Description}, " : string.Empty)}Nr. {bike.Id}";
 
-        /// <summary> Get the display name of a bike. </summary>
-        /// <param name="bike">bike to get name for.</param>
-        /// <returns>Display name of bike.</returns>
-        public static string GetDisplayName(this IBikeInfoMutable bike)
-            => $"{(!string.IsNullOrEmpty(bike.Description) ? $"{bike.Description}" : $"{bike.Id}")}";
+		/// <summary> Get the display name of a bike. </summary>
+		/// <param name="bike">bike to get name for.</param>
+		/// <returns>Display name of bike.</returns>
+		public static string GetDisplayName(this IBikeInfoMutable bike)
+			=> $"{(!string.IsNullOrEmpty(bike.Description) ? $"{bike.Description}" : $"{bike.Id}")}";
 
-        public static string GetDisplayTypeOfBike(this IBikeInfoMutable bike)
-            => $"{(!string.IsNullOrEmpty(bike.Description) ? $"{bike.TypeOfBike}" : $"{bike.Id}")}";
-        public static string GetDisplayWheelType(this IBikeInfoMutable bike)
-            => $"{(!string.IsNullOrEmpty(bike.Description) ? $"{bike.WheelType}" : $"{bike.Id}")}";
+		public static string GetDisplayTypeOfBike(this IBikeInfoMutable bike)
+			=> $"{(!string.IsNullOrEmpty(bike.Description) ? $"{bike.TypeOfBike}" : $"{bike.Id}")}";
+		public static string GetDisplayWheelType(this IBikeInfoMutable bike)
+			=> $"{(!string.IsNullOrEmpty(bike.Description) ? $"{bike.WheelType}" : $"{bike.Id}")}";
 
-        /// <summary> Get the display id of a bike.</summary>
-        /// <remarks>
-        /// If name is empty id is used as name. For this reason return nothing in this case to avoid duplicate output of id.
-        /// </remarks>
-        /// <param name="bike">bike to get name for.</param>
-        /// <returns>Display name of bike.</returns>
-        public static string GetDisplayId(this IBikeInfoMutable bike)
-            => $"{(!string.IsNullOrEmpty(bike.Description) ? $"{bike.Id}" : string.Empty)}";
+		/// <summary> Get the display id of a bike.</summary>
+		/// <remarks>
+		/// If name is empty id is used as name. For this reason return nothing in this case to avoid duplicate output of id.
+		/// </remarks>
+		/// <param name="bike">bike to get name for.</param>
+		/// <returns>Display name of bike.</returns>
+		public static string GetDisplayId(this IBikeInfoMutable bike)
+			=> $"{(!string.IsNullOrEmpty(bike.Description) ? $"{bike.Id}" : string.Empty)}";
 
-        /// <summary>
-        /// Maps state to color.
-        /// </summary>
-        /// <param name="state"></param>
-        /// <returns></returns>
-        public static Color GetColor(this InUseStateEnum state)
-        {
-            switch (state)
-            {
-                case InUseStateEnum.FeedbackPending:
-                case InUseStateEnum.Disposable:
-                    return Color.Default;
+		/// <summary>
+		/// Maps state to color.
+		/// </summary>
+		/// <param name="state"></param>
+		/// <returns></returns>
+		public static Color GetColor(this InUseStateEnum state)
+		{
+			switch (state)
+			{
+				case InUseStateEnum.FeedbackPending:
+				case InUseStateEnum.Disposable:
+					return Color.Default;
 
-                case InUseStateEnum.Reserved:
-                    return Color.Orange;
+				case InUseStateEnum.Reserved:
+					return Color.Orange;
 
-                case InUseStateEnum.Booked:
-                    return Color.Green;
+				case InUseStateEnum.Booked:
+					return Color.Green;
 
-                default:
-                    return Color.Default;
-            }
-        }
+				default:
+					return Color.Default;
+			}
+		}
 
-        /// <summary> Gets message that logged in user has not booked any bikes. </summary>
-        /// <param name="isReportLevelVerbose">Holds whether report level is verbose or not.</param>
-        public static string GetShortErrorInfoText(this Exception exception, bool isReportLevelVerbose)
-        {
-            if (exception == null)
-            {
-                return string.Empty;
-            }
+		/// <summary> Gets message that logged in user has not booked any bikes. </summary>
+		/// <param name="isReportLevelVerbose">Holds whether report level is verbose or not.</param>
+		public static string GetShortErrorInfoText(this Exception exception, bool isReportLevelVerbose)
+		{
+			if (exception == null)
+			{
+				return string.Empty;
+			}
 
-            if (exception is AuthcookieNotDefinedException)
-                return AppResources.ActivityTextAuthcookieNotDefinedException;
+			if (exception is AuthcookieNotDefinedException)
+				return AppResources.ActivityTextAuthcookieNotDefinedException;
 
-            if (!isReportLevelVerbose)
-            {
-                return AppResources.ActivityTextException;
-            }
+			if (!isReportLevelVerbose)
+			{
+				return AppResources.ActivityTextException;
+			}
 
-            // An error occurred getting bikes information.
+			// An error occurred getting bikes information.
 #if USCSHARP9
             switch (exception)
             {
@@ -154,156 +154,156 @@ namespace TINK.ViewModel
                     return AppResources.ActivityTextErrorException;
             }
 #else
-            if (exception is WebConnectFailureException)
-                return AppResources.ActivityTextErrorWebConnectFailureException;
-            if (exception is InvalidResponseException)
-                return AppResources.ActivityTextErrorInvalidResponseException;
-            if (exception is WebForbiddenException)
-                return AppResources.ActivityTextErrorWebForbiddenException;
-            if (exception is DeserializationException)
-                return AppResources.ActivityTextErrorDeserializationException;
-            if (exception is WebException webException)
-            {
-                return webException.Status == WebExceptionStatus.ProtocolError && webException.Response is HttpWebResponse webResponse
-                    ? string.Format(AppResources.ActivityTextErrorWebExceptionProtocolError, webResponse.StatusDescription)
-                    : string.Format(AppResources.ActivityTextErrorWebExceptionGeneralError, webException.Status.ToString());
-            }
+			if (exception is WebConnectFailureException)
+				return AppResources.ActivityTextErrorWebConnectFailureException;
+			if (exception is InvalidResponseException)
+				return AppResources.ActivityTextErrorInvalidResponseException;
+			if (exception is WebForbiddenException)
+				return AppResources.ActivityTextErrorWebForbiddenException;
+			if (exception is DeserializationException)
+				return AppResources.ActivityTextErrorDeserializationException;
+			if (exception is WebException webException)
+			{
+				return webException.Status == WebExceptionStatus.ProtocolError && webException.Response is HttpWebResponse webResponse
+					? string.Format(AppResources.ActivityTextErrorWebExceptionProtocolError, webResponse.StatusDescription)
+					: string.Format(AppResources.ActivityTextErrorWebExceptionGeneralError, webException.Status.ToString());
+			}
 
-            return AppResources.ActivityTextErrorException;
+			return AppResources.ActivityTextErrorException;
 #endif
 
-        }
+		}
 
-        /// <summary> Gets error message and handles aggegate exceptions. </summary>
-        public static string GetErrorMessage(this Exception exception)
-        {
-            if (exception == null)
-                return string.Empty;
+		/// <summary> Gets error message and handles aggegate exceptions. </summary>
+		public static string GetErrorMessage(this Exception exception)
+		{
+			if (exception == null)
+				return string.Empty;
 
-            if (!(exception is AggregateException aggregateException))
-                return exception.Message;
+			if (!(exception is AggregateException aggregateException))
+				return exception.Message;
 
-            if (aggregateException.InnerExceptions.Count == 1)
-                return aggregateException.InnerExceptions[0].Message;
+			if (aggregateException.InnerExceptions.Count == 1)
+				return aggregateException.InnerExceptions[0].Message;
 
-            return new AggregateException().Message + "\r\n" + string.Join("\r\n", aggregateException.InnerExceptions.Select(x => x.Message));
-        }
+			return new AggregateException().Message + "\r\n" + string.Join("\r\n", aggregateException.InnerExceptions.Select(x => x.Message));
+		}
 
-        /// <summary> Gets message that logged in user has not booked any bikes. </summary>
-        public static FormattedString GetErrorInfoText(this Exception exception)
-        {
-            if (exception == null)
-            {
-                return string.Empty;
-            }
+		/// <summary> Gets message that logged in user has not booked any bikes. </summary>
+		public static FormattedString GetErrorInfoText(this Exception exception)
+		{
+			if (exception == null)
+			{
+				return string.Empty;
+			}
 
-            FormattedString l_oError;
-            // An error occurred getting bikes information.
-            if (exception is WebConnectFailureException)
-            {
+			FormattedString l_oError;
+			// An error occurred getting bikes information.
+			if (exception is WebConnectFailureException)
+			{
 
-                l_oError = new FormattedString();
-                l_oError.Spans.Add(new Span { Text = "Information!\r\n", FontAttributes = FontAttributes.Bold });
-                l_oError.Spans.Add(new Span { Text = $"{exception.Message}\r\n{WebConnectFailureException.GetHintToPossibleExceptionsReasons}" });
-                return l_oError;
+				l_oError = new FormattedString();
+				l_oError.Spans.Add(new Span { Text = "Information!\r\n", FontAttributes = FontAttributes.Bold });
+				l_oError.Spans.Add(new Span { Text = $"{exception.Message}\r\n{WebConnectFailureException.GetHintToPossibleExceptionsReasons}" });
+				return l_oError;
 
-            }
-            else if (exception is InvalidResponseException)
-            {
-                l_oError = new FormattedString();
-                l_oError.Spans.Add(new Span { Text = "Fehler, ungültige Serverantwort!\r\n", FontAttributes = FontAttributes.Bold });
-                l_oError.Spans.Add(new Span { Text = $"{exception.Message}" });
-                return l_oError;
-            }
-            else if (exception is WebForbiddenException)
-            {
-                l_oError = new FormattedString();
-                l_oError.Spans.Add(new Span { Text = "Beschäftigt... Einen Moment bitte!" });
-                return l_oError;
-            }
+			}
+			else if (exception is InvalidResponseException)
+			{
+				l_oError = new FormattedString();
+				l_oError.Spans.Add(new Span { Text = "Fehler, ungültige Serverantwort!\r\n", FontAttributes = FontAttributes.Bold });
+				l_oError.Spans.Add(new Span { Text = $"{exception.Message}" });
+				return l_oError;
+			}
+			else if (exception is WebForbiddenException)
+			{
+				l_oError = new FormattedString();
+				l_oError.Spans.Add(new Span { Text = "Beschäftigt... Einen Moment bitte!" });
+				return l_oError;
+			}
 
-            l_oError = new FormattedString();
-            l_oError.Spans.Add(new Span { Text = "Allgemeiner Fehler!\r\n", FontAttributes = FontAttributes.Bold });
-            l_oError.Spans.Add(new Span { Text = $"{exception}" });
-            return l_oError;
-        }
+			l_oError = new FormattedString();
+			l_oError.Spans.Add(new Span { Text = "Allgemeiner Fehler!\r\n", FontAttributes = FontAttributes.Bold });
+			l_oError.Spans.Add(new Span { Text = $"{exception}" });
+			return l_oError;
+		}
 
 
-        /// <summary> User tabbed a URI. </summary>
-        /// <param name="sender">Sender of the event.</param>
-        /// <param name="eventArgs">Event arguments</param>
-        public static void OnNavigating(object sender, WebNavigatingEventArgs eventArgs)
-        {
+		/// <summary> User tabbed a URI. </summary>
+		/// <param name="sender">Sender of the event.</param>
+		/// <param name="eventArgs">Event arguments</param>
+		public static void OnNavigating(object sender, WebNavigatingEventArgs eventArgs)
+		{
 
-            if (!eventArgs.Url.ToUpper().StartsWith("HTTP"))
-            {
-                // An internal link was detected.
-                // Stay inside WebView
-                eventArgs.Cancel = false;
-                return;
-            }
+			if (!eventArgs.Url.ToUpper().StartsWith("HTTP"))
+			{
+				// An internal link was detected.
+				// Stay inside WebView
+				eventArgs.Cancel = false;
+				return;
+			}
 
-            // Do not navigate outside the document.
-            eventArgs.Cancel = true;
+			// Do not navigate outside the document.
+			eventArgs.Cancel = true;
 
-            DependencyService.Get<IExternalBrowserService>().OpenUrl(eventArgs.Url);
-        }
+			DependencyService.Get<IExternalBrowserService>().OpenUrl(eventArgs.Url);
+		}
 
-        /// <summary> Gets the user group if a user friendly name.</summary>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        public static string GetUserGroupDisplayName(this User user)
-        {
-            return string.Join(" & ", user.Group);
-        }
+		/// <summary> Gets the user group if a user friendly name.</summary>
+		/// <param name="user"></param>
+		/// <returns></returns>
+		public static string GetUserGroupDisplayName(this User user)
+		{
+			return string.Join(" & ", user.Group);
+		}
 
 
-        /// <summary> Called when page is shown. </summary>
-        /// <param name="resourceUrl">Url to load data from.</param>
-        /// <param name="isSiteCachingOn">Holds value wether site caching is on or off.</param>
-        /// <param name="resourceProvider"> Provides resource from embedded ressources.</param>
-        public static async Task<string> GetSource(
-            string resourceUrl,
-            bool isSiteCachingOn,
-            Func<string> resourceProvider = null)
-        {
-            if (!Barrel.Current.IsExpired(resourceUrl) && isSiteCachingOn)
-            {
-                // Cached html is still valid and caching is on.
-                return Barrel.Current.Get<string>(resourceUrl);
-            }
+		/// <summary> Called when page is shown. </summary>
+		/// <param name="resourceUrl">Url to load data from.</param>
+		/// <param name="isSiteCachingOn">Holds value wether site caching is on or off.</param>
+		/// <param name="resourceProvider"> Provides resource from embedded ressources.</param>
+		public static async Task<string> GetSource(
+			string resourceUrl,
+			bool isSiteCachingOn,
+			Func<string> resourceProvider = null)
+		{
+			if (!Barrel.Current.IsExpired(resourceUrl) && isSiteCachingOn)
+			{
+				// Cached html is still valid and caching is on.
+				return Barrel.Current.Get<string>(resourceUrl);
+			}
 
-            string htmlContent = string.Empty;
+			string htmlContent = string.Empty;
 
-            try
-            {
-                // Get info from web server.
-                htmlContent = await CopriCallsHttps.Get(resourceUrl);
-            }
-            catch (Exception l_oException)
-            {
-                // Getting html failed.
-                Log.Error($"Requesting {resourceUrl} failed. {l_oException.Message}");
-            }
+			try
+			{
+				// Get info from web server.
+				htmlContent = await CopriCallsHttps.Get(resourceUrl);
+			}
+			catch (Exception l_oException)
+			{
+				// Getting html failed.
+				Log.Error($"Requesting {resourceUrl} failed. {l_oException.Message}");
+			}
 
-            switch (string.IsNullOrEmpty(htmlContent))
-            {
-                case true:
-                    // An error occurred getting resource from web
-                    htmlContent = Barrel.Current.Exists(resourceUrl)
-                        ? Barrel.Current.Get<string>(key: resourceUrl) // Get from MonkeyCache
-                        : resourceProvider != null ? resourceProvider() : $"<DOCTYPE html>Error loading {resourceUrl}.";  // Get build in ressource.
-                    break;
+			switch (string.IsNullOrEmpty(htmlContent))
+			{
+				case true:
+					// An error occurred getting resource from web
+					htmlContent = Barrel.Current.Exists(resourceUrl)
+						? Barrel.Current.Get<string>(key: resourceUrl) // Get from MonkeyCache
+						: resourceProvider != null ? resourceProvider() : $"<DOCTYPE html>Error loading {resourceUrl}.";  // Get build in ressource.
+					break;
 
-                default:
-                    // Add resource to cache.
-                    Barrel.Current.Add(key: resourceUrl, data: htmlContent, expireIn: isSiteCachingOn ? TimeSpan.FromDays(1) : TimeSpan.FromMilliseconds(1));
-                    break;
-            }
+				default:
+					// Add resource to cache.
+					Barrel.Current.Add(key: resourceUrl, data: htmlContent, expireIn: isSiteCachingOn ? TimeSpan.FromDays(1) : TimeSpan.FromMilliseconds(1));
+					break;
+			}
 
-            return htmlContent ?? FromBody("An error occurred loading html- ressource.");
-        }
+			return htmlContent ?? FromBody("An error occurred loading html- ressource.");
+		}
 
-        public static string FromBody(string message) => $"<!DOCTYPE html><html lang=\"de\"><head><title>Error Information</title></head><body>{message}</body></html>";
-    }
+		public static string FromBody(string message) => $"<!DOCTYPE html><html lang=\"de\"><head><title>Error Information</title></head><body>{message}</body></html>";
+	}
 }
diff --git a/TINKLib/ViewModel/WhatsNew/Agb/AgbViewModel.cs b/TINKLib/ViewModel/WhatsNew/Agb/AgbViewModel.cs
index abd8195..0151382 100644
--- a/TINKLib/ViewModel/WhatsNew/Agb/AgbViewModel.cs
+++ b/TINKLib/ViewModel/WhatsNew/Agb/AgbViewModel.cs
@@ -8,78 +8,78 @@ using Xamarin.Forms;
 
 namespace TINK.ViewModel.WhatsNew.Agb
 {
-    public class AgbViewModel : INotifyPropertyChanged
-    {
-        /// <summary> Fired whenever a property changed.</summary>
-        public event PropertyChangedEventHandler PropertyChanged;
+	public class AgbViewModel : INotifyPropertyChanged
+	{
+		/// <summary> Fired whenever a property changed.</summary>
+		public event PropertyChangedEventHandler PropertyChanged;
 
-        /// <summary> Holds the name of the host.</summary>
-        private string HostName { get; }
+		/// <summary> Holds the name of the host.</summary>
+		private string HostName { get; }
 
-        /// <summary> Holds value wether site caching is on or off.</summary>
-        bool IsSiteCachingOn { get; }
+		/// <summary> Holds value wether site caching is on or off.</summary>
+		bool IsSiteCachingOn { get; }
 
-        /// <summary>
-        /// Holds the current ui two letter ISO language name.
-        /// </summary>
-        private string UiIsoLanguageName { get; }
+		/// <summary>
+		/// Holds the current ui two letter ISO language name.
+		/// </summary>
+		private string UiIsoLanguageName { get; }
 
-        /// <summary> Constructs AGB view model</summary>
-        /// <param name="isSiteCachingOn">Holds value wether site caching is on or off.</param>
-        /// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
-        /// <param name="resourceProvider">Delegate to get an an embedded html ressource. Used as fallback if download from web page does not work and cache is empty.</param>
-        /// <param name="viewService">View service to close page.</param>
-        public AgbViewModel(
-            string hostName,
-            bool isSiteCachingOn,
-            string uiIsoLangugageName,
-            Func<string, string> resourceProvider,
-            IViewService viewService)
-        {
-            HostName = hostName;
-            IsSiteCachingOn = isSiteCachingOn;
-            UiIsoLanguageName = uiIsoLangugageName;
+		/// <summary> Constructs AGB view model</summary>
+		/// <param name="isSiteCachingOn">Holds value wether site caching is on or off.</param>
+		/// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
+		/// <param name="resourceProvider">Delegate to get an an embedded html ressource. Used as fallback if download from web page does not work and cache is empty.</param>
+		/// <param name="viewService">View service to close page.</param>
+		public AgbViewModel(
+			string hostName,
+			bool isSiteCachingOn,
+			string uiIsoLangugageName,
+			Func<string, string> resourceProvider,
+			IViewService viewService)
+		{
+			HostName = hostName;
+			IsSiteCachingOn = isSiteCachingOn;
+			UiIsoLanguageName = uiIsoLangugageName;
 
-            ViewService = viewService
-                ?? throw new ArgumentException($"Can not instantiate {typeof(WhatsNewViewModel)}-object. No view available.");
+			ViewService = viewService
+				?? throw new ArgumentException($"Can not instantiate {typeof(WhatsNewViewModel)}-object. No view available.");
 
-            ResourceProvider = resourceProvider
-                ?? throw new ArgumentException($"Can not instantiate {typeof(WhatsNewViewModel)}-object. No ressource provider availalbe.");
-        }
+			ResourceProvider = resourceProvider
+				?? throw new ArgumentException($"Can not instantiate {typeof(WhatsNewViewModel)}-object. No ressource provider availalbe.");
+		}
 
-        /// <summary> Gets the platfrom specific prefix. </summary>
-        private Func<string, string> ResourceProvider { get; set; }
+		/// <summary> Gets the platfrom specific prefix. </summary>
+		private Func<string, string> ResourceProvider { get; set; }
 
-        /// <summary> Agb information text.</summary>
-        private HtmlWebViewSource infoAgb;
+		/// <summary> Agb information text.</summary>
+		private HtmlWebViewSource infoAgb;
 
-        /// <summary> Agb information text.</summary>
-        public HtmlWebViewSource InfoAgb
-        {
-            get => infoAgb;
-            set
-            {
-                infoAgb = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(InfoAgb)));
-            }
-        }
+		/// <summary> Agb information text.</summary>
+		public HtmlWebViewSource InfoAgb
+		{
+			get => infoAgb;
+			set
+			{
+				infoAgb = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(InfoAgb)));
+			}
+		}
 
-        /// <summary> Called when page is shown. </summary>
-        public async Task OnAppearing()
-        {
-            InfoAgb = await InfoPageViewModel.GetAgb(HostName, "agbResourcePath", IsSiteCachingOn, UiIsoLanguageName);
-        }
+		/// <summary> Called when page is shown. </summary>
+		public async Task OnAppearing()
+		{
+			InfoAgb = await InfoPageViewModel.GetAgb(HostName, "agbResourcePath", IsSiteCachingOn, UiIsoLanguageName);
+		}
 
-        /// <summary> User clicks OK button.</summary>
-        public ICommand OnOk
-        {
-            get
-            {
-                return new Command(async () => await ViewService.PopModalAsync());
-            }
-        }
+		/// <summary> User clicks OK button.</summary>
+		public ICommand OnOk
+		{
+			get
+			{
+				return new Command(async () => await ViewService.PopModalAsync());
+			}
+		}
 
-        /// <summary> Reference to view service object.</summary>
-        private IViewService ViewService;
-    }
+		/// <summary> Reference to view service object.</summary>
+		private IViewService ViewService;
+	}
 }
diff --git a/TINKLib/ViewModel/WhatsNew/WhatsNewViewModel.cs b/TINKLib/ViewModel/WhatsNew/WhatsNewViewModel.cs
index 875024e..b9b7e63 100644
--- a/TINKLib/ViewModel/WhatsNew/WhatsNewViewModel.cs
+++ b/TINKLib/ViewModel/WhatsNew/WhatsNewViewModel.cs
@@ -7,101 +7,101 @@ using Xamarin.Forms;
 
 namespace TINK.ViewModel.WhatsNew
 {
-    public class WhatsNewViewModel
-    {
-        /// <summary> Constructs view model. </summary>
-        /// <param name="currentVersion"></param>
-        /// <param name="whatsNewText"></param>
-        /// <param name="isShowAgbRequired"></param>
-        /// <param name="showMasterDetail">Delegate to invoke master detail.</param>
-        /// <param name="p_oViewService">View service to show agb- page.</param>
-        public WhatsNewViewModel(
-            Version currentVersion,
-            IDictionary<Version, string> whatsNewText,
-            bool isShowAgbRequired,
-            Action showMasterDetail,
-            IViewService p_oViewService)
-        {
-            ViewService = p_oViewService
-               ?? throw new ArgumentException($"Can not instantiate {typeof(WhatsNewViewModel)}-object. No view available.");
+	public class WhatsNewViewModel
+	{
+		/// <summary> Constructs view model. </summary>
+		/// <param name="currentVersion"></param>
+		/// <param name="whatsNewText"></param>
+		/// <param name="isShowAgbRequired"></param>
+		/// <param name="showMasterDetail">Delegate to invoke master detail.</param>
+		/// <param name="p_oViewService">View service to show agb- page.</param>
+		public WhatsNewViewModel(
+			Version currentVersion,
+			IDictionary<Version, string> whatsNewText,
+			bool isShowAgbRequired,
+			Action showMasterDetail,
+			IViewService p_oViewService)
+		{
+			ViewService = p_oViewService
+			   ?? throw new ArgumentException($"Can not instantiate {typeof(WhatsNewViewModel)}-object. No view available.");
 
-            ShowMasterDetail = showMasterDetail
-                ?? throw new ArgumentException($"Can not instantiate {typeof(WhatsNewViewModel)}-object. No delegate to activated maste detail page avilable.");
+			ShowMasterDetail = showMasterDetail
+				?? throw new ArgumentException($"Can not instantiate {typeof(WhatsNewViewModel)}-object. No delegate to activated maste detail page avilable.");
 
-            CurrentVersion = currentVersion;
-            WhatsNewText = new FormattedString();
-            WhatsNewText.Spans.Add(new Span { Text = GetWhatNextHtmlText(whatsNewText) });
-            IsAgbChangedVisible = isShowAgbRequired;
-        }
+			CurrentVersion = currentVersion;
+			WhatsNewText = new FormattedString();
+			WhatsNewText.Spans.Add(new Span { Text = GetWhatNextHtmlText(whatsNewText) });
+			IsAgbChangedVisible = isShowAgbRequired;
+		}
 
-        public Version CurrentVersion { get; }
+		public Version CurrentVersion { get; }
 
-        public FormattedString WhatsNewText { get; }
+		public FormattedString WhatsNewText { get; }
 
-        /// <summary>
-        /// Title of the WhatsNewPage.
-        /// </summary>
-        public string WhatsNewTitle
-        {
-            get
-            {
-                // Get version info.
-                return $"Neu in Version {CurrentVersion}";
-            }
-        }
+		/// <summary>
+		/// Title of the WhatsNewPage.
+		/// </summary>
+		public string WhatsNewTitle
+		{
+			get
+			{
+				// Get version info.
+				return $"Neu in Version {CurrentVersion}";
+			}
+		}
 
-        /// <summary> Text saying that AGBs were modified.</summary>
-        public FormattedString AgbChangedText
-        {
-            get
-            {
-                var l_oHint = new FormattedString();
-                l_oHint.Spans.Add(new Span { Text = "AGBs ", ForegroundColor = ViewModelHelper.LINK_COLOR });
-                l_oHint.Spans.Add(new Span { Text = "überarbeitet.\r\n" });
+		/// <summary> Text saying that AGBs were modified.</summary>
+		public FormattedString AgbChangedText
+		{
+			get
+			{
+				var l_oHint = new FormattedString();
+				l_oHint.Spans.Add(new Span { Text = "AGBs ", ForegroundColor = ViewModelHelper.LINK_COLOR });
+				l_oHint.Spans.Add(new Span { Text = "überarbeitet.\r\n" });
 
-                return l_oHint;
-            }
-        }
+				return l_oHint;
+			}
+		}
 
-        public bool IsAgbChangedVisible { get; }
+		public bool IsAgbChangedVisible { get; }
 
-        /// <summary> Command object to bind agb link to view model.</summary>
-        public ICommand OnShowAgbTapped
-        {
-            get
-            {
-                return new Command(async () => await ViewService.PushModalAsync(ViewTypes.AgbPage));
-            }
-        }
+		/// <summary> Command object to bind agb link to view model.</summary>
+		public ICommand OnShowAgbTapped
+		{
+			get
+			{
+				return new Command(async () => await ViewService.PushModalAsync(ViewTypes.AgbPage));
+			}
+		}
 
-        /// <summary> Called when dialog is disappearing.</summary>
-        /// <param name="setWhatsNewWasShown"></param>
-        public void OnDisappearing(Action setWhatsNewWasShown)
-        {
-            setWhatsNewWasShown();
-        }
+		/// <summary> Called when dialog is disappearing.</summary>
+		/// <param name="setWhatsNewWasShown"></param>
+		public void OnDisappearing(Action setWhatsNewWasShown)
+		{
+			setWhatsNewWasShown();
+		}
 
 #if !SHOWFEEDBACK
-        public bool IsFeedbackVisible => false;
+		public bool IsFeedbackVisible => false;
 #else
         public bool IsFeedbackVisible => true;
 #endif
-        /// <summary> User clicks rate button.</summary>
-        public ICommand OnOk
-        {
-            get
-            {
-                return new Command(() => ShowMasterDetail());
-            }
-        }
+		/// <summary> User clicks rate button.</summary>
+		public ICommand OnOk
+		{
+			get
+			{
+				return new Command(() => ShowMasterDetail());
+			}
+		}
 
-        /// <summary>Reference to view service object.</summary>
-        private readonly IViewService ViewService;
+		/// <summary>Reference to view service object.</summary>
+		private readonly IViewService ViewService;
 
-        /// <summary>Reference to view service object.</summary>
-        private Action ShowMasterDetail { get; }
+		/// <summary>Reference to view service object.</summary>
+		private Action ShowMasterDetail { get; }
 
-        public static string GetWhatNextHtmlText(IDictionary<Version, string> whatsNew)
-            => string.Join("", whatsNew.Select(element => $"<p><b>{element.Key}</b><br/>{element.Value}</p>").ToArray());
-    }
+		public static string GetWhatNextHtmlText(IDictionary<Version, string> whatsNew)
+			=> string.Join("", whatsNew.Select(element => $"<p><b>{element.Key}</b><br/>{element.Value}</p>").ToArray());
+	}
 }
diff --git a/TINKLib/ViewTypes.cs b/TINKLib/ViewTypes.cs
index e0acd96..dafe0ad 100644
--- a/TINKLib/ViewTypes.cs
+++ b/TINKLib/ViewTypes.cs
@@ -1,23 +1,23 @@
 namespace TINK
 {
-    /// <summary> Holds a entry for each page of the TINK app.</summary>
-    public enum ViewTypes
-    {
-        LoginPage,
-        MapPage,
-        RegisterPage,
-        PasswordForgottenPage,
-        BikeInfoCarouselPage,
-        MyBikesPage,
-        SettingsPage,
-        TabbedPageInfo,
-        FeesAndBikesPage,
-        ManageAccountPage,
-        AgbPage,
-        WhatsNewPage,
-        BikesAtStation,
-        ContactPage,
-        SelectStationPage,
-        MiniSurvey
-    }
+	/// <summary> Holds a entry for each page of the TINK app.</summary>
+	public enum ViewTypes
+	{
+		LoginPage,
+		MapPage,
+		RegisterPage,
+		PasswordForgottenPage,
+		BikeInfoCarouselPage,
+		MyBikesPage,
+		SettingsPage,
+		TabbedPageInfo,
+		FeesAndBikesPage,
+		ManageAccountPage,
+		AgbPage,
+		WhatsNewPage,
+		BikesAtStation,
+		ContactPage,
+		SelectStationPage,
+		MiniSurvey
+	}
 }
diff --git a/TestFramework/LoginSessionCopriInfo.cs b/TestFramework/LoginSessionCopriInfo.cs
index 5725f2d..92b6344 100644
--- a/TestFramework/LoginSessionCopriInfo.cs
+++ b/TestFramework/LoginSessionCopriInfo.cs
@@ -1,65 +1,65 @@
 namespace TestTINKLib
 {
-    /// <summary>
-    /// Object do define login session info from copri. 
-    /// </summary>
-    public struct LoginSessionCopriInfo
-    {
-        public LoginSessionCopriInfo(
-            string p_strMail,
-            string p_strPwd,
-            string p_strAuthCookie,
-            string p_strDeviceId)
-        {
-            Mail = p_strMail;
-            Pwd = p_strPwd;
-            AuthCookie = p_strAuthCookie;
-            DeviceId = p_strDeviceId;
-        }
+	/// <summary>
+	/// Object do define login session info from copri. 
+	/// </summary>
+	public struct LoginSessionCopriInfo
+	{
+		public LoginSessionCopriInfo(
+			string p_strMail,
+			string p_strPwd,
+			string p_strAuthCookie,
+			string p_strDeviceId)
+		{
+			Mail = p_strMail;
+			Pwd = p_strPwd;
+			AuthCookie = p_strAuthCookie;
+			DeviceId = p_strDeviceId;
+		}
 
-        public string Mail { get; private set; }
-        public string Pwd { get; private set; }
-        public string AuthCookie { get; private set; }
-        public string DeviceId { get; private set; }
+		public string Mail { get; private set; }
+		public string Pwd { get; private set; }
+		public string AuthCookie { get; private set; }
+		public string DeviceId { get; private set; }
 
-        /// <summary>
-        /// First test user which typically has some bikes.
-        /// </summary>
-        public static LoginSessionCopriInfo JavaministerHardwareNr1 = new LoginSessionCopriInfo(
-            "javaminister@gmail.com",
-            "javaminister",
-            "6103_4da3044c8657a04ba60e2eaa753bc51a_",
-            "HwId1000000000000"
-            );
+		/// <summary>
+		/// First test user which typically has some bikes.
+		/// </summary>
+		public static LoginSessionCopriInfo JavaministerHardwareNr1 = new LoginSessionCopriInfo(
+			"javaminister@gmail.com",
+			"javaminister",
+			"6103_4da3044c8657a04ba60e2eaa753bc51a_",
+			"HwId1000000000000"
+			);
 
-        /// <summary>
-        /// First test user which typically has some bikes.
-        /// </summary>
-        public static LoginSessionCopriInfo SkiministerHardwareNr1 = new LoginSessionCopriInfo(
-            "skiminister@posteo.de",
-            "skiminister",
-            "",
-            "HwId1000000000000"
-            );
+		/// <summary>
+		/// First test user which typically has some bikes.
+		/// </summary>
+		public static LoginSessionCopriInfo SkiministerHardwareNr1 = new LoginSessionCopriInfo(
+			"skiminister@posteo.de",
+			"skiminister",
+			"",
+			"HwId1000000000000"
+			);
 
-        /// <summary>
-        /// User which does not exist in copri.
-        /// </summary>
-        public static LoginSessionCopriInfo JavaministerGibtsNet = new LoginSessionCopriInfo(
-            "javaminister@gmail.com.GibtsNet",
-            "javaminister",
-            "",
-            "HwId1000000000000"
-            );
+		/// <summary>
+		/// User which does not exist in copri.
+		/// </summary>
+		public static LoginSessionCopriInfo JavaministerGibtsNet = new LoginSessionCopriInfo(
+			"javaminister@gmail.com.GibtsNet",
+			"javaminister",
+			"",
+			"HwId1000000000000"
+			);
 
-        /// <summary>
-        /// User which does not exist in copri.
-        /// </summary>
-        public static LoginSessionCopriInfo JavaministerKeksGibtsNet = new LoginSessionCopriInfo(
-            "javaminister@gmail.com",
-            "javaminister",
-            "6103_ThisKeksDoesNotExist_",
-            "HwId1000000000000"
-            );
-    }
+		/// <summary>
+		/// User which does not exist in copri.
+		/// </summary>
+		public static LoginSessionCopriInfo JavaministerKeksGibtsNet = new LoginSessionCopriInfo(
+			"javaminister@gmail.com",
+			"javaminister",
+			"6103_ThisKeksDoesNotExist_",
+			"HwId1000000000000"
+			);
+	}
 }
diff --git a/TestFramework/Model/Device/DeviceMock.cs b/TestFramework/Model/Device/DeviceMock.cs
index 1a31c61..e71c288 100644
--- a/TestFramework/Model/Device/DeviceMock.cs
+++ b/TestFramework/Model/Device/DeviceMock.cs
@@ -3,45 +3,45 @@ using Xamarin.Essentials;
 
 namespace TestFramework.Model.Device
 {
-    public class DeviceMock : ISmartDevice
-    {
-        /// <summary>
-        /// Holds the id of the device.
-        /// </summary>
-        private string m_strDeviceId = "522c6ff6886198fd";
+	public class DeviceMock : ISmartDevice
+	{
+		/// <summary>
+		/// Holds the id of the device.
+		/// </summary>
+		private string m_strDeviceId = "522c6ff6886198fd";
 
-        public string Manufacturer => throw new System.NotImplementedException();
+		public string Manufacturer => throw new System.NotImplementedException();
 
-        public string Model => throw new System.NotImplementedException();
+		public string Model => throw new System.NotImplementedException();
 
-        public DevicePlatform Platform => DevicePlatform.UWP;
+		public DevicePlatform Platform => DevicePlatform.UWP;
 
-        public string VersionText => throw new System.NotImplementedException();
+		public string VersionText => throw new System.NotImplementedException();
 
-        /// <summary>
-        /// Constructs a device mock object setting device id to default value.
-        /// </summary>
-        public DeviceMock()
-        {
-        }
+		/// <summary>
+		/// Constructs a device mock object setting device id to default value.
+		/// </summary>
+		public DeviceMock()
+		{
+		}
 
-        /// <summary>
-        /// Constructs a device mock object.
-        /// </summary>
-        /// <param name="p_strDeviceId">Mocked Id</param>
-        public DeviceMock(string p_strDeviceId)
-        {
-            m_strDeviceId = p_strDeviceId;
-        }
+		/// <summary>
+		/// Constructs a device mock object.
+		/// </summary>
+		/// <param name="p_strDeviceId">Mocked Id</param>
+		public DeviceMock(string p_strDeviceId)
+		{
+			m_strDeviceId = p_strDeviceId;
+		}
 
-        /// <summary> Gets the device ID.</summary>
-        /// <returns></returns>
-        public string Identifier
-            => m_strDeviceId;
+		/// <summary> Gets the device ID.</summary>
+		/// <returns></returns>
+		public string Identifier
+			=> m_strDeviceId;
 
-        /// <summary> Close the application. </summary>
-        public void CloseApplication()
-        {
-        }
-    }
+		/// <summary> Close the application. </summary>
+		public void CloseApplication()
+		{
+		}
+	}
 }
diff --git a/TestFramework/Model/Device/SpecialFolderMock.cs b/TestFramework/Model/Device/SpecialFolderMock.cs
index ed43f7f..0c13a3a 100644
--- a/TestFramework/Model/Device/SpecialFolderMock.cs
+++ b/TestFramework/Model/Device/SpecialFolderMock.cs
@@ -2,22 +2,22 @@
 
 namespace TestFramework.Model.Device
 {
-    public class SpecialFolderMock : ISpecialFolder
-    {
-        /// <summary>
-        /// Get the folder name of external folder to write to.
-        /// </summary>
-        /// <returns></returns>
-        public string GetExternalFilesDir()
-        {
-            return string.Empty;
-        }
+	public class SpecialFolderMock : ISpecialFolder
+	{
+		/// <summary>
+		/// Get the folder name of external folder to write to.
+		/// </summary>
+		/// <returns></returns>
+		public string GetExternalFilesDir()
+		{
+			return string.Empty;
+		}
 
-        /// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
-        /// <returns>Directory name.</returns>
-        public string GetInternalPersonalDir()
-        {
-            return System.IO.Path.GetTempPath();
-        }
-    }
+		/// <summary> Gets the folder name of the personal data folder dir on internal storage. </summary>
+		/// <returns>Directory name.</returns>
+		public string GetInternalPersonalDir()
+		{
+			return System.IO.Path.GetTempPath();
+		}
+	}
 }
diff --git a/TestFramework/Model/User/Account/StoreMock.cs b/TestFramework/Model/User/Account/StoreMock.cs
index 3a47a41..41bb26a 100644
--- a/TestFramework/Model/User/Account/StoreMock.cs
+++ b/TestFramework/Model/User/Account/StoreMock.cs
@@ -3,39 +3,39 @@ using TINK.Model.User.Account;
 
 namespace TestFramework.Model.User.Account
 {
-    public class StoreMock : IStore
-    {
-        IAccount m_oAccount;
+	public class StoreMock : IStore
+	{
+		IAccount m_oAccount;
 
-        /// <summary>
-        /// Instantiates
-        /// - a dummy account to simulate a logged in user before end of last session
-        /// - an empty account to simulate no user logged in before end of last session
-        /// </summary>
-        /// <param name="p_oAccount">If null no user is logged in.</param>
-        public StoreMock(IAccount p_oAccount = null)
-        {
-            m_oAccount = new TINK.Model.User.Account.Account(p_oAccount ?? new EmptyAccount());
-        }
+		/// <summary>
+		/// Instantiates
+		/// - a dummy account to simulate a logged in user before end of last session
+		/// - an empty account to simulate no user logged in before end of last session
+		/// </summary>
+		/// <param name="p_oAccount">If null no user is logged in.</param>
+		public StoreMock(IAccount p_oAccount = null)
+		{
+			m_oAccount = new TINK.Model.User.Account.Account(p_oAccount ?? new EmptyAccount());
+		}
 
-        public Task<IAccount> Load()
-        {
-            return Task.FromResult<IAccount>(new TINK.Model.User.Account.Account(m_oAccount));
-        }
+		public Task<IAccount> Load()
+		{
+			return Task.FromResult<IAccount>(new TINK.Model.User.Account.Account(m_oAccount));
+		}
 
-        public IAccount Delete(IAccount p_oAccount)
-        {
-            // Set member to empty.
-            m_oAccount = new EmptyAccount();
+		public IAccount Delete(IAccount p_oAccount)
+		{
+			// Set member to empty.
+			m_oAccount = new EmptyAccount();
 
-            // Return empty account.
-            return new EmptyAccount();
-        }
+			// Return empty account.
+			return new EmptyAccount();
+		}
 
-        public Task Save(IAccount p_oAccount)
-        {
-            m_oAccount = new TINK.Model.User.Account.Account(p_oAccount);
-            return Task.CompletedTask;
-        }
-    }
+		public Task Save(IAccount p_oAccount)
+		{
+			m_oAccount = new TINK.Model.User.Account.Account(p_oAccount);
+			return Task.CompletedTask;
+		}
+	}
 }
diff --git a/TestFramework/Repository/CopriCallMemoryBase.cs b/TestFramework/Repository/CopriCallMemoryBase.cs
index d641586..f0d2cc9 100644
--- a/TestFramework/Repository/CopriCallMemoryBase.cs
+++ b/TestFramework/Repository/CopriCallMemoryBase.cs
@@ -11,304 +11,304 @@ using TINK.Repository.Response;
 
 namespace TestFramework.Repository
 {
-    /// <summary> Provides functionality for keeping a set of COPRI responses. </summary>
-    public abstract class CopriCallMemoryBase
-    {
-        private string BikesAvailableResponse { get; }
+	/// <summary> Provides functionality for keeping a set of COPRI responses. </summary>
+	public abstract class CopriCallMemoryBase
+	{
+		private string BikesAvailableResponse { get; }
 
-        private string BikesOccupiedResponse { get; }
+		private string BikesOccupiedResponse { get; }
 
-        private string AuthResponse { get; }
+		private string AuthResponse { get; }
 
-        private string AuthOutResponse { get; }
+		private string AuthOutResponse { get; }
 
-        private string Stations { get; }
+		private string Stations { get; }
 
-        private string BookingRequestResponse { get; }
+		private string BookingRequestResponse { get; }
 
-        private string CancelBookingRequestResponse { get; }
+		private string CancelBookingRequestResponse { get; }
 
-        private IRequestBuilder requestBuilder;
+		private IRequestBuilder requestBuilder;
 
-        /// <summary>
-        /// Constructs copri server mock from build in resources.
-        /// </summary>
-        /// <param name="bikesAvailableResponseResource"></param>
-        /// <param name="bikesOccupiedResponseResoure"></param>
-        /// <param name="authResponseResource"></param>
-        /// <param name="authOutResponseResource"></param>
-        /// <param name="stationsResponseResource"></param>
-        /// <param name="bookingRequestResponseResource"></param>
-        /// <param name="cancelBookingRequestResponseResource"></param>
-        /// <param name="sessionCookie"></param>
-        public CopriCallMemoryBase(
-            string bikesAvailableResponseResource = null,
-            string bikesOccupiedResponseResoure = null,
-            string authResponseResource = null,
-            string authOutResponseResource = null,
-            string stationsResponseResource = null,
-            string bookingRequestResponseResource = null,
-            string cancelBookingRequestResponseResource = null,
-            string sessionCookie = null)
-        {
-            string ReadResource(string resourceName)
-            {
-                if (string.IsNullOrEmpty(resourceName))
-                    return string.Empty;
+		/// <summary>
+		/// Constructs copri server mock from build in resources.
+		/// </summary>
+		/// <param name="bikesAvailableResponseResource"></param>
+		/// <param name="bikesOccupiedResponseResoure"></param>
+		/// <param name="authResponseResource"></param>
+		/// <param name="authOutResponseResource"></param>
+		/// <param name="stationsResponseResource"></param>
+		/// <param name="bookingRequestResponseResource"></param>
+		/// <param name="cancelBookingRequestResponseResource"></param>
+		/// <param name="sessionCookie"></param>
+		public CopriCallMemoryBase(
+			string bikesAvailableResponseResource = null,
+			string bikesOccupiedResponseResoure = null,
+			string authResponseResource = null,
+			string authOutResponseResource = null,
+			string stationsResponseResource = null,
+			string bookingRequestResponseResource = null,
+			string cancelBookingRequestResponseResource = null,
+			string sessionCookie = null)
+		{
+			string ReadResource(string resourceName)
+			{
+				if (string.IsNullOrEmpty(resourceName))
+					return string.Empty;
 
-                using (var streamReader = new StreamReader(Assembly.GetExecutingAssembly().GetManifestResourceStream(resourceName)))
-                {
-                    return streamReader.ReadToEnd();
-                }
-            }
+				using (var streamReader = new StreamReader(Assembly.GetExecutingAssembly().GetManifestResourceStream(resourceName)))
+				{
+					return streamReader.ReadToEnd();
+				}
+			}
 
-            SessionCookie = sessionCookie;
+			SessionCookie = sessionCookie;
 
-            BikesAvailableResponse = ReadResource(bikesAvailableResponseResource);
-            BikesOccupiedResponse = ReadResource(bikesOccupiedResponseResoure);
-            AuthResponse = ReadResource(authResponseResource);
-            AuthOutResponse = ReadResource(authOutResponseResource);
-            Stations = ReadResource(stationsResponseResource);
-            BookingRequestResponse = ReadResource(bookingRequestResponseResource);
-            CancelBookingRequestResponse = ReadResource(cancelBookingRequestResponseResource);
+			BikesAvailableResponse = ReadResource(bikesAvailableResponseResource);
+			BikesOccupiedResponse = ReadResource(bikesOccupiedResponseResoure);
+			AuthResponse = ReadResource(authResponseResource);
+			AuthOutResponse = ReadResource(authOutResponseResource);
+			Stations = ReadResource(stationsResponseResource);
+			BookingRequestResponse = ReadResource(bookingRequestResponseResource);
+			CancelBookingRequestResponse = ReadResource(cancelBookingRequestResponseResource);
 
-            requestBuilder = string.IsNullOrEmpty(sessionCookie)
-                ? new RequestBuilder(MerchantId, null /*UI language */) as IRequestBuilder
-                : new RequestBuilderLoggedIn(MerchantId, null /*UI language */, sessionCookie);
-        }
+			requestBuilder = string.IsNullOrEmpty(sessionCookie)
+				? new RequestBuilder(MerchantId, null /*UI language */) as IRequestBuilder
+				: new RequestBuilderLoggedIn(MerchantId, null /*UI language */, sessionCookie);
+		}
 
-        /// <summary> Holds the session id of the logged in user, null otherwise. </summary>
-        public string SessionCookie { get; private set; }
+		/// <summary> Holds the session id of the logged in user, null otherwise. </summary>
+		public string SessionCookie { get; private set; }
 
-        /// <summary> Logs user in. </summary>
-        /// <param name="p_oUser">User to log in.</param>
-        /// <param name="deviceId">Id specifying user and hardware.</param>
-        /// <param name="mailAddress">Mailaddress of user to log in.</param>
-        /// <param name="password">Password to log in.</param>
-        /// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
-        public async Task<AuthorizationResponse> DoAuthorizationAsync(
-            string mailAddress,
-            string password,
-            string deviceId)
-            => await Task.Run(() => DoAuthorize(AuthResponse, mailAddress, password, deviceId));
+		/// <summary> Logs user in. </summary>
+		/// <param name="p_oUser">User to log in.</param>
+		/// <param name="deviceId">Id specifying user and hardware.</param>
+		/// <param name="mailAddress">Mailaddress of user to log in.</param>
+		/// <param name="password">Password to log in.</param>
+		/// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
+		public async Task<AuthorizationResponse> DoAuthorizationAsync(
+			string mailAddress,
+			string password,
+			string deviceId)
+			=> await Task.Run(() => DoAuthorize(AuthResponse, mailAddress, password, deviceId));
 
-        /// <summary> Logs user out. </summary>
-        /// <param name="sessionCookie">User to log in.</param>
-        /// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
-        public async Task<AuthorizationoutResponse> DoAuthoutAsync()
-            => await Task.Run(() => DoAuthout(AuthOutResponse, SessionCookie));
+		/// <summary> Logs user out. </summary>
+		/// <param name="sessionCookie">User to log in.</param>
+		/// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
+		public async Task<AuthorizationoutResponse> DoAuthoutAsync()
+			=> await Task.Run(() => DoAuthout(AuthOutResponse, SessionCookie));
 
-        /// <summary>
-        /// Gets list of bikes from memory.
-        /// </summary>
-        /// <returns></returns>
-        public async Task<BikesAvailableResponse> GetBikesAvailableAsync()
-            => await Task.Run(() => GetBikesAvailable(BikesAvailableResponse, null, SessionCookie));
+		/// <summary>
+		/// Gets list of bikes from memory.
+		/// </summary>
+		/// <returns></returns>
+		public async Task<BikesAvailableResponse> GetBikesAvailableAsync()
+			=> await Task.Run(() => GetBikesAvailable(BikesAvailableResponse, null, SessionCookie));
 
-        /// <summary>
-        /// Gets a list of bikes reserved/ booked by acctive user from Copri.
-        /// </summary>
-        /// <param name="p_strSessionCookie">Cookie to authenticate user.</param>
-        /// <returns>Response holding list of bikes.</returns>
-        public async Task<BikesReservedOccupiedResponse> GetBikesOccupiedAsync()
-        {
-            try
-            {
-                requestBuilder.GetBikesOccupied(); // Non mock implementation if ICopriServer call this member as well. To ensure comparable behaviour this member is called here as well.
-            }
-            catch (NotSupportedException)
-            {
-                // No user logged in.
-                await Task.CompletedTask;
-                return ResponseHelper.GetBikesOccupiedNone();
-            }
-            return await Task.Run(() => GetBikesOccupied(BikesOccupiedResponse, SessionCookie));
-        }
+		/// <summary>
+		/// Gets a list of bikes reserved/ booked by acctive user from Copri.
+		/// </summary>
+		/// <param name="p_strSessionCookie">Cookie to authenticate user.</param>
+		/// <returns>Response holding list of bikes.</returns>
+		public async Task<BikesReservedOccupiedResponse> GetBikesOccupiedAsync()
+		{
+			try
+			{
+				requestBuilder.GetBikesOccupied(); // Non mock implementation if ICopriServer call this member as well. To ensure comparable behaviour this member is called here as well.
+			}
+			catch (NotSupportedException)
+			{
+				// No user logged in.
+				await Task.CompletedTask;
+				return ResponseHelper.GetBikesOccupiedNone();
+			}
+			return await Task.Run(() => GetBikesOccupied(BikesOccupiedResponse, SessionCookie));
+		}
 
-        /// <summary>
-        /// Get list of stations from file.
-        /// </summary>
-        /// <param name="p_strCookie">Auto cookie of user if user is logged in.</param>
-        /// <returns>List of files.</returns>
-        public async Task<StationsAvailableResponse> GetStationsAsync()
-            => await Task.Run(() => GetStationsAll(Stations, null, SessionCookie));
+		/// <summary>
+		/// Get list of stations from file.
+		/// </summary>
+		/// <param name="p_strCookie">Auto cookie of user if user is logged in.</param>
+		/// <returns>List of files.</returns>
+		public async Task<StationsAvailableResponse> GetStationsAsync()
+			=> await Task.Run(() => GetStationsAll(Stations, null, SessionCookie));
 
-        /// <summary>
-        /// Gets booking request response.
-        /// </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <returns>Booking response.</returns>
-        public async Task<ReservationBookingResponse> DoReserveAsync(string bikeId, Uri operatorUri)
-            => await Task.Run(() => DoReserve(BookingRequestResponse, bikeId, SessionCookie));
+		/// <summary>
+		/// Gets booking request response.
+		/// </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <returns>Booking response.</returns>
+		public async Task<ReservationBookingResponse> DoReserveAsync(string bikeId, Uri operatorUri)
+			=> await Task.Run(() => DoReserve(BookingRequestResponse, bikeId, SessionCookie));
 
-        /// <summary>
-        /// Gets canel booking request response.
-        /// </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <param name="p_strCookie">Cookie of the logged in user.</param>
-        /// <returns>Response on cancel booking request.</returns>
-        public async Task<ReservationCancelReturnResponse> DoCancelReservationAsync(string bikeId, Uri operatorUri)
-            => await Task.Run(() => DoCancelReservation(CancelBookingRequestResponse, bikeId, SessionCookie));
+		/// <summary>
+		/// Gets canel booking request response.
+		/// </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <param name="p_strCookie">Cookie of the logged in user.</param>
+		/// <returns>Response on cancel booking request.</returns>
+		public async Task<ReservationCancelReturnResponse> DoCancelReservationAsync(string bikeId, Uri operatorUri)
+			=> await Task.Run(() => DoCancelReservation(CancelBookingRequestResponse, bikeId, SessionCookie));
 
 
-        /// <summary> Gets the merchant id.</summary>
-        public string MerchantId => TinkApp.MerchantId;
+		/// <summary> Gets the merchant id.</summary>
+		public string MerchantId => TinkApp.MerchantId;
 
-        /// <summary> Returns false because cached values are returned. </summary>
-        public bool IsConnected => false;
+		/// <summary> Returns false because cached values are returned. </summary>
+		public bool IsConnected => false;
 
-        /// <summary> Logs user in. </summary>
-        /// <param name="deviceId">Id specifying user and hardware.</param>
-        /// <param name="mailAddress">Mailaddress of user to log in.</param>
-        /// <param name="password">Password to log in.</param>
-        /// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
-        public static AuthorizationResponse DoAuthorize(
-            string doAuthResponse,
-            string mailAddress,
-            string password,
-            string deviceId)
-        {
-            return mailAddress == "javaminister@gmail.com"
-                && password == "*********" &&
-                deviceId == "HwId1000000000000"
-                ? JsonConvertRethrow.DeserializeObject<ResponseContainer<AuthorizationResponse>>(doAuthResponse).shareejson
-                : JsonConvertRethrow.DeserializeObject<ResponseContainer<AuthorizationResponse>>(DO_AUTH_Unknown_User_FILE).shareejson;
+		/// <summary> Logs user in. </summary>
+		/// <param name="deviceId">Id specifying user and hardware.</param>
+		/// <param name="mailAddress">Mailaddress of user to log in.</param>
+		/// <param name="password">Password to log in.</param>
+		/// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
+		public static AuthorizationResponse DoAuthorize(
+			string doAuthResponse,
+			string mailAddress,
+			string password,
+			string deviceId)
+		{
+			return mailAddress == "javaminister@gmail.com"
+				&& password == "*********" &&
+				deviceId == "HwId1000000000000"
+				? JsonConvertRethrow.DeserializeObject<ResponseContainer<AuthorizationResponse>>(doAuthResponse).shareejson
+				: JsonConvertRethrow.DeserializeObject<ResponseContainer<AuthorizationResponse>>(DO_AUTH_Unknown_User_FILE).shareejson;
 
-        }
+		}
 
-        /// <summary> Logs user in. </summary>
-        /// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
-        public static AuthorizationoutResponse DoAuthout(
-            string authOutResponse,
-            string sessionCookie)
-        {
-            // Response contains auth cookie of user "JavaministerHardwareNr1"
-            // For this reason do not return answer if mail and pwd do not match.
+		/// <summary> Logs user in. </summary>
+		/// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
+		public static AuthorizationoutResponse DoAuthout(
+			string authOutResponse,
+			string sessionCookie)
+		{
+			// Response contains auth cookie of user "JavaministerHardwareNr1"
+			// For this reason do not return answer if mail and pwd do not match.
 
-            return !string.IsNullOrEmpty(sessionCookie)
-                ? JsonConvertRethrow.DeserializeObject<ResponseContainer<AuthorizationoutResponse>>(authOutResponse).shareejson
-                : throw new NotSupportedException();
+			return !string.IsNullOrEmpty(sessionCookie)
+				? JsonConvertRethrow.DeserializeObject<ResponseContainer<AuthorizationoutResponse>>(authOutResponse).shareejson
+				: throw new NotSupportedException();
 
-        }
+		}
 
-        /// <summary>
-        /// Gets list of bikes from memory.
-        /// </summary>
-        /// <param name="p_strMerchantId">Id of the merchant.</param>
-        /// <param name="p_strSessionCookie">Auto cookie of user if user is logged in.</param>
-        /// <param name="p_eSampleSet">Set of samples.</param>
-        /// <param name="p_lStageIndex">Index of the stage.</param>
-        /// <returns></returns>
-        public static BikesAvailableResponse GetBikesAvailable(
-            string BikesAvailableResponse,
-            string p_strMerchantId,
-            string p_strSessionCookie = null) =>
-            CopriCallsStatic.DeserializeResponse<BikesAvailableResponse>(BikesAvailableResponse);
+		/// <summary>
+		/// Gets list of bikes from memory.
+		/// </summary>
+		/// <param name="p_strMerchantId">Id of the merchant.</param>
+		/// <param name="p_strSessionCookie">Auto cookie of user if user is logged in.</param>
+		/// <param name="p_eSampleSet">Set of samples.</param>
+		/// <param name="p_lStageIndex">Index of the stage.</param>
+		/// <returns></returns>
+		public static BikesAvailableResponse GetBikesAvailable(
+			string BikesAvailableResponse,
+			string p_strMerchantId,
+			string p_strSessionCookie = null) =>
+			CopriCallsStatic.DeserializeResponse<BikesAvailableResponse>(BikesAvailableResponse);
 
-        /// <summary>
-        /// Gets stations response.
-        /// </summary>
-        /// <param name="merchantId">Id of the merchant.</param>
-        /// <param name="cookie">Auto cookie of user if user is logged in.</param>
-        /// <param name="p_eSampleSet"></param>
-        /// <param name="p_lStageIndex"></param>
-        /// <returns></returns>
-        public static StationsAvailableResponse GetStationsAll(
-            string stations,
-            string merchantId,
-            string cookie = null)
-            => JsonConvertRethrow.DeserializeObject<ResponseContainer<StationsAvailableResponse>>(stations).shareejson;
+		/// <summary>
+		/// Gets stations response.
+		/// </summary>
+		/// <param name="merchantId">Id of the merchant.</param>
+		/// <param name="cookie">Auto cookie of user if user is logged in.</param>
+		/// <param name="p_eSampleSet"></param>
+		/// <param name="p_lStageIndex"></param>
+		/// <returns></returns>
+		public static StationsAvailableResponse GetStationsAll(
+			string stations,
+			string merchantId,
+			string cookie = null)
+			=> JsonConvertRethrow.DeserializeObject<ResponseContainer<StationsAvailableResponse>>(stations).shareejson;
 
-        /// <summary>
-        /// Gets booking request response.
-        /// </summary>
-        /// <param name="bikeId">Id of the bike.</param>
-        /// <param name="sessionCookie">Identifies the logged in user.</param>
-        /// <param name="sampleSet">Sample set to use.</param>
-        /// <param name="stageIndex">Index of the stage.</param>
-        /// <returns></returns>
-        public static ReservationBookingResponse DoReserve(
-            string bookingRequestResponse,
-            string bikeId,
-            string sessionCookie)
-            => JsonConvertRethrow.DeserializeObject<ResponseContainer<ReservationBookingResponse>>(bookingRequestResponse).shareejson;
+		/// <summary>
+		/// Gets booking request response.
+		/// </summary>
+		/// <param name="bikeId">Id of the bike.</param>
+		/// <param name="sessionCookie">Identifies the logged in user.</param>
+		/// <param name="sampleSet">Sample set to use.</param>
+		/// <param name="stageIndex">Index of the stage.</param>
+		/// <returns></returns>
+		public static ReservationBookingResponse DoReserve(
+			string bookingRequestResponse,
+			string bikeId,
+			string sessionCookie)
+			=> JsonConvertRethrow.DeserializeObject<ResponseContainer<ReservationBookingResponse>>(bookingRequestResponse).shareejson;
 
-        /// <summary>
-        /// Gets canel booking request response.
-        /// </summary>
-        /// <param name="bikeId">Id of the bike to book.</param>
-        /// <param name="cookie">Cookie of the logged in user.</param>
-        /// <returns>Response on cancel booking request.</returns>
-        public static ReservationCancelReturnResponse DoCancelReservation(
-            string cancelBookingRequestResponse,
-            string bikeId,
-            string cookie)
-            => JsonConvertRethrow.DeserializeObject<ResponseContainer<ReservationCancelReturnResponse>>(cancelBookingRequestResponse).shareejson;
+		/// <summary>
+		/// Gets canel booking request response.
+		/// </summary>
+		/// <param name="bikeId">Id of the bike to book.</param>
+		/// <param name="cookie">Cookie of the logged in user.</param>
+		/// <returns>Response on cancel booking request.</returns>
+		public static ReservationCancelReturnResponse DoCancelReservation(
+			string cancelBookingRequestResponse,
+			string bikeId,
+			string cookie)
+			=> JsonConvertRethrow.DeserializeObject<ResponseContainer<ReservationCancelReturnResponse>>(cancelBookingRequestResponse).shareejson;
 
-        public Task<ReservationBookingResponse> CalculateAuthKeysAsync(string bikeId, Uri operatorUri)
-            => null;
+		public Task<ReservationBookingResponse> CalculateAuthKeysAsync(string bikeId, Uri operatorUri)
+			=> null;
 
-        public Task<ResponseBase> StartReturningBike(
-            string bikeId,
-            Uri operatorUri)
-            => null;
+		public Task<ResponseBase> StartReturningBike(
+			string bikeId,
+			Uri operatorUri)
+			=> null;
 
-        public Task<ReservationBookingResponse> UpdateLockingStateAsync(
-            string bikeId,
-            lock_state state,
-            Uri operatorUri,
-            LocationDto geolocation,
-            double batteryLevel)
-            => null;
+		public Task<ReservationBookingResponse> UpdateLockingStateAsync(
+			string bikeId,
+			lock_state state,
+			Uri operatorUri,
+			LocationDto geolocation,
+			double batteryLevel)
+			=> null;
 
-        public Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
-            => null;
-        public Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(string bikeId, Uri operatorUri)
-            => null;
+		public Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
+			=> null;
+		public Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(string bikeId, Uri operatorUri)
+			=> null;
 
-        public Task<ReservationBookingResponse> BookReservedAndStartOpeningAsync(string bikeId, Uri operatorUri)
-            => null;
+		public Task<ReservationBookingResponse> BookReservedAndStartOpeningAsync(string bikeId, Uri operatorUri)
+			=> null;
 
-        public Task<DoReturnResponse> DoReturn(
-            string bikeId,
-            LocationDto geolocation,
-            ISmartDevice smartDevice,
-            Uri operatorUri)
-            => null;
+		public Task<DoReturnResponse> DoReturn(
+			string bikeId,
+			LocationDto geolocation,
+			ISmartDevice smartDevice,
+			Uri operatorUri)
+			=> null;
 
-        public Task<DoReturnResponse> ReturnAndStartClosingAsync(
-            string bikeId,
-            ISmartDevice smartDevice,
-            Uri operatorUri)
-            => null;
+		public Task<DoReturnResponse> ReturnAndStartClosingAsync(
+			string bikeId,
+			ISmartDevice smartDevice,
+			Uri operatorUri)
+			=> null;
 
-        public Task<SubmitFeedbackResponse> DoSubmitFeedback(string bikeId, int? currentChargeBars, string message, bool isBikeBroken, Uri operatorUri)
-            => null;
+		public Task<SubmitFeedbackResponse> DoSubmitFeedback(string bikeId, int? currentChargeBars, string message, bool isBikeBroken, Uri operatorUri)
+			=> null;
 
-        /// <summary> Submits mini survey to copri server. </summary>
-        /// <param name="answers">Collection of answers.</param>
-        public Task<ResponseBase> DoSubmitMiniSurvey(IDictionary<string, string> answers)
-            => null;
+		/// <summary> Submits mini survey to copri server. </summary>
+		/// <param name="answers">Collection of answers.</param>
+		public Task<ResponseBase> DoSubmitMiniSurvey(IDictionary<string, string> answers)
+			=> null;
 
-        /// <summary>
-        /// Gets a list of bikes reserved/ booked by acctive user from Copri.
-        /// </summary>
-        /// <param name="sessionCookie">Cookie to authenticate user.</param>
-        /// <param name="SampleSet">Sample set to use.</param>
-        /// <param name="p_lStageIndex">Index of the stage.</param>
-        /// <returns>Response holding list of bikes.</returns>
-        public static BikesReservedOccupiedResponse GetBikesOccupied(
-            string bikesOccupied,
-            string sessionCookie = null)
-        {
-            var response = CopriCallsStatic.DeserializeResponse<BikesReservedOccupiedResponse>(bikesOccupied);
-            return sessionCookie != null && (response?.authcookie?.Contains(sessionCookie) ?? false)
-                ? response
-                : ResponseHelper.GetBikesOccupiedNone(sessionCookie);
+		/// <summary>
+		/// Gets a list of bikes reserved/ booked by acctive user from Copri.
+		/// </summary>
+		/// <param name="sessionCookie">Cookie to authenticate user.</param>
+		/// <param name="SampleSet">Sample set to use.</param>
+		/// <param name="p_lStageIndex">Index of the stage.</param>
+		/// <returns>Response holding list of bikes.</returns>
+		public static BikesReservedOccupiedResponse GetBikesOccupied(
+			string bikesOccupied,
+			string sessionCookie = null)
+		{
+			var response = CopriCallsStatic.DeserializeResponse<BikesReservedOccupiedResponse>(bikesOccupied);
+			return sessionCookie != null && (response?.authcookie?.Contains(sessionCookie) ?? false)
+				? response
+				: ResponseHelper.GetBikesOccupiedNone(sessionCookie);
 
-        }
+		}
 
-        public const string DO_AUTH_Unknown_User_FILE = @"
+		public const string DO_AUTH_Unknown_User_FILE = @"
         {
            ""shareejson"" : {
               ""response"" : ""authorization"",
@@ -317,5 +317,5 @@ namespace TestFramework.Repository
               ""apiserver"" : ""https://tinkwwp.copri-bike.de""
            }
         }";
-    }
+	}
 }
diff --git a/TestFramework/Repository/CopriCallsMemory001.cs b/TestFramework/Repository/CopriCallsMemory001.cs
index 137a4a4..40acd09 100644
--- a/TestFramework/Repository/CopriCallsMemory001.cs
+++ b/TestFramework/Repository/CopriCallsMemory001.cs
@@ -2,20 +2,20 @@
 
 namespace TestFramework.Repository
 {
-    /// <summary> 
-    /// Holds some COPRI responses for testing purposes.
-    /// </summary>
-    /// <remarks> Holds some demo Meinkonrad and LastenradBayern bikes
-    /// </remarks>
-    public class CopriCallsMemory001 : CopriCallMemoryBase, ICopriServer
-    {
-        public CopriCallsMemory001(string sessionCookie = null) : base(
-            bikesAvailableResponseResource: "TestFramework.Repository.CopriCallsMemory001.BikesAvailableResponse.json",
-            bikesOccupiedResponseResoure: "TestFramework.Repository.CopriCallsMemory001.BikesOccupiedResponse.json",
-            authResponseResource: "TestFramework.Repository.CopriCallsMemory001.AuthorizationResponse.json",
-            authOutResponseResource: "TestFramework.Repository.CopriCallsMemory001.AuthoutResponse.json",
-            stationsResponseResource: "TestFramework.Repository.CopriCallsMemory001.StationsAvailable.json",
-            sessionCookie: sessionCookie)
-        { }
-    }
+	/// <summary> 
+	/// Holds some COPRI responses for testing purposes.
+	/// </summary>
+	/// <remarks> Holds some demo Meinkonrad and LastenradBayern bikes
+	/// </remarks>
+	public class CopriCallsMemory001 : CopriCallMemoryBase, ICopriServer
+	{
+		public CopriCallsMemory001(string sessionCookie = null) : base(
+			bikesAvailableResponseResource: "TestFramework.Repository.CopriCallsMemory001.BikesAvailableResponse.json",
+			bikesOccupiedResponseResoure: "TestFramework.Repository.CopriCallsMemory001.BikesOccupiedResponse.json",
+			authResponseResource: "TestFramework.Repository.CopriCallsMemory001.AuthorizationResponse.json",
+			authOutResponseResource: "TestFramework.Repository.CopriCallsMemory001.AuthoutResponse.json",
+			stationsResponseResource: "TestFramework.Repository.CopriCallsMemory001.StationsAvailable.json",
+			sessionCookie: sessionCookie)
+		{ }
+	}
 }
\ No newline at end of file
diff --git a/TestFramework/Repository/ExceptionServer.cs b/TestFramework/Repository/ExceptionServer.cs
index a61739d..694a952 100644
--- a/TestFramework/Repository/ExceptionServer.cs
+++ b/TestFramework/Repository/ExceptionServer.cs
@@ -8,98 +8,98 @@ using TINK.Repository.Response;
 
 namespace TestFramework.Repository
 {
-    /// <summary> Simulates communication errors when connecting to copri.</summary>
-    public class ExceptionServer : ICopriServer
-    {
-        private Func<string, Exception> ExceptionFactory { get; }
+	/// <summary> Simulates communication errors when connecting to copri.</summary>
+	public class ExceptionServer : ICopriServer
+	{
+		private Func<string, Exception> ExceptionFactory { get; }
 
-        /// <summary> Constructs object.</summary>
-        /// <param name="exceptionFactory"> Provides exceptions which are thrown whenn querrying information from server.</param>
-        public ExceptionServer(Func<string, Exception> exceptionFactory)
-        {
-            ExceptionFactory = exceptionFactory;
-        }
+		/// <summary> Constructs object.</summary>
+		/// <param name="exceptionFactory"> Provides exceptions which are thrown whenn querrying information from server.</param>
+		public ExceptionServer(Func<string, Exception> exceptionFactory)
+		{
+			ExceptionFactory = exceptionFactory;
+		}
 
-        public bool IsConnected => true;
+		public bool IsConnected => true;
 
-        public string SessionCookie => string.Empty;
+		public string SessionCookie => string.Empty;
 
-        public string MerchantId => string.Empty;
+		public string MerchantId => string.Empty;
 
-        public Task<AuthorizationResponse> DoAuthorizationAsync(string p_strMailAddress, string p_strPassword, string p_strDeviceId)
-        {
-            throw new NotImplementedException();
-        }
+		public Task<AuthorizationResponse> DoAuthorizationAsync(string p_strMailAddress, string p_strPassword, string p_strDeviceId)
+		{
+			throw new NotImplementedException();
+		}
 
-        public Task<AuthorizationoutResponse> DoAuthoutAsync()
-        {
-            throw new NotImplementedException();
-        }
+		public Task<AuthorizationoutResponse> DoAuthoutAsync()
+		{
+			throw new NotImplementedException();
+		}
 
-        public Task<ReservationBookingResponse> DoReserveAsync(string bikeId, Uri operatorUri)
-        {
-            throw new NotImplementedException();
-        }
+		public Task<ReservationBookingResponse> DoReserveAsync(string bikeId, Uri operatorUri)
+		{
+			throw new NotImplementedException();
+		}
 
-        public Task<ReservationCancelReturnResponse> DoCancelReservationAsync(string p_iBikeId, Uri operatorUri)
-        {
-            throw new NotImplementedException();
-        }
+		public Task<ReservationCancelReturnResponse> DoCancelReservationAsync(string p_iBikeId, Uri operatorUri)
+		{
+			throw new NotImplementedException();
+		}
 
-        public Task<ReservationBookingResponse> CalculateAuthKeysAsync(string bikeId, Uri operatorUri)
-            => throw new NotImplementedException();
+		public Task<ReservationBookingResponse> CalculateAuthKeysAsync(string bikeId, Uri operatorUri)
+			=> throw new NotImplementedException();
 
-        public Task<ResponseBase> StartReturningBike(
-            string bikeId,
-            Uri operatorUri)
-            => null;
+		public Task<ResponseBase> StartReturningBike(
+			string bikeId,
+			Uri operatorUri)
+			=> null;
 
-        public Task<ReservationBookingResponse> UpdateLockingStateAsync(
-            string bikeId,
-            lock_state state,
-            Uri operatorUri,
-            LocationDto geolocation,
-            double batteryPercentage)
-            => throw new NotImplementedException();
+		public Task<ReservationBookingResponse> UpdateLockingStateAsync(
+			string bikeId,
+			lock_state state,
+			Uri operatorUri,
+			LocationDto geolocation,
+			double batteryPercentage)
+			=> throw new NotImplementedException();
 
-        public Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
-            => throw new NotImplementedException();
+		public Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
+			=> throw new NotImplementedException();
 
-        public Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(string bikeId, Uri operatorUri)
-            => throw new NotImplementedException();
+		public Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(string bikeId, Uri operatorUri)
+			=> throw new NotImplementedException();
 
-        public Task<ReservationBookingResponse> BookReservedAndStartOpeningAsync(string bikeId, Uri operatorUri)
-            => throw new NotImplementedException();
+		public Task<ReservationBookingResponse> BookReservedAndStartOpeningAsync(string bikeId, Uri operatorUri)
+			=> throw new NotImplementedException();
 
-        public Task<DoReturnResponse> DoReturn(string bikeId, LocationDto location, ISmartDevice smartDevice, Uri operatorUri)
-            => throw new NotImplementedException();
-        public Task<DoReturnResponse> ReturnAndStartClosingAsync(
-            string bikeId,
-            ISmartDevice smartDevice,
-            Uri operatorUri)
-            => throw new NotImplementedException();
+		public Task<DoReturnResponse> DoReturn(string bikeId, LocationDto location, ISmartDevice smartDevice, Uri operatorUri)
+			=> throw new NotImplementedException();
+		public Task<DoReturnResponse> ReturnAndStartClosingAsync(
+			string bikeId,
+			ISmartDevice smartDevice,
+			Uri operatorUri)
+			=> throw new NotImplementedException();
 
-        public Task<SubmitFeedbackResponse> DoSubmitFeedback(string bikeId, int? currentChargeBars, string message, bool isBikeBroken, Uri operatorUri)
-            => throw new NotImplementedException();
+		public Task<SubmitFeedbackResponse> DoSubmitFeedback(string bikeId, int? currentChargeBars, string message, bool isBikeBroken, Uri operatorUri)
+			=> throw new NotImplementedException();
 
-        /// <summary> Submits mini survey to copri server. </summary>
-        /// <param name="answers">Collection of answers.</param>
-        public Task<ResponseBase> DoSubmitMiniSurvey(IDictionary<string, string> answers)
-            => throw new NotImplementedException();
+		/// <summary> Submits mini survey to copri server. </summary>
+		/// <param name="answers">Collection of answers.</param>
+		public Task<ResponseBase> DoSubmitMiniSurvey(IDictionary<string, string> answers)
+			=> throw new NotImplementedException();
 
-        public Task<BikesAvailableResponse> GetBikesAvailableAsync()
-        {
-            throw ExceptionFactory($"Simulated error thrown at {nameof(GetBikesAvailableAsync)}.");
-        }
+		public Task<BikesAvailableResponse> GetBikesAvailableAsync()
+		{
+			throw ExceptionFactory($"Simulated error thrown at {nameof(GetBikesAvailableAsync)}.");
+		}
 
-        public Task<BikesReservedOccupiedResponse> GetBikesOccupiedAsync()
-        {
-            throw ExceptionFactory($"Simulated error thrown at {nameof(GetBikesOccupiedAsync)}.");
-        }
+		public Task<BikesReservedOccupiedResponse> GetBikesOccupiedAsync()
+		{
+			throw ExceptionFactory($"Simulated error thrown at {nameof(GetBikesOccupiedAsync)}.");
+		}
 
-        public Task<StationsAvailableResponse> GetStationsAsync()
-        {
-            throw ExceptionFactory($"Simulated error thrown at {nameof(GetStationsAsync)}.");
-        }
-    }
+		public Task<StationsAvailableResponse> GetStationsAsync()
+		{
+			throw ExceptionFactory($"Simulated error thrown at {nameof(GetStationsAsync)}.");
+		}
+	}
 }
diff --git a/TestFramework/Services/BluetoothLock/LocksServiceMock.cs b/TestFramework/Services/BluetoothLock/LocksServiceMock.cs
index 01830e1..f27670b 100644
--- a/TestFramework/Services/BluetoothLock/LocksServiceMock.cs
+++ b/TestFramework/Services/BluetoothLock/LocksServiceMock.cs
@@ -8,79 +8,79 @@ using TINK.Services.BluetoothLock.Tdo;
 
 namespace TestFramework.Services.BluetoothLock
 {
-    public class LocksServiceMock : ILocksService
-    {
-        /// <param name="connectTimeout">Timeout for connect operation of a single lock.</param>
-        public async Task<IEnumerable<LockInfoTdo>> GetLocksStateAsync(IEnumerable<LockInfoAuthTdo> locksInfo, TimeSpan connectTimeout)
-        {
-            return await Task.FromResult(new List<LockInfoTdo>());
-        }
+	public class LocksServiceMock : ILocksService
+	{
+		/// <param name="connectTimeout">Timeout for connect operation of a single lock.</param>
+		public async Task<IEnumerable<LockInfoTdo>> GetLocksStateAsync(IEnumerable<LockInfoAuthTdo> locksInfo, TimeSpan connectTimeout)
+		{
+			return await Task.FromResult(new List<LockInfoTdo>());
+		}
 
-        /// <summary> Holds timeout values for series of connecting attemps to a lock or multiple locks. </summary>
-        public ITimeOutProvider TimeOut { get; set; }
+		/// <summary> Holds timeout values for series of connecting attemps to a lock or multiple locks. </summary>
+		public ITimeOutProvider TimeOut { get; set; }
 
-        public void UpdateSimulation(BikeCollection bikes) { }
+		public void UpdateSimulation(BikeCollection bikes) { }
 
-        /// <summary> Opens lock.</summary>
-        /// <param name="bike">Bike object to update.</param>
-        public async Task<LockitLockingState?> OpenAsync(int lockId, byte[] copriKey) => await Task.FromResult(LockitLockingState.Open);
+		/// <summary> Opens lock.</summary>
+		/// <param name="bike">Bike object to update.</param>
+		public async Task<LockitLockingState?> OpenAsync(int lockId, byte[] copriKey) => await Task.FromResult(LockitLockingState.Open);
 
-        /// <summary> Closes lock.</summary>
-        /// <param name="bike">Bike object to update.</param>
-        public async Task<LockitLockingState?> CloseAsync(int lockId, byte[] copriKey) => await Task.FromResult(LockitLockingState.Closed);
+		/// <summary> Closes lock.</summary>
+		/// <param name="bike">Bike object to update.</param>
+		public async Task<LockitLockingState?> CloseAsync(int lockId, byte[] copriKey) => await Task.FromResult(LockitLockingState.Closed);
 
-        /// <summary> Gets the state of a bike. </summary>
-        /// <param name="lockId">Id of lockId to get state for.</param>
-        /// <returns></returns>
-        public async Task<LockitLockingState?> GetState(string lockId) => await Task.FromResult((LockitLockingState?)null);
+		/// <summary> Gets the state of a bike. </summary>
+		/// <param name="lockId">Id of lockId to get state for.</param>
+		/// <returns></returns>
+		public async Task<LockitLockingState?> GetState(string lockId) => await Task.FromResult((LockitLockingState?)null);
 
-        /// <summary> Connects to lock.</summary>
-        /// <param name="authInfo"> Info required to connect to lock.</param>
-        /// <param name="connectTimeout">Timeout for connect operation.</param>
-        public async Task<LockInfoTdo> ConnectAsync(LockInfoAuthTdo authInfo, TimeSpan connectTimeout)
-        {
-            return await Task.FromResult(new LockInfoTdo.Builder { Id = 12, Guid = new System.Guid("00000000-0000-0000-0000-000000000042"), State = null }.Build());
-        }
+		/// <summary> Connects to lock.</summary>
+		/// <param name="authInfo"> Info required to connect to lock.</param>
+		/// <param name="connectTimeout">Timeout for connect operation.</param>
+		public async Task<LockInfoTdo> ConnectAsync(LockInfoAuthTdo authInfo, TimeSpan connectTimeout)
+		{
+			return await Task.FromResult(new LockInfoTdo.Builder { Id = 12, Guid = new System.Guid("00000000-0000-0000-0000-000000000042"), State = null }.Build());
+		}
 
-        /// <summary> Set sound settings.</summary>
-        /// <param name="lockId">Id of lock to set sound settings.</param>
-        public async Task<bool> SetSoundAsync(int lockId, SoundSettings settings)
-        {
-            return await Task.FromResult(true);
-        }
+		/// <summary> Set sound settings.</summary>
+		/// <param name="lockId">Id of lock to set sound settings.</param>
+		public async Task<bool> SetSoundAsync(int lockId, SoundSettings settings)
+		{
+			return await Task.FromResult(true);
+		}
 
-        /// <summary> Gets battery percentage.</summary>
-        /// <param name="lockId">Id of lock to get info for.</param>
-        public Task<double> GetBatteryPercentageAsync(int lockId)
-        {
-            throw new NotSupportedException();
-        }
+		/// <summary> Gets battery percentage.</summary>
+		/// <param name="lockId">Id of lock to get info for.</param>
+		public Task<double> GetBatteryPercentageAsync(int lockId)
+		{
+			throw new NotSupportedException();
+		}
 
-        /// <summary> Sets whether alarm is on or off.</summary>
-        /// <param name="lockId">Id of lock to get info from.</param>
-        public async Task SetIsAlarmOffAsync(int lockId, bool activated)
-        {
-            await Task.FromResult(true);
-        }
+		/// <summary> Sets whether alarm is on or off.</summary>
+		/// <param name="lockId">Id of lock to get info from.</param>
+		public async Task SetIsAlarmOffAsync(int lockId, bool activated)
+		{
+			await Task.FromResult(true);
+		}
 
-        /// <summary> Gets whether alarm is on or off.</summary>
-        /// <param name="lockId">Id of lock to get info for.</param>
-        public async Task<bool> GetIsAlarmOffAsync(int lockId)
-        {
-            return await Task.FromResult(true);
-        }
+		/// <summary> Gets whether alarm is on or off.</summary>
+		/// <param name="lockId">Id of lock to get info for.</param>
+		public async Task<bool> GetIsAlarmOffAsync(int lockId)
+		{
+			return await Task.FromResult(true);
+		}
 
-        /// <summary>Gets a lock by bike Id.</summary>
-        /// <param name="bikeId"></param>
-        /// <returns>Lock object</returns>
-        public ILockService this[int bikeId]
-        {
-            get
-            {
-                return null;
-            }
-        }
+		/// <summary>Gets a lock by bike Id.</summary>
+		/// <param name="bikeId"></param>
+		/// <returns>Lock object</returns>
+		public ILockService this[int bikeId]
+		{
+			get
+			{
+				return null;
+			}
+		}
 
-        public Task<LockingState> DisconnectAsync(int bikeId, Guid bikeGuid) => throw new NotSupportedException();
-    }
+		public Task<LockingState> DisconnectAsync(int bikeId, Guid bikeGuid) => throw new NotSupportedException();
+	}
 }
diff --git a/TestFramework/Services/CopriApi/CopriCallsCacheMemory001.cs b/TestFramework/Services/CopriApi/CopriCallsCacheMemory001.cs
index 4b74c65..9b92af6 100644
--- a/TestFramework/Services/CopriApi/CopriCallsCacheMemory001.cs
+++ b/TestFramework/Services/CopriApi/CopriCallsCacheMemory001.cs
@@ -9,118 +9,118 @@ using TINK.Repository.Response;
 
 namespace TestFramework.Services.CopriApi.Connector
 {
-    /// <summary> Allows use of memory for retrieving defined respones.</summary>
-    public class CopriCallsCacheMemory001 : ICopriCache
-    {
-        private CopriCallsMemory001 server;
+	/// <summary> Allows use of memory for retrieving defined respones.</summary>
+	public class CopriCallsCacheMemory001 : ICopriCache
+	{
+		private CopriCallsMemory001 server;
 
-        public CopriCallsCacheMemory001(string sessionCookie = null)
-        {
-            server = new CopriCallsMemory001(sessionCookie);
-        }
+		public CopriCallsCacheMemory001(string sessionCookie = null)
+		{
+			server = new CopriCallsMemory001(sessionCookie);
+		}
 
-        public bool IsStationsExpired => true;
+		public bool IsStationsExpired => true;
 
-        public bool IsBikesAvailableExpired => true;
+		public bool IsBikesAvailableExpired => true;
 
-        public bool IsBikesOccupiedExpired => true;
+		public bool IsBikesOccupiedExpired => true;
 
-        public bool IsConnected => server.IsConnected;
+		public bool IsConnected => server.IsConnected;
 
-        public string SessionCookie => server.SessionCookie;
+		public string SessionCookie => server.SessionCookie;
 
-        public string MerchantId => server.MerchantId;
+		public string MerchantId => server.MerchantId;
 
-        public void AddToCache(StationsAvailableResponse stations)
-        {
-            return;
-        }
+		public void AddToCache(StationsAvailableResponse stations)
+		{
+			return;
+		}
 
-        public void AddToCache(BikesAvailableResponse bikes)
-        {
-            return;
-        }
+		public void AddToCache(BikesAvailableResponse bikes)
+		{
+			return;
+		}
 
-        public void AddToCache(BikesReservedOccupiedResponse bikes)
-        {
-            return;
-        }
+		public void AddToCache(BikesReservedOccupiedResponse bikes)
+		{
+			return;
+		}
 
-        public Task<AuthorizationResponse> DoAuthorizationAsync(string p_strMailAddress, string p_strPassword, string p_strDeviceId)
-        {
-            throw new NotImplementedException();
-        }
+		public Task<AuthorizationResponse> DoAuthorizationAsync(string p_strMailAddress, string p_strPassword, string p_strDeviceId)
+		{
+			throw new NotImplementedException();
+		}
 
-        public Task<AuthorizationoutResponse> DoAuthoutAsync()
-        {
-            throw new NotImplementedException();
-        }
+		public Task<AuthorizationoutResponse> DoAuthoutAsync()
+		{
+			throw new NotImplementedException();
+		}
 
-        public Task<ReservationBookingResponse> DoReserveAsync(string bikeId, Uri operatorUri)
-        {
-            throw new NotImplementedException();
-        }
+		public Task<ReservationBookingResponse> DoReserveAsync(string bikeId, Uri operatorUri)
+		{
+			throw new NotImplementedException();
+		}
 
-        public Task<ReservationCancelReturnResponse> DoCancelReservationAsync(string p_iBikeId, Uri operatorUri)
-        {
-            throw new NotImplementedException();
-        }
+		public Task<ReservationCancelReturnResponse> DoCancelReservationAsync(string p_iBikeId, Uri operatorUri)
+		{
+			throw new NotImplementedException();
+		}
 
-        public Task<ReservationBookingResponse> CalculateAuthKeysAsync(string bikeId, Uri operatorUri)
-            => throw new NotSupportedException();
+		public Task<ReservationBookingResponse> CalculateAuthKeysAsync(string bikeId, Uri operatorUri)
+			=> throw new NotSupportedException();
 
-        public Task<ResponseBase> StartReturningBike(
-            string bikeId,
-            Uri operatorUri)
-            => null;
+		public Task<ResponseBase> StartReturningBike(
+			string bikeId,
+			Uri operatorUri)
+			=> null;
 
-        public Task<ReservationBookingResponse> UpdateLockingStateAsync(
-            string bikeId,
-            lock_state state,
-            Uri operatorUri,
-            LocationDto geolocation,
-            double batteryPercentage)
-            => throw new NotImplementedException();
+		public Task<ReservationBookingResponse> UpdateLockingStateAsync(
+			string bikeId,
+			lock_state state,
+			Uri operatorUri,
+			LocationDto geolocation,
+			double batteryPercentage)
+			=> throw new NotImplementedException();
 
-        public Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
-            => throw new NotImplementedException();
+		public Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
+			=> throw new NotImplementedException();
 
-        public Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(string bikeId, Uri operatorUri)
-            => throw new NotImplementedException();
+		public Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(string bikeId, Uri operatorUri)
+			=> throw new NotImplementedException();
 
-        public Task<ReservationBookingResponse> BookReservedAndStartOpeningAsync(string bikeId, Uri operatorUri)
-            => throw new NotImplementedException();
+		public Task<ReservationBookingResponse> BookReservedAndStartOpeningAsync(string bikeId, Uri operatorUri)
+			=> throw new NotImplementedException();
 
-        public Task<DoReturnResponse> DoReturn(string bikeId, LocationDto location, ISmartDevice smartDevice, Uri operatorUri)
-            => throw new NotImplementedException();
+		public Task<DoReturnResponse> DoReturn(string bikeId, LocationDto location, ISmartDevice smartDevice, Uri operatorUri)
+			=> throw new NotImplementedException();
 
-        public Task<DoReturnResponse> ReturnAndStartClosingAsync(
-            string bikeId,
-            ISmartDevice smartDevice,
-            Uri operatorUri)
-            => throw new NotImplementedException();
+		public Task<DoReturnResponse> ReturnAndStartClosingAsync(
+			string bikeId,
+			ISmartDevice smartDevice,
+			Uri operatorUri)
+			=> throw new NotImplementedException();
 
-        public Task<SubmitFeedbackResponse> DoSubmitFeedback(string bikeId, int? currentChargeBars, string message, bool isBikeBroken, Uri operatorUri)
-            => throw new NotImplementedException();
+		public Task<SubmitFeedbackResponse> DoSubmitFeedback(string bikeId, int? currentChargeBars, string message, bool isBikeBroken, Uri operatorUri)
+			=> throw new NotImplementedException();
 
-        /// <summary> Submits mini survey to copri server. </summary>
-        /// <param name="answers">Collection of answers.</param>
-        public Task<ResponseBase> DoSubmitMiniSurvey(IDictionary<string, string> answers)
-            => throw new NotImplementedException();
+		/// <summary> Submits mini survey to copri server. </summary>
+		/// <param name="answers">Collection of answers.</param>
+		public Task<ResponseBase> DoSubmitMiniSurvey(IDictionary<string, string> answers)
+			=> throw new NotImplementedException();
 
-        public Task<BikesAvailableResponse> GetBikesAvailableAsync()
-        {
-            return server.GetBikesAvailableAsync();
-        }
+		public Task<BikesAvailableResponse> GetBikesAvailableAsync()
+		{
+			return server.GetBikesAvailableAsync();
+		}
 
-        public Task<BikesReservedOccupiedResponse> GetBikesOccupiedAsync()
-        {
-            return server.GetBikesOccupiedAsync();
-        }
+		public Task<BikesReservedOccupiedResponse> GetBikesOccupiedAsync()
+		{
+			return server.GetBikesOccupiedAsync();
+		}
 
-        public Task<StationsAvailableResponse> GetStationsAsync()
-        {
-            return server.GetStationsAsync();
-        }
-    }
+		public Task<StationsAvailableResponse> GetStationsAsync()
+		{
+			return server.GetStationsAsync();
+		}
+	}
 }
diff --git a/TestFramework/Services/Geolocation/GeolocationMock.cs b/TestFramework/Services/Geolocation/GeolocationMock.cs
index f42e76e..ca35b71 100644
--- a/TestFramework/Services/Geolocation/GeolocationMock.cs
+++ b/TestFramework/Services/Geolocation/GeolocationMock.cs
@@ -6,17 +6,17 @@ using Xamarin.Essentials;
 
 namespace TestFramework.Model.Services.Geolocation
 {
-    public class GeolocationMock : IGeolocation
-    {
+	public class GeolocationMock : IGeolocation
+	{
 
-        public Task<Location> GetAsync(CancellationToken? cancelToken = null, DateTime? timeStamp = null)
-        {
-            throw new NotImplementedException();
-        }
+		public Task<Location> GetAsync(CancellationToken? cancelToken = null, DateTime? timeStamp = null)
+		{
+			throw new NotImplementedException();
+		}
 
-        /// <summary> If true location data returned is simulated.</summary>
-        public bool IsSimulation { get => true; }
+		/// <summary> If true location data returned is simulated.</summary>
+		public bool IsSimulation { get => true; }
 
-        public bool IsGeolcationEnabled => true;
-    }
+		public bool IsGeolcationEnabled => true;
+	}
 }
diff --git a/TestFramework/TestHelper.cs b/TestFramework/TestHelper.cs
index 86dd9f5..c6b611b 100644
--- a/TestFramework/TestHelper.cs
+++ b/TestFramework/TestHelper.cs
@@ -1,18 +1,18 @@
 namespace TestFramework
 {
-    /// <summary>
-    /// Provides helper functionality. Used in TestShareeLib and TestTINKLib.
-    /// </summary>
-    public static class TestHelper
-    {
-        /// <summary>
-        /// Eases comparison of xml- files.
-        /// </summary>
-        /// <param name="p_strXmlFile"></param>
-        /// <returns></returns>
-        public static string PrepareXmlForStringCompare(string p_strXmlFile)
-        {
-            return p_strXmlFile.Replace("\r\n", string.Empty).Replace("\t", string.Empty).Replace(" ", string.Empty);
-        }
-    }
+	/// <summary>
+	/// Provides helper functionality. Used in TestShareeLib and TestTINKLib.
+	/// </summary>
+	public static class TestHelper
+	{
+		/// <summary>
+		/// Eases comparison of xml- files.
+		/// </summary>
+		/// <param name="p_strXmlFile"></param>
+		/// <returns></returns>
+		public static string PrepareXmlForStringCompare(string p_strXmlFile)
+		{
+			return p_strXmlFile.Replace("\r\n", string.Empty).Replace("\t", string.Empty).Replace(" ", string.Empty);
+		}
+	}
 }
diff --git a/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItBase.cs b/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItBase.cs
index f95d201..133c59c 100644
--- a/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItBase.cs
+++ b/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItBase.cs
@@ -11,178 +11,178 @@ using TINK.Services.BluetoothLock.Tdo;
 
 namespace TestLockItBLE.Services.BluetoothLock.BLE
 {
-    public class TestLockItBase
-    {
+	public class TestLockItBase
+	{
 
-        [Test]
-        public void TestName_Null()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var cipher = Substitute.For<TINK.Model.Device.ICipher>();
-            var auth = Substitute.For<ICharacteristic>();
-            var lockControl = Substitute.For<IService>();
+		[Test]
+		public void TestName_Null()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<TINK.Model.Device.ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var lockControl = Substitute.For<IService>();
 
-            var authTdo = new LockInfoAuthTdo.Builder
-            {
-                Id = 12,
-                K_seed = new byte[] { (byte)'X', (byte)'D', (byte)'G', (byte)'x', (byte)'q', (byte)'M', (byte)'f', (byte)'A', (byte)'F', (byte)'q', (byte)'g', (byte)'N', (byte)'V', (byte)'r', (byte)'N', (byte)'Y' },
-                K_u = new byte[16]
-            }.Build();
+			var authTdo = new LockInfoAuthTdo.Builder
+			{
+				Id = 12,
+				K_seed = new byte[] { (byte)'X', (byte)'D', (byte)'G', (byte)'x', (byte)'q', (byte)'M', (byte)'f', (byte)'A', (byte)'F', (byte)'q', (byte)'g', (byte)'N', (byte)'V', (byte)'r', (byte)'N', (byte)'Y' },
+				K_u = new byte[16]
+			}.Build();
 
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
-            device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
-            lockControl.GetCharacteristicAsync(Arg.Any<Guid>()).Returns(Task.FromResult(auth));
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
-            cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
-            cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
+			lockControl.GetCharacteristicAsync(Arg.Any<Guid>()).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
 
-            device.Name.Returns((string)null);
+			device.Name.Returns((string)null);
 
-            // Use factory to create LockIt-object.
-            var lockIt = LockItBaseTest.Authenticate(device, authTdo, adapter, cipher).Result;
-            Assert.AreEqual(string.Empty, lockIt.Name);
-        }
+			// Use factory to create LockIt-object.
+			var lockIt = LockItBaseTest.Authenticate(device, authTdo, adapter, cipher).Result;
+			Assert.AreEqual(string.Empty, lockIt.Name);
+		}
 
-        [Test]
-        public void TestName()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var cipher = Substitute.For<ICipher>();
-            var auth = Substitute.For<ICharacteristic>();
-            var lockControl = Substitute.For<IService>();
+		[Test]
+		public void TestName()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var lockControl = Substitute.For<IService>();
 
-            var authTdo = new LockInfoAuthTdo.Builder
-            {
-                Id = 12,
-                K_seed = new byte[] { (byte)'m', (byte)'x', (byte)'p', (byte)'J', (byte)'g', (byte)'D', (byte)'D', (byte)'i', (byte)'o', (byte)'T', (byte)'F', (byte)'M', (byte)'S', (byte)'E', (byte)'m', (byte)'E' },
-                K_u = new byte[16]
-            }.Build();
+			var authTdo = new LockInfoAuthTdo.Builder
+			{
+				Id = 12,
+				K_seed = new byte[] { (byte)'m', (byte)'x', (byte)'p', (byte)'J', (byte)'g', (byte)'D', (byte)'D', (byte)'i', (byte)'o', (byte)'T', (byte)'F', (byte)'M', (byte)'S', (byte)'E', (byte)'m', (byte)'E' },
+				K_u = new byte[16]
+			}.Build();
 
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
-            device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
-            lockControl.GetCharacteristicAsync(Arg.Any<Guid>()).Returns(Task.FromResult(auth));
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
-            cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
-            cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
+			lockControl.GetCharacteristicAsync(Arg.Any<Guid>()).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
 
-            device.Name.Returns("ISHAREIT+123");
+			device.Name.Returns("ISHAREIT+123");
 
-            // Use factory to create LockIt-object.
-            var lockIt = LockItBaseTest.Authenticate(device, authTdo, adapter, cipher).Result;
-            Assert.AreEqual("ISHAREIT+123", lockIt.Name);
-        }
+			// Use factory to create LockIt-object.
+			var lockIt = LockItBaseTest.Authenticate(device, authTdo, adapter, cipher).Result;
+			Assert.AreEqual("ISHAREIT+123", lockIt.Name);
+		}
 
-        [Test]
-        public void TestId()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var cipher = Substitute.For<ICipher>();
-            var auth = Substitute.For<ICharacteristic>();
-            var lockControl = Substitute.For<IService>();
+		[Test]
+		public void TestId()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var lockControl = Substitute.For<IService>();
 
-            var authTdo = new LockInfoAuthTdo.Builder
-            {
-                Id = 12,
-                K_seed = new byte[] { (byte)'l', (byte)'x', (byte)'p', (byte)'J', (byte)'g', (byte)'D', (byte)'D', (byte)'i', (byte)'o', (byte)'T', (byte)'F', (byte)'M', (byte)'S', (byte)'E', (byte)'m', (byte)'E' },
-                K_u = new byte[16]
-            }.Build();
+			var authTdo = new LockInfoAuthTdo.Builder
+			{
+				Id = 12,
+				K_seed = new byte[] { (byte)'l', (byte)'x', (byte)'p', (byte)'J', (byte)'g', (byte)'D', (byte)'D', (byte)'i', (byte)'o', (byte)'T', (byte)'F', (byte)'M', (byte)'S', (byte)'E', (byte)'m', (byte)'E' },
+				K_u = new byte[16]
+			}.Build();
 
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
-            device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
-            lockControl.GetCharacteristicAsync(Arg.Any<Guid>()).Returns(Task.FromResult(auth));
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
-            cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
-            cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
+			lockControl.GetCharacteristicAsync(Arg.Any<Guid>()).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
 
-            device.Name.Returns("ISHAREIT+123");
+			device.Name.Returns("ISHAREIT+123");
 
-            // Use factory to create LockIt-object.
-            var lockIt = LockItBaseTest.Authenticate(device, authTdo, adapter, cipher).Result;
-            Assert.AreEqual(123, lockIt.Id);
-        }
+			// Use factory to create LockIt-object.
+			var lockIt = LockItBaseTest.Authenticate(device, authTdo, adapter, cipher).Result;
+			Assert.AreEqual(123, lockIt.Id);
+		}
 
-        [Test]
-        public void TestGuid()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var cipher = Substitute.For<TINK.Model.Device.ICipher>();
-            var auth = Substitute.For<ICharacteristic>();
-            var lockControl = Substitute.For<IService>();
+		[Test]
+		public void TestGuid()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<TINK.Model.Device.ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var lockControl = Substitute.For<IService>();
 
-            var authTdo = new LockInfoAuthTdo.Builder
-            {
-                Id = 12,
-                K_seed = new byte[] { (byte)'l', (byte)'x', (byte)'p', (byte)'J', (byte)'g', (byte)'D', (byte)'D', (byte)'i', (byte)'o', (byte)'T', (byte)'F', (byte)'M', (byte)'S', (byte)'E', (byte)'m', (byte)'E' },
-                K_u = new byte[16]
-            }.Build();
+			var authTdo = new LockInfoAuthTdo.Builder
+			{
+				Id = 12,
+				K_seed = new byte[] { (byte)'l', (byte)'x', (byte)'p', (byte)'J', (byte)'g', (byte)'D', (byte)'D', (byte)'i', (byte)'o', (byte)'T', (byte)'F', (byte)'M', (byte)'S', (byte)'E', (byte)'m', (byte)'E' },
+				K_u = new byte[16]
+			}.Build();
 
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("72bdc44f-c588-44f3-b6df-9aace7daafdd"));
-            device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
-            lockControl.GetCharacteristicAsync(Arg.Any<Guid>()).Returns(Task.FromResult(auth));
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
-            cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
-            cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("72bdc44f-c588-44f3-b6df-9aace7daafdd"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
+			lockControl.GetCharacteristicAsync(Arg.Any<Guid>()).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
 
-            device.Name.Returns("ISHAREIT+123");
+			device.Name.Returns("ISHAREIT+123");
 
-            // Use factory to create LockIt-object.
-            var lockIt = LockItBaseTest.Authenticate(device, authTdo, adapter, cipher).Result;
-            Assert.AreEqual(new Guid("72bdc44f-c588-44f3-b6df-9aace7daafdd"), lockIt.Guid);
-        }
+			// Use factory to create LockIt-object.
+			var lockIt = LockItBaseTest.Authenticate(device, authTdo, adapter, cipher).Result;
+			Assert.AreEqual(new Guid("72bdc44f-c588-44f3-b6df-9aace7daafdd"), lockIt.Guid);
+		}
 
-        /// <summary> Derives from LockItBase class for testing purposes. </summary>
+		/// <summary> Derives from LockItBase class for testing purposes. </summary>
 
-        private class LockItBaseTest : LockItBase
-        {
-            private LockItBaseTest(IDevice device, IAdapter adapter, ICipher cipher) : base(device, adapter, cipher)
-            {
-            }
-            /// <summary> Connects to device. </summary>
-            /// <param name="authInfo">Info required to connect.</param>
-            /// <param name="device">Device with must be connected.</param>
-            /// <returns>True if connecting succeeded, false if not.</returns>
-            public static async Task<LockItBase> Authenticate(
-                IDevice device,
-                LockInfoAuthTdo authInfo,
-                IAdapter adapter,
-                ICipher cipher)
-            => await Authenticate(
-                device,
-                authInfo,
-                adapter,
-                cipher,
-                () => new LockItBaseTest(device, adapter, cipher));
+		private class LockItBaseTest : LockItBase
+		{
+			private LockItBaseTest(IDevice device, IAdapter adapter, ICipher cipher) : base(device, adapter, cipher)
+			{
+			}
+			/// <summary> Connects to device. </summary>
+			/// <param name="authInfo">Info required to connect.</param>
+			/// <param name="device">Device with must be connected.</param>
+			/// <returns>True if connecting succeeded, false if not.</returns>
+			public static async Task<LockItBase> Authenticate(
+				IDevice device,
+				LockInfoAuthTdo authInfo,
+				IAdapter adapter,
+				ICipher cipher)
+			=> await Authenticate(
+				device,
+				authInfo,
+				adapter,
+				cipher,
+				() => new LockItBaseTest(device, adapter, cipher));
 
-            public override Task<LockitLockingState?> CloseAsync()
-            {
-                throw new NotImplementedException();
-            }
+			public override Task<LockitLockingState?> CloseAsync()
+			{
+				throw new NotImplementedException();
+			}
 
-            public override Task<LockitLockingState?> OpenAsync()
-            {
-                throw new NotImplementedException();
-            }
+			public override Task<LockitLockingState?> OpenAsync()
+			{
+				throw new NotImplementedException();
+			}
 
-            public override Task ReconnectAsync(LockInfoAuthTdo authInfo, TimeSpan connectTimeout)
-            {
-                throw new NotImplementedException();
-            }
-        }
-    }
+			public override Task ReconnectAsync(LockInfoAuthTdo authInfo, TimeSpan connectTimeout)
+			{
+				throw new NotImplementedException();
+			}
+		}
+	}
 }
diff --git a/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItEventBased.cs b/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItEventBased.cs
index 63633a7..b0da439 100644
--- a/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItEventBased.cs
+++ b/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItEventBased.cs
@@ -12,304 +12,304 @@ using DeviceState = Plugin.BLE.Abstractions.DeviceState;
 
 namespace TestLockItBLE
 {
-    public class Tests
-    {
-        [Test]
-        public void TestOpen()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var cipher = Substitute.For<TINK.Model.Device.ICipher>();
-            var auth = Substitute.For<ICharacteristic>();
-            var controlService = Substitute.For<IService>();
-            var controlCharacteristic = Substitute.For<ICharacteristic>();
-            var stateCharacteristic = Substitute.For<ICharacteristic>();
-            var activateCharacteristic = Substitute.For<ICharacteristic>();
+	public class Tests
+	{
+		[Test]
+		public void TestOpen()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<TINK.Model.Device.ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var controlService = Substitute.For<IService>();
+			var controlCharacteristic = Substitute.For<ICharacteristic>();
+			var stateCharacteristic = Substitute.For<ICharacteristic>();
+			var activateCharacteristic = Substitute.For<ICharacteristic>();
 
-            var authTdo = new LockInfoAuthTdo.Builder
-            {
-                Id = 12,
-                K_seed = new byte[] { (byte)'p', (byte)'a', (byte)'w', (byte)'m', (byte)'X', (byte)'8', (byte)'T', (byte)'X', (byte)'Q', (byte)'Z', (byte)'d', (byte)'l', (byte)'k', (byte)'3', (byte)'e', (byte)'V', },
-                K_u = new byte[16]
-            }.Build();
+			var authTdo = new LockInfoAuthTdo.Builder
+			{
+				Id = 12,
+				K_seed = new byte[] { (byte)'p', (byte)'a', (byte)'w', (byte)'m', (byte)'X', (byte)'8', (byte)'T', (byte)'X', (byte)'Q', (byte)'Z', (byte)'d', (byte)'l', (byte)'k', (byte)'3', (byte)'e', (byte)'V', },
+				K_u = new byte[16]
+			}.Build();
 
-            // Calls related to Authenticate functionality.
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
-            device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(controlService));
-            controlService.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
-            cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
-            cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
+			// Calls related to Authenticate functionality.
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(controlService));
+			controlService.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
 
-            device.Name.Returns("ISHAREIT+123");
+			device.Name.Returns("ISHAREIT+123");
 
-            // Calls related to open functionality.
-            controlService.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
-            controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 1 /* State read before open action: closed */ }));
-            controlService.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateCharacteristic));
-            activateCharacteristic.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            stateCharacteristic.Value.Returns(new byte[] { (byte)LockitLockingState.Open /* State passed as event argument after opening. */});
+			// Calls related to open functionality.
+			controlService.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
+			controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 1 /* State read before open action: closed */ }));
+			controlService.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateCharacteristic));
+			activateCharacteristic.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			stateCharacteristic.Value.Returns(new byte[] { (byte)LockitLockingState.Open /* State passed as event argument after opening. */});
 
-            // Use factory to create LockIt-object.
-            var lockIt = LockItEventBased.Authenticate(device, authTdo, adapter, cipher).Result;
-            var lockState = lockIt.OpenAsync();
-            controlCharacteristic.ValueUpdated += Raise.EventWith(new object(), new CharacteristicUpdatedEventArgs(stateCharacteristic));
-            Assert.That(lockState.Result, Is.EqualTo(LockitLockingState.Open));
-        }
+			// Use factory to create LockIt-object.
+			var lockIt = LockItEventBased.Authenticate(device, authTdo, adapter, cipher).Result;
+			var lockState = lockIt.OpenAsync();
+			controlCharacteristic.ValueUpdated += Raise.EventWith(new object(), new CharacteristicUpdatedEventArgs(stateCharacteristic));
+			Assert.That(lockState.Result, Is.EqualTo(LockitLockingState.Open));
+		}
 
-        [Test]
-        public void TestOpen_ThrowsCouldntOpenInconsistentStateExecption()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var cipher = Substitute.For<TINK.Model.Device.ICipher>();
-            var auth = Substitute.For<ICharacteristic>();
-            var controlService = Substitute.For<IService>();
-            var controlCharacteristic = Substitute.For<ICharacteristic>();
-            var stateCharacteristic = Substitute.For<ICharacteristic>();
-            var activateLock = Substitute.For<ICharacteristic>();
+		[Test]
+		public void TestOpen_ThrowsCouldntOpenInconsistentStateExecption()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<TINK.Model.Device.ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var controlService = Substitute.For<IService>();
+			var controlCharacteristic = Substitute.For<ICharacteristic>();
+			var stateCharacteristic = Substitute.For<ICharacteristic>();
+			var activateLock = Substitute.For<ICharacteristic>();
 
-            var authTdo = new LockInfoAuthTdo.Builder
-            {
-                Id = 12,
-                K_seed = new byte[] { (byte)'m', (byte)'l', (byte)'Q', (byte)'I', (byte)'S', (byte)'z', (byte)'p', (byte)'H', (byte)'m', (byte)'n', (byte)'V', (byte)'n', (byte)'7', (byte)'f', (byte)'i', (byte)'3' },
-                K_u = new byte[16]
-            }.Build();
+			var authTdo = new LockInfoAuthTdo.Builder
+			{
+				Id = 12,
+				K_seed = new byte[] { (byte)'m', (byte)'l', (byte)'Q', (byte)'I', (byte)'S', (byte)'z', (byte)'p', (byte)'H', (byte)'m', (byte)'n', (byte)'V', (byte)'n', (byte)'7', (byte)'f', (byte)'i', (byte)'3' },
+				K_u = new byte[16]
+			}.Build();
 
-            // Calls related to Authenticate functionality.
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
-            device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(controlService));
-            controlService.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
-            cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
-            cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
+			// Calls related to Authenticate functionality.
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(controlService));
+			controlService.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
 
-            device.Name.Returns("ISHAREIT+123");
+			device.Name.Returns("ISHAREIT+123");
 
-            // Calls related to open functionality.
-            controlService.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
-            controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 1 /* State read before open action: closed */ }));
-            controlService.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
-            activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            stateCharacteristic.Value.Returns(new byte[] { (byte)LockitLockingState.Closed /* State passed as event argument after opening. */});
+			// Calls related to open functionality.
+			controlService.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
+			controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 1 /* State read before open action: closed */ }));
+			controlService.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
+			activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			stateCharacteristic.Value.Returns(new byte[] { (byte)LockitLockingState.Closed /* State passed as event argument after opening. */});
 
-            // Use factory to create LockIt-object.
-            var lockIt = LockItEventBased.Authenticate(device, authTdo, adapter, cipher).Result;
-            Assert.That(async () =>
-                {
-                    var lockState = lockIt.OpenAsync();
-                    controlCharacteristic.ValueUpdated += Raise.EventWith(new object(), new CharacteristicUpdatedEventArgs(stateCharacteristic));
-                    await lockState;
-                },
-            Throws.InstanceOf<CouldntOpenInconsistentStateExecption>());
-        }
+			// Use factory to create LockIt-object.
+			var lockIt = LockItEventBased.Authenticate(device, authTdo, adapter, cipher).Result;
+			Assert.That(async () =>
+				{
+					var lockState = lockIt.OpenAsync();
+					controlCharacteristic.ValueUpdated += Raise.EventWith(new object(), new CharacteristicUpdatedEventArgs(stateCharacteristic));
+					await lockState;
+				},
+			Throws.InstanceOf<CouldntOpenInconsistentStateExecption>());
+		}
 
-        [Test]
-        public void TestOpen_ThrowsCouldntOpenBoldBlockedException()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var cipher = Substitute.For<TINK.Model.Device.ICipher>();
-            var auth = Substitute.For<ICharacteristic>();
-            var lockControl = Substitute.For<IService>();
-            var controlCharacteristic = Substitute.For<ICharacteristic>();
-            var activateLock = Substitute.For<ICharacteristic>();
-            var stateCharacteristic = Substitute.For<ICharacteristic>();
+		[Test]
+		public void TestOpen_ThrowsCouldntOpenBoldBlockedException()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<TINK.Model.Device.ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var lockControl = Substitute.For<IService>();
+			var controlCharacteristic = Substitute.For<ICharacteristic>();
+			var activateLock = Substitute.For<ICharacteristic>();
+			var stateCharacteristic = Substitute.For<ICharacteristic>();
 
-            var authTdo = new LockInfoAuthTdo.Builder
-            {
-                Id = 12,
-                K_seed = new byte[] { (byte)'i', (byte)'r', (byte)'F', (byte)'h', (byte)'G', (byte)'T', (byte)'z', (byte)'P', (byte)'F', (byte)'Z', (byte)'n', (byte)'z', (byte)'Y', (byte)'B', (byte)'s', (byte)'9' },
-                K_u = new byte[16]
-            }.Build();
+			var authTdo = new LockInfoAuthTdo.Builder
+			{
+				Id = 12,
+				K_seed = new byte[] { (byte)'i', (byte)'r', (byte)'F', (byte)'h', (byte)'G', (byte)'T', (byte)'z', (byte)'P', (byte)'F', (byte)'Z', (byte)'n', (byte)'z', (byte)'Y', (byte)'B', (byte)'s', (byte)'9' },
+				K_u = new byte[16]
+			}.Build();
 
-            // Calls related to Authenticate functionality.
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
-            device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
-            lockControl.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
-            cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
-            cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
+			// Calls related to Authenticate functionality.
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
+			lockControl.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
 
-            device.Name.Returns("ISHAREIT+123");
+			device.Name.Returns("ISHAREIT+123");
 
-            // Calls related to open functionality.
-            lockControl.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
-            controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 1 /* closed */}), Task.FromResult(new byte[] { 4 /* bold blocked */ }));
-            lockControl.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
-            activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            stateCharacteristic.Value.Returns(new byte[] { (byte)LockitLockingState.CouldntOpenBoldBlocked /* State passed as event argument after opening. */});
+			// Calls related to open functionality.
+			lockControl.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
+			controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 1 /* closed */}), Task.FromResult(new byte[] { 4 /* bold blocked */ }));
+			lockControl.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
+			activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			stateCharacteristic.Value.Returns(new byte[] { (byte)LockitLockingState.CouldntOpenBoldBlocked /* State passed as event argument after opening. */});
 
-            var lockIt = LockItEventBased.Authenticate(device, authTdo, adapter, cipher).Result;
+			var lockIt = LockItEventBased.Authenticate(device, authTdo, adapter, cipher).Result;
 
-            // Use factory to create LockIt-object.
-            Assert.That(async () =>
-            {
-                var lockState = lockIt.OpenAsync();
-                controlCharacteristic.ValueUpdated += Raise.EventWith(new object(), new CharacteristicUpdatedEventArgs(stateCharacteristic));
-                await lockState;
-            },
-            Throws.InstanceOf<CouldntOpenBoldIsBlockedException>());
-        }
+			// Use factory to create LockIt-object.
+			Assert.That(async () =>
+			{
+				var lockState = lockIt.OpenAsync();
+				controlCharacteristic.ValueUpdated += Raise.EventWith(new object(), new CharacteristicUpdatedEventArgs(stateCharacteristic));
+				await lockState;
+			},
+			Throws.InstanceOf<CouldntOpenBoldIsBlockedException>());
+		}
 
-        [Test]
-        public void TestClose()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var cipher = Substitute.For<TINK.Model.Device.ICipher>();
-            var auth = Substitute.For<ICharacteristic>();
-            var lockControl = Substitute.For<IService>();
-            var controlCharacteristic = Substitute.For<ICharacteristic>();
-            var activateLock = Substitute.For<ICharacteristic>();
-            var stateCharacteristic = Substitute.For<ICharacteristic>();
+		[Test]
+		public void TestClose()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<TINK.Model.Device.ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var lockControl = Substitute.For<IService>();
+			var controlCharacteristic = Substitute.For<ICharacteristic>();
+			var activateLock = Substitute.For<ICharacteristic>();
+			var stateCharacteristic = Substitute.For<ICharacteristic>();
 
-            var authTdo = new LockInfoAuthTdo.Builder
-            {
-                Id = 12,
-                K_seed = new byte[] { (byte)'I', (byte)'7', (byte)'y', (byte)'B', (byte)'f', (byte)'s', (byte)'v', (byte)'L', (byte)'G', (byte)'L', (byte)'7', (byte)'b', (byte)'7', (byte)'X', (byte)'z', (byte)'t' },
-                K_u = new byte[16]
-            }.Build();
+			var authTdo = new LockInfoAuthTdo.Builder
+			{
+				Id = 12,
+				K_seed = new byte[] { (byte)'I', (byte)'7', (byte)'y', (byte)'B', (byte)'f', (byte)'s', (byte)'v', (byte)'L', (byte)'G', (byte)'L', (byte)'7', (byte)'b', (byte)'7', (byte)'X', (byte)'z', (byte)'t' },
+				K_u = new byte[16]
+			}.Build();
 
-            // Calls related to Authenticate functionality.
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
-            device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
-            lockControl.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
-            cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
-            cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
+			// Calls related to Authenticate functionality.
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
+			lockControl.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
 
-            device.Name.Returns("ISHAREIT+123");
+			device.Name.Returns("ISHAREIT+123");
 
-            // Calls related to close functionality.
-            lockControl.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
-            controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 0 /* open */ }), Task.FromResult(new byte[] { 1 /* closed */}));
-            lockControl.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
-            activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            stateCharacteristic.Value.Returns(new byte[] { (byte)LockitLockingState.Closed /* State passed as event argument after closing. */});
+			// Calls related to close functionality.
+			lockControl.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
+			controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 0 /* open */ }), Task.FromResult(new byte[] { 1 /* closed */}));
+			lockControl.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
+			activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			stateCharacteristic.Value.Returns(new byte[] { (byte)LockitLockingState.Closed /* State passed as event argument after closing. */});
 
-            // Use factory to create LockIt-object.
-            var lockIt = LockItEventBased.Authenticate(device, authTdo, adapter, cipher).Result;
+			// Use factory to create LockIt-object.
+			var lockIt = LockItEventBased.Authenticate(device, authTdo, adapter, cipher).Result;
 
-            var lockState = lockIt.CloseAsync();
-            controlCharacteristic.ValueUpdated += Raise.EventWith(new object(), new CharacteristicUpdatedEventArgs(stateCharacteristic));
-            Assert.That(lockState.Result, Is.EqualTo(LockitLockingState.Closed));
-        }
+			var lockState = lockIt.CloseAsync();
+			controlCharacteristic.ValueUpdated += Raise.EventWith(new object(), new CharacteristicUpdatedEventArgs(stateCharacteristic));
+			Assert.That(lockState.Result, Is.EqualTo(LockitLockingState.Closed));
+		}
 
-        [Test]
-        public void TestClose_ThrowsCouldntCloseInconsistentStateExecption()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var cipher = Substitute.For<TINK.Model.Device.ICipher>();
-            var auth = Substitute.For<ICharacteristic>();
-            var lockControl = Substitute.For<IService>();
-            var controlCharacteristic = Substitute.For<ICharacteristic>();
-            var activateLock = Substitute.For<ICharacteristic>();
-            var stateCharacteristic = Substitute.For<ICharacteristic>();
+		[Test]
+		public void TestClose_ThrowsCouldntCloseInconsistentStateExecption()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<TINK.Model.Device.ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var lockControl = Substitute.For<IService>();
+			var controlCharacteristic = Substitute.For<ICharacteristic>();
+			var activateLock = Substitute.For<ICharacteristic>();
+			var stateCharacteristic = Substitute.For<ICharacteristic>();
 
-            var authTdo = new LockInfoAuthTdo.Builder
-            {
-                Id = 12,
-                K_seed = new byte[] { (byte)'8', (byte)'q', (byte)'3', (byte)'9', (byte)'i', (byte)'6', (byte)'c', (byte)'g', (byte)'9', (byte)'L', (byte)'V', (byte)'7', (byte)'T', (byte)'G', (byte)'l', (byte)'f' },
-                K_u = new byte[16]
-            }.Build();
+			var authTdo = new LockInfoAuthTdo.Builder
+			{
+				Id = 12,
+				K_seed = new byte[] { (byte)'8', (byte)'q', (byte)'3', (byte)'9', (byte)'i', (byte)'6', (byte)'c', (byte)'g', (byte)'9', (byte)'L', (byte)'V', (byte)'7', (byte)'T', (byte)'G', (byte)'l', (byte)'f' },
+				K_u = new byte[16]
+			}.Build();
 
-            // Calls related to Authenticate functionality.
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
-            device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
-            lockControl.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
-            cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
-            cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
+			// Calls related to Authenticate functionality.
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
+			lockControl.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
 
-            device.Name.Returns("ISHAREIT+123");
+			device.Name.Returns("ISHAREIT+123");
 
-            // Calls related to close functionality.
-            lockControl.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
-            controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 0 /* opened */}));
-            lockControl.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
-            activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            stateCharacteristic.Value.Returns(new byte[] { (byte)LockitLockingState.Open /* State passed as event argument after closing. */});
+			// Calls related to close functionality.
+			lockControl.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
+			controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 0 /* opened */}));
+			lockControl.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
+			activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			stateCharacteristic.Value.Returns(new byte[] { (byte)LockitLockingState.Open /* State passed as event argument after closing. */});
 
-            // Use factory to create LockIt-object.
-            var lockIt = LockItEventBased.Authenticate(device, authTdo, adapter, cipher).Result;
+			// Use factory to create LockIt-object.
+			var lockIt = LockItEventBased.Authenticate(device, authTdo, adapter, cipher).Result;
 
-            // Use factory to create LockIt-object.
-            Assert.That(async () =>
-            {
-                var lockState = lockIt.CloseAsync();
-                controlCharacteristic.ValueUpdated += Raise.EventWith(new object(), new CharacteristicUpdatedEventArgs(stateCharacteristic));
-                await lockState;
-            },
-            Throws.InstanceOf<CouldntCloseInconsistentStateExecption>());
-        }
+			// Use factory to create LockIt-object.
+			Assert.That(async () =>
+			{
+				var lockState = lockIt.CloseAsync();
+				controlCharacteristic.ValueUpdated += Raise.EventWith(new object(), new CharacteristicUpdatedEventArgs(stateCharacteristic));
+				await lockState;
+			},
+			Throws.InstanceOf<CouldntCloseInconsistentStateExecption>());
+		}
 
-        [Test]
-        public void TestClose_ThrowsCouldntCloseBoldBlockedException()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var cipher = Substitute.For<TINK.Model.Device.ICipher>();
-            var auth = Substitute.For<ICharacteristic>();
-            var lockControl = Substitute.For<IService>();
-            var controlCharacteristic = Substitute.For<ICharacteristic>();
-            var activateLock = Substitute.For<ICharacteristic>();
-            var stateCharacteristic = Substitute.For<ICharacteristic>();
+		[Test]
+		public void TestClose_ThrowsCouldntCloseBoldBlockedException()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<TINK.Model.Device.ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var lockControl = Substitute.For<IService>();
+			var controlCharacteristic = Substitute.For<ICharacteristic>();
+			var activateLock = Substitute.For<ICharacteristic>();
+			var stateCharacteristic = Substitute.For<ICharacteristic>();
 
-            var authTdo = new LockInfoAuthTdo.Builder
-            {
-                Id = 12,
-                K_seed = new byte[] { (byte)'v', (byte)'f', (byte)'u', (byte)'v', (byte)'j', (byte)'E', (byte)'b', (byte)'x', (byte)'p', (byte)'z', (byte)'a', (byte)'h', (byte)'V', (byte)'5', (byte)'9', (byte)'i' },
-                K_u = new byte[16]
-            }.Build();
+			var authTdo = new LockInfoAuthTdo.Builder
+			{
+				Id = 12,
+				K_seed = new byte[] { (byte)'v', (byte)'f', (byte)'u', (byte)'v', (byte)'j', (byte)'E', (byte)'b', (byte)'x', (byte)'p', (byte)'z', (byte)'a', (byte)'h', (byte)'V', (byte)'5', (byte)'9', (byte)'i' },
+				K_u = new byte[16]
+			}.Build();
 
-            // Calls related to Authenticate functionality.
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
-            device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
-            lockControl.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
-            cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
-            cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
+			// Calls related to Authenticate functionality.
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
+			lockControl.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
 
-            device.Name.Returns("ISHAREIT+123");
+			device.Name.Returns("ISHAREIT+123");
 
-            // Calls related to Close functionality.
-            lockControl.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
-            controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 0 /* open */}));
-            lockControl.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
-            activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            stateCharacteristic.Value.Returns(new byte[] { (byte)LockitLockingState.CouldntCloseBoldBlocked /* State passed as event argument after opening. */});
+			// Calls related to Close functionality.
+			lockControl.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
+			controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 0 /* open */}));
+			lockControl.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
+			activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			stateCharacteristic.Value.Returns(new byte[] { (byte)LockitLockingState.CouldntCloseBoldBlocked /* State passed as event argument after opening. */});
 
-            // Use factory to create LockIt-object.
-            var lockIt = LockItEventBased.Authenticate(device, authTdo, adapter, cipher).Result;
+			// Use factory to create LockIt-object.
+			var lockIt = LockItEventBased.Authenticate(device, authTdo, adapter, cipher).Result;
 
-            // Use factory to create LockIt-object.
-            Assert.That(async () =>
-            {
-                var lockState = lockIt.CloseAsync();
-                controlCharacteristic.ValueUpdated += Raise.EventWith(new object(), new CharacteristicUpdatedEventArgs(stateCharacteristic));
-                await lockState;
-            },
-            Throws.InstanceOf<CouldntCloseBoldBlockedException>());
-        }
-    }
+			// Use factory to create LockIt-object.
+			Assert.That(async () =>
+			{
+				var lockState = lockIt.CloseAsync();
+				controlCharacteristic.ValueUpdated += Raise.EventWith(new object(), new CharacteristicUpdatedEventArgs(stateCharacteristic));
+				await lockState;
+			},
+			Throws.InstanceOf<CouldntCloseBoldBlockedException>());
+		}
+	}
 }
\ No newline at end of file
diff --git a/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItPolling.cs b/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItPolling.cs
index 44819e7..ca12f6b 100644
--- a/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItPolling.cs
+++ b/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItPolling.cs
@@ -11,260 +11,260 @@ using DeviceState = Plugin.BLE.Abstractions.DeviceState;
 
 namespace TestLockItBLE.Services.BluetoothLock.BLE
 {
-    public class TestLockItPolling
-    {
-        [Test]
-        public void TestOpen()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var cipher = Substitute.For<TINK.Model.Device.ICipher>();
-            var auth = Substitute.For<ICharacteristic>();
-            var controlService = Substitute.For<IService>();
-            var controlCharacteristic = Substitute.For<ICharacteristic>();
-            var activateLock = Substitute.For<ICharacteristic>();
+	public class TestLockItPolling
+	{
+		[Test]
+		public void TestOpen()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<TINK.Model.Device.ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var controlService = Substitute.For<IService>();
+			var controlCharacteristic = Substitute.For<ICharacteristic>();
+			var activateLock = Substitute.For<ICharacteristic>();
 
-            var authTdo = new LockInfoAuthTdo.Builder
-            {
-                Id = 12,
-                K_seed = new byte[] { (byte)'o', (byte)'a', (byte)'w', (byte)'m', (byte)'X', (byte)'8', (byte)'T', (byte)'X', (byte)'Q', (byte)'Z', (byte)'d', (byte)'l', (byte)'k', (byte)'3', (byte)'e', (byte)'V', },
-                K_u = new byte[16]
-            }.Build();
+			var authTdo = new LockInfoAuthTdo.Builder
+			{
+				Id = 12,
+				K_seed = new byte[] { (byte)'o', (byte)'a', (byte)'w', (byte)'m', (byte)'X', (byte)'8', (byte)'T', (byte)'X', (byte)'Q', (byte)'Z', (byte)'d', (byte)'l', (byte)'k', (byte)'3', (byte)'e', (byte)'V', },
+				K_u = new byte[16]
+			}.Build();
 
-            // Calls related to Authenticate functionality.
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
-            device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(controlService));
-            controlService.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
-            cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
-            cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
+			// Calls related to Authenticate functionality.
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(controlService));
+			controlService.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
 
-            device.Name.Returns("ISHAREIT+123");
+			device.Name.Returns("ISHAREIT+123");
 
-            // Calls related to open functionality.
-            controlService.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
-            controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 1 /* state read after sending open commant: closed */ }), Task.FromResult(new byte[] { 0 /* state read after sending open commant: open */}));
-            controlService.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
-            activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			// Calls related to open functionality.
+			controlService.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
+			controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 1 /* state read after sending open commant: closed */ }), Task.FromResult(new byte[] { 0 /* state read after sending open commant: open */}));
+			controlService.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
+			activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
 
 
-            // Use factory to create LockIt-object.
-            var lockIt = LockItPolling.Authenticate(device, authTdo, adapter, cipher).Result;
-            Assert.That(lockIt.OpenAsync().Result, Is.EqualTo(LockitLockingState.Open));
-        }
+			// Use factory to create LockIt-object.
+			var lockIt = LockItPolling.Authenticate(device, authTdo, adapter, cipher).Result;
+			Assert.That(lockIt.OpenAsync().Result, Is.EqualTo(LockitLockingState.Open));
+		}
 
-        [Test]
-        public void TestOpen_ThrowsCouldntOpenInconsistentStateExecption()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var cipher = Substitute.For<TINK.Model.Device.ICipher>();
-            var auth = Substitute.For<ICharacteristic>();
-            var controlService = Substitute.For<IService>();
-            var controlCharacteristic = Substitute.For<ICharacteristic>();
-            var activateLock = Substitute.For<ICharacteristic>();
+		[Test]
+		public void TestOpen_ThrowsCouldntOpenInconsistentStateExecption()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<TINK.Model.Device.ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var controlService = Substitute.For<IService>();
+			var controlCharacteristic = Substitute.For<ICharacteristic>();
+			var activateLock = Substitute.For<ICharacteristic>();
 
-            var authTdo = new LockInfoAuthTdo.Builder
-            {
-                Id = 12,
-                K_seed = new byte[] { (byte)'n', (byte)'l', (byte)'Q', (byte)'I', (byte)'S', (byte)'z', (byte)'p', (byte)'H', (byte)'m', (byte)'n', (byte)'V', (byte)'n', (byte)'7', (byte)'f', (byte)'i', (byte)'3' },
-                K_u = new byte[16]
-            }.Build();
+			var authTdo = new LockInfoAuthTdo.Builder
+			{
+				Id = 12,
+				K_seed = new byte[] { (byte)'n', (byte)'l', (byte)'Q', (byte)'I', (byte)'S', (byte)'z', (byte)'p', (byte)'H', (byte)'m', (byte)'n', (byte)'V', (byte)'n', (byte)'7', (byte)'f', (byte)'i', (byte)'3' },
+				K_u = new byte[16]
+			}.Build();
 
-            // Calls related to Authenticate functionality.
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
-            device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(controlService));
-            controlService.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
-            cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
-            cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
+			// Calls related to Authenticate functionality.
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(controlService));
+			controlService.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
 
-            device.Name.Returns("ISHAREIT+123");
+			device.Name.Returns("ISHAREIT+123");
 
-            // Calls related to open functionality.
-            controlService.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
-            controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 1 /* closed */})); // Closed is returned twice => Inconsistent state ....
-            controlService.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
-            activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			// Calls related to open functionality.
+			controlService.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
+			controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 1 /* closed */})); // Closed is returned twice => Inconsistent state ....
+			controlService.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
+			activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
 
-            // Use factory to create LockIt-object.
-            var lockIt = LockItPolling.Authenticate(device, authTdo, adapter, cipher).Result;
-            Assert.That(async () => { var result = await lockIt.OpenAsync(); }, Throws.InstanceOf<CouldntOpenInconsistentStateExecption>());
-        }
+			// Use factory to create LockIt-object.
+			var lockIt = LockItPolling.Authenticate(device, authTdo, adapter, cipher).Result;
+			Assert.That(async () => { var result = await lockIt.OpenAsync(); }, Throws.InstanceOf<CouldntOpenInconsistentStateExecption>());
+		}
 
-        [Test]
-        public void TestOpen_ThrowsCouldntOpenBoldBlockedException()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var cipher = Substitute.For<TINK.Model.Device.ICipher>();
-            var auth = Substitute.For<ICharacteristic>();
-            var controlService = Substitute.For<IService>();
-            var controlCharacteristic = Substitute.For<ICharacteristic>();
-            var activateLock = Substitute.For<ICharacteristic>();
+		[Test]
+		public void TestOpen_ThrowsCouldntOpenBoldBlockedException()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<TINK.Model.Device.ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var controlService = Substitute.For<IService>();
+			var controlCharacteristic = Substitute.For<ICharacteristic>();
+			var activateLock = Substitute.For<ICharacteristic>();
 
-            var authTdo = new LockInfoAuthTdo.Builder
-            {
-                Id = 12,
-                K_seed = new byte[] { (byte)'h', (byte)'r', (byte)'F', (byte)'h', (byte)'G', (byte)'T', (byte)'z', (byte)'P', (byte)'F', (byte)'Z', (byte)'n', (byte)'z', (byte)'Y', (byte)'B', (byte)'s', (byte)'9' },
-                K_u = new byte[16]
-            }.Build();
+			var authTdo = new LockInfoAuthTdo.Builder
+			{
+				Id = 12,
+				K_seed = new byte[] { (byte)'h', (byte)'r', (byte)'F', (byte)'h', (byte)'G', (byte)'T', (byte)'z', (byte)'P', (byte)'F', (byte)'Z', (byte)'n', (byte)'z', (byte)'Y', (byte)'B', (byte)'s', (byte)'9' },
+				K_u = new byte[16]
+			}.Build();
 
-            // Calls related to Authenticate functionality.
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
-            device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(controlService));
-            controlService.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
-            cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
-            cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
+			// Calls related to Authenticate functionality.
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(controlService));
+			controlService.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
 
-            device.Name.Returns("ISHAREIT+123");
+			device.Name.Returns("ISHAREIT+123");
 
-            // Calls related to open functionality.
-            controlService.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
-            controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 1 /* closed */}), Task.FromResult(new byte[] { 4 /* bold blocked */ }));
-            controlService.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
-            activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			// Calls related to open functionality.
+			controlService.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
+			controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 1 /* closed */}), Task.FromResult(new byte[] { 4 /* bold blocked */ }));
+			controlService.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
+			activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
 
-            // Use factory to create LockIt-object.
-            var lockIt = LockItPolling.Authenticate(device, authTdo, adapter, cipher).Result;
-            Assert.That(async () => { var result = await lockIt.OpenAsync(); }, Throws.InstanceOf<CouldntOpenBoldIsBlockedException>());
-        }
+			// Use factory to create LockIt-object.
+			var lockIt = LockItPolling.Authenticate(device, authTdo, adapter, cipher).Result;
+			Assert.That(async () => { var result = await lockIt.OpenAsync(); }, Throws.InstanceOf<CouldntOpenBoldIsBlockedException>());
+		}
 
-        [Test]
-        public void TestClose()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var cipher = Substitute.For<TINK.Model.Device.ICipher>();
-            var auth = Substitute.For<ICharacteristic>();
-            var controlService = Substitute.For<IService>();
-            var controlCharacteristic = Substitute.For<ICharacteristic>();
-            var activateLock = Substitute.For<ICharacteristic>();
+		[Test]
+		public void TestClose()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<TINK.Model.Device.ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var controlService = Substitute.For<IService>();
+			var controlCharacteristic = Substitute.For<ICharacteristic>();
+			var activateLock = Substitute.For<ICharacteristic>();
 
-            var authTdo = new LockInfoAuthTdo.Builder
-            {
-                Id = 12,
-                K_seed = new byte[] { (byte)'H', (byte)'7', (byte)'y', (byte)'B', (byte)'f', (byte)'s', (byte)'v', (byte)'L', (byte)'G', (byte)'L', (byte)'7', (byte)'b', (byte)'7', (byte)'X', (byte)'z', (byte)'t' },
-                K_u = new byte[16]
-            }.Build();
+			var authTdo = new LockInfoAuthTdo.Builder
+			{
+				Id = 12,
+				K_seed = new byte[] { (byte)'H', (byte)'7', (byte)'y', (byte)'B', (byte)'f', (byte)'s', (byte)'v', (byte)'L', (byte)'G', (byte)'L', (byte)'7', (byte)'b', (byte)'7', (byte)'X', (byte)'z', (byte)'t' },
+				K_u = new byte[16]
+			}.Build();
 
-            // Calls related to Authenticate functionality.
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
-            device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(controlService));
-            controlService.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
-            cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
-            cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
+			// Calls related to Authenticate functionality.
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(controlService));
+			controlService.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
 
-            device.Name.Returns("ISHAREIT+123");
+			device.Name.Returns("ISHAREIT+123");
 
-            // Calls related to close functionality.
-            controlService.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
-            controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 0 /* open */ }), Task.FromResult(new byte[] { 1 /* closed */}));
-            controlService.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
-            activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			// Calls related to close functionality.
+			controlService.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
+			controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 0 /* open */ }), Task.FromResult(new byte[] { 1 /* closed */}));
+			controlService.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
+			activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
 
-            // Use factory to create LockIt-object.
-            var lockIt = LockItPolling.Authenticate(device, authTdo, adapter, cipher).Result;
-            Assert.That(lockIt.CloseAsync().Result, Is.EqualTo(LockitLockingState.Closed));
-        }
+			// Use factory to create LockIt-object.
+			var lockIt = LockItPolling.Authenticate(device, authTdo, adapter, cipher).Result;
+			Assert.That(lockIt.CloseAsync().Result, Is.EqualTo(LockitLockingState.Closed));
+		}
 
-        [Test]
-        public void TestClose_ThrowsCouldntOpenInconsistentStateExecption()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var cipher = Substitute.For<TINK.Model.Device.ICipher>();
-            var auth = Substitute.For<ICharacteristic>();
-            var controlService = Substitute.For<IService>();
-            var controlCharacteristic = Substitute.For<ICharacteristic>();
-            var activateLock = Substitute.For<ICharacteristic>();
+		[Test]
+		public void TestClose_ThrowsCouldntOpenInconsistentStateExecption()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<TINK.Model.Device.ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var controlService = Substitute.For<IService>();
+			var controlCharacteristic = Substitute.For<ICharacteristic>();
+			var activateLock = Substitute.For<ICharacteristic>();
 
-            var authTdo = new LockInfoAuthTdo.Builder
-            {
-                Id = 12,
-                K_seed = new byte[] { (byte)'7', (byte)'q', (byte)'3', (byte)'9', (byte)'i', (byte)'6', (byte)'c', (byte)'g', (byte)'9', (byte)'L', (byte)'V', (byte)'7', (byte)'T', (byte)'G', (byte)'l', (byte)'f' },
-                K_u = new byte[16]
-            }.Build();
+			var authTdo = new LockInfoAuthTdo.Builder
+			{
+				Id = 12,
+				K_seed = new byte[] { (byte)'7', (byte)'q', (byte)'3', (byte)'9', (byte)'i', (byte)'6', (byte)'c', (byte)'g', (byte)'9', (byte)'L', (byte)'V', (byte)'7', (byte)'T', (byte)'G', (byte)'l', (byte)'f' },
+				K_u = new byte[16]
+			}.Build();
 
-            // Calls related to Authenticate functionality.
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
-            device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(controlService));
-            controlService.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
-            cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
-            cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
+			// Calls related to Authenticate functionality.
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(controlService));
+			controlService.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
 
-            device.Name.Returns("ISHAREIT+123");
+			device.Name.Returns("ISHAREIT+123");
 
-            // Calls related to close functionality.
-            controlService.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
-            controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 0 /* opened */}));
-            controlService.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
-            activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			// Calls related to close functionality.
+			controlService.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
+			controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 0 /* opened */}));
+			controlService.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
+			activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
 
-            // Use factory to create LockIt-object.
-            var lockIt = LockItPolling.Authenticate(device, authTdo, adapter, cipher).Result;
-            Assert.That(async () => { var result = await lockIt.CloseAsync(); }, Throws.InstanceOf<CouldntCloseInconsistentStateExecption>());
-        }
+			// Use factory to create LockIt-object.
+			var lockIt = LockItPolling.Authenticate(device, authTdo, adapter, cipher).Result;
+			Assert.That(async () => { var result = await lockIt.CloseAsync(); }, Throws.InstanceOf<CouldntCloseInconsistentStateExecption>());
+		}
 
-        [Test]
-        public void TestClose_ThrowsCouldntOpenBoldBlockedException()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var cipher = Substitute.For<TINK.Model.Device.ICipher>();
-            var auth = Substitute.For<ICharacteristic>();
-            var controlService = Substitute.For<IService>();
-            var controlCharacteristic = Substitute.For<ICharacteristic>();
-            var activateLock = Substitute.For<ICharacteristic>();
+		[Test]
+		public void TestClose_ThrowsCouldntOpenBoldBlockedException()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<TINK.Model.Device.ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var controlService = Substitute.For<IService>();
+			var controlCharacteristic = Substitute.For<ICharacteristic>();
+			var activateLock = Substitute.For<ICharacteristic>();
 
-            var authTdo = new LockInfoAuthTdo.Builder
-            {
-                Id = 12,
-                K_seed = new byte[] { (byte)'u', (byte)'f', (byte)'u', (byte)'v', (byte)'j', (byte)'E', (byte)'b', (byte)'x', (byte)'p', (byte)'z', (byte)'a', (byte)'h', (byte)'V', (byte)'5', (byte)'9', (byte)'i' },
-                K_u = new byte[16]
-            }.Build();
+			var authTdo = new LockInfoAuthTdo.Builder
+			{
+				Id = 12,
+				K_seed = new byte[] { (byte)'u', (byte)'f', (byte)'u', (byte)'v', (byte)'j', (byte)'E', (byte)'b', (byte)'x', (byte)'p', (byte)'z', (byte)'a', (byte)'h', (byte)'V', (byte)'5', (byte)'9', (byte)'i' },
+				K_u = new byte[16]
+			}.Build();
 
-            // Calls related to Authenticate functionality.
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
-            device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(controlService));
-            controlService.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
-            cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
-            cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
+			// Calls related to Authenticate functionality.
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(controlService));
+			controlService.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
 
-            device.Name.Returns("ISHAREIT+123");
+			device.Name.Returns("ISHAREIT+123");
 
-            // Calls related to Close functionality.
-            controlService.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
-            controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 0 /* open */}), Task.FromResult(new byte[] { 5 /* bold blocked */ }));
-            controlService.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
-            activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			// Calls related to Close functionality.
+			controlService.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
+			controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 0 /* open */}), Task.FromResult(new byte[] { 5 /* bold blocked */ }));
+			controlService.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
+			activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
 
 
-            // Use factory to create LockIt-object.
-            var lockIt = LockItPolling.Authenticate(device, authTdo, adapter, cipher).Result;
-            Assert.That(async () => { var result = await lockIt.CloseAsync(); }, Throws.InstanceOf<CouldntCloseBoldBlockedException>());
-        }
-    }
+			// Use factory to create LockIt-object.
+			var lockIt = LockItPolling.Authenticate(device, authTdo, adapter, cipher).Result;
+			Assert.That(async () => { var result = await lockIt.CloseAsync(); }, Throws.InstanceOf<CouldntCloseBoldBlockedException>());
+		}
+	}
 }
diff --git a/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItServiceBase.cs b/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItServiceBase.cs
index 4212a7e..cd4147b 100644
--- a/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItServiceBase.cs
+++ b/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItServiceBase.cs
@@ -9,60 +9,60 @@ using TINK.Services.BluetoothLock.Tdo;
 
 namespace TestLockItBLE.Services.BluetoothLock.BLE
 {
-    public class TestLockItServiceBase
-    {
-        [Test]
-        public async Task TestCheckReconnect_EmptyList()
-        {
-            var disconnectedDevice = Substitute.For<ILockService>();
-            disconnectedDevice.GetDeviceState().Returns(DeviceState.Disconnected);
-            var devices = new List<ILockService> { disconnectedDevice };
-            var locksInfo = new List<LockInfoAuthTdo>();
+	public class TestLockItServiceBase
+	{
+		[Test]
+		public async Task TestCheckReconnect_EmptyList()
+		{
+			var disconnectedDevice = Substitute.For<ILockService>();
+			disconnectedDevice.GetDeviceState().Returns(DeviceState.Disconnected);
+			var devices = new List<ILockService> { disconnectedDevice };
+			var locksInfo = new List<LockInfoAuthTdo>();
 
-            await LockItServiceBase.CheckReconnect(
-                devices,
-                locksInfo,
-                TimeSpan.FromSeconds(0));
+			await LockItServiceBase.CheckReconnect(
+				devices,
+				locksInfo,
+				TimeSpan.FromSeconds(0));
 
-            await disconnectedDevice.DidNotReceive().ReconnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-        }
+			await disconnectedDevice.DidNotReceive().ReconnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
+		}
 
-        [Test]
-        public async Task TestCheckReconnect_NoMatchingIdEntry()
-        {
-            var disconnectedDevice = Substitute.For<ILockService>();
-            disconnectedDevice.GetDeviceState().Returns(DeviceState.Disconnected);
-            disconnectedDevice.Name.Returns("ISHAREIT+334");
-            disconnectedDevice.Guid.Returns(new Guid("00000000-0000-0000-0000-000000000001"));
+		[Test]
+		public async Task TestCheckReconnect_NoMatchingIdEntry()
+		{
+			var disconnectedDevice = Substitute.For<ILockService>();
+			disconnectedDevice.GetDeviceState().Returns(DeviceState.Disconnected);
+			disconnectedDevice.Name.Returns("ISHAREIT+334");
+			disconnectedDevice.Guid.Returns(new Guid("00000000-0000-0000-0000-000000000001"));
 
-            var devices = new List<ILockService> { disconnectedDevice };
-            var locksInfo = new List<LockInfoAuthTdo> { new LockInfoAuthTdo.Builder { Id = 992, Guid = new Guid("00000000-0000-0000-0000-000000000002"), K_seed = new byte[] { 2 }, K_u = new byte[] { 3 } }.Build() };
+			var devices = new List<ILockService> { disconnectedDevice };
+			var locksInfo = new List<LockInfoAuthTdo> { new LockInfoAuthTdo.Builder { Id = 992, Guid = new Guid("00000000-0000-0000-0000-000000000002"), K_seed = new byte[] { 2 }, K_u = new byte[] { 3 } }.Build() };
 
-            await LockItServiceBase.CheckReconnect(
-                devices,
-                locksInfo,
-                TimeSpan.FromSeconds(0));
+			await LockItServiceBase.CheckReconnect(
+				devices,
+				locksInfo,
+				TimeSpan.FromSeconds(0));
 
-            await disconnectedDevice.DidNotReceive().ReconnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-        }
+			await disconnectedDevice.DidNotReceive().ReconnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
+		}
 
-        [Test]
-        public async Task TestCheckReconnect()
-        {
-            var disconnectedDevice = Substitute.For<ILockService>();
-            disconnectedDevice.GetDeviceState().Returns(DeviceState.Disconnected);
-            disconnectedDevice.Name.Returns("ISHAREIT+992");
-            disconnectedDevice.Guid.Returns(new Guid("00000000-0000-0000-0000-000000000001"));
+		[Test]
+		public async Task TestCheckReconnect()
+		{
+			var disconnectedDevice = Substitute.For<ILockService>();
+			disconnectedDevice.GetDeviceState().Returns(DeviceState.Disconnected);
+			disconnectedDevice.Name.Returns("ISHAREIT+992");
+			disconnectedDevice.Guid.Returns(new Guid("00000000-0000-0000-0000-000000000001"));
 
-            var devices = new List<ILockService> { disconnectedDevice };
-            var locksInfo = new List<LockInfoAuthTdo> { new LockInfoAuthTdo.Builder { Id = 992, Guid = new Guid("00000000-0000-0000-0000-000000000002"), K_seed = new byte[] { 2 }, K_u = new byte[] { 3 } }.Build() };
+			var devices = new List<ILockService> { disconnectedDevice };
+			var locksInfo = new List<LockInfoAuthTdo> { new LockInfoAuthTdo.Builder { Id = 992, Guid = new Guid("00000000-0000-0000-0000-000000000002"), K_seed = new byte[] { 2 }, K_u = new byte[] { 3 } }.Build() };
 
-            await LockItServiceBase.CheckReconnect(
-                devices,
-                locksInfo,
-                TimeSpan.FromSeconds(0));
+			await LockItServiceBase.CheckReconnect(
+				devices,
+				locksInfo,
+				TimeSpan.FromSeconds(0));
 
-            await disconnectedDevice.Received().ReconnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-        }
-    }
+			await disconnectedDevice.Received().ReconnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
+		}
+	}
 }
diff --git a/TestLockItBLE/Services/BluetoothLock/BLE/TestPluginBleHelper.cs b/TestLockItBLE/Services/BluetoothLock/BLE/TestPluginBleHelper.cs
index fbc24be..038b73b 100644
--- a/TestLockItBLE/Services/BluetoothLock/BLE/TestPluginBleHelper.cs
+++ b/TestLockItBLE/Services/BluetoothLock/BLE/TestPluginBleHelper.cs
@@ -4,40 +4,40 @@ using TINK.Services.BluetoothLock.BLE;
 
 namespace TestLockItBLE.Services.BluetoothLock.BLE
 {
-    [TestFixture]
-    public class TestPluginBleHelper
-    {
-        [Test]
-        public void TestGetDeviceState()
-        {
-            foreach (Plugin.BLE.Abstractions.DeviceState state in Enum.GetValues(typeof(Plugin.BLE.Abstractions.DeviceState)))
-            {
-                switch (state)
-                {
-                    case Plugin.BLE.Abstractions.DeviceState.Connecting:
-                        Assert.That(state.GetDeviceState(),
-                            Is.EqualTo(TINK.Services.BluetoothLock.DeviceState.Connecting));
-                        break;
+	[TestFixture]
+	public class TestPluginBleHelper
+	{
+		[Test]
+		public void TestGetDeviceState()
+		{
+			foreach (Plugin.BLE.Abstractions.DeviceState state in Enum.GetValues(typeof(Plugin.BLE.Abstractions.DeviceState)))
+			{
+				switch (state)
+				{
+					case Plugin.BLE.Abstractions.DeviceState.Connecting:
+						Assert.That(state.GetDeviceState(),
+							Is.EqualTo(TINK.Services.BluetoothLock.DeviceState.Connecting));
+						break;
 
-                    case Plugin.BLE.Abstractions.DeviceState.Connected:
-                        Assert.That(state.GetDeviceState(),
-                            Is.EqualTo(TINK.Services.BluetoothLock.DeviceState.Connected));
-                        break;
+					case Plugin.BLE.Abstractions.DeviceState.Connected:
+						Assert.That(state.GetDeviceState(),
+							Is.EqualTo(TINK.Services.BluetoothLock.DeviceState.Connected));
+						break;
 
-                    case Plugin.BLE.Abstractions.DeviceState.Disconnected:
-                        Assert.That(state.GetDeviceState(),
-                            Is.EqualTo(TINK.Services.BluetoothLock.DeviceState.Disconnected));
-                        break;
+					case Plugin.BLE.Abstractions.DeviceState.Disconnected:
+						Assert.That(state.GetDeviceState(),
+							Is.EqualTo(TINK.Services.BluetoothLock.DeviceState.Disconnected));
+						break;
 
-                    case Plugin.BLE.Abstractions.DeviceState.Limited:
-                        Assert.That(state.GetDeviceState(),
-                            Is.EqualTo(TINK.Services.BluetoothLock.DeviceState.Limited));
-                        break;
+					case Plugin.BLE.Abstractions.DeviceState.Limited:
+						Assert.That(state.GetDeviceState(),
+							Is.EqualTo(TINK.Services.BluetoothLock.DeviceState.Limited));
+						break;
 
-                    default:
-                        throw new Exception($"Unexpected state {state} detected.");
-                }
-            }
-        }
-    }
+					default:
+						throw new Exception($"Unexpected state {state} detected.");
+				}
+			}
+		}
+	}
 }
diff --git a/TestLockItBLE/TestLockItBLE.csproj b/TestLockItBLE/TestLockItBLE.csproj
index 40da5df..04a48c5 100644
--- a/TestLockItBLE/TestLockItBLE.csproj
+++ b/TestLockItBLE/TestLockItBLE.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="NSubstitute" Version="4.4.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/TestLockItShared/Services/BluetoothLock/Exception/TestCouldntCloseInconsistentStateExecption.cs b/TestLockItShared/Services/BluetoothLock/Exception/TestCouldntCloseInconsistentStateExecption.cs
index f49bdb7..d2e279b 100644
--- a/TestLockItShared/Services/BluetoothLock/Exception/TestCouldntCloseInconsistentStateExecption.cs
+++ b/TestLockItShared/Services/BluetoothLock/Exception/TestCouldntCloseInconsistentStateExecption.cs
@@ -3,27 +3,27 @@ using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 
 namespace TINK.Services.BluetoothLock.Exception
 {
-    [TestFixture]
-    public class TestCouldntCloseInconsistentStateExecption
-    {
-        [Test]
-        public void TestCtor_Unknown()
-        {
-            var ex = new CouldntCloseInconsistentStateExecption(LockingState.UnknownFromHardwareError);
+	[TestFixture]
+	public class TestCouldntCloseInconsistentStateExecption
+	{
+		[Test]
+		public void TestCtor_Unknown()
+		{
+			var ex = new CouldntCloseInconsistentStateExecption(LockingState.UnknownFromHardwareError);
 
-            Assert.That(
-                ex.Message,
-                Is.EqualTo("Lock reports unknown bold position."));
-        }
+			Assert.That(
+				ex.Message,
+				Is.EqualTo("Lock reports unknown bold position."));
+		}
 
-        [Test]
-        public void TestCtor_Open()
-        {
-            var ex = new CouldntCloseInconsistentStateExecption(LockingState.Open);
+		[Test]
+		public void TestCtor_Open()
+		{
+			var ex = new CouldntCloseInconsistentStateExecption(LockingState.Open);
 
-            Assert.That(
-                ex.Message,
-                Does.Contain("locking state \"Open\""));
-        }
-    }
+			Assert.That(
+				ex.Message,
+				Does.Contain("locking state \"Open\""));
+		}
+	}
 }
diff --git a/TestLockItShared/Services/BluetoothLock/Exception/TestCouldntOpenInconsistentStateExecption.cs b/TestLockItShared/Services/BluetoothLock/Exception/TestCouldntOpenInconsistentStateExecption.cs
index 3c13fc3..22e36a3 100644
--- a/TestLockItShared/Services/BluetoothLock/Exception/TestCouldntOpenInconsistentStateExecption.cs
+++ b/TestLockItShared/Services/BluetoothLock/Exception/TestCouldntOpenInconsistentStateExecption.cs
@@ -3,27 +3,27 @@ using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 
 namespace TINK.Services.BluetoothLock.Exception
 {
-    [TestFixture]
-    public class TestCouldntOpenInconsistentStateExecption
-    {
-        [Test]
-        public void TestCtor_Unknown()
-        {
-            var ex = new CouldntOpenInconsistentStateExecption(LockingState.UnknownFromHardwareError);
+	[TestFixture]
+	public class TestCouldntOpenInconsistentStateExecption
+	{
+		[Test]
+		public void TestCtor_Unknown()
+		{
+			var ex = new CouldntOpenInconsistentStateExecption(LockingState.UnknownFromHardwareError);
 
-            Assert.That(
-                ex.Message,
-                Is.EqualTo("Unexpected locking state \"UnknownFromHardwareError\" detected after sending open command."));
-        }
+			Assert.That(
+				ex.Message,
+				Is.EqualTo("Unexpected locking state \"UnknownFromHardwareError\" detected after sending open command."));
+		}
 
-        [Test]
-        public void TestCtor_Open()
-        {
-            var ex = new CouldntOpenInconsistentStateExecption(LockingState.Closed);
+		[Test]
+		public void TestCtor_Open()
+		{
+			var ex = new CouldntOpenInconsistentStateExecption(LockingState.Closed);
 
-            Assert.That(
-                ex.Message,
-                Does.Contain("locking state \"Closed\""));
-        }
-    }
+			Assert.That(
+				ex.Message,
+				Does.Contain("locking state \"Closed\""));
+		}
+	}
 }
diff --git a/TestLockItShared/Services/BluetoothLock/TestTimeOutProvider.cs b/TestLockItShared/Services/BluetoothLock/TestTimeOutProvider.cs
index fb57cc3..52fcf90 100644
--- a/TestLockItShared/Services/BluetoothLock/TestTimeOutProvider.cs
+++ b/TestLockItShared/Services/BluetoothLock/TestTimeOutProvider.cs
@@ -4,25 +4,25 @@ using NUnit.Framework;
 
 namespace TINK.Services.BluetoothLock
 {
-    [TestFixture]
-    public class TestTimeOutProvider
-    {
-        [Test]
-        public void TestCtor()
-        {
-            Assert.That(new TimeOutProvider().MultiConnect.TotalSeconds, Is.EqualTo(5), "Unexpected bluetooth default timeout detected.");
+	[TestFixture]
+	public class TestTimeOutProvider
+	{
+		[Test]
+		public void TestCtor()
+		{
+			Assert.That(new TimeOutProvider().MultiConnect.TotalSeconds, Is.EqualTo(5), "Unexpected bluetooth default timeout detected.");
 
-            Assert.That(new TimeOutProvider(new List<TimeSpan>() { new TimeSpan(0, 0, 4) }).MultiConnect.TotalSeconds, Is.EqualTo(4));
-        }
+			Assert.That(new TimeOutProvider(new List<TimeSpan>() { new TimeSpan(0, 0, 4) }).MultiConnect.TotalSeconds, Is.EqualTo(4));
+		}
 
-        [Test]
-        public void TestGetSingleConnect()
-        {
-            Assert.That(new TimeOutProvider(new List<TimeSpan>() { new TimeSpan(0, 0, 4) }).GetSingleConnect(1).TotalSeconds, Is.EqualTo(4));
-            Assert.That(new TimeOutProvider(new List<TimeSpan>() { new TimeSpan(0, 0, 4) }).GetSingleConnect(2).TotalSeconds, Is.EqualTo(8));
-            Assert.That(new TimeOutProvider(new List<TimeSpan>() { new TimeSpan(0, 0, 4) }).GetSingleConnect(3).TotalSeconds, Is.EqualTo(12));
-            Assert.That(new TimeOutProvider(new List<TimeSpan>() { new TimeSpan(0, 0, 4) }).GetSingleConnect(4).TotalSeconds, Is.EqualTo(16));
-            Assert.That(new TimeOutProvider(new List<TimeSpan>() { new TimeSpan(0, 0, 4) }).GetSingleConnect(5).TotalSeconds, Is.EqualTo(16));
-        }
-    }
+		[Test]
+		public void TestGetSingleConnect()
+		{
+			Assert.That(new TimeOutProvider(new List<TimeSpan>() { new TimeSpan(0, 0, 4) }).GetSingleConnect(1).TotalSeconds, Is.EqualTo(4));
+			Assert.That(new TimeOutProvider(new List<TimeSpan>() { new TimeSpan(0, 0, 4) }).GetSingleConnect(2).TotalSeconds, Is.EqualTo(8));
+			Assert.That(new TimeOutProvider(new List<TimeSpan>() { new TimeSpan(0, 0, 4) }).GetSingleConnect(3).TotalSeconds, Is.EqualTo(12));
+			Assert.That(new TimeOutProvider(new List<TimeSpan>() { new TimeSpan(0, 0, 4) }).GetSingleConnect(4).TotalSeconds, Is.EqualTo(16));
+			Assert.That(new TimeOutProvider(new List<TimeSpan>() { new TimeSpan(0, 0, 4) }).GetSingleConnect(5).TotalSeconds, Is.EqualTo(16));
+		}
+	}
 }
diff --git a/TestLockItShared/TestLockItShared.csproj b/TestLockItShared/TestLockItShared.csproj
index e324d37..3b02b62 100644
--- a/TestLockItShared/TestLockItShared.csproj
+++ b/TestLockItShared/TestLockItShared.csproj
@@ -14,7 +14,7 @@
   <ItemGroup>
     <PackageReference Include="nunit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/TestShareeLib/Model/Bike/BC/TestBikeInfo.cs b/TestShareeLib/Model/Bike/BC/TestBikeInfo.cs
index 896b7df..3c7ae11 100644
--- a/TestShareeLib/Model/Bike/BC/TestBikeInfo.cs
+++ b/TestShareeLib/Model/Bike/BC/TestBikeInfo.cs
@@ -9,65 +9,65 @@ using TINK.Model.State;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Bike.BC
 {
-    [TestFixture]
-    public class TestBikeInfo
-    {
-        /// <summary>
-        /// Dummy subclass to provide assess to protected member for testing.
-        /// </summary>
-        private class TestBikeInfoSubClass : BikeInfo
-        {
-            public TestBikeInfoSubClass(
-                IStateInfo stateInfo,
-                TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike bike,
-                Drive drive,
-                bool? isDemo = DEFAULTVALUEISDEMO,
-                IEnumerable<string> group = null,
-                string stationId = null,
-                Uri operatorUri = null,
-                RentalDescription tariffDescription = null) : base(
-                    stateInfo,
-                    bike,
-                    drive,
-                    isDemo,
-                    group,
-                    stationId,
-                    operatorUri,
-                    tariffDescription)
-            {
-            }
-        }
+	[TestFixture]
+	public class TestBikeInfo
+	{
+		/// <summary>
+		/// Dummy subclass to provide assess to protected member for testing.
+		/// </summary>
+		private class TestBikeInfoSubClass : BikeInfo
+		{
+			public TestBikeInfoSubClass(
+				IStateInfo stateInfo,
+				TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike bike,
+				Drive drive,
+				bool? isDemo = DEFAULTVALUEISDEMO,
+				IEnumerable<string> group = null,
+				string stationId = null,
+				Uri operatorUri = null,
+				RentalDescription tariffDescription = null) : base(
+					stateInfo,
+					bike,
+					drive,
+					isDemo,
+					group,
+					stationId,
+					operatorUri,
+					tariffDescription)
+			{
+			}
+		}
 
-        [Test]
-        public void TestCtorCopyNull()
-        {
-            Assert.Throws<ArgumentNullException>(
-                () => new BikeInfo(null),
-                "Verify that no unspecific reference not set to... exception is thrown");
-        }
+		[Test]
+		public void TestCtorCopyNull()
+		{
+			Assert.Throws<ArgumentNullException>(
+				() => new BikeInfo(null),
+				"Verify that no unspecific reference not set to... exception is thrown");
+		}
 
-        [Test]
-        public void TestCtorBikeNull()
-        {
-            Assert.That(
-                () => new TestBikeInfoSubClass(new StateInfo(), null, new Drive()),
-                Throws.ArgumentNullException);
-        }
+		[Test]
+		public void TestCtorBikeNull()
+		{
+			Assert.That(
+				() => new TestBikeInfoSubClass(new StateInfo(), null, new Drive()),
+				Throws.ArgumentNullException);
+		}
 
-        [Test]
-        public void TestCtorDriveNull()
-        {
-            Assert.That(
-                () => new TestBikeInfoSubClass(new StateInfo(), new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike(string.Empty, LockModel.ILockIt), null),
-                Throws.ArgumentNullException);
-        }
+		[Test]
+		public void TestCtorDriveNull()
+		{
+			Assert.That(
+				() => new TestBikeInfoSubClass(new StateInfo(), new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike(string.Empty, LockModel.ILockIt), null),
+				Throws.ArgumentNullException);
+		}
 
-        [Test]
-        public void TestCtorCopy()
-        {
-            Assert.That(
-                () => new BikeInfo(null),
-                Throws.ArgumentNullException);
-        }
-    }
+		[Test]
+		public void TestCtorCopy()
+		{
+			Assert.That(
+				() => new BikeInfo(null),
+				Throws.ArgumentNullException);
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Bike/BC/TestBikeMutable.cs b/TestShareeLib/Model/Bike/BC/TestBikeMutable.cs
index c672ff3..0fd3b63 100644
--- a/TestShareeLib/Model/Bike/BC/TestBikeMutable.cs
+++ b/TestShareeLib/Model/Bike/BC/TestBikeMutable.cs
@@ -7,88 +7,88 @@ using TINK.Model.State;
 
 namespace TestTINKLib
 {
-    [TestFixture]
-    class TestBikeMutable
-    {
-        private class BikeInfoMutable : TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable
-        {
-            public BikeInfoMutable(
-                string id,
-                LockModel lockType,
-                bool isDemo = false,
-                IEnumerable<string> group = null,
-                WheelType? wheelType = null,
-                TypeOfBike? typeOfBike = null,
-                string description = null,
-                string stationId = null,
-                string stationName = null,
-                Uri operatorUri = null,
-                RentalDescription tariffDescription = null,
-                Func<DateTime> dateTimeProvider = null,
-                IStateInfo stateInfo = null) : base(
-                    new Bike(id, lockType, wheelType, typeOfBike, description),
-                    new TINK.Model.Bikes.BikeInfoNS.DriveNS.Drive(),
-                    isDemo,
-                    group,
-                    stationId,
-                    stationName,
-                    operatorUri,
-                    tariffDescription,
-                    dateTimeProvider,
-                    stateInfo)
-            {
-            }
-        }
+	[TestFixture]
+	class TestBikeMutable
+	{
+		private class BikeInfoMutable : TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable
+		{
+			public BikeInfoMutable(
+				string id,
+				LockModel lockType,
+				bool isDemo = false,
+				IEnumerable<string> group = null,
+				WheelType? wheelType = null,
+				TypeOfBike? typeOfBike = null,
+				string description = null,
+				string stationId = null,
+				string stationName = null,
+				Uri operatorUri = null,
+				RentalDescription tariffDescription = null,
+				Func<DateTime> dateTimeProvider = null,
+				IStateInfo stateInfo = null) : base(
+					new Bike(id, lockType, wheelType, typeOfBike, description),
+					new TINK.Model.Bikes.BikeInfoNS.DriveNS.Drive(),
+					isDemo,
+					group,
+					stationId,
+					stationName,
+					operatorUri,
+					tariffDescription,
+					dateTimeProvider,
+					stateInfo)
+			{
+			}
+		}
 
-        [Test]
-        public void TestConstruct()
-        {
-            var l_oBike = new BikeInfoMutable(
-                                "42",
-                                LockModel.ILockIt,
-                                false,
-                                new List<string> { "TINK" },
-                                WheelType.Two,
-                                TypeOfBike.Cargo);
+		[Test]
+		public void TestConstruct()
+		{
+			var l_oBike = new BikeInfoMutable(
+								"42",
+								LockModel.ILockIt,
+								false,
+								new List<string> { "TINK" },
+								WheelType.Two,
+								TypeOfBike.Cargo);
 
-            Assert.AreEqual("42", l_oBike.Id);
-            Assert.IsFalse(l_oBike.IsDemo);
-            Assert.AreEqual(WheelType.Two, l_oBike.WheelType);
-            Assert.AreEqual(TypeOfBike.Cargo, l_oBike.TypeOfBike);
-            Assert.AreEqual(InUseStateEnum.Disposable, l_oBike.State.Value);
-            Assert.IsNull(l_oBike.StationId);
+			Assert.AreEqual("42", l_oBike.Id);
+			Assert.IsFalse(l_oBike.IsDemo);
+			Assert.AreEqual(WheelType.Two, l_oBike.WheelType);
+			Assert.AreEqual(TypeOfBike.Cargo, l_oBike.TypeOfBike);
+			Assert.AreEqual(InUseStateEnum.Disposable, l_oBike.State.Value);
+			Assert.IsNull(l_oBike.StationId);
 
-            l_oBike = new BikeInfoMutable(
-                                "17",
-                                LockModel.ILockIt,
-                                true,
-                                new List<string> { "TINK" },
-                                WheelType.Mono,
-                                TypeOfBike.Allround,
-                                "Test description",
-                                "1");
+			l_oBike = new BikeInfoMutable(
+								"17",
+								LockModel.ILockIt,
+								true,
+								new List<string> { "TINK" },
+								WheelType.Mono,
+								TypeOfBike.Allround,
+								"Test description",
+								"1");
 
-            Assert.AreEqual("17", l_oBike.Id);
-            Assert.IsTrue(l_oBike.IsDemo);
-            Assert.AreEqual(WheelType.Mono, l_oBike.WheelType);
-            Assert.AreEqual(TypeOfBike.Allround, l_oBike.TypeOfBike);
-            Assert.AreEqual(InUseStateEnum.Disposable, l_oBike.State.Value);
-            Assert.AreEqual("1", l_oBike.StationId);
-        }
+			Assert.AreEqual("17", l_oBike.Id);
+			Assert.IsTrue(l_oBike.IsDemo);
+			Assert.AreEqual(WheelType.Mono, l_oBike.WheelType);
+			Assert.AreEqual(TypeOfBike.Allround, l_oBike.TypeOfBike);
+			Assert.AreEqual(InUseStateEnum.Disposable, l_oBike.State.Value);
+			Assert.AreEqual("1", l_oBike.StationId);
+		}
 
-        [Test]
-        public void TestToString()
-        {
-            var l_oBike = new BikeInfoMutable("3", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Two, TypeOfBike.Cargo, dateTimeProvider: () => new DateTime(1970, 1, 1));
+		[Test]
+		public void TestToString()
+		{
+			var l_oBike = new BikeInfoMutable("3", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Two, TypeOfBike.Cargo, dateTimeProvider: () => new DateTime(1970, 1, 1));
 
-            Assert.AreEqual(
-                "Id=3, wheel(s)=Two, type=Cargo, demo=False, state=Disposable, location=On the road.",
-                l_oBike.ToString());
+			Assert.AreEqual(
+				"Id=3, wheel(s)=Two, type=Cargo, demo=False, state=Disposable, location=On the road.",
+				l_oBike.ToString());
 
-            l_oBike = new BikeInfoMutable("3", LockModel.ILockIt, true, new List<string> { "TINK" }, WheelType.Trike, TypeOfBike.Allround, "Test description", "5", dateTimeProvider: () => new DateTime(1970, 1, 1));
-            Assert.AreEqual(
-                "Id=3, wheel(s)=Trike, type=Allround, demo=True, state=Disposable, location=Station 5.",
-                l_oBike.ToString());
-        }
-    }
+			l_oBike = new BikeInfoMutable("3", LockModel.ILockIt, true, new List<string> { "TINK" }, WheelType.Trike, TypeOfBike.Allround, "Test description", "5", dateTimeProvider: () => new DateTime(1970, 1, 1));
+			Assert.AreEqual(
+				"Id=3, wheel(s)=Trike, type=Allround, demo=True, state=Disposable, location=Station 5.",
+				l_oBike.ToString());
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Bike/BluetoothLock/TestBikeInfo.cs b/TestShareeLib/Model/Bike/BluetoothLock/TestBikeInfo.cs
index f5dce05..3772727 100644
--- a/TestShareeLib/Model/Bike/BluetoothLock/TestBikeInfo.cs
+++ b/TestShareeLib/Model/Bike/BluetoothLock/TestBikeInfo.cs
@@ -7,97 +7,97 @@ using TINK.Model.State;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 {
-    [TestFixture]
-    public class TestBikeInfo
-    {
-        [Test]
-        public void TestCtorCopyNull()
-        {
-            Assert.Throws<ArgumentException>(
-                () => new BikeInfo(null, null),
-                "Verify that no unspecific reference not set to... exception is thrown");
+	[TestFixture]
+	public class TestBikeInfo
+	{
+		[Test]
+		public void TestCtorCopyNull()
+		{
+			Assert.Throws<ArgumentException>(
+				() => new BikeInfo(null, null),
+				"Verify that no unspecific reference not set to... exception is thrown");
 
-            Assert.Throws<ArgumentException>(
-                () => new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("12", LockModel.ILockIt), new Drive(), "1"), null),
-                "Verify that no unspecific reference not set to... exception is thrown");
-        }
+			Assert.Throws<ArgumentException>(
+				() => new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("12", LockModel.ILockIt), new Drive(), "1"), null),
+				"Verify that no unspecific reference not set to... exception is thrown");
+		}
 
-        [Test]
-        public void TestCtorAvailable()
-        {
-            Assert.AreEqual("12", new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("12", LockModel.ILockIt), new Drive(), 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "13").Id);
-            Assert.AreEqual("13", new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("12", LockModel.ILockIt), new Drive(), 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "13").StationId);
-            Assert.AreEqual(InUseStateEnum.Disposable, new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("12", LockModel.ILockIt), new Drive(), 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "13").State.Value);
-        }
+		[Test]
+		public void TestCtorAvailable()
+		{
+			Assert.AreEqual("12", new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("12", LockModel.ILockIt), new Drive(), 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "13").Id);
+			Assert.AreEqual("13", new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("12", LockModel.ILockIt), new Drive(), 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "13").StationId);
+			Assert.AreEqual(InUseStateEnum.Disposable, new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("12", LockModel.ILockIt), new Drive(), 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "13").State.Value);
+		}
 
-        [Test]
-        public void TestCtorAvailableBikeNull()
-        {
-            Assert.That(
-                () => new BikeInfo(
-                    null,
-                    new Drive(),
-                    5200544,
-                    new Guid("00000000-0000-0000-0000-000000000001"),
-                    "13"),
-                Throws.ArgumentNullException);
-        }
+		[Test]
+		public void TestCtorAvailableBikeNull()
+		{
+			Assert.That(
+				() => new BikeInfo(
+					null,
+					new Drive(),
+					5200544,
+					new Guid("00000000-0000-0000-0000-000000000001"),
+					"13"),
+				Throws.ArgumentNullException);
+		}
 
-        [Test]
-        public void TestCtorRequested()
-        {
-            Assert.AreEqual("12", new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("12", LockModel.ILockIt), new Drive(), 112, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b", "13", null, null, dateTimeProvider: () => new DateTime(2019, 1, 1), false /*isDemo*/, null /*group*/).Id);
-            Assert.AreEqual(112, new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("12", LockModel.ILockIt), new Drive(), 112, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b", "13", null, null, dateTimeProvider: () => new DateTime(2019, 1, 1), false /*isDemo*/, null /*group*/).LockInfo.Id);
-            Assert.AreEqual(InUseStateEnum.Reserved, new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("12", LockModel.ILockIt), new Drive(), 112, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b", "13", null, null, dateTimeProvider: () => new DateTime(2019, 1, 1), false /*isDemo*/, null /*group*/).State.Value);
-        }
+		[Test]
+		public void TestCtorRequested()
+		{
+			Assert.AreEqual("12", new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("12", LockModel.ILockIt), new Drive(), 112, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b", "13", null, null, dateTimeProvider: () => new DateTime(2019, 1, 1), false /*isDemo*/, null /*group*/).Id);
+			Assert.AreEqual(112, new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("12", LockModel.ILockIt), new Drive(), 112, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b", "13", null, null, dateTimeProvider: () => new DateTime(2019, 1, 1), false /*isDemo*/, null /*group*/).LockInfo.Id);
+			Assert.AreEqual(InUseStateEnum.Reserved, new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("12", LockModel.ILockIt), new Drive(), 112, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b", "13", null, null, dateTimeProvider: () => new DateTime(2019, 1, 1), false /*isDemo*/, null /*group*/).State.Value);
+		}
 
-        [Test]
-        public void TestCtorRequestedBikeNull()
-        {
-            Assert.That(
-                () => new BikeInfo(
-                    null,
-                    new Drive(), 112,
-                    new Guid(),
-                    null,
-                    null,
-                    null,
-                    new DateTime(2020, 1, 1),
-                    "a@b",
-                    "13",
-                    null,
-                    null,
-                    dateTimeProvider: () => new DateTime(2019, 1, 1),
-                    false /*isDemo*/,
-                    null /*group*/),
-                Throws.ArgumentNullException);
-        }
+		[Test]
+		public void TestCtorRequestedBikeNull()
+		{
+			Assert.That(
+				() => new BikeInfo(
+					null,
+					new Drive(), 112,
+					new Guid(),
+					null,
+					null,
+					null,
+					new DateTime(2020, 1, 1),
+					"a@b",
+					"13",
+					null,
+					null,
+					dateTimeProvider: () => new DateTime(2019, 1, 1),
+					false /*isDemo*/,
+					null /*group*/),
+				Throws.ArgumentNullException);
+		}
 
-        [Test]
-        public void TestCtorBooked()
-        {
-            Assert.AreEqual("12", new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("12", LockModel.ILockIt), new Drive(), 112, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b", "13", null /*operator uri*/).Id);
-            Assert.AreEqual(112, new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("12", LockModel.ILockIt), new Drive(), 112, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b", "13", null /*operator uri*/).LockInfo.Id);
-            Assert.AreEqual(InUseStateEnum.Booked, new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("12", LockModel.ILockIt), new Drive(), 112, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b", "13", null /*operator uri*/).State.Value);
-        }
+		[Test]
+		public void TestCtorBooked()
+		{
+			Assert.AreEqual("12", new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("12", LockModel.ILockIt), new Drive(), 112, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b", "13", null /*operator uri*/).Id);
+			Assert.AreEqual(112, new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("12", LockModel.ILockIt), new Drive(), 112, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b", "13", null /*operator uri*/).LockInfo.Id);
+			Assert.AreEqual(InUseStateEnum.Booked, new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("12", LockModel.ILockIt), new Drive(), 112, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b", "13", null /*operator uri*/).State.Value);
+		}
 
-        [Test]
-        public void TestCtorBookedNull()
-        {
-            Assert.That(
-                () => new BikeInfo(
-                    null,
-                    new Drive(),
-                    112,
-                    new Guid(),
-                    null,
-                    null,
-                    null,
-                    new DateTime(2020, 1, 1),
-                    "a@b",
-                    "13",
-                    null /*operator uri*/),
-                Throws.ArgumentNullException);
-        }
-    }
+		[Test]
+		public void TestCtorBookedNull()
+		{
+			Assert.That(
+				() => new BikeInfo(
+					null,
+					new Drive(),
+					112,
+					new Guid(),
+					null,
+					null,
+					null,
+					new DateTime(2020, 1, 1),
+					"a@b",
+					"13",
+					null /*operator uri*/),
+				Throws.ArgumentNullException);
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Bike/BluetoothLock/TestBikeInfoMutalbe.cs b/TestShareeLib/Model/Bike/BluetoothLock/TestBikeInfoMutalbe.cs
index 2b63bba..df703fe 100644
--- a/TestShareeLib/Model/Bike/BluetoothLock/TestBikeInfoMutalbe.cs
+++ b/TestShareeLib/Model/Bike/BluetoothLock/TestBikeInfoMutalbe.cs
@@ -5,23 +5,23 @@ using TINK.Model.Bikes.BikeInfoNS.DriveNS;
 
 namespace TestShareeLib.Model.Bike.BluetoothLock
 {
-    [TestFixture]
-    public class TestBikeInfoMutalbe
-    {
-        [Test]
-        public void TestCtor()
-        {
-            Assert.That(
-                new BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("MyBikeId", TINK.Model.Bikes.BikeInfoNS.BikeNS.LockModel.ILockIt), new Drive(), 42, new Guid(), "17"), "My Station Name").StationName,
-                Is.EqualTo("My Station Name"));
-        }
+	[TestFixture]
+	public class TestBikeInfoMutalbe
+	{
+		[Test]
+		public void TestCtor()
+		{
+			Assert.That(
+				new BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("MyBikeId", TINK.Model.Bikes.BikeInfoNS.BikeNS.LockModel.ILockIt), new Drive(), 42, new Guid(), "17"), "My Station Name").StationName,
+				Is.EqualTo("My Station Name"));
+		}
 
-        [Test]
-        public void TestCtorBikeNull()
-        {
-            Assert.That(
-                () => new BikeInfoMutable(null, "My Station Name"),
-                Throws.ArgumentNullException);
-        }
-    }
+		[Test]
+		public void TestCtorBikeNull()
+		{
+			Assert.That(
+				() => new BikeInfoMutable(null, "My Station Name"),
+				Throws.ArgumentNullException);
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Bike/BluetoothLock/TestLockInfo.cs b/TestShareeLib/Model/Bike/BluetoothLock/TestLockInfo.cs
index 92d1900..5de0ee4 100644
--- a/TestShareeLib/Model/Bike/BluetoothLock/TestLockInfo.cs
+++ b/TestShareeLib/Model/Bike/BluetoothLock/TestLockInfo.cs
@@ -3,173 +3,173 @@ using NUnit.Framework;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 {
-    [TestFixture]
-    public class TestLockInfo
-    {
-        [Test]
-        public void TestCtor()
-        {
-            Assert.AreEqual(
-                LockingState.UnknownDisconnected,
-                new LockInfo.Builder { Id = 123 }.Build().State);
+	[TestFixture]
+	public class TestLockInfo
+	{
+		[Test]
+		public void TestCtor()
+		{
+			Assert.AreEqual(
+				LockingState.UnknownDisconnected,
+				new LockInfo.Builder { Id = 123 }.Build().State);
 
-            Assert.AreEqual(
-                123,
-                new LockInfo.Builder { Id = 123 }.Build().Id);
-        }
+			Assert.AreEqual(
+				123,
+				new LockInfo.Builder { Id = 123 }.Build().Id);
+		}
 
-        [Test]
-        public void TestEquals()
-        {
-            Assert.IsTrue(new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build() == new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build());
-        }
+		[Test]
+		public void TestEquals()
+		{
+			Assert.IsTrue(new LockInfo.Builder
+			{
+				Id = 2,
+				Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
+				Seed = new byte[] { 1, 2 },
+				UserKey = new byte[] { 7, 2 },
+				AdminKey = new byte[] { 2, 1 },
+				State = LockingState.Closed
+			}.Build() == new LockInfo.Builder
+			{
+				Id = 2,
+				Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
+				Seed = new byte[] { 1, 2 },
+				UserKey = new byte[] { 7, 2 },
+				AdminKey = new byte[] { 2, 1 },
+				State = LockingState.Closed
+			}.Build());
+		}
 
-        [Test]
-        public void TestEqualsFalse_Id()
-        {
-            Assert.IsFalse(new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build() == new LockInfo.Builder
-            {
-                Id = 3,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build());
-        }
+		[Test]
+		public void TestEqualsFalse_Id()
+		{
+			Assert.IsFalse(new LockInfo.Builder
+			{
+				Id = 2,
+				Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
+				Seed = new byte[] { 1, 2 },
+				UserKey = new byte[] { 7, 2 },
+				AdminKey = new byte[] { 2, 1 },
+				State = LockingState.Closed
+			}.Build() == new LockInfo.Builder
+			{
+				Id = 3,
+				Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
+				Seed = new byte[] { 1, 2 },
+				UserKey = new byte[] { 7, 2 },
+				AdminKey = new byte[] { 2, 1 },
+				State = LockingState.Closed
+			}.Build());
+		}
 
-        [Test]
-        public void TestEqualsFalse_Guid()
-        {
-            Assert.IsFalse(new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build() == new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("1000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build());
-        }
+		[Test]
+		public void TestEqualsFalse_Guid()
+		{
+			Assert.IsFalse(new LockInfo.Builder
+			{
+				Id = 2,
+				Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
+				Seed = new byte[] { 1, 2 },
+				UserKey = new byte[] { 7, 2 },
+				AdminKey = new byte[] { 2, 1 },
+				State = LockingState.Closed
+			}.Build() == new LockInfo.Builder
+			{
+				Id = 2,
+				Guid = new Guid("1000f00d-1212-efde-1523-785fef13d123"),
+				Seed = new byte[] { 1, 2 },
+				UserKey = new byte[] { 7, 2 },
+				AdminKey = new byte[] { 2, 1 },
+				State = LockingState.Closed
+			}.Build());
+		}
 
-        [Test]
-        public void TestEqualsFalse_Seed()
-        {
-            Assert.IsFalse(new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build() == new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 5, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build());
-        }
+		[Test]
+		public void TestEqualsFalse_Seed()
+		{
+			Assert.IsFalse(new LockInfo.Builder
+			{
+				Id = 2,
+				Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
+				Seed = new byte[] { 1, 2 },
+				UserKey = new byte[] { 7, 2 },
+				AdminKey = new byte[] { 2, 1 },
+				State = LockingState.Closed
+			}.Build() == new LockInfo.Builder
+			{
+				Id = 2,
+				Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
+				Seed = new byte[] { 5, 2 },
+				UserKey = new byte[] { 7, 2 },
+				AdminKey = new byte[] { 2, 1 },
+				State = LockingState.Closed
+			}.Build());
+		}
 
-        [Test]
-        public void TestEqualsFalse_UserKey()
-        {
-            Assert.IsFalse(new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build() == new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 9, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build());
-        }
+		[Test]
+		public void TestEqualsFalse_UserKey()
+		{
+			Assert.IsFalse(new LockInfo.Builder
+			{
+				Id = 2,
+				Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
+				Seed = new byte[] { 1, 2 },
+				UserKey = new byte[] { 7, 2 },
+				AdminKey = new byte[] { 2, 1 },
+				State = LockingState.Closed
+			}.Build() == new LockInfo.Builder
+			{
+				Id = 2,
+				Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
+				Seed = new byte[] { 1, 2 },
+				UserKey = new byte[] { 9, 2 },
+				AdminKey = new byte[] { 2, 1 },
+				State = LockingState.Closed
+			}.Build());
+		}
 
-        [Test]
-        public void TestEqualsFalse_AdminKey()
-        {
-            Assert.IsFalse(new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build() == new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 11, 1 },
-                State = LockingState.Closed
-            }.Build());
-        }
+		[Test]
+		public void TestEqualsFalse_AdminKey()
+		{
+			Assert.IsFalse(new LockInfo.Builder
+			{
+				Id = 2,
+				Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
+				Seed = new byte[] { 1, 2 },
+				UserKey = new byte[] { 7, 2 },
+				AdminKey = new byte[] { 2, 1 },
+				State = LockingState.Closed
+			}.Build() == new LockInfo.Builder
+			{
+				Id = 2,
+				Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
+				Seed = new byte[] { 1, 2 },
+				UserKey = new byte[] { 7, 2 },
+				AdminKey = new byte[] { 11, 1 },
+				State = LockingState.Closed
+			}.Build());
+		}
 
-        [Test]
-        public void TestEqualsFalse_LockingState()
-        {
-            Assert.IsFalse(new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build() == new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Open
-            }.Build());
-        }
-    }
+		[Test]
+		public void TestEqualsFalse_LockingState()
+		{
+			Assert.IsFalse(new LockInfo.Builder
+			{
+				Id = 2,
+				Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
+				Seed = new byte[] { 1, 2 },
+				UserKey = new byte[] { 7, 2 },
+				AdminKey = new byte[] { 2, 1 },
+				State = LockingState.Closed
+			}.Build() == new LockInfo.Builder
+			{
+				Id = 2,
+				Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
+				Seed = new byte[] { 1, 2 },
+				UserKey = new byte[] { 7, 2 },
+				AdminKey = new byte[] { 2, 1 },
+				State = LockingState.Open
+			}.Build());
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Bike/BluetoothLock/TestLockInfoHelper.cs b/TestShareeLib/Model/Bike/BluetoothLock/TestLockInfoHelper.cs
index f831cc7..5bd497f 100644
--- a/TestShareeLib/Model/Bike/BluetoothLock/TestLockInfoHelper.cs
+++ b/TestShareeLib/Model/Bike/BluetoothLock/TestLockInfoHelper.cs
@@ -7,47 +7,47 @@ using TINK.Services.BluetoothLock.Tdo;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 {
-    [TestFixture]
-    public class TestLockInfoHelper
-    {
-        [Test]
-        public void TestUpdateById_State()
-        {
-            var locksInfo = new List<LockInfo> {
-                new LockInfo.Builder { Id = 12, Seed = new byte[] { 3, 5 }, UserKey = new byte[] {2, 1 }, State = LockingState.UnknownFromHardwareError }.Build(),
-                new LockInfo.Builder { Id = 14, Seed = new byte[] { 3, 1 }, UserKey = new byte[] {2, 7 }, State = LockingState.Open }.Build(),
-                new LockInfo.Builder { Id = 3, Seed = new byte[] { 1, 5 }, UserKey = new byte[] {2, 9 }, State = LockingState.Closed }.Build(),
-            };
+	[TestFixture]
+	public class TestLockInfoHelper
+	{
+		[Test]
+		public void TestUpdateById_State()
+		{
+			var locksInfo = new List<LockInfo> {
+				new LockInfo.Builder { Id = 12, Seed = new byte[] { 3, 5 }, UserKey = new byte[] {2, 1 }, State = LockingState.UnknownFromHardwareError }.Build(),
+				new LockInfo.Builder { Id = 14, Seed = new byte[] { 3, 1 }, UserKey = new byte[] {2, 7 }, State = LockingState.Open }.Build(),
+				new LockInfo.Builder { Id = 3, Seed = new byte[] { 1, 5 }, UserKey = new byte[] {2, 9 }, State = LockingState.Closed }.Build(),
+			};
 
-            var locksInfoTdo = new List<LockInfoTdo> {
-                new LockInfoTdo.Builder { Id =14, State = LockitLockingState.Closed}.Build()
-                };
+			var locksInfoTdo = new List<LockInfoTdo> {
+				new LockInfoTdo.Builder { Id =14, State = LockitLockingState.Closed}.Build()
+				};
 
-            var resultList = locksInfo.UpdateById(locksInfoTdo);
+			var resultList = locksInfo.UpdateById(locksInfoTdo);
 
-            var result = resultList.FirstOrDefault(x => x.Id == 14);
-            Assert.NotNull(result, "Target element was removed.");
-            Assert.AreEqual(LockingState.Closed, result.State);
-        }
+			var result = resultList.FirstOrDefault(x => x.Id == 14);
+			Assert.NotNull(result, "Target element was removed.");
+			Assert.AreEqual(LockingState.Closed, result.State);
+		}
 
-        [Test]
-        public void TestUpdateById_Guid()
-        {
-            var locksInfo = new List<LockInfo> {
-                new LockInfo.Builder { Id = 12, Seed = new byte[] { 3, 5 }, UserKey = new byte[] {2, 1 }, State = LockingState.UnknownFromHardwareError }.Build(),
-                new LockInfo.Builder { Id = 14, Seed = new byte[] { 3, 1 }, UserKey = new byte[] {2, 7 }, State = LockingState.Open }.Build(),
-                new LockInfo.Builder { Id = 3, Seed = new byte[] { 1, 5 }, UserKey = new byte[] {2, 9 }, State = LockingState.Closed }.Build(),
-            };
+		[Test]
+		public void TestUpdateById_Guid()
+		{
+			var locksInfo = new List<LockInfo> {
+				new LockInfo.Builder { Id = 12, Seed = new byte[] { 3, 5 }, UserKey = new byte[] {2, 1 }, State = LockingState.UnknownFromHardwareError }.Build(),
+				new LockInfo.Builder { Id = 14, Seed = new byte[] { 3, 1 }, UserKey = new byte[] {2, 7 }, State = LockingState.Open }.Build(),
+				new LockInfo.Builder { Id = 3, Seed = new byte[] { 1, 5 }, UserKey = new byte[] {2, 9 }, State = LockingState.Closed }.Build(),
+			};
 
-            var locksInfoTdo = new List<LockInfoTdo> {
-                new LockInfoTdo.Builder { Id =14, Guid = new System.Guid("00000000-0000-0000-0000-e57e6b9aee16"), State = LockitLockingState.Open}.Build()
-                };
+			var locksInfoTdo = new List<LockInfoTdo> {
+				new LockInfoTdo.Builder { Id =14, Guid = new System.Guid("00000000-0000-0000-0000-e57e6b9aee16"), State = LockitLockingState.Open}.Build()
+				};
 
-            var resultList = locksInfo.UpdateById(locksInfoTdo);
+			var resultList = locksInfo.UpdateById(locksInfoTdo);
 
-            var result = resultList.FirstOrDefault(x => x.Id == 14);
-            Assert.NotNull(result, "Target element was removed.");
-            Assert.AreEqual(new Guid("00000000-0000-0000-0000-e57e6b9aee16"), result.Guid);
-        }
-    }
+			var result = resultList.FirstOrDefault(x => x.Id == 14);
+			Assert.NotNull(result, "Target element was removed.");
+			Assert.AreEqual(new Guid("00000000-0000-0000-0000-e57e6b9aee16"), result.Guid);
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Bike/BluetoothLock/TestLockInfoMutable.cs b/TestShareeLib/Model/Bike/BluetoothLock/TestLockInfoMutable.cs
index f2657b9..8de966b 100644
--- a/TestShareeLib/Model/Bike/BluetoothLock/TestLockInfoMutable.cs
+++ b/TestShareeLib/Model/Bike/BluetoothLock/TestLockInfoMutable.cs
@@ -5,62 +5,62 @@ using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 {
-    [TestFixture]
-    public class TestLockInfoMutable
-    {
-        [Test]
-        public void TestCtor()
-        {
-            var lockInfo = new LockInfoMutable(
-                1,
-                new Guid("00000000-0000-0000-0000-e57e6b9aee16"),
-                new byte[] { 1, 2, 3 },  // User key
-                new byte[] { 1, 23 },   // Admin key
-                new byte[] { 1, 12 },   // Seed
-                LockingState.Closed);
+	[TestFixture]
+	public class TestLockInfoMutable
+	{
+		[Test]
+		public void TestCtor()
+		{
+			var lockInfo = new LockInfoMutable(
+				1,
+				new Guid("00000000-0000-0000-0000-e57e6b9aee16"),
+				new byte[] { 1, 2, 3 },  // User key
+				new byte[] { 1, 23 },   // Admin key
+				new byte[] { 1, 12 },   // Seed
+				LockingState.Closed);
 
-            Assert.AreEqual(1, lockInfo.Id);
-            Assert.AreEqual(new Guid("00000000-0000-0000-0000-e57e6b9aee16"), lockInfo.Guid);
-            Assert.IsTrue((new byte[] { 1, 2, 3 }).SequenceEqual(lockInfo.UserKey));
-            Assert.IsTrue((new byte[] { 1, 23 }).SequenceEqual(lockInfo.AdminKey));
-            Assert.IsTrue((new byte[] { 1, 12 }).SequenceEqual(lockInfo.Seed));
-            Assert.AreEqual(LockingState.Closed, lockInfo.State);
-        }
+			Assert.AreEqual(1, lockInfo.Id);
+			Assert.AreEqual(new Guid("00000000-0000-0000-0000-e57e6b9aee16"), lockInfo.Guid);
+			Assert.IsTrue((new byte[] { 1, 2, 3 }).SequenceEqual(lockInfo.UserKey));
+			Assert.IsTrue((new byte[] { 1, 23 }).SequenceEqual(lockInfo.AdminKey));
+			Assert.IsTrue((new byte[] { 1, 12 }).SequenceEqual(lockInfo.Seed));
+			Assert.AreEqual(LockingState.Closed, lockInfo.State);
+		}
 
-        [Test]
-        public void TestSetGuid()
-        {
-            var lockInfo = new LockInfoMutable(1, new Guid(), new byte[] { 1, 2, 3 }, new byte[] { 1, 23 }, new byte[] { 1, 12 }, LockingState.Closed);
+		[Test]
+		public void TestSetGuid()
+		{
+			var lockInfo = new LockInfoMutable(1, new Guid(), new byte[] { 1, 2, 3 }, new byte[] { 1, 23 }, new byte[] { 1, 12 }, LockingState.Closed);
 
-            lockInfo.Guid = new Guid("00000000-0000-0000-0000-e57e6b9aee16");
-            Assert.AreEqual(new Guid("00000000-0000-0000-0000-e57e6b9aee16"), lockInfo.Guid);
-        }
+			lockInfo.Guid = new Guid("00000000-0000-0000-0000-e57e6b9aee16");
+			Assert.AreEqual(new Guid("00000000-0000-0000-0000-e57e6b9aee16"), lockInfo.Guid);
+		}
 
-        [Test]
-        public void TestLoad()
-        {
+		[Test]
+		public void TestLoad()
+		{
 
-            var lockInfo = new LockInfoMutable(
-                2,
-                new Guid(),
-                new byte[] { 5, 4 },  // User key
-                new byte[] { 14, 223 },   // Admin key
-                new byte[] { 3, 4, 5 },   // Seed
-                LockingState.Closed);
+			var lockInfo = new LockInfoMutable(
+				2,
+				new Guid(),
+				new byte[] { 5, 4 },  // User key
+				new byte[] { 14, 223 },   // Admin key
+				new byte[] { 3, 4, 5 },   // Seed
+				LockingState.Closed);
 
-            lockInfo.Load(
-                1,
-                new Guid("00000000-0000-0000-0000-e57e6b9aee16"),
-                new byte[] { 1, 12 }, // Seed
-                new byte[] { 1, 2, 3 }, // User key)
-                new byte[] { 1, 23 });
+			lockInfo.Load(
+				1,
+				new Guid("00000000-0000-0000-0000-e57e6b9aee16"),
+				new byte[] { 1, 12 }, // Seed
+				new byte[] { 1, 2, 3 }, // User key)
+				new byte[] { 1, 23 });
 
-            Assert.AreEqual(1, lockInfo.Id);
-            Assert.AreEqual(new Guid("00000000-0000-0000-0000-e57e6b9aee16"), lockInfo.Guid);
-            Assert.IsTrue((new byte[] { 1, 2, 3 }).SequenceEqual(lockInfo.UserKey));
-            Assert.IsTrue((new byte[] { 1, 23 }).SequenceEqual(lockInfo.AdminKey));
-            Assert.IsTrue((new byte[] { 1, 12 }).SequenceEqual(lockInfo.Seed));
-            Assert.AreEqual(LockingState.Closed, lockInfo.State);
-        }
-    }
+			Assert.AreEqual(1, lockInfo.Id);
+			Assert.AreEqual(new Guid("00000000-0000-0000-0000-e57e6b9aee16"), lockInfo.Guid);
+			Assert.IsTrue((new byte[] { 1, 2, 3 }).SequenceEqual(lockInfo.UserKey));
+			Assert.IsTrue((new byte[] { 1, 23 }).SequenceEqual(lockInfo.AdminKey));
+			Assert.IsTrue((new byte[] { 1, 12 }).SequenceEqual(lockInfo.Seed));
+			Assert.AreEqual(LockingState.Closed, lockInfo.State);
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Bike/CopriLock/TestBikeInfo.cs b/TestShareeLib/Model/Bike/CopriLock/TestBikeInfo.cs
index 57e95e1..2afdde1 100644
--- a/TestShareeLib/Model/Bike/CopriLock/TestBikeInfo.cs
+++ b/TestShareeLib/Model/Bike/CopriLock/TestBikeInfo.cs
@@ -6,82 +6,82 @@ using TINK.Model.Bikes.BikeInfoNS.DriveNS;
 
 namespace TestShareeLib.Model.Bike.CopriLock
 {
-    [TestFixture]
-    public class TestBikeInfo
-    {
-        [Test]
-        public void TestCtorAvailable()
-        {
-            var bike = new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
-                new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("bikeId", LockModel.Sigo),
-                new Drive(),
-                "stationId",
-                new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo());
+	[TestFixture]
+	public class TestBikeInfo
+	{
+		[Test]
+		public void TestCtorAvailable()
+		{
+			var bike = new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
+				new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("bikeId", LockModel.Sigo),
+				new Drive(),
+				"stationId",
+				new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo());
 
-            Assert.That(
-                bike.State.Value,
-                Is.EqualTo(TINK.Model.State.InUseStateEnum.Disposable));
-        }
+			Assert.That(
+				bike.State.Value,
+				Is.EqualTo(TINK.Model.State.InUseStateEnum.Disposable));
+		}
 
 
-        [Test]
-        public void TestCtorAvailableBikeNull()
-        {
-            Assert.That(
-                () => new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
-                    null,
-                    new Drive(),
-                    "stationId",
-                    new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo()),
-                Throws.ArgumentNullException);
-        }
+		[Test]
+		public void TestCtorAvailableBikeNull()
+		{
+			Assert.That(
+				() => new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
+					null,
+					new Drive(),
+					"stationId",
+					new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo()),
+				Throws.ArgumentNullException);
+		}
 
-        [Test]
-        public void TestCtorFeedbackRequired()
-        {
-            var bike = new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
-                new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("bikeId", LockModel.Sigo),
-                new Drive(),
-                "stationId",
-                new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo(),
-                true);
+		[Test]
+		public void TestCtorFeedbackRequired()
+		{
+			var bike = new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
+				new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("bikeId", LockModel.Sigo),
+				new Drive(),
+				"stationId",
+				new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo(),
+				true);
 
-            Assert.That(
-                bike.State.Value,
-                Is.EqualTo(TINK.Model.State.InUseStateEnum.FeedbackPending));
-        }
+			Assert.That(
+				bike.State.Value,
+				Is.EqualTo(TINK.Model.State.InUseStateEnum.FeedbackPending));
+		}
 
-        [Test]
-        public void TestCtorRequestedBikeNull()
-        {
-            Assert.That(
-                () => new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
-                    null,
-                    new Drive(),
-                    DateTime.Now,
-                    "a@b",
-                    "stationId",
-                    new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo(),
-                    new Uri("https://sharee.bike"),
-                    new RentalDescription(),
-                    () => DateTime.Now),
-                Throws.ArgumentNullException);
-        }
+		[Test]
+		public void TestCtorRequestedBikeNull()
+		{
+			Assert.That(
+				() => new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
+					null,
+					new Drive(),
+					DateTime.Now,
+					"a@b",
+					"stationId",
+					new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo(),
+					new Uri("https://sharee.bike"),
+					new RentalDescription(),
+					() => DateTime.Now),
+				Throws.ArgumentNullException);
+		}
 
-        [Test]
-        public void TestCtorOccupiedBikeNull()
-        {
-            Assert.That(
-                () => new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
-                    null,
-                    new Drive(),
-                    DateTime.Now,
-                    "a@b",
-                    "stationId",
-                    new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo(),
-                    new Uri("https://sharee.bike"),
-                    new RentalDescription()),
-                Throws.ArgumentNullException);
-        }
-    }
+		[Test]
+		public void TestCtorOccupiedBikeNull()
+		{
+			Assert.That(
+				() => new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
+					null,
+					new Drive(),
+					DateTime.Now,
+					"a@b",
+					"stationId",
+					new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo(),
+					new Uri("https://sharee.bike"),
+					new RentalDescription()),
+				Throws.ArgumentNullException);
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Bike/CopriLock/TestBikeInfoMutable.cs b/TestShareeLib/Model/Bike/CopriLock/TestBikeInfoMutable.cs
index 70d7dee..71a704e 100644
--- a/TestShareeLib/Model/Bike/CopriLock/TestBikeInfoMutable.cs
+++ b/TestShareeLib/Model/Bike/CopriLock/TestBikeInfoMutable.cs
@@ -4,33 +4,33 @@ using TINK.Model.Bikes.BikeInfoNS.DriveNS;
 
 namespace TestShareeLib.Model.Bike.CopriLock
 {
-    [TestFixture]
-    public class TestBikeInfoMutable
-    {
-        [Test]
-        public void TestCtorBikeInfoNull()
-        {
-            Assert.That(
-                () => new BikeInfoMutable(null, "Station 32"),
-                Throws.ArgumentNullException);
-        }
+	[TestFixture]
+	public class TestBikeInfoMutable
+	{
+		[Test]
+		public void TestCtorBikeInfoNull()
+		{
+			Assert.That(
+				() => new BikeInfoMutable(null, "Station 32"),
+				Throws.ArgumentNullException);
+		}
 
-        [Test]
-        public void TestCtorBikeInfo()
-        {
-            var bike = new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike(
-                    "MyId",
-                    TINK.Model.Bikes.BikeInfoNS.BikeNS.LockModel.Sigo);
+		[Test]
+		public void TestCtorBikeInfo()
+		{
+			var bike = new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike(
+					"MyId",
+					TINK.Model.Bikes.BikeInfoNS.BikeNS.LockModel.Sigo);
 
-            var bikeInfo = new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
-                bike,
-                new Drive(new TINK.Model.Bikes.BikeInfoNS.DriveNS.EngineNS.Engine("BackendLock")),
-                "StationId",
-                new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo());
+			var bikeInfo = new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
+				bike,
+				new Drive(new TINK.Model.Bikes.BikeInfoNS.DriveNS.EngineNS.Engine("BackendLock")),
+				"StationId",
+				new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo());
 
-            Assert.That(
-                new BikeInfoMutable(bikeInfo, "Station 32").Drive.Type,
-                Is.EqualTo(DriveType.Pedelec));
-        }
-    }
+			Assert.That(
+				new BikeInfoMutable(bikeInfo, "Station 32").Drive.Type,
+				Is.EqualTo(DriveType.Pedelec));
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Bike/TestBike.cs b/TestShareeLib/Model/Bike/TestBike.cs
index 013b719..9ecb6e3 100644
--- a/TestShareeLib/Model/Bike/TestBike.cs
+++ b/TestShareeLib/Model/Bike/TestBike.cs
@@ -2,45 +2,45 @@
 
 namespace TestTINKLib.Fixtures.ObjectTests.Bike
 {
-    using TINK.Model.Bikes.BikeInfoNS.BikeNS;
+	using TINK.Model.Bikes.BikeInfoNS.BikeNS;
 
-    [TestFixture]
-    public class TestBike
-    {
-        [Test]
-        public void TestConstruct()
-        {
-            var l_oBike = new Bike("43", LockModel.ILockIt);
-            Assert.AreEqual("43", l_oBike.Id);
-            Assert.AreEqual(null, l_oBike.TypeOfBike);
-            Assert.AreEqual(null, l_oBike.WheelType);
+	[TestFixture]
+	public class TestBike
+	{
+		[Test]
+		public void TestConstruct()
+		{
+			var l_oBike = new Bike("43", LockModel.ILockIt);
+			Assert.AreEqual("43", l_oBike.Id);
+			Assert.AreEqual(null, l_oBike.TypeOfBike);
+			Assert.AreEqual(null, l_oBike.WheelType);
 
-            l_oBike = new Bike("43", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Cargo);
+			l_oBike = new Bike("43", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Cargo);
 
-            Assert.AreEqual("43", l_oBike.Id);
-            Assert.AreEqual(TypeOfBike.Cargo, l_oBike.TypeOfBike);
-            Assert.AreEqual(WheelType.Mono, l_oBike.WheelType);
-        }
+			Assert.AreEqual("43", l_oBike.Id);
+			Assert.AreEqual(TypeOfBike.Cargo, l_oBike.TypeOfBike);
+			Assert.AreEqual(WheelType.Mono, l_oBike.WheelType);
+		}
 
-        [Test]
-        public void TestCompare()
-        {
-            var l_oBike1 = new Bike("43", LockModel.ILockIt);
-            Assert.AreEqual("43", l_oBike1.Id);
-            Assert.AreEqual(null, l_oBike1.TypeOfBike);
-            Assert.AreEqual(null, l_oBike1.WheelType);
+		[Test]
+		public void TestCompare()
+		{
+			var l_oBike1 = new Bike("43", LockModel.ILockIt);
+			Assert.AreEqual("43", l_oBike1.Id);
+			Assert.AreEqual(null, l_oBike1.TypeOfBike);
+			Assert.AreEqual(null, l_oBike1.WheelType);
 
-            var l_oBike2 = new Bike("42", LockModel.ILockIt, WheelType.Two, TypeOfBike.Allround);
-            Assert.IsFalse(l_oBike1 == l_oBike2);
+			var l_oBike2 = new Bike("42", LockModel.ILockIt, WheelType.Two, TypeOfBike.Allround);
+			Assert.IsFalse(l_oBike1 == l_oBike2);
 
-            l_oBike2 = new Bike("43", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround);
-            Assert.IsFalse(l_oBike1 == l_oBike2);
+			l_oBike2 = new Bike("43", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround);
+			Assert.IsFalse(l_oBike1 == l_oBike2);
 
-            l_oBike2 = new Bike("43", LockModel.ILockIt, WheelType.Two, TypeOfBike.Cargo);
-            Assert.IsFalse(l_oBike1 == l_oBike2);
+			l_oBike2 = new Bike("43", LockModel.ILockIt, WheelType.Two, TypeOfBike.Cargo);
+			Assert.IsFalse(l_oBike1 == l_oBike2);
 
-            l_oBike2 = new Bike("43", LockModel.ILockIt, null, null);
-            Assert.IsTrue(l_oBike1 == l_oBike2);
-        }
-    }
+			l_oBike2 = new Bike("43", LockModel.ILockIt, null, null);
+			Assert.IsTrue(l_oBike1 == l_oBike2);
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Bike/TestBikeCollection.cs b/TestShareeLib/Model/Bike/TestBikeCollection.cs
index a3ba871..1b8cd53 100644
--- a/TestShareeLib/Model/Bike/TestBikeCollection.cs
+++ b/TestShareeLib/Model/Bike/TestBikeCollection.cs
@@ -5,17 +5,17 @@ using TINK.Model.Bikes;
 namespace TestTINKLib
 {
 
-    [TestFixture]
-    public class TestBikeCollection
-    {
-        /// <summary> Tests the member.</summary>
-        [Test]
-        public void TestConstruct()
-        {
-            var l_oColl = new BikeCollection();
+	[TestFixture]
+	public class TestBikeCollection
+	{
+		/// <summary> Tests the member.</summary>
+		[Test]
+		public void TestConstruct()
+		{
+			var l_oColl = new BikeCollection();
 
-            Assert.AreEqual(0, l_oColl.Count);
-            Assert.IsNull(l_oColl.GetById("1"));
-        }
-    }
+			Assert.AreEqual(0, l_oColl.Count);
+			Assert.IsNull(l_oColl.GetById("1"));
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Bike/TestBikeCollectionMutable.cs b/TestShareeLib/Model/Bike/TestBikeCollectionMutable.cs
index fcd0980..5db193d 100644
--- a/TestShareeLib/Model/Bike/TestBikeCollectionMutable.cs
+++ b/TestShareeLib/Model/Bike/TestBikeCollectionMutable.cs
@@ -14,220 +14,220 @@ using BikeInfo = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo;
 namespace TestTINKLib
 {
 
-    [TestFixture]
-    public class TestBikeCollectionMutable
-    {
-        private class BikeInfoMutable : TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable
-        {
-            public BikeInfoMutable(
-                string id,
-                LockModel lockType,
-                bool isDemo = false,
-                IEnumerable<string> group = null,
-                WheelType? wheelType = null,
-                TypeOfBike? typeOfBike = null,
-                string description = null,
-                string stationId = null,
-                string stationName = null,
-                Uri operatorUri = null,
-                RentalDescription tariffDescription = null,
-                Func<DateTime> dateTimeProvider = null,
-                IStateInfo stateInfo = null) : base(
-                    new Bike(id, lockType, wheelType, typeOfBike, description),
-                    new TINK.Model.Bikes.BikeInfoNS.DriveNS.Drive(),
-                    isDemo,
-                    group,
-                    stationId,
-                    stationName,
-                    operatorUri,
-                    tariffDescription,
-                    dateTimeProvider,
-                    stateInfo)
-            {
-            }
-        }
+	[TestFixture]
+	public class TestBikeCollectionMutable
+	{
+		private class BikeInfoMutable : TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable
+		{
+			public BikeInfoMutable(
+				string id,
+				LockModel lockType,
+				bool isDemo = false,
+				IEnumerable<string> group = null,
+				WheelType? wheelType = null,
+				TypeOfBike? typeOfBike = null,
+				string description = null,
+				string stationId = null,
+				string stationName = null,
+				Uri operatorUri = null,
+				RentalDescription tariffDescription = null,
+				Func<DateTime> dateTimeProvider = null,
+				IStateInfo stateInfo = null) : base(
+					new Bike(id, lockType, wheelType, typeOfBike, description),
+					new TINK.Model.Bikes.BikeInfoNS.DriveNS.Drive(),
+					isDemo,
+					group,
+					stationId,
+					stationName,
+					operatorUri,
+					tariffDescription,
+					dateTimeProvider,
+					stateInfo)
+			{
+			}
+		}
 
-        /// <summary> Tests the member.</summary>
-        [Test]
-        public void TestAdd()
-        {
-            var l_oColl = new BikeCollectionMutable();
+		/// <summary> Tests the member.</summary>
+		[Test]
+		public void TestAdd()
+		{
+			var l_oColl = new BikeCollectionMutable();
 
-            l_oColl.Add(new BikeInfoMutable("57", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Two, TypeOfBike.Allround));
+			l_oColl.Add(new BikeInfoMutable("57", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Two, TypeOfBike.Allround));
 
-            Assert.Throws<Exception>(() => l_oColl.Add(new BikeInfoMutable("57", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Trike, TypeOfBike.Cargo)));
-        }
+			Assert.Throws<Exception>(() => l_oColl.Add(new BikeInfoMutable("57", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Trike, TypeOfBike.Cargo)));
+		}
 
-        [Test]
-        public void TestUpdate_Null()
-        {
-            var l_oBikeRequested = new BikeInfoMutable("20", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Trike, TypeOfBike.Allround);
-            l_oBikeRequested.State.Load(new StateInfo(() => DateTime.Now, DateTime.Now, "john@long", "1234"));
+		[Test]
+		public void TestUpdate_Null()
+		{
+			var l_oBikeRequested = new BikeInfoMutable("20", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Trike, TypeOfBike.Allround);
+			l_oBikeRequested.State.Load(new StateInfo(() => DateTime.Now, DateTime.Now, "john@long", "1234"));
 
-            var l_oBikeColl = new BikeCollectionMutable
-            {
-                new BikeInfoMutable("63", LockModel.ILockIt, false, new List<string> { "TINK" },  WheelType.Two, TypeOfBike.Allround),
-                new BikeInfoMutable("57", LockModel.ILockIt, false, new List<string> { "TINK" },  WheelType.Trike, TypeOfBike.Cargo),
-                l_oBikeRequested,
-            };
+			var l_oBikeColl = new BikeCollectionMutable
+			{
+				new BikeInfoMutable("63", LockModel.ILockIt, false, new List<string> { "TINK" },  WheelType.Two, TypeOfBike.Allround),
+				new BikeInfoMutable("57", LockModel.ILockIt, false, new List<string> { "TINK" },  WheelType.Trike, TypeOfBike.Cargo),
+				l_oBikeRequested,
+			};
 
-            // Verify initial state
-            Assert.NotNull(l_oBikeColl.GetById("63"));
-            Assert.AreEqual(InUseStateEnum.Disposable, l_oBikeColl.GetById("57").State.Value);
-            Assert.AreEqual(InUseStateEnum.Reserved, l_oBikeColl.GetById("20").State.Value);
-            Assert.Null(l_oBikeColl.GetById("33"));
+			// Verify initial state
+			Assert.NotNull(l_oBikeColl.GetById("63"));
+			Assert.AreEqual(InUseStateEnum.Disposable, l_oBikeColl.GetById("57").State.Value);
+			Assert.AreEqual(InUseStateEnum.Reserved, l_oBikeColl.GetById("20").State.Value);
+			Assert.Null(l_oBikeColl.GetById("33"));
 
-            l_oBikeColl.Update(null, null);
+			l_oBikeColl.Update(null, null);
 
-            // Verify modified state
-            Assert.Null(l_oBikeColl.GetById("63"));
-            Assert.Null(l_oBikeColl.GetById("57"));
-            Assert.Null(l_oBikeColl.GetById("20"));
-            Assert.Null(l_oBikeColl.GetById("33"));
-        }
+			// Verify modified state
+			Assert.Null(l_oBikeColl.GetById("63"));
+			Assert.Null(l_oBikeColl.GetById("57"));
+			Assert.Null(l_oBikeColl.GetById("20"));
+			Assert.Null(l_oBikeColl.GetById("33"));
+		}
 
-        [Test]
-        public void TestUpdate()
-        {
-            var bikeRequested = new BikeInfoMutable("20", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Trike, TypeOfBike.Allround);
-            bikeRequested.State.Load(new StateInfo(() => DateTime.Now, DateTime.Now, "john@long", "1234"));
+		[Test]
+		public void TestUpdate()
+		{
+			var bikeRequested = new BikeInfoMutable("20", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Trike, TypeOfBike.Allround);
+			bikeRequested.State.Load(new StateInfo(() => DateTime.Now, DateTime.Now, "john@long", "1234"));
 
-            var bikeColl = new BikeCollectionMutable
-            {
-                new BikeInfoMutable("63", LockModel.ILockIt, false, new List<string> { "TINK" },  WheelType.Two, TypeOfBike.Allround),
-                new BikeInfoMutable("57", LockModel.ILockIt, false, new List<string> { "TINK" },  WheelType.Trike, TypeOfBike.Cargo),
-                bikeRequested,
-            };
+			var bikeColl = new BikeCollectionMutable
+			{
+				new BikeInfoMutable("63", LockModel.ILockIt, false, new List<string> { "TINK" },  WheelType.Two, TypeOfBike.Allround),
+				new BikeInfoMutable("57", LockModel.ILockIt, false, new List<string> { "TINK" },  WheelType.Trike, TypeOfBike.Cargo),
+				bikeRequested,
+			};
 
-            // Verify initial state
-            Assert.NotNull(bikeColl.GetById("63")); // Will be removed
-            Assert.AreEqual(InUseStateEnum.Disposable, bikeColl.GetById("57").State.Value); // Will be requested
-            Assert.AreEqual(InUseStateEnum.Reserved, bikeColl.GetById("20").State.Value); // Will be booked
-            Assert.Null(bikeColl.GetById("33")); // 
+			// Verify initial state
+			Assert.NotNull(bikeColl.GetById("63")); // Will be removed
+			Assert.AreEqual(InUseStateEnum.Disposable, bikeColl.GetById("57").State.Value); // Will be requested
+			Assert.AreEqual(InUseStateEnum.Reserved, bikeColl.GetById("20").State.Value); // Will be booked
+			Assert.Null(bikeColl.GetById("33")); // 
 
-            var bikeResponse = new List<BikeInfo>
-            {
-                new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
-                    new Bike("57", LockModel.ILockIt),
-                    new Drive(),
-                    DateTime.Now,
-                    "john@long",
-                    "7" /*station id*/,
-                    new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo(),
-                    null),
-                new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
-                    new Bike("20", LockModel.ILockIt),
-                    new Drive(),
-                    DateTime.Now,
-                    "john@long",
-                    "7",
-                    new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo(),
-                    null),
-                new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
-                    new Bike("33", LockModel.Sigo), new Drive(),
-                    "7",
-                    new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo()),
-            };
+			var bikeResponse = new List<BikeInfo>
+			{
+				new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
+					new Bike("57", LockModel.ILockIt),
+					new Drive(),
+					DateTime.Now,
+					"john@long",
+					"7" /*station id*/,
+					new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo(),
+					null),
+				new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
+					new Bike("20", LockModel.ILockIt),
+					new Drive(),
+					DateTime.Now,
+					"john@long",
+					"7",
+					new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo(),
+					null),
+				new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
+					new Bike("33", LockModel.Sigo), new Drive(),
+					"7",
+					new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo()),
+			};
 
 
-            bikeColl.Update(bikeResponse, new List<IStation>());
+			bikeColl.Update(bikeResponse, new List<IStation>());
 
-            // Verify modified state
-            Assert.Null(bikeColl.GetById("63"), "Bike not contained in response must not exist.");
-            Assert.AreEqual(InUseStateEnum.Booked, bikeColl.GetById("57").State.Value);
-            Assert.AreEqual(InUseStateEnum.Booked, bikeColl.GetById("20").State.Value);
-            Assert.NotNull(bikeColl.GetById("33"));
-        }
+			// Verify modified state
+			Assert.Null(bikeColl.GetById("63"), "Bike not contained in response must not exist.");
+			Assert.AreEqual(InUseStateEnum.Booked, bikeColl.GetById("57").State.Value);
+			Assert.AreEqual(InUseStateEnum.Booked, bikeColl.GetById("20").State.Value);
+			Assert.NotNull(bikeColl.GetById("33"));
+		}
 
-        /// <summary>
-        /// Bike for which station name is updated is not contained in bike collection when calling update.
-        /// </summary>
-        [Test]
-        public void TestUpdate_StationName_NewBike()
-        {
-            var bikeColl = new BikeCollectionMutable();
+		/// <summary>
+		/// Bike for which station name is updated is not contained in bike collection when calling update.
+		/// </summary>
+		[Test]
+		public void TestUpdate_StationName_NewBike()
+		{
+			var bikeColl = new BikeCollectionMutable();
 
-            // Verify initial state
-            Assert.That(bikeColl.GetById("57"), Is.Null);
+			// Verify initial state
+			Assert.That(bikeColl.GetById("57"), Is.Null);
 
-            var l_oBikeResponse = new List<BikeInfo>
-            {
-                new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
-                    new Bike("57", LockModel.Sigo), new Drive(),
-                    "7" /*station id*/,
-                    new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo()),
-            };
+			var l_oBikeResponse = new List<BikeInfo>
+			{
+				new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
+					new Bike("57", LockModel.Sigo), new Drive(),
+					"7" /*station id*/,
+					new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo()),
+			};
 
-            var stations = new List<IStation>
-            {
-                new Station("7", new List<string>(), null, "My facy station")
-            };
+			var stations = new List<IStation>
+			{
+				new Station("7", new List<string>(), null, "My facy station")
+			};
 
-            bikeColl.Update(l_oBikeResponse, stations);
+			bikeColl.Update(l_oBikeResponse, stations);
 
-            // Verify modified state
-            Assert.That(bikeColl.GetById("57").StationId, Is.EqualTo("7"));
-            Assert.That(bikeColl.GetById("57").StationName, Is.EqualTo("My facy station"));
-        }
+			// Verify modified state
+			Assert.That(bikeColl.GetById("57").StationId, Is.EqualTo("7"));
+			Assert.That(bikeColl.GetById("57").StationName, Is.EqualTo("My facy station"));
+		}
 
 
-        [Test]
-        public void TestUpdate_StationName_UpdateExistingBike()
-        {
+		[Test]
+		public void TestUpdate_StationName_UpdateExistingBike()
+		{
 
-            var bikeColl = new BikeCollectionMutable
-            {
-                new BikeInfoMutable("57", LockModel.ILockIt, false, new List<string> { "TINK" },  WheelType.Trike, TypeOfBike.Cargo),
-            };
+			var bikeColl = new BikeCollectionMutable
+			{
+				new BikeInfoMutable("57", LockModel.ILockIt, false, new List<string> { "TINK" },  WheelType.Trike, TypeOfBike.Cargo),
+			};
 
-            // Verify initial state
-            Assert.That(bikeColl.GetById("57"), Is.Not.Null);
+			// Verify initial state
+			Assert.That(bikeColl.GetById("57"), Is.Not.Null);
 
-            var bikeResponse = new List<BikeInfo>
-            {
-                new BikeInfo(new Bike("57" /* bike id*/, LockModel.ILockIt, WheelType.Trike, TypeOfBike.Allround, "Test description"), new Drive(), false, new List<string> {"TINK" }, "7" /*station id*/, null /*operator uri*/, null, DateTime.Now, "john@long,", "1234"),
-            };
+			var bikeResponse = new List<BikeInfo>
+			{
+				new BikeInfo(new Bike("57" /* bike id*/, LockModel.ILockIt, WheelType.Trike, TypeOfBike.Allround, "Test description"), new Drive(), false, new List<string> {"TINK" }, "7" /*station id*/, null /*operator uri*/, null, DateTime.Now, "john@long,", "1234"),
+			};
 
-            var stations = new List<IStation>
-            {
-                new Station("7", new List<string>(), null, "My facy station")
-            };
+			var stations = new List<IStation>
+			{
+				new Station("7", new List<string>(), null, "My facy station")
+			};
 
-            bikeColl.Update(bikeResponse, stations);
+			bikeColl.Update(bikeResponse, stations);
 
-            // Verify modified state
-            Assert.That(bikeColl.GetById("57").StationId, Is.Null, "Station id is only set when update creates BikeInfo object, not when updating object BikeInfo because station name does not change.");
-            Assert.That(bikeColl.GetById("57").StationName, Is.Null, "Station name is only set when update creates BikeInfo object, not when updating object BikeInfo because station name does not change.");
-        }
+			// Verify modified state
+			Assert.That(bikeColl.GetById("57").StationId, Is.Null, "Station id is only set when update creates BikeInfo object, not when updating object BikeInfo because station name does not change.");
+			Assert.That(bikeColl.GetById("57").StationName, Is.Null, "Station name is only set when update creates BikeInfo object, not when updating object BikeInfo because station name does not change.");
+		}
 
-        [Test]
-        public void TestUpdate_StationName_Nullstations()
-        {
+		[Test]
+		public void TestUpdate_StationName_Nullstations()
+		{
 
-            var bikeColl = new BikeCollectionMutable();
+			var bikeColl = new BikeCollectionMutable();
 
 
-            var bikeResponse = new List<BikeInfo>
-            {
-                new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
-                    new Bike("57", LockModel.Sigo), new Drive(),
-                    "7" /*station id*/,
-                    new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo(),
-                    operatorUri: null /*operator uri*/),
-            };
+			var bikeResponse = new List<BikeInfo>
+			{
+				new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
+					new Bike("57", LockModel.Sigo), new Drive(),
+					"7" /*station id*/,
+					new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo(),
+					operatorUri: null /*operator uri*/),
+			};
 
-            bikeColl.Update(bikeResponse, null);
+			bikeColl.Update(bikeResponse, null);
 
-            // Verify modified state
-            Assert.That(bikeColl.GetById("57").StationId, Is.EqualTo("7"));
-            Assert.That(bikeColl.GetById("57").StationName, Is.EqualTo(""));
-        }
+			// Verify modified state
+			Assert.That(bikeColl.GetById("57").StationId, Is.EqualTo("7"));
+			Assert.That(bikeColl.GetById("57").StationName, Is.EqualTo(""));
+		}
 
-        [Test]
-        public void TestCreateBluetoothBike()
-        {
-            var bikeInfo = BikeInfoFactory.Create(JsonConvert.DeserializeObject<TINK.Repository.Response.BikeInfoAvailable>(
-                @"{
+		[Test]
+		public void TestCreateBluetoothBike()
+		{
+			var bikeInfo = BikeInfoFactory.Create(JsonConvert.DeserializeObject<TINK.Repository.Response.BikeInfoAvailable>(
+				@"{
                     ""description"" : ""Cargo Long"",
                     ""state"" : ""available"",
                     ""bike"" : ""1"",
@@ -236,16 +236,16 @@ namespace TestTINKLib
                     ""system"" : ""Ilockit""
                 }"));
 
-            Assert.That(
-                BikeCollectionMutable.BikeInfoMutableFactory.Create(bikeInfo, "Stat1").GetType(),
-                Is.EqualTo(typeof(TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable)));
-        }
+			Assert.That(
+				BikeCollectionMutable.BikeInfoMutableFactory.Create(bikeInfo, "Stat1").GetType(),
+				Is.EqualTo(typeof(TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable)));
+		}
 
-        [Test]
-        public void TestCreateCopriBike()
-        {
-            var bikeInfo = BikeInfoFactory.Create(JsonConvert.DeserializeObject<TINK.Repository.Response.BikeInfoAvailable>(
-                @"{
+		[Test]
+		public void TestCreateCopriBike()
+		{
+			var bikeInfo = BikeInfoFactory.Create(JsonConvert.DeserializeObject<TINK.Repository.Response.BikeInfoAvailable>(
+				@"{
                     ""description"" : ""Cargo Long"",
                     ""state"" : ""available"",
                     ""bike"" : ""1"",
@@ -254,17 +254,17 @@ namespace TestTINKLib
                     ""system"" : ""SIGO""
                 }"));
 
-            Assert.That(
-                BikeCollectionMutable.BikeInfoMutableFactory.Create(bikeInfo, "Stat1").GetType(),
-                Is.EqualTo(typeof(TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfoMutable)));
-        }
+			Assert.That(
+				BikeCollectionMutable.BikeInfoMutableFactory.Create(bikeInfo, "Stat1").GetType(),
+				Is.EqualTo(typeof(TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfoMutable)));
+		}
 
 
-        [Test]
-        public void TestCreateBCBike()
-        {
-            var bikeInfo = BikeInfoFactory.Create(JsonConvert.DeserializeObject<TINK.Repository.Response.BikeInfoAvailable>(
-                @"{
+		[Test]
+		public void TestCreateBCBike()
+		{
+			var bikeInfo = BikeInfoFactory.Create(JsonConvert.DeserializeObject<TINK.Repository.Response.BikeInfoAvailable>(
+				@"{
                     ""description"" : ""Cargo Long"",
                     ""state"" : ""available"",
                     ""bike"" : ""1"",
@@ -273,9 +273,9 @@ namespace TestTINKLib
                     ""system"" : ""LOCK""
                 }"));
 
-            Assert.That(
-                BikeCollectionMutable.BikeInfoMutableFactory.Create(bikeInfo, "Stat1"),
-                Is.Null);
-        }
-    }
+			Assert.That(
+				BikeCollectionMutable.BikeInfoMutableFactory.Create(bikeInfo, "Stat1"),
+				Is.Null);
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Bike/TestBikeExtension.cs b/TestShareeLib/Model/Bike/TestBikeExtension.cs
index 78deccd..6012dd3 100644
--- a/TestShareeLib/Model/Bike/TestBikeExtension.cs
+++ b/TestShareeLib/Model/Bike/TestBikeExtension.cs
@@ -4,23 +4,23 @@ using TINK.Model.Bikes.BikeInfoNS.BikeNS;
 
 namespace TestShareeLib.Model.Bike
 {
-    [TestFixture]
-    public class TestBikeExtension
-    {
-        [Test]
-        public void TestGetType()
-        {
-            Assert.That(LockModel.Sigo.GetLockType(), Is.EqualTo(LockType.Backend));
-            Assert.That(LockModel.ILockIt.GetLockType(), Is.EqualTo(LockType.Bluethooth));
-            Assert.That(
-                () => LockModel.BordComputer.GetLockType(),
-                Throws.InstanceOf<ArgumentException>());
-        }
+	[TestFixture]
+	public class TestBikeExtension
+	{
+		[Test]
+		public void TestGetType()
+		{
+			Assert.That(LockModel.Sigo.GetLockType(), Is.EqualTo(LockType.Backend));
+			Assert.That(LockModel.ILockIt.GetLockType(), Is.EqualTo(LockType.Bluethooth));
+			Assert.That(
+				() => LockModel.BordComputer.GetLockType(),
+				Throws.InstanceOf<ArgumentException>());
+		}
 
-        [Test]
-        public void TestGetTypeCount()
-        {
-            Assert.That(Enum.GetValues(typeof(LockModel)).Length, Is.EqualTo(3), $"Impelemtation of {nameof(BikeExtension.GetLockType)} must be updated.");
-        }
-    }
+		[Test]
+		public void TestGetTypeCount()
+		{
+			Assert.That(Enum.GetValues(typeof(LockModel)).Length, Is.EqualTo(3), $"Impelemtation of {nameof(BikeExtension.GetLockType)} must be updated.");
+		}
+	}
 }
diff --git a/TestShareeLib/Model/BikeInfo/DriveNS/BatteryNS/TestBattery.cs b/TestShareeLib/Model/BikeInfo/DriveNS/BatteryNS/TestBattery.cs
index 175c3d5..69d27e2 100644
--- a/TestShareeLib/Model/BikeInfo/DriveNS/BatteryNS/TestBattery.cs
+++ b/TestShareeLib/Model/BikeInfo/DriveNS/BatteryNS/TestBattery.cs
@@ -3,47 +3,47 @@ using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 
 namespace TestShareeLib.Model.BikeInfo.DriveNS.BatteryNS
 {
-    [TestFixture]
-    public class TestBattery
-    {
-        [Test]
-        public void TestSetCurrentChargePercent() => Assert.That(
-            new Battery.Builder { CurrentChargePercent = 20 }.Build().CurrentChargePercent,
-            Is.EqualTo(20.0));
+	[TestFixture]
+	public class TestBattery
+	{
+		[Test]
+		public void TestSetCurrentChargePercent() => Assert.That(
+			new Battery.Builder { CurrentChargePercent = 20 }.Build().CurrentChargePercent,
+			Is.EqualTo(20.0));
 
-        [Test]
-        public void TestSetCurrentChargePercentOutOfRange() => Assert.That(
-            new Battery.Builder { CurrentChargePercent = 101 }.Build().CurrentChargePercent,
-            Is.NaN);
+		[Test]
+		public void TestSetCurrentChargePercentOutOfRange() => Assert.That(
+			new Battery.Builder { CurrentChargePercent = 101 }.Build().CurrentChargePercent,
+			Is.NaN);
 
-        [Test]
-        public void TestSetCurrentChargeBars() => Assert.That(
-            new Battery.Builder { CurrentChargeBars = 21, MaxChargeBars = 22 }.Build().CurrentChargeBars,
-            Is.EqualTo(21));
+		[Test]
+		public void TestSetCurrentChargeBars() => Assert.That(
+			new Battery.Builder { CurrentChargeBars = 21, MaxChargeBars = 22 }.Build().CurrentChargeBars,
+			Is.EqualTo(21));
 
-        [Test]
-        public void TestSetCurrentChargeBarsOutOfRange() => Assert.That(
-            new Battery.Builder { CurrentChargeBars = -1, MaxChargeBars = 22 }.Build().CurrentChargeBars,
-            Is.Null);
+		[Test]
+		public void TestSetCurrentChargeBarsOutOfRange() => Assert.That(
+			new Battery.Builder { CurrentChargeBars = -1, MaxChargeBars = 22 }.Build().CurrentChargeBars,
+			Is.Null);
 
-        [Test]
-        public void TestSetMaxChargeBars() => Assert.That(
-            new Battery.Builder { MaxChargeBars = 23 }.Build().MaxChargeBars,
-            Is.EqualTo(23));
+		[Test]
+		public void TestSetMaxChargeBars() => Assert.That(
+			new Battery.Builder { MaxChargeBars = 23 }.Build().MaxChargeBars,
+			Is.EqualTo(23));
 
-        [Test]
-        public void TestSetMaxChargeBarsOutOfRange() => Assert.That(
-            new Battery.Builder { MaxChargeBars = -1 }.Build().MaxChargeBars,
-            Is.Null);
+		[Test]
+		public void TestSetMaxChargeBarsOutOfRange() => Assert.That(
+			new Battery.Builder { MaxChargeBars = -1 }.Build().MaxChargeBars,
+			Is.Null);
 
-        [Test]
-        public void TestSetCurrentChargeBarsNoMaxValueSet() => Assert.That(
-            new Battery.Builder { CurrentChargeBars = 21 }.Build().CurrentChargeBars,
-            Is.Null);
+		[Test]
+		public void TestSetCurrentChargeBarsNoMaxValueSet() => Assert.That(
+			new Battery.Builder { CurrentChargeBars = 21 }.Build().CurrentChargeBars,
+			Is.Null);
 
-        [Test]
-        public void TestSetCurrentChargeBars_CurrentValueTooLarge() => Assert.That(
-            new Battery.Builder { CurrentChargeBars = 25, MaxChargeBars = 22 }.Build().CurrentChargeBars,
-            Is.Null);
-    }
+		[Test]
+		public void TestSetCurrentChargeBars_CurrentValueTooLarge() => Assert.That(
+			new Battery.Builder { CurrentChargeBars = 25, MaxChargeBars = 22 }.Build().CurrentChargeBars,
+			Is.Null);
+	}
 }
diff --git a/TestShareeLib/Model/BikeInfo/DriveNS/TestDriveMutable.cs b/TestShareeLib/Model/BikeInfo/DriveNS/TestDriveMutable.cs
index c9c0eaf..fdc6123 100644
--- a/TestShareeLib/Model/BikeInfo/DriveNS/TestDriveMutable.cs
+++ b/TestShareeLib/Model/BikeInfo/DriveNS/TestDriveMutable.cs
@@ -6,44 +6,44 @@ using TINK.Model.Bikes.BikeInfoNS.DriveNS.EngineNS;
 
 namespace TestShareeLib.Model.BikeInfo.DriveNS
 {
-    [TestFixture]
-    public class TestDriveMutable
-    {
-        [Test]
-        public void TestCtorNoArgs()
-        {
-            var drive = new TINK.Model.Bikes.BikeInfoNS.DriveNS.Drive();
-            Assert.That(
-                drive.Type,
-                Is.EqualTo(DriveType.SoleHumanPowered));
+	[TestFixture]
+	public class TestDriveMutable
+	{
+		[Test]
+		public void TestCtorNoArgs()
+		{
+			var drive = new TINK.Model.Bikes.BikeInfoNS.DriveNS.Drive();
+			Assert.That(
+				drive.Type,
+				Is.EqualTo(DriveType.SoleHumanPowered));
 
-            Assert.That(
-                drive.Engine,
-                Is.Not.Null);
+			Assert.That(
+				drive.Engine,
+				Is.Not.Null);
 
-            Assert.That(
-                drive.Battery,
-                Is.Not.Null);
-        }
+			Assert.That(
+				drive.Battery,
+				Is.Not.Null);
+		}
 
-        [Test]
-        public void TestCtor()
-        {
-            var engine = Substitute.For<IEngine>();
-            var battery = Substitute.For<IBattery>();
+		[Test]
+		public void TestCtor()
+		{
+			var engine = Substitute.For<IEngine>();
+			var battery = Substitute.For<IBattery>();
 
-            engine.Manufacturer.Returns("Bosch");
-            battery.CurrentChargePercent.Returns(97);
+			engine.Manufacturer.Returns("Bosch");
+			battery.CurrentChargePercent.Returns(97);
 
-            var drive = new TINK.Model.Bikes.BikeInfoNS.DriveNS.Drive(engine, battery);
+			var drive = new TINK.Model.Bikes.BikeInfoNS.DriveNS.Drive(engine, battery);
 
-            Assert.That(
-                drive.Engine.Manufacturer,
-                Is.EqualTo("Bosch"));
+			Assert.That(
+				drive.Engine.Manufacturer,
+				Is.EqualTo("Bosch"));
 
-            Assert.That(
-                drive.Battery.CurrentChargePercent,
-                Is.EqualTo(97));
-        }
-    }
+			Assert.That(
+				drive.Battery.CurrentChargePercent,
+				Is.EqualTo(97));
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Connector/Filter/TestIntersectGroupFilterHelper.cs b/TestShareeLib/Model/Connector/Filter/TestIntersectGroupFilterHelper.cs
index 37c0a54..f9b8dc7 100644
--- a/TestShareeLib/Model/Connector/Filter/TestIntersectGroupFilterHelper.cs
+++ b/TestShareeLib/Model/Connector/Filter/TestIntersectGroupFilterHelper.cs
@@ -5,71 +5,71 @@ using TINK.Model.Connector.Filter;
 
 namespace TestShareeLib.Model.Connector.Filter
 {
-    [TestFixture]
-    public class TestIntersectGroupFilterHelper
-    {
-        [Test]
-        public void TestGetBikeCategory()
-        {
-            CollectionAssert.AreEqual(
-                 "300102",
-                 "Fr_300102".GetBikeCategory());
-        }
+	[TestFixture]
+	public class TestIntersectGroupFilterHelper
+	{
+		[Test]
+		public void TestGetBikeCategory()
+		{
+			CollectionAssert.AreEqual(
+				 "300102",
+				 "Fr_300102".GetBikeCategory());
+		}
 
-        [Test]
-        public void TestGetBikeCategoryEmpty()
-        {
-            CollectionAssert.AreEqual(
-                 "",
-                 "CAD_".GetBikeCategory());
-        }
+		[Test]
+		public void TestGetBikeCategoryEmpty()
+		{
+			CollectionAssert.AreEqual(
+				 "",
+				 "CAD_".GetBikeCategory());
+		}
 
-        [Test]
-        public void TestToBikeCategory()
-        {
-            CollectionAssert.AreEqual(
-                 new List<string> { "300102", "777" },
-                 IntersectGroupFilterHelper.ToBikeCategory(new List<string> { "KN_300102", "Bla_XXX", "FR_777" }));
-        }
+		[Test]
+		public void TestToBikeCategory()
+		{
+			CollectionAssert.AreEqual(
+				 new List<string> { "300102", "777" },
+				 IntersectGroupFilterHelper.ToBikeCategory(new List<string> { "KN_300102", "Bla_XXX", "FR_777" }));
+		}
 
-        [Test]
-        public void TestToBikeCategoryEmpty()
-        {
-            Assert.That(
-                   IntersectGroupFilterHelper.ToBikeCategory(new List<string> { "KN_" }).Count(),
-                   Is.EqualTo(0));
-        }
+		[Test]
+		public void TestToBikeCategoryEmpty()
+		{
+			Assert.That(
+				   IntersectGroupFilterHelper.ToBikeCategory(new List<string> { "KN_" }).Count(),
+				   Is.EqualTo(0));
+		}
 
-        [Test]
-        public void TestIntersectByGoupId()
-        {
-            CollectionAssert.AreEqual(
-                new List<string> { "FR_300101" },
-                new List<string> { "FR_300101", "XY_777" }.IntersectByGoupId(new List<string> { "XY_776", "KN_300101" }));
-        }
+		[Test]
+		public void TestIntersectByGoupId()
+		{
+			CollectionAssert.AreEqual(
+				new List<string> { "FR_300101" },
+				new List<string> { "FR_300101", "XY_777" }.IntersectByGoupId(new List<string> { "XY_776", "KN_300101" }));
+		}
 
-        [Test]
-        public void TestIntersectByGoupId_Empty()
-        {
-            CollectionAssert.AreEqual(
-                new List<string>(),
-                new List<string> { "FR_300102" }.IntersectByGoupId(new List<string> { "FR_300101" }));
-        }
+		[Test]
+		public void TestIntersectByGoupId_Empty()
+		{
+			CollectionAssert.AreEqual(
+				new List<string>(),
+				new List<string> { "FR_300102" }.IntersectByGoupId(new List<string> { "FR_300101" }));
+		}
 
-        [Test]
-        public void TestContainsGroupId_True()
-        {
-            Assert.That(
-                new List<string> { "FR_300101", "XY_777" }.ContainsGroupId("KN_300101"),
-                Is.True);
-        }
+		[Test]
+		public void TestContainsGroupId_True()
+		{
+			Assert.That(
+				new List<string> { "FR_300101", "XY_777" }.ContainsGroupId("KN_300101"),
+				Is.True);
+		}
 
-        [Test]
-        public void TestContainsGroupId_False()
-        {
-            Assert.That(
-                new List<string> { "FR_300101", "XY_777" }.ContainsGroupId("XY_776"),
-                Is.False);
-        }
-    }
+		[Test]
+		public void TestContainsGroupId_False()
+		{
+			Assert.That(
+				new List<string> { "FR_300101", "XY_777" }.ContainsGroupId("XY_776"),
+				Is.False);
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Connector/TestCachedQueryLoggedIn.cs b/TestShareeLib/Model/Connector/TestCachedQueryLoggedIn.cs
index 64d3d3e..d828e2a 100644
--- a/TestShareeLib/Model/Connector/TestCachedQueryLoggedIn.cs
+++ b/TestShareeLib/Model/Connector/TestCachedQueryLoggedIn.cs
@@ -11,18 +11,18 @@ using TINK.Services.CopriApi;
 
 namespace TestShareeLib.Model.Connector
 {
-    [TestFixture]
-    public class TestCachedQueryLoggedIn
-    {
-        /// <summary>
-        /// Verifies that available bikes are not considered to by kind of MyBikes. 
-        /// </summary>
-        [Test]
-        public async Task TestGetBikesOccupiedAsyncMyBikesNone()
-        {
-            var server = Substitute.For<ICachedCopriServer>();
+	[TestFixture]
+	public class TestCachedQueryLoggedIn
+	{
+		/// <summary>
+		/// Verifies that available bikes are not considered to by kind of MyBikes. 
+		/// </summary>
+		[Test]
+		public async Task TestGetBikesOccupiedAsyncMyBikesNone()
+		{
+			var server = Substitute.For<ICachedCopriServer>();
 
-            var bikesAvailable = JsonConvert.DeserializeObject<BikesAvailableResponse>(@"
+			var bikesAvailable = JsonConvert.DeserializeObject<BikesAvailableResponse>(@"
             {
                 ""bikes"": {
                         ""FR1005"": {
@@ -35,47 +35,47 @@ namespace TestShareeLib.Model.Connector
                     ""copri_version"": ""4.1.12.5"",
             }");
 
-            var bikesOccupied = JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(@"
+			var bikesOccupied = JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(@"
             {
                 ""bikes_occupied"": { },
                 ""copri_version"": ""4.1.12.5"",
             }");
 
-            var resultAvailable = new Result<BikesAvailableResponse>(
-                typeof(CopriCallsHttps), // Marks that response was taken from cache
-                bikesAvailable,
-                new GeneralData());
+			var resultAvailable = new Result<BikesAvailableResponse>(
+				typeof(CopriCallsHttps), // Marks that response was taken from cache
+				bikesAvailable,
+				new GeneralData());
 
-            var resultOccupied = new Result<BikesReservedOccupiedResponse>(
-                typeof(CopriCallsHttps),
-                bikesOccupied,
-                new GeneralData());
+			var resultOccupied = new Result<BikesReservedOccupiedResponse>(
+				typeof(CopriCallsHttps),
+				bikesOccupied,
+				new GeneralData());
 
-            server.GetBikesAvailable(false).Returns(Task.FromResult(resultAvailable));
-            server.GetBikesOccupied(false).Returns(Task.FromResult(resultOccupied));
+			server.GetBikesAvailable(false).Returns(Task.FromResult(resultAvailable));
+			server.GetBikesOccupied(false).Returns(Task.FromResult(resultOccupied));
 
-            var query = new CachedQueryLoggedIn(
-                server,
-                "SessionCookie",
-                "Mail",
-                () => new DateTime(2022, 7, 16));
+			var query = new CachedQueryLoggedIn(
+				server,
+				"SessionCookie",
+				"Mail",
+				() => new DateTime(2022, 7, 16));
 
-            var bikesResponse = await query.GetBikesOccupiedAsync();
+			var bikesResponse = await query.GetBikesOccupiedAsync();
 
-            Assert.That(
-                bikesResponse.Response.Count,
-                Is.EqualTo(0));
-        }
+			Assert.That(
+				bikesResponse.Response.Count,
+				Is.EqualTo(0));
+		}
 
-        /// <summary>
-        /// Verifies that available bikes with Co2Saving entry set are considered to by kind of MyBikes. 
-        /// </summary>
-        [Test]
-        public async Task TestGetBikesOccupiedAsyncMyBikesOneFeedbackPending()
-        {
-            var server = Substitute.For<ICachedCopriServer>();
+		/// <summary>
+		/// Verifies that available bikes with Co2Saving entry set are considered to by kind of MyBikes. 
+		/// </summary>
+		[Test]
+		public async Task TestGetBikesOccupiedAsyncMyBikesOneFeedbackPending()
+		{
+			var server = Substitute.For<ICachedCopriServer>();
 
-            var bikesAvailable = JsonConvert.DeserializeObject<BikesAvailableResponse>(@"
+			var bikesAvailable = JsonConvert.DeserializeObject<BikesAvailableResponse>(@"
             {
                 ""bikes"": {
                         ""FR1005"": {
@@ -89,53 +89,53 @@ namespace TestShareeLib.Model.Connector
                     ""copri_version"": ""4.1.12.5"",
             }");
 
-            var bikesOccupied = JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(@"
+			var bikesOccupied = JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(@"
             {
                 ""bikes_occupied"": { },
                 ""copri_version"": ""4.1.12.5"",
             }");
 
-            var resultAvailable = new Result<BikesAvailableResponse>(
-                typeof(CopriCallsHttps),
-                bikesAvailable,
-                new GeneralData());
+			var resultAvailable = new Result<BikesAvailableResponse>(
+				typeof(CopriCallsHttps),
+				bikesAvailable,
+				new GeneralData());
 
-            var resultOccupied = new Result<BikesReservedOccupiedResponse>(
-                typeof(CopriCallsHttps),
-                bikesOccupied,
-                new GeneralData());
+			var resultOccupied = new Result<BikesReservedOccupiedResponse>(
+				typeof(CopriCallsHttps),
+				bikesOccupied,
+				new GeneralData());
 
-            server.GetBikesAvailable(false).Returns(Task.FromResult(resultAvailable));
-            server.GetBikesOccupied(false).Returns(Task.FromResult(resultOccupied));
+			server.GetBikesAvailable(false).Returns(Task.FromResult(resultAvailable));
+			server.GetBikesOccupied(false).Returns(Task.FromResult(resultOccupied));
 
-            var query = new CachedQueryLoggedIn(
-                server,
-                "SessionCookie",
-                "Mail",
-                () => new DateTime(2022, 7, 16));
+			var query = new CachedQueryLoggedIn(
+				server,
+				"SessionCookie",
+				"Mail",
+				() => new DateTime(2022, 7, 16));
 
-            var bikesResponse = await query.GetBikesOccupiedAsync();
+			var bikesResponse = await query.GetBikesOccupiedAsync();
 
-            Assert.That(
-                bikesResponse.Response.Count,
-                Is.EqualTo(1));
-        }
+			Assert.That(
+				bikesResponse.Response.Count,
+				Is.EqualTo(1));
+		}
 
-        /// <summary>
-        /// . 
-        /// </summary>
-        [Test]
-        public async Task TestGetBikesOccupiedAsyncMyBikesOneOccupied()
-        {
-            var server = Substitute.For<ICachedCopriServer>();
+		/// <summary>
+		/// . 
+		/// </summary>
+		[Test]
+		public async Task TestGetBikesOccupiedAsyncMyBikesOneOccupied()
+		{
+			var server = Substitute.For<ICachedCopriServer>();
 
-            var bikesAvailable = JsonConvert.DeserializeObject<BikesAvailableResponse>(@"
+			var bikesAvailable = JsonConvert.DeserializeObject<BikesAvailableResponse>(@"
             {
                 ""bikes"": { },
                 ""copri_version"": ""4.1.12.5"",
             }");
 
-            var bikesOccupied = JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(@"
+			var bikesOccupied = JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(@"
             {
                 ""bikes_occupied"": {
                         ""FR1005"": {
@@ -149,41 +149,41 @@ namespace TestShareeLib.Model.Connector
                     ""copri_version"": ""4.1.12.5"",
             }");
 
-            var resultAvailable = new Result<BikesAvailableResponse>(
-                typeof(CopriCallsHttps),
-                bikesAvailable,
-                new GeneralData());
+			var resultAvailable = new Result<BikesAvailableResponse>(
+				typeof(CopriCallsHttps),
+				bikesAvailable,
+				new GeneralData());
 
-            var resultOccupied = new Result<BikesReservedOccupiedResponse>(
-                typeof(CopriCallsHttps),
-                bikesOccupied,
-                new GeneralData());
+			var resultOccupied = new Result<BikesReservedOccupiedResponse>(
+				typeof(CopriCallsHttps),
+				bikesOccupied,
+				new GeneralData());
 
-            server.GetBikesAvailable(false).Returns(Task.FromResult(resultAvailable));   // Get bikes from copri
-            server.GetBikesOccupied(false).Returns(Task.FromResult(resultOccupied));    // Get bikes from cache
+			server.GetBikesAvailable(false).Returns(Task.FromResult(resultAvailable));   // Get bikes from copri
+			server.GetBikesOccupied(false).Returns(Task.FromResult(resultOccupied));    // Get bikes from cache
 
-            var query = new CachedQueryLoggedIn(
-                server,
-                "SessionCookie",
-                "Mail",
-                () => new DateTime(2022, 7, 16));
+			var query = new CachedQueryLoggedIn(
+				server,
+				"SessionCookie",
+				"Mail",
+				() => new DateTime(2022, 7, 16));
 
-            var bikesResponse = await query.GetBikesOccupiedAsync();
+			var bikesResponse = await query.GetBikesOccupiedAsync();
 
-            Assert.That(
-                bikesResponse.Response.Count,
-                Is.EqualTo(1));
-        }
+			Assert.That(
+				bikesResponse.Response.Count,
+				Is.EqualTo(1));
+		}
 
-        /// <summary>
-        /// Scenario: Call of GetBikesAvailable fails data is taken from cache. 
-        /// </summary>
-        [Test]
-        public async Task TestGetBikesOccupiedAsyncGetAvailableFailsMyBikeOneFeedbackPending()
-        {
-            var server = Substitute.For<ICachedCopriServer>();
+		/// <summary>
+		/// Scenario: Call of GetBikesAvailable fails data is taken from cache. 
+		/// </summary>
+		[Test]
+		public async Task TestGetBikesOccupiedAsyncGetAvailableFailsMyBikeOneFeedbackPending()
+		{
+			var server = Substitute.For<ICachedCopriServer>();
 
-            var bikesAvailable = JsonConvert.DeserializeObject<BikesAvailableResponse>(@"
+			var bikesAvailable = JsonConvert.DeserializeObject<BikesAvailableResponse>(@"
             {
                 ""bikes"": {
                         ""FR1005"": {
@@ -197,53 +197,53 @@ namespace TestShareeLib.Model.Connector
                     ""copri_version"": ""4.1.12.5"",
             }");
 
-            var bikesOccupied = JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(@"
+			var bikesOccupied = JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(@"
             {
                 ""bikes_occupied"": { },
                 ""copri_version"": ""4.1.12.5"",
             }");
 
-            var resultAvailable = new Result<BikesAvailableResponse>(
-                typeof(CopriCallsMonkeyStore),
-                bikesAvailable,
-                new GeneralData());
+			var resultAvailable = new Result<BikesAvailableResponse>(
+				typeof(CopriCallsMonkeyStore),
+				bikesAvailable,
+				new GeneralData());
 
-            var resultOccupied = new Result<BikesReservedOccupiedResponse>(
-                typeof(CopriCallsMonkeyStore),
-                bikesOccupied,
-                new GeneralData());
+			var resultOccupied = new Result<BikesReservedOccupiedResponse>(
+				typeof(CopriCallsMonkeyStore),
+				bikesOccupied,
+				new GeneralData());
 
-            server.GetBikesAvailable(false).Returns(Task.FromResult(resultAvailable));
-            server.GetBikesOccupied(true).Returns(Task.FromResult(resultOccupied));
+			server.GetBikesAvailable(false).Returns(Task.FromResult(resultAvailable));
+			server.GetBikesOccupied(true).Returns(Task.FromResult(resultOccupied));
 
-            var query = new CachedQueryLoggedIn(
-                server,
-                "SessionCookie",
-                "Mail",
-                () => new DateTime(2022, 7, 16));
+			var query = new CachedQueryLoggedIn(
+				server,
+				"SessionCookie",
+				"Mail",
+				() => new DateTime(2022, 7, 16));
 
-            var bikesResponse = await query.GetBikesOccupiedAsync();
+			var bikesResponse = await query.GetBikesOccupiedAsync();
 
-            Assert.That(
-                bikesResponse.Response.Count,
-                Is.EqualTo(1));
-        }
+			Assert.That(
+				bikesResponse.Response.Count,
+				Is.EqualTo(1));
+		}
 
-        /// <summary>
-        /// Scenario: Call of GetBikesAvailable succeeds but because call of  GetBikesOccupied fails data is taken from cache.
-        /// </summary>
-        [Test]
-        public async Task TestGetBikesOccupiedAsyncGetGetBikesOccupiedFailsMyBikeFeedbackPending()
-        {
-            var server = Substitute.For<ICachedCopriServer>();
+		/// <summary>
+		/// Scenario: Call of GetBikesAvailable succeeds but because call of  GetBikesOccupied fails data is taken from cache.
+		/// </summary>
+		[Test]
+		public async Task TestGetBikesOccupiedAsyncGetGetBikesOccupiedFailsMyBikeFeedbackPending()
+		{
+			var server = Substitute.For<ICachedCopriServer>();
 
-            var bikesAvailableCopri = JsonConvert.DeserializeObject<BikesAvailableResponse>(@"
+			var bikesAvailableCopri = JsonConvert.DeserializeObject<BikesAvailableResponse>(@"
                 {
                     ""bikes"": { },
                     ""copri_version"": ""4.1.12.5"",
                 }");
 
-            var bikesAvailableCache = JsonConvert.DeserializeObject<BikesAvailableResponse>(@"
+			var bikesAvailableCache = JsonConvert.DeserializeObject<BikesAvailableResponse>(@"
                 {
                     ""bikes"": {
                             ""FR1005"": {
@@ -257,42 +257,42 @@ namespace TestShareeLib.Model.Connector
                         ""copri_version"": ""4.1.12.5"",
                 }");
 
-            var bikesOccupied = JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(@"
+			var bikesOccupied = JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(@"
                 {
                     ""bikes_occupied"": { },
                     ""copri_version"": ""4.1.12.5"",
                 }");
 
-            var resultAvailableCopri = new Result<BikesAvailableResponse>(
-                typeof(CopriCallsHttps), // Marks that response was taken from copri
-                bikesAvailableCache,
-                new GeneralData());
+			var resultAvailableCopri = new Result<BikesAvailableResponse>(
+				typeof(CopriCallsHttps), // Marks that response was taken from copri
+				bikesAvailableCache,
+				new GeneralData());
 
-            var resultAvailableCache = new Result<BikesAvailableResponse>(
-                typeof(CopriCallsMonkeyStore), // Marks that response was taken from cache
-                bikesAvailableCache,
-                new GeneralData());
+			var resultAvailableCache = new Result<BikesAvailableResponse>(
+				typeof(CopriCallsMonkeyStore), // Marks that response was taken from cache
+				bikesAvailableCache,
+				new GeneralData());
 
-            var resultOccupied = new Result<BikesReservedOccupiedResponse>(
-                typeof(CopriCallsMonkeyStore),
-                bikesOccupied,
-                new GeneralData());
+			var resultOccupied = new Result<BikesReservedOccupiedResponse>(
+				typeof(CopriCallsMonkeyStore),
+				bikesOccupied,
+				new GeneralData());
 
-            server.GetBikesAvailable(false).Returns(Task.FromResult(resultAvailableCopri));   // Get bikes from copri
-            server.GetBikesOccupied(false).Returns(Task.FromResult(resultOccupied));    // Get bikes from copri fails
-            server.GetBikesAvailable(true).Returns(Task.FromResult(resultAvailableCache));   // Get bikes from cache
+			server.GetBikesAvailable(false).Returns(Task.FromResult(resultAvailableCopri));   // Get bikes from copri
+			server.GetBikesOccupied(false).Returns(Task.FromResult(resultOccupied));    // Get bikes from copri fails
+			server.GetBikesAvailable(true).Returns(Task.FromResult(resultAvailableCache));   // Get bikes from cache
 
-            var query = new CachedQueryLoggedIn(
-                server,
-                "SessionCookie",
-                "Mail",
-                () => new DateTime(2022, 7, 16));
+			var query = new CachedQueryLoggedIn(
+				server,
+				"SessionCookie",
+				"Mail",
+				() => new DateTime(2022, 7, 16));
 
-            var bikesResponse = await query.GetBikesOccupiedAsync();
+			var bikesResponse = await query.GetBikesOccupiedAsync();
 
-            Assert.That(
-                bikesResponse.Response.Count,
-                Is.EqualTo(1));
-        }
-    }
+			Assert.That(
+				bikesResponse.Response.Count,
+				Is.EqualTo(1));
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Connector/TestCachetimings.cs b/TestShareeLib/Model/Connector/TestCachetimings.cs
index 7dd54aa..3a618a6 100644
--- a/TestShareeLib/Model/Connector/TestCachetimings.cs
+++ b/TestShareeLib/Model/Connector/TestCachetimings.cs
@@ -9,155 +9,155 @@ using UITest.Fixtures.Connector;
 
 namespace TestTINKLib.Fixtures.Misc
 {
-    [TestFixture]
-    [Category(TestCopriCallsHttps.CATEGORY_REQUIRESCOPRI)]
-    public class TestCachetimings
-    {
-        [Test]
-#if !NOLIVESERVER        
-        [Explicit("Run with care because this stress impact live system.")]
-        //[Category(TestCopriCallsHttps.CATEGORY_USESLIVESERVER)]
+	[TestFixture]
+	[Category(TestCopriCallsHttps.CATEGORY_REQUIRESCOPRI)]
+	public class TestCachetimings
+	{
+		[Test]
+#if !NOLIVESERVER
+		[Explicit("Run with care because this stress impact live system.")]
+		//[Category(TestCopriCallsHttps.CATEGORY_USESLIVESERVER)]
 #elif !NODEVELSERVER
         [Category(TestCopriCallsHttps.CATEGORY_USESDEVELSERVER)]
 #endif
-        public void TestCachedQuery_GetStationsAll(
+		public void TestCachedQuery_GetStationsAll(
 #if NOLIVESERVER
             [Values(CopriServerUriList.SHAREE_DEVEL)] string url,
 #elif NODEVELSERVER
         [Values(CopriServerUriList.SHAREE_LIVE)] string url,
 #else
-        [Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url,
+		[Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url,
 #endif
-        [Values(";", "6103_4da3044c8657a04ba60e2eaa753bc51a_;javaminister@gmail.com")] string cookieAndMail)
-        {
-            Barrel.ApplicationId = GetType().Name + nameof(TestCachedQuery_GetStationsAll);
+		[Values(";", "6103_4da3044c8657a04ba60e2eaa753bc51a_;javaminister@gmail.com")] string cookieAndMail)
+		{
+			Barrel.ApplicationId = GetType().Name + nameof(TestCachedQuery_GetStationsAll);
 
-            Log.Logger = new LoggerConfiguration()
-                .MinimumLevel.ControlledBy(new Serilog.Core.LoggingLevelSwitch(Serilog.Events.LogEventLevel.Error))
-                .WriteTo.Debug()
-                .CreateLogger();
+			Log.Logger = new LoggerConfiguration()
+				.MinimumLevel.ControlledBy(new Serilog.Core.LoggingLevelSwitch(Serilog.Events.LogEventLevel.Error))
+				.WriteTo.Debug()
+				.CreateLogger();
 
-            var connector = ConnectorFactory.Create(
-                true, // Is connected
-                new Uri(url),
-                new AppContextInfo("oiF2kahH" + nameof(TestCachedQuery_GetStationsAll), "sharee.bike.test", new Version(3, 0, 267)),
-                null /*UI language */,
-                cookieAndMail.Split(';')[0],
-                cookieAndMail.Split(';')[1],
-                TimeSpan.FromSeconds(3)); // See task #97 for need of custom expiresAfter value. 
+			var connector = ConnectorFactory.Create(
+				true, // Is connected
+				new Uri(url),
+				new AppContextInfo("oiF2kahH" + nameof(TestCachedQuery_GetStationsAll), "sharee.bike.test", new Version(3, 0, 267)),
+				null /*UI language */,
+				cookieAndMail.Split(';')[0],
+				cookieAndMail.Split(';')[1],
+				TimeSpan.FromSeconds(3)); // See task #97 for need of custom expiresAfter value. 
 
-            var start = DateTime.Now;
+			var start = DateTime.Now;
 
-            var queryIndex = 1;
-            while (DateTime.Now.Subtract(start).TotalSeconds < 60)
-            {
-                Log.ForContext<TestCachetimings>().Information($"Query #{queryIndex}");
+			var queryIndex = 1;
+			while (DateTime.Now.Subtract(start).TotalSeconds < 60)
+			{
+				Log.ForContext<TestCachetimings>().Information($"Query #{queryIndex}");
 
-                var result = connector.Query.GetBikesAndStationsAsync().Result;
-                Assert.IsNull(result.Exception, $"Exception message: {result.Exception?.Message}");
+				var result = connector.Query.GetBikesAndStationsAsync().Result;
+				Assert.IsNull(result.Exception, $"Exception message: {result.Exception?.Message}");
 
-                queryIndex++;
-            }
-        }
+				queryIndex++;
+			}
+		}
 
-        /// <remarks>
-        /// From COPRI version v4.1 switched from TINK devel https://tinkwwp.copri-bike.de/APIjsonserver to sharee devel https://shareeapp-primary.copri-bike.de/APIjsonserver
-        /// </summary>
-        /// <param name="uri"></param>
-        /// <param name="cookieAndMail"></param>
-        [Test]
-#if !NOLIVESERVER        
-        [Explicit("Run with care because this stress impact live system.")]
-        //[Category(TestCopriCallsHttps.CATEGORY_USESLIVESERVER)]
+		/// <remarks>
+		/// From COPRI version v4.1 switched from TINK devel https://tinkwwp.copri-bike.de/APIjsonserver to sharee devel https://shareeapp-primary.copri-bike.de/APIjsonserver
+		/// </summary>
+		/// <param name="uri"></param>
+		/// <param name="cookieAndMail"></param>
+		[Test]
+#if !NOLIVESERVER
+		[Explicit("Run with care because this stress impact live system.")]
+		//[Category(TestCopriCallsHttps.CATEGORY_USESLIVESERVER)]
 #elif !NODEVELSERVER
         [Category(TestCopriCallsHttps.CATEGORY_USESDEVELSERVER)]
 #endif
-        public void TestCachedQuery_GetBikes(
+		public void TestCachedQuery_GetBikes(
 #if NOLIVESERVER
             [Values(CopriServerUriList.SHAREE_DEVEL)] string url,
 #elif NODEVELSERVER
         [Values(CopriServerUriList.SHAREE_LIVE)] string url,
 #else
-        [Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url,
+		[Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url,
 #endif
-           [Values(";", "6103_4da3044c8657a04ba60e2eaa753bc51a_;javaminister@gmail.com")] string cookieAndMail)
-        {
-            Barrel.ApplicationId = GetType().Name + nameof(TestCachedQuery_GetBikes);
+		   [Values(";", "6103_4da3044c8657a04ba60e2eaa753bc51a_;javaminister@gmail.com")] string cookieAndMail)
+		{
+			Barrel.ApplicationId = GetType().Name + nameof(TestCachedQuery_GetBikes);
 
-            Log.Logger = new LoggerConfiguration()
-                .MinimumLevel.ControlledBy(new Serilog.Core.LoggingLevelSwitch(Serilog.Events.LogEventLevel.Error))
-                .WriteTo.Debug()
-                .CreateLogger();
+			Log.Logger = new LoggerConfiguration()
+				.MinimumLevel.ControlledBy(new Serilog.Core.LoggingLevelSwitch(Serilog.Events.LogEventLevel.Error))
+				.WriteTo.Debug()
+				.CreateLogger();
 
-            var connector = ConnectorFactory.Create(
-                true, // Is connected
-                new Uri(url),
-                new AppContextInfo("oiF2kahH" + nameof(TestCachedQuery_GetBikes), "sharee.bike.test", new Version(3, 0, 267)),
-                null /*UI language */,
-                cookieAndMail.Split(';')[0],
-                cookieAndMail.Split(';')[1],
-                TimeSpan.FromSeconds(3)); // See task #97 for need of custom expiresAfter value.
+			var connector = ConnectorFactory.Create(
+				true, // Is connected
+				new Uri(url),
+				new AppContextInfo("oiF2kahH" + nameof(TestCachedQuery_GetBikes), "sharee.bike.test", new Version(3, 0, 267)),
+				null /*UI language */,
+				cookieAndMail.Split(';')[0],
+				cookieAndMail.Split(';')[1],
+				TimeSpan.FromSeconds(3)); // See task #97 for need of custom expiresAfter value.
 
-            var start = DateTime.Now;
+			var start = DateTime.Now;
 
-            var queryIndex = 1;
-            while (DateTime.Now.Subtract(start).TotalSeconds < 60)
-            {
-                Log.ForContext<TestCachetimings>().Information($"Query #{queryIndex}");
+			var queryIndex = 1;
+			while (DateTime.Now.Subtract(start).TotalSeconds < 60)
+			{
+				Log.ForContext<TestCachetimings>().Information($"Query #{queryIndex}");
 
-                var result = connector.Query.GetBikesAsync().Result;
-                Assert.IsNull(result.Exception, $"Exception message: {result.Exception?.Message}");
+				var result = connector.Query.GetBikesAsync().Result;
+				Assert.IsNull(result.Exception, $"Exception message: {result.Exception?.Message}");
 
-                queryIndex++;
-            }
-        }
+				queryIndex++;
+			}
+		}
 
-        [Test]
-#if !NOLIVESERVER        
-        [Explicit("Run with care because this stress impact live system.")]
-        //[Category(TestCopriCallsHttps.CATEGORY_USESLIVESERVER)]
+		[Test]
+#if !NOLIVESERVER
+		[Explicit("Run with care because this stress impact live system.")]
+		//[Category(TestCopriCallsHttps.CATEGORY_USESLIVESERVER)]
 #elif !NODEVELSERVER
         [Category(TestCopriCallsHttps.CATEGORY_USESDEVELSERVER)]
 #endif
-        public void TestCachedQuery_GetBikesOccupied(
+		public void TestCachedQuery_GetBikesOccupied(
 #if NOLIVESERVER
             [Values(CopriServerUriList.SHAREE_DEVEL)] string url,
 #elif NODEVELSERVER
         [Values(CopriServerUriList.SHAREE_LIVE)] string url,
 #else
-        [Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url,
+		[Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url,
 #endif
-            [Values("6103_4da3044c8657a04ba60e2eaa753bc51a_;javaminister@gmail.com")] string cookieAndMail)
-        {
-            Barrel.ApplicationId = GetType().Name + nameof(TestCachedQuery_GetBikes);
+			[Values("6103_4da3044c8657a04ba60e2eaa753bc51a_;javaminister@gmail.com")] string cookieAndMail)
+		{
+			Barrel.ApplicationId = GetType().Name + nameof(TestCachedQuery_GetBikes);
 
-            Log.Logger = new LoggerConfiguration()
-                .MinimumLevel.ControlledBy(new Serilog.Core.LoggingLevelSwitch(Serilog.Events.LogEventLevel.Verbose))
-                .WriteTo.Debug()
-                .WriteTo.File($"Log{nameof(TestCachedQuery_GetBikes)}.log")
-                .CreateLogger();
+			Log.Logger = new LoggerConfiguration()
+				.MinimumLevel.ControlledBy(new Serilog.Core.LoggingLevelSwitch(Serilog.Events.LogEventLevel.Verbose))
+				.WriteTo.Debug()
+				.WriteTo.File($"Log{nameof(TestCachedQuery_GetBikes)}.log")
+				.CreateLogger();
 
-            var connector = ConnectorFactory.Create(
-                true, // Is connected
-                new Uri(url),
-                new AppContextInfo("oiF2kahH" + nameof(TestCachedQuery_GetBikesOccupied), "sharee.bike.test", new Version(3, 0, 267)),
-                null /*UI language */,
-                cookieAndMail.Split(';')[0],
-                cookieAndMail.Split(';')[1],
-                TimeSpan.FromSeconds(3)); // See task #97 for need of custom expiresAfter value.
+			var connector = ConnectorFactory.Create(
+				true, // Is connected
+				new Uri(url),
+				new AppContextInfo("oiF2kahH" + nameof(TestCachedQuery_GetBikesOccupied), "sharee.bike.test", new Version(3, 0, 267)),
+				null /*UI language */,
+				cookieAndMail.Split(';')[0],
+				cookieAndMail.Split(';')[1],
+				TimeSpan.FromSeconds(3)); // See task #97 for need of custom expiresAfter value.
 
-            var start = DateTime.Now;
+			var start = DateTime.Now;
 
-            var queryIndex = 1;
-            while (DateTime.Now.Subtract(start).TotalSeconds < 60)
-            {
-                Log.ForContext<TestCachetimings>().Information($"Query #{queryIndex}");
+			var queryIndex = 1;
+			while (DateTime.Now.Subtract(start).TotalSeconds < 60)
+			{
+				Log.ForContext<TestCachetimings>().Information($"Query #{queryIndex}");
 
-                var result = connector.Query.GetBikesOccupiedAsync().Result;
-                Assert.IsNull(result.Exception, $"Exception message: {result.Exception?.Message}");
+				var result = connector.Query.GetBikesOccupiedAsync().Result;
+				Assert.IsNull(result.Exception, $"Exception message: {result.Exception?.Message}");
 
-                queryIndex++;
-            }
-        }
-    }
+				queryIndex++;
+			}
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Connector/TestConnectorFactory.cs b/TestShareeLib/Model/Connector/TestConnectorFactory.cs
index 6f41af7..2ddc112 100644
--- a/TestShareeLib/Model/Connector/TestConnectorFactory.cs
+++ b/TestShareeLib/Model/Connector/TestConnectorFactory.cs
@@ -6,22 +6,22 @@ using TINK.Repository;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Connector
 {
-    [TestFixture]
-    public class TestConnectorFactory
-    {
-        [Test]
-        public void TestCreate()
-        {
-            if (string.IsNullOrEmpty(Barrel.ApplicationId))
-            {
-                Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
-            }
+	[TestFixture]
+	public class TestConnectorFactory
+	{
+		[Test]
+		public void TestCreate()
+		{
+			if (string.IsNullOrEmpty(Barrel.ApplicationId))
+			{
+				Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
+			}
 
-            var connector = ConnectorFactory.Create(false, new Uri("https://1.2.3.4"), new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), null /*UI language */, "123456789", "a@b");
-            Assert.AreEqual(typeof(ConnectorCache), connector.GetType());
+			var connector = ConnectorFactory.Create(false, new Uri("https://1.2.3.4"), new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), null /*UI language */, "123456789", "a@b");
+			Assert.AreEqual(typeof(ConnectorCache), connector.GetType());
 
-            connector = ConnectorFactory.Create(true, new Uri("https://1.2.3.4"), new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), null /*UI language */, "123456789", "a@b");
-            Assert.AreEqual(typeof(TINK.Model.Connector.Connector), connector.GetType());
-        }
-    }
+			connector = ConnectorFactory.Create(true, new Uri("https://1.2.3.4"), new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), null /*UI language */, "123456789", "a@b");
+			Assert.AreEqual(typeof(TINK.Model.Connector.Connector), connector.GetType());
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Connector/TestCopriProviderHttps.cs b/TestShareeLib/Model/Connector/TestCopriProviderHttps.cs
index 9373cfe..bdd79d5 100644
--- a/TestShareeLib/Model/Connector/TestCopriProviderHttps.cs
+++ b/TestShareeLib/Model/Connector/TestCopriProviderHttps.cs
@@ -12,10 +12,10 @@ using TINK.Services.CopriApi;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Connector
 {
-    [TestFixture]
-    public class TestCopriProviderHttps
-    {
-        private const string BIKESAVAILABLE = @"{
+	[TestFixture]
+	public class TestCopriProviderHttps
+	{
+		private const string BIKESAVAILABLE = @"{
               ""copri_version"" : ""4.1.0.0"",
               ""bikes"" : {},
               ""response_state"" : ""OK"",
@@ -33,7 +33,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
             }
         }";
 
-        private const string BIKESOCCUPIED = @"{
+		private const string BIKESOCCUPIED = @"{
           ""authcookie"" : ""6103_f782a208d9399291ba8d086b5dcc2509_12345678"",
           ""debuglevel"" : ""2"",
           ""user_group"" : [ ""TINK"" ],
@@ -66,7 +66,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
             }
         }";
 
-        private const string STATIONSALL = @"{
+		private const string STATIONSALL = @"{
               ""copri_version"" : ""4.1.0.0"",
               ""stations"" : {
                  ""5"" : {
@@ -106,424 +106,424 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
               ""apiserver"" : ""https://tinkwwp.copri-bike.de""
         }";
 
-        [Test]
-        public async Task TestGetBikesAvailable_NotExpired()
-        {
-            var cache = Substitute.For<ICopriCache>();
-            var https = Substitute.For<ICopriServer>();
-
-            cache.IsBikesAvailableExpired.Returns(false);
-            cache.GetBikesAvailableAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE)));
-
-            var provider = new CopriProviderHttps(
-                new Uri("http://1.2.3.4"),
-                "123", // Merchant id
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), // User agent
-                null /*UI language */,
-                "456", // cookie
-                cacheServer: cache,
-                httpsServer: https);
-
-            var bikes = await provider.GetBikesAvailable();
-
-            Assert.AreEqual(1, bikes.Response.bikes.Count);
-            Assert.AreEqual(typeof(CopriCallsMonkeyStore).Name, bikes.Source.Name);
-            Assert.IsNull(bikes.Exception);
-        }
-
-
-        [Test]
-        public async Task TestGetBikesAvailable_ExpiredForceCache()
-        {
-            var cache = Substitute.For<ICopriCache>();
-            var https = Substitute.For<ICopriServer>();
-
-            cache.IsBikesAvailableExpired.Returns(true);
-            cache.GetBikesAvailableAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE)));
-
-            var provider = new CopriProviderHttps(
-                new Uri("http://1.2.3.4"),
-                "123",
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                null /*UI language */,
-                cacheServer: cache,
-                httpsServer: https);
-
-            var bikes = await provider.GetBikesAvailable(true);
-
-            Assert.AreEqual(1, bikes.Response.bikes.Count);
-            Assert.AreEqual(typeof(CopriCallsMonkeyStore).Name, bikes.Source.Name);
-            Assert.IsNull(bikes.Exception);
-        }
-
-        [Test]
-        public async Task TestGetBikesAvailable_Expired()
-        {
-            var cache = Substitute.For<ICopriCache>();
-            var https = Substitute.For<ICopriServer>();
-
-            cache.IsBikesAvailableExpired.Returns(true);
-            https.GetBikesAvailableAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE)));
-
-            var provider = new CopriProviderHttps(
-                new Uri("http://1.2.3.4"),
-                "123",
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                null /*UI language */,
-                cacheServer: cache,
-                httpsServer: https);
-
-            var bikes = await provider.GetBikesAvailable();
-
-            Assert.AreEqual(1, bikes.Response.bikes.Count);
-            Assert.AreEqual(typeof(CopriCallsHttps).Name, bikes.Source.Name);
-            Assert.IsNull(bikes.Exception);
-        }
-
-        [Test]
-        public async Task TestGetBikesAvailable_Exception()
-        {
-            var cache = Substitute.For<ICopriCache>();
-            var https = Substitute.For<ICopriServer>();
-
-            cache.IsBikesAvailableExpired.Returns(true);
-            cache.GetBikesAvailableAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE)));
-            https.GetBikesAvailableAsync().Returns<BikesAvailableResponse>(x => { throw new WebConnectFailureException("Bang...", new Exception()); });
-
-            var provider = new CopriProviderHttps(
-                new Uri("http://1.2.3.4"),
-                "123",
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                null /*UI language */,
-                cacheServer: cache,
-                httpsServer: https);
-
-            var bikes = await provider.GetBikesAvailable();
-
-            Assert.AreEqual(1, bikes.Response.bikes.Count);
-            Assert.AreEqual(typeof(CopriCallsMonkeyStore).Name, bikes.Source.Name);
-            Assert.AreEqual("Bang...", bikes.Exception.Message);
-        }
-
-        [Test]
-        public async Task TestGetBikesOccupied_NotExpired()
-        {
-            var cache = Substitute.For<ICopriCache>();
-            var https = Substitute.For<ICopriServer>();
-
-            cache.IsBikesOccupiedExpired.Returns(false);
-            cache.GetBikesOccupiedAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED)));
-
-            var provider = new CopriProviderHttps(
-                new Uri("http://1.2.3.4"),
-                "12345678", // Merchant id
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), // User agent
-                null /*UI language */,
-                "f782a208d9399291ba8d086b5dcc2509", // Auth cookie
-                cacheServer: cache,
-                httpsServer: https);
-
-            var bikes = await provider.GetBikesOccupied();
-
-            Assert.AreEqual(1, bikes.Response.bikes_occupied.Count);
-            Assert.AreEqual(typeof(CopriCallsMonkeyStore).Name, bikes.Source.Name);
-            Assert.IsNull(bikes.Exception);
-        }
-
-        [Test]
-        public async Task TestGetBikesOccupied_ExpiredForceCache()
-        {
-            var cache = Substitute.For<ICopriCache>();
-            var https = Substitute.For<ICopriServer>();
-
-            cache.IsBikesOccupiedExpired.Returns(true);
-            cache.GetBikesOccupiedAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED)));
-
-            var provider = new CopriProviderHttps(
-                new Uri("http://1.2.3.4"),
-                "12345678", // Merchant id
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), // User agent
-                null /*UI language */,
-                "f782a208d9399291ba8d086b5dcc2509", // Auth cookie
-                cacheServer: cache,
-                httpsServer: https);
-
-            var bikes = await provider.GetBikesOccupied(true);
-
-            Assert.AreEqual(1, bikes.Response.bikes_occupied.Count);
-            Assert.AreEqual(typeof(CopriCallsMonkeyStore).Name, bikes.Source.Name);
-            Assert.IsNull(bikes.Exception);
-        }
-
-        [Test]
-        public async Task TestGetBikesOccupied_Expired()
-        {
-            var cache = Substitute.For<ICopriCache>();
-            var https = Substitute.For<ICopriServer>();
-
-            cache.IsBikesOccupiedExpired.Returns(true);
-            https.GetBikesOccupiedAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED)));
-
-            var provider = new CopriProviderHttps(
-                new Uri("http://1.2.3.4"),
-                "12345678", // Merchant id
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), // User agent
-                null /*UI language */,
-                "f782a208d9399291ba8d086b5dcc2509", // Auth cookie
-                cacheServer: cache,
-                httpsServer: https);
-
-            var bikes = await provider.GetBikesOccupied();
-
-            Assert.AreEqual(1, bikes.Response.bikes_occupied.Count);
-            Assert.AreEqual(typeof(CopriCallsHttps).Name, bikes.Source.Name);
-            Assert.IsNull(bikes.Exception);
-        }
-
-        [Test]
-        public async Task TestGetBikesOccupied_Exception()
-        {
-            var cache = Substitute.For<ICopriCache>();
-            var https = Substitute.For<ICopriServer>();
-
-            cache.IsBikesOccupiedExpired.Returns(true);
-            cache.GetBikesOccupiedAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED)));
-            https.GetBikesOccupiedAsync().Returns<BikesReservedOccupiedResponse>(x => { throw new WebConnectFailureException("Bang...", new Exception()); });
-
-            var provider = new CopriProviderHttps(
-                new Uri("http://1.2.3.4"),
-                "12345678", // Merchant id
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), // User agent
-                null /*UI language */,
-                "f782a208d9399291ba8d086b5dcc2509", // Auth cookie
-                cacheServer: cache,
-                httpsServer: https);
-
-            var bikes = await provider.GetBikesOccupied();
-
-            Assert.AreEqual(1, bikes.Response.bikes_occupied.Count);
-            Assert.AreEqual(typeof(CopriCallsMonkeyStore).Name, bikes.Source.Name);
-            Assert.AreEqual("Bang...", bikes.Exception.Message);
-        }
-
-        [Test]
-        public async Task TestGetStations_NotExpired()
-        {
-            var cache = Substitute.For<ICopriCache>();
-            var https = Substitute.For<ICopriServer>();
-
-            cache.IsStationsExpired.Returns(false);
-            cache.GetStationsAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL)));
-
-            var provider = new CopriProviderHttps(
-                new Uri("http://1.2.3.4"),
-                "123", // Merchant id
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), // User agent
-                null /*UI language */,
-                "456", // cookie
-                cacheServer: cache,
-                httpsServer: https);
-
-            var stations = await provider.GetStations();
-
-            Assert.AreEqual(3, stations.Response.stations.Count);
-            Assert.AreEqual(typeof(CopriCallsMonkeyStore).Name, stations.Source.Name);
-            Assert.IsNull(stations.Exception);
-        }
-
-        [Test]
-        public async Task TestGetStations_ExpiredForceCache()
-        {
-            var cache = Substitute.For<ICopriCache>();
-            var https = Substitute.For<ICopriServer>();
-
-            cache.IsStationsExpired.Returns(true);
-            cache.GetStationsAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL)));
-
-            var provider = new CopriProviderHttps(
-                new Uri("http://1.2.3.4"),
-                "123",
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                null /*UI language */,
-                cacheServer: cache,
-                httpsServer: https);
-
-            var stations = await provider.GetStations(true);
-
-            Assert.AreEqual(3, stations.Response.stations.Count);
-            Assert.AreEqual(typeof(CopriCallsMonkeyStore).Name, stations.Source.Name);
-            Assert.IsNull(stations.Exception);
-        }
-
-        [Test]
-        public async Task TestGetStations_Expired()
-        {
-            var cache = Substitute.For<ICopriCache>();
-            var https = Substitute.For<ICopriServer>();
-
-            cache.IsStationsExpired.Returns(true);
-            https.GetStationsAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL)));
-
-            var provider = new CopriProviderHttps(
-                new Uri("http://1.2.3.4"),
-                "123",
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                null /*UI language */,
-                cacheServer: cache,
-                httpsServer: https);
-
-            var stations = await provider.GetStations();
-
-            Assert.AreEqual(3, stations.Response.stations.Count);
-            Assert.AreEqual(typeof(CopriCallsHttps).Name, stations.Source.Name);
-            Assert.IsNull(stations.Exception);
-        }
-
-        [Test]
-        public async Task TestGetStations_Exception()
-        {
-            var cache = Substitute.For<ICopriCache>();
-            var https = Substitute.For<ICopriServer>();
-
-            cache.IsStationsExpired.Returns(true);
-            cache.GetStationsAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL)));
-            https.GetStationsAsync().Returns<StationsAvailableResponse>(x => { throw new WebConnectFailureException("Bang...", new Exception()); });
-
-            var provider = new CopriProviderHttps(
-                new Uri("http://1.2.3.4"),
-                "123",
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                null /*UI language */,
-                cacheServer: cache,
-                httpsServer: https);
-
-            var stations = await provider.GetStations();
-
-            Assert.AreEqual(3, stations.Response.stations.Count);
-            Assert.AreEqual(typeof(CopriCallsMonkeyStore).Name, stations.Source.Name);
-            Assert.AreEqual("Bang...", stations.Exception.Message);
-        }
-
-        [Test]
-        public async Task Test_AddToCache_Stations()
-        {
-            if (string.IsNullOrEmpty(Barrel.ApplicationId))
-            {
-                Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
-            }
-
-            var provider = new CopriProviderHttps(
-                new Uri("http://1.2.3.4"),
-                "123456789",
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                null /*UI language */);
-
-            var stations = await provider.GetStations(true);
-            Assert.AreEqual(0, stations.Response.stations.Count);
-
-            try
-            {
-                // Do not add if an excption occurred
-                provider.AddToCache(new Result<StationsAvailableResponse>(typeof(CopriCallsHttps), JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL), new GeneralData(), new Exception("Bang...")));
-                stations = await provider.GetStations(true);
-                Assert.AreEqual(0, stations.Response.stations.Count);
-
-                // Do not add if results from cache
-                provider.AddToCache(new Result<StationsAvailableResponse>(typeof(CopriCallsMonkeyStore), JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL), new GeneralData()));
-                stations = await provider.GetStations(true);
-                Assert.AreEqual(0, stations.Response.stations.Count);
-
-                // Add result
-                provider.AddToCache(new Result<StationsAvailableResponse>(typeof(CopriCallsHttps), JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL), new GeneralData()));
-                stations = await provider.GetStations(true);
-                Assert.AreEqual(3, stations.Response.stations.Count);
-            }
-            finally
-            {
-                Barrel.Current.EmptyAll();
-            }
-        }
-
-        [Test]
-        public async Task Test_AddToCache_BikesAvailable()
-        {
-            if (string.IsNullOrEmpty(Barrel.ApplicationId))
-            {
-                Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
-            }
-
-            var provider = new CopriProviderHttps(
-                new Uri("http://1.2.3.4"),
-                "123456789",
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                null /*UI language */);
-
-            var bikes = await provider.GetBikesAvailable(true);
-            Assert.AreEqual(0, bikes.Response.bikes.Count);
-
-            try
-            {
-                // Do not add if an excption occurred
-                provider.AddToCache(new Result<BikesAvailableResponse>(typeof(CopriCallsHttps), JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE), new GeneralData(), new Exception("Bang...")));
-                bikes = await provider.GetBikesAvailable(true);
-                Assert.AreEqual(0, bikes.Response.bikes.Count);
-
-                // Do not add if results from cache
-                provider.AddToCache(new Result<BikesAvailableResponse>(typeof(CopriCallsMonkeyStore), JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE), new GeneralData()));
-                bikes = await provider.GetBikesAvailable(true);
-                Assert.AreEqual(0, bikes.Response.bikes.Count);
-
-                // Add result
-                provider.AddToCache(new Result<BikesAvailableResponse>(typeof(CopriCallsHttps), JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE), new GeneralData()));
-                bikes = await provider.GetBikesAvailable(true);
-                Assert.AreEqual(1, bikes.Response.bikes.Count);
-            }
-            finally
-            {
-                Barrel.Current.EmptyAll();
-            }
-        }
-
-
-        [Test]
-        public async Task Test_AddToCache_BikesOccupied()
-        {
-            if (string.IsNullOrEmpty(Barrel.ApplicationId))
-            {
-                Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
-            }
-
-            var provider = new CopriProviderHttps(
-                new Uri("http://1.2.3.4"),
-                "123456789",
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), // User agent
-                null /* langugage */,
-                "876");
-
-            var bikes = await provider.GetBikesOccupied(true);
-            Assert.AreEqual(0, bikes.Response.bikes_occupied.Count);
-
-            try
-            {
-                // Do not add if an excption occurred
-                provider.AddToCache(new Result<BikesReservedOccupiedResponse>(typeof(CopriCallsHttps), JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED), new GeneralData(), new Exception("Bang...")));
-                bikes = await provider.GetBikesOccupied(true);
-                Assert.AreEqual(0, bikes.Response.bikes_occupied.Count);
-
-                // Do not add if results from cache
-                provider.AddToCache(new Result<BikesReservedOccupiedResponse>(typeof(CopriCallsMonkeyStore), JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED), new GeneralData()));
-                bikes = await provider.GetBikesOccupied(true);
-                Assert.AreEqual(0, bikes.Response.bikes_occupied.Count);
-
-                // Add result
-                provider.AddToCache(new Result<BikesReservedOccupiedResponse>(typeof(CopriCallsHttps), JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED), new GeneralData()));
-                bikes = await provider.GetBikesOccupied(true);
-                Assert.AreEqual(1, bikes.Response.bikes_occupied.Count);
-            }
-            finally
-            {
-                Barrel.Current.EmptyAll();
-            }
-        }
-    }
+		[Test]
+		public async Task TestGetBikesAvailable_NotExpired()
+		{
+			var cache = Substitute.For<ICopriCache>();
+			var https = Substitute.For<ICopriServer>();
+
+			cache.IsBikesAvailableExpired.Returns(false);
+			cache.GetBikesAvailableAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE)));
+
+			var provider = new CopriProviderHttps(
+				new Uri("http://1.2.3.4"),
+				"123", // Merchant id
+				new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), // User agent
+				null /*UI language */,
+				"456", // cookie
+				cacheServer: cache,
+				httpsServer: https);
+
+			var bikes = await provider.GetBikesAvailable();
+
+			Assert.AreEqual(1, bikes.Response.bikes.Count);
+			Assert.AreEqual(typeof(CopriCallsMonkeyStore).Name, bikes.Source.Name);
+			Assert.IsNull(bikes.Exception);
+		}
+
+
+		[Test]
+		public async Task TestGetBikesAvailable_ExpiredForceCache()
+		{
+			var cache = Substitute.For<ICopriCache>();
+			var https = Substitute.For<ICopriServer>();
+
+			cache.IsBikesAvailableExpired.Returns(true);
+			cache.GetBikesAvailableAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE)));
+
+			var provider = new CopriProviderHttps(
+				new Uri("http://1.2.3.4"),
+				"123",
+				new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+				null /*UI language */,
+				cacheServer: cache,
+				httpsServer: https);
+
+			var bikes = await provider.GetBikesAvailable(true);
+
+			Assert.AreEqual(1, bikes.Response.bikes.Count);
+			Assert.AreEqual(typeof(CopriCallsMonkeyStore).Name, bikes.Source.Name);
+			Assert.IsNull(bikes.Exception);
+		}
+
+		[Test]
+		public async Task TestGetBikesAvailable_Expired()
+		{
+			var cache = Substitute.For<ICopriCache>();
+			var https = Substitute.For<ICopriServer>();
+
+			cache.IsBikesAvailableExpired.Returns(true);
+			https.GetBikesAvailableAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE)));
+
+			var provider = new CopriProviderHttps(
+				new Uri("http://1.2.3.4"),
+				"123",
+				new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+				null /*UI language */,
+				cacheServer: cache,
+				httpsServer: https);
+
+			var bikes = await provider.GetBikesAvailable();
+
+			Assert.AreEqual(1, bikes.Response.bikes.Count);
+			Assert.AreEqual(typeof(CopriCallsHttps).Name, bikes.Source.Name);
+			Assert.IsNull(bikes.Exception);
+		}
+
+		[Test]
+		public async Task TestGetBikesAvailable_Exception()
+		{
+			var cache = Substitute.For<ICopriCache>();
+			var https = Substitute.For<ICopriServer>();
+
+			cache.IsBikesAvailableExpired.Returns(true);
+			cache.GetBikesAvailableAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE)));
+			https.GetBikesAvailableAsync().Returns<BikesAvailableResponse>(x => { throw new WebConnectFailureException("Bang...", new Exception()); });
+
+			var provider = new CopriProviderHttps(
+				new Uri("http://1.2.3.4"),
+				"123",
+				new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+				null /*UI language */,
+				cacheServer: cache,
+				httpsServer: https);
+
+			var bikes = await provider.GetBikesAvailable();
+
+			Assert.AreEqual(1, bikes.Response.bikes.Count);
+			Assert.AreEqual(typeof(CopriCallsMonkeyStore).Name, bikes.Source.Name);
+			Assert.AreEqual("Bang...", bikes.Exception.Message);
+		}
+
+		[Test]
+		public async Task TestGetBikesOccupied_NotExpired()
+		{
+			var cache = Substitute.For<ICopriCache>();
+			var https = Substitute.For<ICopriServer>();
+
+			cache.IsBikesOccupiedExpired.Returns(false);
+			cache.GetBikesOccupiedAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED)));
+
+			var provider = new CopriProviderHttps(
+				new Uri("http://1.2.3.4"),
+				"12345678", // Merchant id
+				new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), // User agent
+				null /*UI language */,
+				"f782a208d9399291ba8d086b5dcc2509", // Auth cookie
+				cacheServer: cache,
+				httpsServer: https);
+
+			var bikes = await provider.GetBikesOccupied();
+
+			Assert.AreEqual(1, bikes.Response.bikes_occupied.Count);
+			Assert.AreEqual(typeof(CopriCallsMonkeyStore).Name, bikes.Source.Name);
+			Assert.IsNull(bikes.Exception);
+		}
+
+		[Test]
+		public async Task TestGetBikesOccupied_ExpiredForceCache()
+		{
+			var cache = Substitute.For<ICopriCache>();
+			var https = Substitute.For<ICopriServer>();
+
+			cache.IsBikesOccupiedExpired.Returns(true);
+			cache.GetBikesOccupiedAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED)));
+
+			var provider = new CopriProviderHttps(
+				new Uri("http://1.2.3.4"),
+				"12345678", // Merchant id
+				new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), // User agent
+				null /*UI language */,
+				"f782a208d9399291ba8d086b5dcc2509", // Auth cookie
+				cacheServer: cache,
+				httpsServer: https);
+
+			var bikes = await provider.GetBikesOccupied(true);
+
+			Assert.AreEqual(1, bikes.Response.bikes_occupied.Count);
+			Assert.AreEqual(typeof(CopriCallsMonkeyStore).Name, bikes.Source.Name);
+			Assert.IsNull(bikes.Exception);
+		}
+
+		[Test]
+		public async Task TestGetBikesOccupied_Expired()
+		{
+			var cache = Substitute.For<ICopriCache>();
+			var https = Substitute.For<ICopriServer>();
+
+			cache.IsBikesOccupiedExpired.Returns(true);
+			https.GetBikesOccupiedAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED)));
+
+			var provider = new CopriProviderHttps(
+				new Uri("http://1.2.3.4"),
+				"12345678", // Merchant id
+				new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), // User agent
+				null /*UI language */,
+				"f782a208d9399291ba8d086b5dcc2509", // Auth cookie
+				cacheServer: cache,
+				httpsServer: https);
+
+			var bikes = await provider.GetBikesOccupied();
+
+			Assert.AreEqual(1, bikes.Response.bikes_occupied.Count);
+			Assert.AreEqual(typeof(CopriCallsHttps).Name, bikes.Source.Name);
+			Assert.IsNull(bikes.Exception);
+		}
+
+		[Test]
+		public async Task TestGetBikesOccupied_Exception()
+		{
+			var cache = Substitute.For<ICopriCache>();
+			var https = Substitute.For<ICopriServer>();
+
+			cache.IsBikesOccupiedExpired.Returns(true);
+			cache.GetBikesOccupiedAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED)));
+			https.GetBikesOccupiedAsync().Returns<BikesReservedOccupiedResponse>(x => { throw new WebConnectFailureException("Bang...", new Exception()); });
+
+			var provider = new CopriProviderHttps(
+				new Uri("http://1.2.3.4"),
+				"12345678", // Merchant id
+				new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), // User agent
+				null /*UI language */,
+				"f782a208d9399291ba8d086b5dcc2509", // Auth cookie
+				cacheServer: cache,
+				httpsServer: https);
+
+			var bikes = await provider.GetBikesOccupied();
+
+			Assert.AreEqual(1, bikes.Response.bikes_occupied.Count);
+			Assert.AreEqual(typeof(CopriCallsMonkeyStore).Name, bikes.Source.Name);
+			Assert.AreEqual("Bang...", bikes.Exception.Message);
+		}
+
+		[Test]
+		public async Task TestGetStations_NotExpired()
+		{
+			var cache = Substitute.For<ICopriCache>();
+			var https = Substitute.For<ICopriServer>();
+
+			cache.IsStationsExpired.Returns(false);
+			cache.GetStationsAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL)));
+
+			var provider = new CopriProviderHttps(
+				new Uri("http://1.2.3.4"),
+				"123", // Merchant id
+				new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), // User agent
+				null /*UI language */,
+				"456", // cookie
+				cacheServer: cache,
+				httpsServer: https);
+
+			var stations = await provider.GetStations();
+
+			Assert.AreEqual(3, stations.Response.stations.Count);
+			Assert.AreEqual(typeof(CopriCallsMonkeyStore).Name, stations.Source.Name);
+			Assert.IsNull(stations.Exception);
+		}
+
+		[Test]
+		public async Task TestGetStations_ExpiredForceCache()
+		{
+			var cache = Substitute.For<ICopriCache>();
+			var https = Substitute.For<ICopriServer>();
+
+			cache.IsStationsExpired.Returns(true);
+			cache.GetStationsAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL)));
+
+			var provider = new CopriProviderHttps(
+				new Uri("http://1.2.3.4"),
+				"123",
+				new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+				null /*UI language */,
+				cacheServer: cache,
+				httpsServer: https);
+
+			var stations = await provider.GetStations(true);
+
+			Assert.AreEqual(3, stations.Response.stations.Count);
+			Assert.AreEqual(typeof(CopriCallsMonkeyStore).Name, stations.Source.Name);
+			Assert.IsNull(stations.Exception);
+		}
+
+		[Test]
+		public async Task TestGetStations_Expired()
+		{
+			var cache = Substitute.For<ICopriCache>();
+			var https = Substitute.For<ICopriServer>();
+
+			cache.IsStationsExpired.Returns(true);
+			https.GetStationsAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL)));
+
+			var provider = new CopriProviderHttps(
+				new Uri("http://1.2.3.4"),
+				"123",
+				new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+				null /*UI language */,
+				cacheServer: cache,
+				httpsServer: https);
+
+			var stations = await provider.GetStations();
+
+			Assert.AreEqual(3, stations.Response.stations.Count);
+			Assert.AreEqual(typeof(CopriCallsHttps).Name, stations.Source.Name);
+			Assert.IsNull(stations.Exception);
+		}
+
+		[Test]
+		public async Task TestGetStations_Exception()
+		{
+			var cache = Substitute.For<ICopriCache>();
+			var https = Substitute.For<ICopriServer>();
+
+			cache.IsStationsExpired.Returns(true);
+			cache.GetStationsAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL)));
+			https.GetStationsAsync().Returns<StationsAvailableResponse>(x => { throw new WebConnectFailureException("Bang...", new Exception()); });
+
+			var provider = new CopriProviderHttps(
+				new Uri("http://1.2.3.4"),
+				"123",
+				new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+				null /*UI language */,
+				cacheServer: cache,
+				httpsServer: https);
+
+			var stations = await provider.GetStations();
+
+			Assert.AreEqual(3, stations.Response.stations.Count);
+			Assert.AreEqual(typeof(CopriCallsMonkeyStore).Name, stations.Source.Name);
+			Assert.AreEqual("Bang...", stations.Exception.Message);
+		}
+
+		[Test]
+		public async Task Test_AddToCache_Stations()
+		{
+			if (string.IsNullOrEmpty(Barrel.ApplicationId))
+			{
+				Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
+			}
+
+			var provider = new CopriProviderHttps(
+				new Uri("http://1.2.3.4"),
+				"123456789",
+				new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+				null /*UI language */);
+
+			var stations = await provider.GetStations(true);
+			Assert.AreEqual(0, stations.Response.stations.Count);
+
+			try
+			{
+				// Do not add if an excption occurred
+				provider.AddToCache(new Result<StationsAvailableResponse>(typeof(CopriCallsHttps), JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL), new GeneralData(), new Exception("Bang...")));
+				stations = await provider.GetStations(true);
+				Assert.AreEqual(0, stations.Response.stations.Count);
+
+				// Do not add if results from cache
+				provider.AddToCache(new Result<StationsAvailableResponse>(typeof(CopriCallsMonkeyStore), JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL), new GeneralData()));
+				stations = await provider.GetStations(true);
+				Assert.AreEqual(0, stations.Response.stations.Count);
+
+				// Add result
+				provider.AddToCache(new Result<StationsAvailableResponse>(typeof(CopriCallsHttps), JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL), new GeneralData()));
+				stations = await provider.GetStations(true);
+				Assert.AreEqual(3, stations.Response.stations.Count);
+			}
+			finally
+			{
+				Barrel.Current.EmptyAll();
+			}
+		}
+
+		[Test]
+		public async Task Test_AddToCache_BikesAvailable()
+		{
+			if (string.IsNullOrEmpty(Barrel.ApplicationId))
+			{
+				Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
+			}
+
+			var provider = new CopriProviderHttps(
+				new Uri("http://1.2.3.4"),
+				"123456789",
+				new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+				null /*UI language */);
+
+			var bikes = await provider.GetBikesAvailable(true);
+			Assert.AreEqual(0, bikes.Response.bikes.Count);
+
+			try
+			{
+				// Do not add if an excption occurred
+				provider.AddToCache(new Result<BikesAvailableResponse>(typeof(CopriCallsHttps), JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE), new GeneralData(), new Exception("Bang...")));
+				bikes = await provider.GetBikesAvailable(true);
+				Assert.AreEqual(0, bikes.Response.bikes.Count);
+
+				// Do not add if results from cache
+				provider.AddToCache(new Result<BikesAvailableResponse>(typeof(CopriCallsMonkeyStore), JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE), new GeneralData()));
+				bikes = await provider.GetBikesAvailable(true);
+				Assert.AreEqual(0, bikes.Response.bikes.Count);
+
+				// Add result
+				provider.AddToCache(new Result<BikesAvailableResponse>(typeof(CopriCallsHttps), JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE), new GeneralData()));
+				bikes = await provider.GetBikesAvailable(true);
+				Assert.AreEqual(1, bikes.Response.bikes.Count);
+			}
+			finally
+			{
+				Barrel.Current.EmptyAll();
+			}
+		}
+
+
+		[Test]
+		public async Task Test_AddToCache_BikesOccupied()
+		{
+			if (string.IsNullOrEmpty(Barrel.ApplicationId))
+			{
+				Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
+			}
+
+			var provider = new CopriProviderHttps(
+				new Uri("http://1.2.3.4"),
+				"123456789",
+				new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), // User agent
+				null /* langugage */,
+				"876");
+
+			var bikes = await provider.GetBikesOccupied(true);
+			Assert.AreEqual(0, bikes.Response.bikes_occupied.Count);
+
+			try
+			{
+				// Do not add if an excption occurred
+				provider.AddToCache(new Result<BikesReservedOccupiedResponse>(typeof(CopriCallsHttps), JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED), new GeneralData(), new Exception("Bang...")));
+				bikes = await provider.GetBikesOccupied(true);
+				Assert.AreEqual(0, bikes.Response.bikes_occupied.Count);
+
+				// Do not add if results from cache
+				provider.AddToCache(new Result<BikesReservedOccupiedResponse>(typeof(CopriCallsMonkeyStore), JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED), new GeneralData()));
+				bikes = await provider.GetBikesOccupied(true);
+				Assert.AreEqual(0, bikes.Response.bikes_occupied.Count);
+
+				// Add result
+				provider.AddToCache(new Result<BikesReservedOccupiedResponse>(typeof(CopriCallsHttps), JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED), new GeneralData()));
+				bikes = await provider.GetBikesOccupied(true);
+				Assert.AreEqual(1, bikes.Response.bikes_occupied.Count);
+			}
+			finally
+			{
+				Barrel.Current.EmptyAll();
+			}
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Connector/TestTextToTypeHelper.cs b/TestShareeLib/Model/Connector/TestTextToTypeHelper.cs
index 0ac7403..a09f0bc 100644
--- a/TestShareeLib/Model/Connector/TestTextToTypeHelper.cs
+++ b/TestShareeLib/Model/Connector/TestTextToTypeHelper.cs
@@ -11,25 +11,25 @@ using JsonConvertRethrow = TINK.Repository.Response.JsonConvertRethrow;
 namespace TestTINKLib.Fixtures.Connector
 {
 
-    [TestFixture]
-    public class TestTextToTypeHelper
-    {
-        [Test]
-        public void TestGetWheelType_InvalidDescription()
-        {
-            var l_oInfo = new BikeInfoBase();
+	[TestFixture]
+	public class TestTextToTypeHelper
+	{
+		[Test]
+		public void TestGetWheelType_InvalidDescription()
+		{
+			var l_oInfo = new BikeInfoBase();
 
-            // Verify prerequisites
-            Assert.IsNull(l_oInfo.description);
+			// Verify prerequisites
+			Assert.IsNull(l_oInfo.description);
 
-            // Verify behaviour of member.
-            Assert.IsNull(TextToTypeHelper.GetWheelType(l_oInfo));
-        }
+			// Verify behaviour of member.
+			Assert.IsNull(TextToTypeHelper.GetWheelType(l_oInfo));
+		}
 
-        [Test]
-        public void TestGetWheelType()
-        {
-            var l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
+		[Test]
+		public void TestGetWheelType()
+		{
+			var l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
             {
                 ""bike"" : ""2"",
                 ""bike_group"" : [ ""TINK"" ],
@@ -43,10 +43,10 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
              }");
 
-            // Verify behaviour of member.
-            Assert.AreEqual(WheelType.Two, TextToTypeHelper.GetWheelType(l_oInfo));
+			// Verify behaviour of member.
+			Assert.AreEqual(WheelType.Two, TextToTypeHelper.GetWheelType(l_oInfo));
 
-            l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
+			l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
             {
                 ""bike"" : ""11"",
                 ""bike_group"" : [ ""TINK"" ],
@@ -60,10 +60,10 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
             }");
 
-            // Verify behaviour of member.
-            Assert.AreEqual(WheelType.Trike, TextToTypeHelper.GetWheelType(l_oInfo));
+			// Verify behaviour of member.
+			Assert.AreEqual(WheelType.Trike, TextToTypeHelper.GetWheelType(l_oInfo));
 
-            l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
+			l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
             {
                 ""bike"" : ""51"",
                 ""bike_group"" : [ ""Konrad"" ],
@@ -73,10 +73,10 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
             }");
 
-            // Verify behaviour of member.
-            Assert.That(TextToTypeHelper.GetWheelType(l_oInfo), Is.Null); // Was WheelType.Two up to 3.0.322
+			// Verify behaviour of member.
+			Assert.That(TextToTypeHelper.GetWheelType(l_oInfo), Is.Null); // Was WheelType.Two up to 3.0.322
 
-            l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
+			l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
             {
                 ""bike"" : ""51"",
                 ""bike_group"" : [ ""Konrad"" ],
@@ -86,26 +86,26 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
             }");
 
-            // Verify behaviour of member.
-            Assert.That(TextToTypeHelper.GetWheelType(l_oInfo), Is.Null); // Was WheelType.Two up to 3.0.322
-        }
+			// Verify behaviour of member.
+			Assert.That(TextToTypeHelper.GetWheelType(l_oInfo), Is.Null); // Was WheelType.Two up to 3.0.322
+		}
 
-        [Test]
-        public void TestGetTypeOfBike_InvalidDescription()
-        {
-            var l_oInfo = new BikeInfoBase();
+		[Test]
+		public void TestGetTypeOfBike_InvalidDescription()
+		{
+			var l_oInfo = new BikeInfoBase();
 
-            // Verify prerequisites
-            Assert.IsNull(l_oInfo.description);
+			// Verify prerequisites
+			Assert.IsNull(l_oInfo.description);
 
-            // Verify behaviour of member.
-            Assert.IsNull(TextToTypeHelper.GetTypeOfBike(l_oInfo));
-        }
+			// Verify behaviour of member.
+			Assert.IsNull(TextToTypeHelper.GetTypeOfBike(l_oInfo));
+		}
 
-        [Test]
-        public void TestGetTypeOfBike()
-        {
-            var info = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
+		[Test]
+		public void TestGetTypeOfBike()
+		{
+			var info = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
             {
                 ""bike"" : ""2"",
                 ""bike_group"" : [ ""TINK"" ],
@@ -119,10 +119,10 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
              }");
 
-            // Verify behaviour of member.
-            Assert.AreEqual(TypeOfBike.Cargo, TextToTypeHelper.GetTypeOfBike(info));
+			// Verify behaviour of member.
+			Assert.AreEqual(TypeOfBike.Cargo, TextToTypeHelper.GetTypeOfBike(info));
 
-            info = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
+			info = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
             {
                 ""bike"" : ""11"",
                 ""bike_group"" : [ ""TINK"" ],
@@ -136,10 +136,10 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
             }");
 
-            // Verify behaviour of member.
-            Assert.AreEqual(TypeOfBike.Cargo, TextToTypeHelper.GetTypeOfBike(info));
+			// Verify behaviour of member.
+			Assert.AreEqual(TypeOfBike.Cargo, TextToTypeHelper.GetTypeOfBike(info));
 
-            info = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
+			info = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
             {
                 ""bike"" : ""51"",
                 ""bike_group"" : [ ""Konrad"" ],
@@ -153,10 +153,10 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
             }");
 
-            // Verify behaviour of member.
-            Assert.AreEqual(TypeOfBike.City, TextToTypeHelper.GetTypeOfBike(info));
+			// Verify behaviour of member.
+			Assert.AreEqual(TypeOfBike.City, TextToTypeHelper.GetTypeOfBike(info));
 
-            info = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
+			info = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
             {
                 ""bike"" : ""51"",
                 ""bike_group"" : [ ""Konrad"" ],
@@ -168,75 +168,75 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
             }");
 
-            // Verify behaviour of member.
-            Assert.That(
-                TextToTypeHelper.GetTypeOfBike(info),
-                Is.Null); // Version up to 3.0.322 considered this bike to be a city bike to to description "Stadtrad"
-        }
+			// Verify behaviour of member.
+			Assert.That(
+				TextToTypeHelper.GetTypeOfBike(info),
+				Is.Null); // Version up to 3.0.322 considered this bike to be a city bike to to description "Stadtrad"
+		}
 
-        [Test]
-        public void TestGetStateAvailable()
-            => Assert.That(
-                JsonConvert.DeserializeObject<BikeInfoBase>("{ \"state\" : \"available\" }").GetState(),
-                Is.EqualTo(TINK.Model.State.InUseStateEnum.Disposable));
+		[Test]
+		public void TestGetStateAvailable()
+			=> Assert.That(
+				JsonConvert.DeserializeObject<BikeInfoBase>("{ \"state\" : \"available\" }").GetState(),
+				Is.EqualTo(TINK.Model.State.InUseStateEnum.Disposable));
 
-        [Test]
-        public void TestGetStateAvailableCase()
-            => Assert.That(
-                JsonConvert.DeserializeObject<BikeInfoBase>("{ \"state\" : \"availablE \" }").GetState(),
-                Is.EqualTo(TINK.Model.State.InUseStateEnum.Disposable));
+		[Test]
+		public void TestGetStateAvailableCase()
+			=> Assert.That(
+				JsonConvert.DeserializeObject<BikeInfoBase>("{ \"state\" : \"availablE \" }").GetState(),
+				Is.EqualTo(TINK.Model.State.InUseStateEnum.Disposable));
 
-        [Test]
-        public void TestGetStateReserved()
-            => Assert.That(
-                JsonConvert.DeserializeObject<BikeInfoBase>("{ \"state\" : \"requested\" }").GetState(),
-                Is.EqualTo(TINK.Model.State.InUseStateEnum.Reserved));
+		[Test]
+		public void TestGetStateReserved()
+			=> Assert.That(
+				JsonConvert.DeserializeObject<BikeInfoBase>("{ \"state\" : \"requested\" }").GetState(),
+				Is.EqualTo(TINK.Model.State.InUseStateEnum.Reserved));
 
-        [Test]
-        public void TestGetStateReservedCase()
-        => Assert.That(
-            JsonConvert.DeserializeObject<BikeInfoBase>("{ \"state\" : \" reQuested\" }").GetState(),
-            Is.EqualTo(TINK.Model.State.InUseStateEnum.Reserved));
+		[Test]
+		public void TestGetStateReservedCase()
+		=> Assert.That(
+			JsonConvert.DeserializeObject<BikeInfoBase>("{ \"state\" : \" reQuested\" }").GetState(),
+			Is.EqualTo(TINK.Model.State.InUseStateEnum.Reserved));
 
-        [Test]
-        public void TestGetStateOccupied()
-            => Assert.That(
-                JsonConvert.DeserializeObject<BikeInfoBase>("{ \"state\" : \"occupied\" }").GetState(),
-                Is.EqualTo(TINK.Model.State.InUseStateEnum.Booked));
+		[Test]
+		public void TestGetStateOccupied()
+			=> Assert.That(
+				JsonConvert.DeserializeObject<BikeInfoBase>("{ \"state\" : \"occupied\" }").GetState(),
+				Is.EqualTo(TINK.Model.State.InUseStateEnum.Booked));
 
-        [Test]
-        public void TestGetStateOccupiedCase()
-        => Assert.That(
-            JsonConvert.DeserializeObject<BikeInfoBase>("{ \"state\" : \"occuPied\" }").GetState(),
-            Is.EqualTo(TINK.Model.State.InUseStateEnum.Booked));
+		[Test]
+		public void TestGetStateOccupiedCase()
+		=> Assert.That(
+			JsonConvert.DeserializeObject<BikeInfoBase>("{ \"state\" : \"occuPied\" }").GetState(),
+			Is.EqualTo(TINK.Model.State.InUseStateEnum.Booked));
 
-        [Test]
-        public void TestGetStateBikeInfoAvailableDisposable()
-            => Assert.That(
-                JsonConvert.DeserializeObject<BikeInfoAvailable>("{ \"state\" : \"available\" }").GetState(),
-                Is.EqualTo(TINK.Model.State.InUseStateEnum.Disposable));
-        [Test]
-        public void TestGetStateBikeInfoAvailableFeedbackPending()
-            => Assert.That(
-                JsonConvert.DeserializeObject<BikeInfoAvailable>("{ \"state\" : \"available\", \"co2saving\" : \"\" }").GetState(),
-                Is.EqualTo(TINK.Model.State.InUseStateEnum.FeedbackPending));
+		[Test]
+		public void TestGetStateBikeInfoAvailableDisposable()
+			=> Assert.That(
+				JsonConvert.DeserializeObject<BikeInfoAvailable>("{ \"state\" : \"available\" }").GetState(),
+				Is.EqualTo(TINK.Model.State.InUseStateEnum.Disposable));
+		[Test]
+		public void TestGetStateBikeInfoAvailableFeedbackPending()
+			=> Assert.That(
+				JsonConvert.DeserializeObject<BikeInfoAvailable>("{ \"state\" : \"available\", \"co2saving\" : \"\" }").GetState(),
+				Is.EqualTo(TINK.Model.State.InUseStateEnum.FeedbackPending));
 
-        [Test]
-        public void TestGetState_InvalidDescription()
-        {
-            var info = new BikeInfoBase();
+		[Test]
+		public void TestGetState_InvalidDescription()
+		{
+			var info = new BikeInfoBase();
 
-            // Verify prerequisites
-            Assert.IsNull(info.state);
+			// Verify prerequisites
+			Assert.IsNull(info.state);
 
-            // Verify behaviour of member.
-            Assert.Throws<InvalidResponseException<BikeInfoBase>>(() => TextToTypeHelper.GetState(info));
-        }
+			// Verify behaviour of member.
+			Assert.Throws<InvalidResponseException<BikeInfoBase>>(() => TextToTypeHelper.GetState(info));
+		}
 
-        [Test]
-        public void TestGetIsDemo()
-        {
-            var l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
+		[Test]
+		public void TestGetIsDemo()
+		{
+			var l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
             {
                 ""bike"" : ""2"",
                 ""bike_group"" : [ ""TINK"" ],
@@ -246,10 +246,10 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
              }");
 
-            // Verify behaviour of member.
-            Assert.IsFalse(TextToTypeHelper.GetIsDemo(l_oInfo));
+			// Verify behaviour of member.
+			Assert.IsFalse(TextToTypeHelper.GetIsDemo(l_oInfo));
 
-            l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
+			l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
             {
                 ""bike"" : ""11"",
                 ""bike_group"" : [ ""TINK"" ],
@@ -259,10 +259,10 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
             }");
 
-            // Verify behaviour of member.
-            Assert.IsFalse(TextToTypeHelper.GetIsDemo(l_oInfo));
+			// Verify behaviour of member.
+			Assert.IsFalse(TextToTypeHelper.GetIsDemo(l_oInfo));
 
-            l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
+			l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
             {
                 ""bike"" : ""51"",
                 ""bike_group"" : [ ""Konrad"" ],
@@ -272,10 +272,10 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
             }");
 
-            // Verify behaviour of member.
-            Assert.IsTrue(TextToTypeHelper.GetIsDemo(l_oInfo));
+			// Verify behaviour of member.
+			Assert.IsTrue(TextToTypeHelper.GetIsDemo(l_oInfo));
 
-            l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
+			l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
             {
                 ""bike"" : ""51"",
                 ""bike_group"" : [ ""Konrad"" ],
@@ -285,21 +285,21 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
             }");
 
-            // Verify behaviour of member.
-            Assert.IsFalse(TextToTypeHelper.GetIsDemo(l_oInfo));
-        }
+			// Verify behaviour of member.
+			Assert.IsFalse(TextToTypeHelper.GetIsDemo(l_oInfo));
+		}
 
-        [Test]
-        public void TestGetPosition()
-        {
-            Assert.AreEqual(1.234d, TextToTypeHelper.GetPosition(JsonConvert.DeserializeObject<Position>("{ \"latitude\" : \"1.234\", \"longitude\" : \"5.678\"}")).Latitude);
-            Assert.AreEqual(5.678d, TextToTypeHelper.GetPosition(JsonConvert.DeserializeObject<Position>("{ \"latitude\" : \"1.234\", \"longitude\" : \"5.678\"}")).Longitude);
-        }
+		[Test]
+		public void TestGetPosition()
+		{
+			Assert.AreEqual(1.234d, TextToTypeHelper.GetPosition(JsonConvert.DeserializeObject<Position>("{ \"latitude\" : \"1.234\", \"longitude\" : \"5.678\"}")).Latitude);
+			Assert.AreEqual(5.678d, TextToTypeHelper.GetPosition(JsonConvert.DeserializeObject<Position>("{ \"latitude\" : \"1.234\", \"longitude\" : \"5.678\"}")).Longitude);
+		}
 
-        [Test]
-        public void TestMapSpan()
-        {
-            var response = JsonConvertRethrow.DeserializeObject<ResponseBase>(@"
+		[Test]
+		public void TestMapSpan()
+		{
+			var response = JsonConvertRethrow.DeserializeObject<ResponseBase>(@"
             {
                 ""init_map"": {
                     ""radius"": ""2.9"",
@@ -310,15 +310,15 @@ namespace TestTINKLib.Fixtures.Connector
                 }
             }");
 
-            Assert.That(
-                TextToTypeHelper.GetMapSpan(response.init_map).Radius,
-                Is.EqualTo(2.9));
-        }
+			Assert.That(
+				TextToTypeHelper.GetMapSpan(response.init_map).Radius,
+				Is.EqualTo(2.9));
+		}
 
-        [Test]
-        public void TestMapSpan_EmptyRadius()
-        {
-            var response = JsonConvertRethrow.DeserializeObject<ResponseBase>(@"
+		[Test]
+		public void TestMapSpan_EmptyRadius()
+		{
+			var response = JsonConvertRethrow.DeserializeObject<ResponseBase>(@"
             {
                 ""init_map"": {
                     ""radius"": """",
@@ -329,15 +329,15 @@ namespace TestTINKLib.Fixtures.Connector
                 }
             }");
 
-            Assert.That(
-                TextToTypeHelper.GetMapSpan(response.init_map).IsValid,
-                Is.False);
-        }
+			Assert.That(
+				TextToTypeHelper.GetMapSpan(response.init_map).IsValid,
+				Is.False);
+		}
 
-        [Test]
-        public void TestMapSpan_EmptyPos()
-        {
-            var response = JsonConvertRethrow.DeserializeObject<ResponseBase>(@"
+		[Test]
+		public void TestMapSpan_EmptyPos()
+		{
+			var response = JsonConvertRethrow.DeserializeObject<ResponseBase>(@"
             {
                 ""init_map"": {
                     ""radius"": """",
@@ -348,67 +348,67 @@ namespace TestTINKLib.Fixtures.Connector
                 }
             }");
 
-            Assert.That(
-                TextToTypeHelper.GetMapSpan(response.init_map).IsValid,
-                Is.False);
-        }
+			Assert.That(
+				TextToTypeHelper.GetMapSpan(response.init_map).IsValid,
+				Is.False);
+		}
 
-        [Test]
-        public void TestMapSpan_Empty()
-        {
-            var response = JsonConvertRethrow.DeserializeObject<ResponseBase>(@"
+		[Test]
+		public void TestMapSpan_Empty()
+		{
+			var response = JsonConvertRethrow.DeserializeObject<ResponseBase>(@"
             {
             }");
 
-            Assert.That(
-                TextToTypeHelper.GetMapSpan(response.init_map).IsValid,
-                Is.False);
-        }
+			Assert.That(
+				TextToTypeHelper.GetMapSpan(response.init_map).IsValid,
+				Is.False);
+		}
 
-        [Test]
-        public void TestGetStationGroup_Invalid()
-        {
-            var l_oStation = JsonConvertRethrow.DeserializeObject<StationsAvailableResponse.StationInfo>(
-            @"{
+		[Test]
+		public void TestGetStationGroup_Invalid()
+		{
+			var l_oStation = JsonConvertRethrow.DeserializeObject<StationsAvailableResponse.StationInfo>(
+			@"{
                     ""station"" : ""4"",
                     ""gps"" : { ""latitude"": ""47.6586936667"", ""longitude"": ""9.16863116667"" }
                 }");
 
-            // From COPRI version v4.1 no more exception thrown.
-            Assert.That(l_oStation.GetGroup().Count(), Is.EqualTo(0));
-        }
+			// From COPRI version v4.1 no more exception thrown.
+			Assert.That(l_oStation.GetGroup().Count(), Is.EqualTo(0));
+		}
 
-        [Test]
-        public void TestGetStationGroup_TINK()
-        {
-            var l_oStation = JsonConvertRethrow.DeserializeObject<StationsAvailableResponse.StationInfo>(
-            @"{
+		[Test]
+		public void TestGetStationGroup_TINK()
+		{
+			var l_oStation = JsonConvertRethrow.DeserializeObject<StationsAvailableResponse.StationInfo>(
+			@"{
                     ""station"" : ""4"",
                     ""station_group"" : [ ""TINK"" ],
                     ""gps"" : { ""latitude"": ""47.6586936667"", ""longitude"": ""9.16863116667"" }
                 }");
 
-            Assert.AreEqual("TINK", string.Join(",", l_oStation.GetGroup().ToArray()));
-        }
+			Assert.AreEqual("TINK", string.Join(",", l_oStation.GetGroup().ToArray()));
+		}
 
-        [Test]
-        public void TestGetStationGroup_TINKAndKonrad()
-        {
-            var l_oStation = JsonConvertRethrow.DeserializeObject<StationsAvailableResponse.StationInfo>(
-            @"{
+		[Test]
+		public void TestGetStationGroup_TINKAndKonrad()
+		{
+			var l_oStation = JsonConvertRethrow.DeserializeObject<StationsAvailableResponse.StationInfo>(
+			@"{
                     ""station"" : ""4"",
                     ""station_group"": [ ""TINK"", ""Konrad"" ],
                     ""gps"" : { ""latitude"": ""47.6586936667"", ""longitude"": ""9.16863116667"" }
                 }");
 
-            Assert.AreEqual("TINK,Konrad", string.Join(",", l_oStation.GetGroup().ToArray()));
-        }
+			Assert.AreEqual("TINK,Konrad", string.Join(",", l_oStation.GetGroup().ToArray()));
+		}
 
-        [Test]
-        public void TestGetBikeGroup_TINK()
-        {
-            var l_oBike = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(
-            @"{
+		[Test]
+		public void TestGetBikeGroup_TINK()
+		{
+			var l_oBike = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(
+			@"{
                 ""state"" : ""available"",
                 ""bike"" : ""18"",
                 ""description"" : ""Cargo Long"",
@@ -416,14 +416,14 @@ namespace TestTINKLib.Fixtures.Connector
                 ""station"" : ""13"",
              }");
 
-            Assert.AreEqual("TINK", string.Join(",", l_oBike.GetGroup().ToArray()));
-        }
+			Assert.AreEqual("TINK", string.Join(",", l_oBike.GetGroup().ToArray()));
+		}
 
-        [Test]
-        public void TestGetBikeGroup_TINKCopri()
-        {
-            var l_oBike = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(
-            @"{
+		[Test]
+		public void TestGetBikeGroup_TINKCopri()
+		{
+			var l_oBike = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(
+			@"{
                 ""state"" : ""available"",
                 ""bike"" : ""18"",
                 ""description"" : ""Cargo Long"",
@@ -432,14 +432,14 @@ namespace TestTINKLib.Fixtures.Connector
                 ""station"" : ""13"",
              }");
 
-            Assert.AreEqual("TINK", string.Join(",", l_oBike.GetGroup().ToArray()));
-        }
+			Assert.AreEqual("TINK", string.Join(",", l_oBike.GetGroup().ToArray()));
+		}
 
-        [Test]
-        public void TestGetBikeGroup_TINKSMS()
-        {
-            var l_oBike = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(
-            @"{
+		[Test]
+		public void TestGetBikeGroup_TINKSMS()
+		{
+			var l_oBike = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(
+			@"{
                 ""state"" : ""available"",
                 ""bike"" : ""18"",
                 ""description"" : ""Cargo Long"",
@@ -448,14 +448,14 @@ namespace TestTINKLib.Fixtures.Connector
                 ""station"" : ""13"",
              }");
 
-            Assert.AreEqual("TINK", string.Join(",", l_oBike.GetGroup().ToArray()));
-        }
+			Assert.AreEqual("TINK", string.Join(",", l_oBike.GetGroup().ToArray()));
+		}
 
-        [Test]
-        public void TestGetBikeGroup_Konrad()
-        {
-            var l_oBike = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(
-            @"{
+		[Test]
+		public void TestGetBikeGroup_Konrad()
+		{
+			var l_oBike = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(
+			@"{
                 ""state"" : ""available"",
                 ""bike"" : ""18"",
                 ""description"" : ""Cargo Long"",
@@ -463,29 +463,29 @@ namespace TestTINKLib.Fixtures.Connector
                 ""station"" : ""13"",
              }");
 
-            Assert.AreEqual("Konrad", string.Join(",", l_oBike.GetGroup().ToArray()));
-        }
+			Assert.AreEqual("Konrad", string.Join(",", l_oBike.GetGroup().ToArray()));
+		}
 
-        [Test]
-        public void TestGetBikeGroup_Null()
-        {
-            var l_oBike = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(
-            @"{
+		[Test]
+		public void TestGetBikeGroup_Null()
+		{
+			var l_oBike = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(
+			@"{
                 ""state"" : ""available"",
                 ""bike"" : ""18"",
                 ""description"" : ""Cargo Long"",
                 ""station"" : ""13"",
              }");
 
-            Assert.AreEqual(0, l_oBike.GetGroup().ToArray().Length);
-        }
-        [Test]
-        public void TestGetAuthGroup()
-        {
-            // User group was of format [ ""TINK"", ""Konrad"" ] in early day...
-            // Since COPRI 4.1 use group is no more used.
-            // Groups are of format <OperatorId>_<BikeType> for this user group would be like below if it would be used.
-            var response = JsonConvertRethrow.DeserializeObject<AuthorizationResponse>(@"
+			Assert.AreEqual(0, l_oBike.GetGroup().ToArray().Length);
+		}
+		[Test]
+		public void TestGetAuthGroup()
+		{
+			// User group was of format [ ""TINK"", ""Konrad"" ] in early day...
+			// Since COPRI 4.1 use group is no more used.
+			// Groups are of format <OperatorId>_<BikeType> for this user group would be like below if it would be used.
+			var response = JsonConvertRethrow.DeserializeObject<AuthorizationResponse>(@"
             {
                   ""response"" : ""authorization"",
                   ""authcookie"" : ""4da3044c8657a04ba60e2eaa753bc51a"",
@@ -494,35 +494,35 @@ namespace TestTINKLib.Fixtures.Connector
                   ""apiserver"" : ""https://tinkwwp.copri-bike.de""
                }");
 
-            Assert.AreEqual(2, response.GetGroup().ToList().Count);
-            Assert.AreEqual($"KN_300102", response.GetGroup().ToList()[0]);
-            Assert.AreEqual($"KN_300101", response.GetGroup().ToList()[1]);
-        }
+			Assert.AreEqual(2, response.GetGroup().ToList().Count);
+			Assert.AreEqual($"KN_300102", response.GetGroup().ToList()[0]);
+			Assert.AreEqual($"KN_300101", response.GetGroup().ToList()[1]);
+		}
 
-        [Test]
-        public void TestGetGroupString()
-        {
-            // From COPRI version v4.1 no more exception thrown.
-            Assert.That(TextToTypeHelper.GetGroup(new string[0]).Count(), Is.EqualTo(0));
-        }
+		[Test]
+		public void TestGetGroupString()
+		{
+			// From COPRI version v4.1 no more exception thrown.
+			Assert.That(TextToTypeHelper.GetGroup(new string[0]).Count(), Is.EqualTo(0));
+		}
 
-        [Test]
-        public void TestGetGroupString_Null()
-        {
-            // From COPRI version v4.1 no more exception thrown.
-            Assert.That(TextToTypeHelper.GetGroup((string[])null).Count(), Is.EqualTo(0));
-        }
+		[Test]
+		public void TestGetGroupString_Null()
+		{
+			// From COPRI version v4.1 no more exception thrown.
+			Assert.That(TextToTypeHelper.GetGroup((string[])null).Count(), Is.EqualTo(0));
+		}
 
-        [Test]
-        public void TestGetGroupString_Roundtrip()
-        {
-            Assert.AreEqual("Tunk,Unk", TextToTypeHelper.GetGroup(TextToTypeHelper.GetGroup(new[] { "Tunk", "Unk" })));
-        }
+		[Test]
+		public void TestGetGroupString_Roundtrip()
+		{
+			Assert.AreEqual("Tunk,Unk", TextToTypeHelper.GetGroup(TextToTypeHelper.GetGroup(new[] { "Tunk", "Unk" })));
+		}
 
-        [Test]
-        public void TestGetUserKey()
-        {
-            var l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoReservedOrBooked>(@"
+		[Test]
+		public void TestGetUserKey()
+		{
+			var l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoReservedOrBooked>(@"
             {
                 ""total_price"": ""0.00"",
                 ""gps"" : { ""latitude"": ""47.6586133"", ""longitude"": ""9.16864"" },
@@ -544,18 +544,18 @@ namespace TestTINKLib.Fixtures.Connector
                 ""description"": ""Cargo Long""
             }");
 
-            Assert.AreEqual(
-                99,
-                TextToTypeHelper.GetUserKey(l_oInfo)[0]);
-            Assert.AreEqual(
-                104,
-                TextToTypeHelper.GetUserKey(l_oInfo)[1]);
-        }
+			Assert.AreEqual(
+				99,
+				TextToTypeHelper.GetUserKey(l_oInfo)[0]);
+			Assert.AreEqual(
+				104,
+				TextToTypeHelper.GetUserKey(l_oInfo)[1]);
+		}
 
-        [Test]
-        public void TestGetAdminKey()
-        {
-            var l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoReservedOrBooked>(@"
+		[Test]
+		public void TestGetAdminKey()
+		{
+			var l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoReservedOrBooked>(@"
             {
                 ""total_price"": ""0.00"",
                 ""gps"" : { ""latitude"": ""47.6586133"", ""longitude"": ""9.16864"" },
@@ -577,18 +577,18 @@ namespace TestTINKLib.Fixtures.Connector
                 ""description"": ""Cargo Long""
             }");
 
-            Assert.AreEqual(
-                237,
-                TextToTypeHelper.GetAdminKey(l_oInfo)[0]);
-            Assert.AreEqual(
-                29,
-                TextToTypeHelper.GetAdminKey(l_oInfo)[1]);
-        }
+			Assert.AreEqual(
+				237,
+				TextToTypeHelper.GetAdminKey(l_oInfo)[0]);
+			Assert.AreEqual(
+				29,
+				TextToTypeHelper.GetAdminKey(l_oInfo)[1]);
+		}
 
-        [Test]
-        public void TestGetSeed()
-        {
-            var l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoReservedOrBooked>(@"
+		[Test]
+		public void TestGetSeed()
+		{
+			var l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoReservedOrBooked>(@"
             {
                 ""total_price"": ""0.00"",
                 ""gps"" : { ""latitude"": ""47.6586133"", ""longitude"": ""9.16864"" },
@@ -610,18 +610,18 @@ namespace TestTINKLib.Fixtures.Connector
                 ""description"": ""Cargo Long""
             }");
 
-            Assert.AreEqual(
-                238,
-                TextToTypeHelper.GetSeed(l_oInfo)[0]);
-            Assert.AreEqual(
-                176,
-                TextToTypeHelper.GetSeed(l_oInfo)[1]);
-        }
+			Assert.AreEqual(
+				238,
+				TextToTypeHelper.GetSeed(l_oInfo)[0]);
+			Assert.AreEqual(
+				176,
+				TextToTypeHelper.GetSeed(l_oInfo)[1]);
+		}
 
-        [Test]
-        public void TestGetSeedUserKeyAdminKey_Invalid()
-        {
-            var l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoReservedOrBooked>(@"
+		[Test]
+		public void TestGetSeedUserKeyAdminKey_Invalid()
+		{
+			var l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoReservedOrBooked>(@"
             {
                 ""total_price"": ""0.00"",
                 ""gps"" : { ""latitude"": ""47.6586133"", ""longitude"": ""9.16864"" },
@@ -643,174 +643,174 @@ namespace TestTINKLib.Fixtures.Connector
                 ""description"": ""Cargo Long""
             }");
 
-            Assert.AreEqual(
-                0,
-                TextToTypeHelper.GetSeed(l_oInfo).Length);
+			Assert.AreEqual(
+				0,
+				TextToTypeHelper.GetSeed(l_oInfo).Length);
 
-            Assert.AreEqual(
-                0,
-                TextToTypeHelper.GetUserKey(l_oInfo).Length);
+			Assert.AreEqual(
+				0,
+				TextToTypeHelper.GetUserKey(l_oInfo).Length);
 
-            Assert.AreEqual(
-                0,
-                TextToTypeHelper.GetAdminKey(l_oInfo).Length);
-        }
+			Assert.AreEqual(
+				0,
+				TextToTypeHelper.GetAdminKey(l_oInfo).Length);
+		}
 
-        [Test]
-        public void TestGetBluetoothLockId_FromBikeInfo_Invalid()
-        {
-            var l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoReservedOrBooked>(@"
+		[Test]
+		public void TestGetBluetoothLockId_FromBikeInfo_Invalid()
+		{
+			var l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoReservedOrBooked>(@"
             {
             }");
 
-            Assert.AreEqual(0, TextToTypeHelper.GetBluetoothLockId(l_oInfo));
+			Assert.AreEqual(0, TextToTypeHelper.GetBluetoothLockId(l_oInfo));
 
-            l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoReservedOrBooked>(@"
+			l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoReservedOrBooked>(@"
             {
                 ""Ilockit_ID"": """"
             }");
 
-            Assert.AreEqual(0, TextToTypeHelper.GetBluetoothLockId(l_oInfo));
-        }
+			Assert.AreEqual(0, TextToTypeHelper.GetBluetoothLockId(l_oInfo));
+		}
 
-        [Test]
-        public void TestGetBluetoothLockId_FromBikeInfo()
-        {
-            var l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoReservedOrBooked>(@"
+		[Test]
+		public void TestGetBluetoothLockId_FromBikeInfo()
+		{
+			var l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoReservedOrBooked>(@"
             {
                 ""Ilockit_ID"": ""ISHAREIT-132""
             }");
 
-            Assert.AreEqual(
-                132,
-                TextToTypeHelper.GetBluetoothLockId(l_oInfo));
-        }
+			Assert.AreEqual(
+				132,
+				TextToTypeHelper.GetBluetoothLockId(l_oInfo));
+		}
 
-        [Test]
-        public void TestGetBluetoothLockId_FromString_Invalid()
-        {
-            Assert.AreEqual(0, TextToLockItTypeHelper.GetBluetoothLockId((string)null));
-            Assert.AreEqual(0, TextToLockItTypeHelper.GetBluetoothLockId(""));
+		[Test]
+		public void TestGetBluetoothLockId_FromString_Invalid()
+		{
+			Assert.AreEqual(0, TextToLockItTypeHelper.GetBluetoothLockId((string)null));
+			Assert.AreEqual(0, TextToLockItTypeHelper.GetBluetoothLockId(""));
 
-            Assert.AreEqual(0, TextToLockItTypeHelper.GetBluetoothLockId("HubbaBubba"));
-        }
+			Assert.AreEqual(0, TextToLockItTypeHelper.GetBluetoothLockId("HubbaBubba"));
+		}
 
-        [Test]
-        public void TestGetBluetoothLockId_FromString()
-        {
-            Assert.AreEqual(
-                132,
-                TextToLockItTypeHelper.GetBluetoothLockId("ISHAREIT-132"));
+		[Test]
+		public void TestGetBluetoothLockId_FromString()
+		{
+			Assert.AreEqual(
+				132,
+				TextToLockItTypeHelper.GetBluetoothLockId("ISHAREIT-132"));
 
-            Assert.AreEqual(
-                132,
-                TextToLockItTypeHelper.GetBluetoothLockId("ISHAREIT+132"));
-        }
+			Assert.AreEqual(
+				132,
+				TextToLockItTypeHelper.GetBluetoothLockId("ISHAREIT+132"));
+		}
 
-        [Test]
-        public void TestGetCopriVersion()
-        {
-            var version = JsonConvertRethrow.DeserializeObject<CopriVersion>(@"
+		[Test]
+		public void TestGetCopriVersion()
+		{
+			var version = JsonConvertRethrow.DeserializeObject<CopriVersion>(@"
             {
                 ""copri_version"": ""4.3.2.1""
             }");
 
-            Assert.That(
-                version.GetCopriVersion(),
-                Is.EqualTo(new Version(4, 3, 2, 1)));
-        }
+			Assert.That(
+				version.GetCopriVersion(),
+				Is.EqualTo(new Version(4, 3, 2, 1)));
+		}
 
-        [Test]
-        public void TestGetCopriVersion_Invald()
-        {
-            var version = JsonConvertRethrow.DeserializeObject<CopriVersion>(@"
+		[Test]
+		public void TestGetCopriVersion_Invald()
+		{
+			var version = JsonConvertRethrow.DeserializeObject<CopriVersion>(@"
             {
                 ""copri_version"": ""hellO""
             }");
 
-            Assert.That(
-                () => version.GetCopriVersion(),
-                Throws.InstanceOf<InvalidResponseException>());
-        }
+			Assert.That(
+				() => version.GetCopriVersion(),
+				Throws.InstanceOf<InvalidResponseException>());
+		}
 
 
-        [Test]
-        public void TestGetCopriVersion_Null()
-        {
+		[Test]
+		public void TestGetCopriVersion_Null()
+		{
 
-            Assert.That(
-                () => TextToTypeHelper.GetCopriVersion(null),
-                Throws.InstanceOf<InvalidResponseException>());
-        }
+			Assert.That(
+				() => TextToTypeHelper.GetCopriVersion(null),
+				Throws.InstanceOf<InvalidResponseException>());
+		}
 
-        [Test]
-        public void TestGetCopriVersion_NotContained()
-        {
-            var version = JsonConvertRethrow.DeserializeObject<CopriVersion>(@"
+		[Test]
+		public void TestGetCopriVersion_NotContained()
+		{
+			var version = JsonConvertRethrow.DeserializeObject<CopriVersion>(@"
             {
             }");
 
-            Assert.That(
-                () => version.GetCopriVersion(),
-                Throws.InstanceOf<InvalidResponseException>());
-        }
+			Assert.That(
+				() => version.GetCopriVersion(),
+				Throws.InstanceOf<InvalidResponseException>());
+		}
 
-        [Test]
-        public void TestGetIsAgbAcknowledged()
-        {
-            var response = JsonConvertRethrow.DeserializeObject<AuthorizationResponse>(@"
+		[Test]
+		public void TestGetIsAgbAcknowledged()
+		{
+			var response = JsonConvertRethrow.DeserializeObject<AuthorizationResponse>(@"
             {
                 ""agb_checked"" : ""1""
             }");
 
-            Assert.That(
-                () => response.GetIsAgbAcknowledged(),
-                Is.True);
-        }
+			Assert.That(
+				() => response.GetIsAgbAcknowledged(),
+				Is.True);
+		}
 
-        [Test]
-        public void TestGetIsAgbAcknowledged_No()
-        {
-            var response = JsonConvertRethrow.DeserializeObject<AuthorizationResponse>(@"
+		[Test]
+		public void TestGetIsAgbAcknowledged_No()
+		{
+			var response = JsonConvertRethrow.DeserializeObject<AuthorizationResponse>(@"
             {
                 ""agb_checked"" : ""0""
             }");
 
-            Assert.That(
-                () => response.GetIsAgbAcknowledged(),
-                Is.False);
-        }
+			Assert.That(
+				() => response.GetIsAgbAcknowledged(),
+				Is.False);
+		}
 
-        [Test]
-        public void TestGetIsAgbAcknowledged_Invalid()
-        {
-            var response = JsonConvertRethrow.DeserializeObject<AuthorizationResponse>(@"
+		[Test]
+		public void TestGetIsAgbAcknowledged_Invalid()
+		{
+			var response = JsonConvertRethrow.DeserializeObject<AuthorizationResponse>(@"
             {
                 ""agb_checked"" : ""ä""
             }");
 
-            Assert.That(
-                () => response.GetIsAgbAcknowledged(),
-                Is.False);
-        }
+			Assert.That(
+				() => response.GetIsAgbAcknowledged(),
+				Is.False);
+		}
 
-        [Test]
-        public void TestGetIsAgbAcknowledged_Empty()
-        {
-            var response = JsonConvertRethrow.DeserializeObject<AuthorizationResponse>(@"
+		[Test]
+		public void TestGetIsAgbAcknowledged_Empty()
+		{
+			var response = JsonConvertRethrow.DeserializeObject<AuthorizationResponse>(@"
             {
             }");
 
-            Assert.That(
-                () => response.GetIsAgbAcknowledged(),
-                Is.False);
-        }
+			Assert.That(
+				() => response.GetIsAgbAcknowledged(),
+				Is.False);
+		}
 
-        [Test]
-        public void TestGetLockModelBluetooth()
-        {
-            var response = JsonConvert.DeserializeObject<BikeInfoBase>(
-                @"{
+		[Test]
+		public void TestGetLockModelBluetooth()
+		{
+			var response = JsonConvert.DeserializeObject<BikeInfoBase>(
+				@"{
                     ""description"" : ""Cargo Long"",
                     ""state"" : ""available"",
                     ""bike"" : ""1"",
@@ -818,16 +818,16 @@ namespace TestTINKLib.Fixtures.Connector
                     ""station"" : ""9"",
                     ""system"" : ""Ilockit""
                 }");
-            Assert.That(
-                response.GetLockModel(),
-                Is.EqualTo(LockModel.ILockIt));
-        }
+			Assert.That(
+				response.GetLockModel(),
+				Is.EqualTo(LockModel.ILockIt));
+		}
 
-        [Test]
-        public void TestGetLockModelSigo()
-        {
-            var response = JsonConvert.DeserializeObject<BikeInfoBase>(
-                @"{
+		[Test]
+		public void TestGetLockModelSigo()
+		{
+			var response = JsonConvert.DeserializeObject<BikeInfoBase>(
+				@"{
                     ""description"" : ""Cargo Long"",
                     ""state"" : ""available"",
                     ""bike"" : ""1"",
@@ -835,16 +835,16 @@ namespace TestTINKLib.Fixtures.Connector
                     ""station"" : ""9"",
                     ""system"" : ""SIGO""
                 }");
-            Assert.That(
-                response.GetLockModel(),
-                Is.EqualTo(LockModel.Sigo));
-        }
+			Assert.That(
+				response.GetLockModel(),
+				Is.EqualTo(LockModel.Sigo));
+		}
 
-        [Test]
-        public void TestGetLockModelBordComputer()
-        {
-            var response = JsonConvert.DeserializeObject<BikeInfoBase>(
-                @"{
+		[Test]
+		public void TestGetLockModelBordComputer()
+		{
+			var response = JsonConvert.DeserializeObject<BikeInfoBase>(
+				@"{
                     ""description"" : ""Cargo Long"",
                     ""state"" : ""available"",
                     ""bike"" : ""1"",
@@ -852,16 +852,16 @@ namespace TestTINKLib.Fixtures.Connector
                     ""station"" : ""9"",
                     ""system"" : ""LOCK""
                 }");
-            Assert.That(
-                response.GetLockModel(),
-                Is.EqualTo(LockModel.BordComputer));
-        }
+			Assert.That(
+				response.GetLockModel(),
+				Is.EqualTo(LockModel.BordComputer));
+		}
 
-        [Test]
-        public void TestGetLockModelUnknown()
-        {
-            var response = JsonConvert.DeserializeObject<BikeInfoBase>(
-                @"{
+		[Test]
+		public void TestGetLockModelUnknown()
+		{
+			var response = JsonConvert.DeserializeObject<BikeInfoBase>(
+				@"{
                     ""description"" : ""Cargo Long"",
                     ""state"" : ""available"",
                     ""bike"" : ""1"",
@@ -869,16 +869,16 @@ namespace TestTINKLib.Fixtures.Connector
                     ""station"" : ""9"",
                     ""system"" : """"
                 }");
-            Assert.That(
-                response.GetLockModel(),
-                Is.Null);
-        }
+			Assert.That(
+				response.GetLockModel(),
+				Is.Null);
+		}
 
-        [Test]
-        public void TestGetCopriLockingStateClosed()
-        {
-            var response = JsonConvert.DeserializeObject<BikeInfoBase>(
-                @"{
+		[Test]
+		public void TestGetCopriLockingStateClosed()
+		{
+			var response = JsonConvert.DeserializeObject<BikeInfoBase>(
+				@"{
                     ""description"" : ""Cargo Long"",
                     ""state"" : ""available"",
                     ""bike"" : ""1"",
@@ -888,16 +888,16 @@ namespace TestTINKLib.Fixtures.Connector
                     ""lock_state"" : ""locked""
                 }");
 
-            Assert.That(
-                TextToTypeHelper.GetCopriLockingState(response),
-                Is.EqualTo(TINK.Model.Bikes.BikeInfoNS.CopriLock.LockingState.Closed));
-        }
+			Assert.That(
+				TextToTypeHelper.GetCopriLockingState(response),
+				Is.EqualTo(TINK.Model.Bikes.BikeInfoNS.CopriLock.LockingState.Closed));
+		}
 
-        [Test]
-        public void TestGetCopriLockingStateClosing()
-        {
-            var response = JsonConvert.DeserializeObject<BikeInfoBase>(
-                @"{
+		[Test]
+		public void TestGetCopriLockingStateClosing()
+		{
+			var response = JsonConvert.DeserializeObject<BikeInfoBase>(
+				@"{
                     ""description"" : ""Cargo Long"",
                     ""state"" : ""available"",
                     ""bike"" : ""1"",
@@ -907,16 +907,16 @@ namespace TestTINKLib.Fixtures.Connector
                     ""lock_state"" : ""locking""
                 }");
 
-            Assert.That(
-                TextToTypeHelper.GetCopriLockingState(response),
-                Is.EqualTo(TINK.Model.Bikes.BikeInfoNS.CopriLock.LockingState.Closing));
-        }
+			Assert.That(
+				TextToTypeHelper.GetCopriLockingState(response),
+				Is.EqualTo(TINK.Model.Bikes.BikeInfoNS.CopriLock.LockingState.Closing));
+		}
 
-        [Test]
-        public void TestGetCopriLockingStateOpen()
-        {
-            var response = JsonConvert.DeserializeObject<BikeInfoBase>(
-                @"{
+		[Test]
+		public void TestGetCopriLockingStateOpen()
+		{
+			var response = JsonConvert.DeserializeObject<BikeInfoBase>(
+				@"{
                     ""description"" : ""Cargo Long"",
                     ""state"" : ""available"",
                     ""bike"" : ""1"",
@@ -926,16 +926,16 @@ namespace TestTINKLib.Fixtures.Connector
                     ""lock_state"" : ""unlocked""
                 }");
 
-            Assert.That(
-                TextToTypeHelper.GetCopriLockingState(response),
-                Is.EqualTo(TINK.Model.Bikes.BikeInfoNS.CopriLock.LockingState.Open));
-        }
+			Assert.That(
+				TextToTypeHelper.GetCopriLockingState(response),
+				Is.EqualTo(TINK.Model.Bikes.BikeInfoNS.CopriLock.LockingState.Open));
+		}
 
-        [Test]
-        public void TestGetCopriLockingStateOpening()
-        {
-            var response = JsonConvert.DeserializeObject<BikeInfoBase>(
-                @"{
+		[Test]
+		public void TestGetCopriLockingStateOpening()
+		{
+			var response = JsonConvert.DeserializeObject<BikeInfoBase>(
+				@"{
                     ""description"" : ""Cargo Long"",
                     ""state"" : ""available"",
                     ""bike"" : ""1"",
@@ -945,86 +945,86 @@ namespace TestTINKLib.Fixtures.Connector
                     ""lock_state"" : ""unlocking""
                 }");
 
-            Assert.That(
-                TextToTypeHelper.GetCopriLockingState(response),
-                Is.EqualTo(TINK.Model.Bikes.BikeInfoNS.CopriLock.LockingState.Opening));
-        }
+			Assert.That(
+				TextToTypeHelper.GetCopriLockingState(response),
+				Is.EqualTo(TINK.Model.Bikes.BikeInfoNS.CopriLock.LockingState.Opening));
+		}
 
-        [Test]
-        public void TestGetIsFeedbackPendingIsPendingValue()
-            => Assert.That(
-                JsonConvert.DeserializeObject<BikeInfoAvailable>("{ \"co2saving\" : \"Tonns\" }").GetIsFeedbackPending(),
-                Is.True);
+		[Test]
+		public void TestGetIsFeedbackPendingIsPendingValue()
+			=> Assert.That(
+				JsonConvert.DeserializeObject<BikeInfoAvailable>("{ \"co2saving\" : \"Tonns\" }").GetIsFeedbackPending(),
+				Is.True);
 
-        [Test]
-        public void TestGetIsFeedbackPendingIsPending()
-            => Assert.That(
-                JsonConvert.DeserializeObject<BikeInfoAvailable>("{ \"co2saving\" : \"\" }").GetIsFeedbackPending(),
-                Is.True);
+		[Test]
+		public void TestGetIsFeedbackPendingIsPending()
+			=> Assert.That(
+				JsonConvert.DeserializeObject<BikeInfoAvailable>("{ \"co2saving\" : \"\" }").GetIsFeedbackPending(),
+				Is.True);
 
-        [Test]
-        public void TestGetIsFeedbackPendingNot()
-            => Assert.That(
-                JsonConvert.DeserializeObject<BikeInfoAvailable>("{  }").GetIsFeedbackPending(),
-                Is.False);
+		[Test]
+		public void TestGetIsFeedbackPendingNot()
+			=> Assert.That(
+				JsonConvert.DeserializeObject<BikeInfoAvailable>("{  }").GetIsFeedbackPending(),
+				Is.False);
 
-        [Test]
-        public void TestGetTypeOfBikeCity()
-            => Assert.That(
-                JsonConvert.DeserializeObject<BikeInfoBase>("{ \"bike_type\" : { \"category\" : \"city\" } }").GetTypeOfBike(),
-                Is.EqualTo(TypeOfBike.City));
+		[Test]
+		public void TestGetTypeOfBikeCity()
+			=> Assert.That(
+				JsonConvert.DeserializeObject<BikeInfoBase>("{ \"bike_type\" : { \"category\" : \"city\" } }").GetTypeOfBike(),
+				Is.EqualTo(TypeOfBike.City));
 
-        [Test]
-        public void TestGetTypeOfBikeCargo()
-            => Assert.That(
-                JsonConvert.DeserializeObject<BikeInfoBase>("{ \"bike_type\" : { \"category\" : \"cargo\" } }").GetTypeOfBike(),
-                Is.EqualTo(TypeOfBike.Cargo));
+		[Test]
+		public void TestGetTypeOfBikeCargo()
+			=> Assert.That(
+				JsonConvert.DeserializeObject<BikeInfoBase>("{ \"bike_type\" : { \"category\" : \"cargo\" } }").GetTypeOfBike(),
+				Is.EqualTo(TypeOfBike.Cargo));
 
-        [Test]
-        public void TestGetTypeOfBikeNull()
-        => Assert.That(
-            JsonConvert.DeserializeObject<BikeInfoBase>("{ \"bike_type\" : {  } }").GetTypeOfBike(),
-            Is.Null);
+		[Test]
+		public void TestGetTypeOfBikeNull()
+		=> Assert.That(
+			JsonConvert.DeserializeObject<BikeInfoBase>("{ \"bike_type\" : {  } }").GetTypeOfBike(),
+			Is.Null);
 
-        [Test]
-        public void TestGetWheelTypeTrike()
-            => Assert.That(
-                JsonConvert.DeserializeObject<BikeInfoBase>("{ \"bike_type\" : { \"wheels\" : \"3\" } }").GetWheelType(),
-                Is.EqualTo(WheelType.Trike));
+		[Test]
+		public void TestGetWheelTypeTrike()
+			=> Assert.That(
+				JsonConvert.DeserializeObject<BikeInfoBase>("{ \"bike_type\" : { \"wheels\" : \"3\" } }").GetWheelType(),
+				Is.EqualTo(WheelType.Trike));
 
-        [Test]
-        public void TestGetWheelTypeQuad()
-            => Assert.That(
-                JsonConvert.DeserializeObject<BikeInfoBase>("{ \"bike_type\" : { \"wheels\" : \"4\" } }").GetWheelType(),
-                Is.EqualTo(WheelType.Quad));
+		[Test]
+		public void TestGetWheelTypeQuad()
+			=> Assert.That(
+				JsonConvert.DeserializeObject<BikeInfoBase>("{ \"bike_type\" : { \"wheels\" : \"4\" } }").GetWheelType(),
+				Is.EqualTo(WheelType.Quad));
 
-        [Test]
-        public void TestGetWheelTypeTow()
-            => Assert.That(
-                JsonConvert.DeserializeObject<BikeInfoBase>("{ \"bike_type\" : { \"wheels\" : \"2\" } }").GetWheelType(),
-                Is.EqualTo(WheelType.Two));
+		[Test]
+		public void TestGetWheelTypeTow()
+			=> Assert.That(
+				JsonConvert.DeserializeObject<BikeInfoBase>("{ \"bike_type\" : { \"wheels\" : \"2\" } }").GetWheelType(),
+				Is.EqualTo(WheelType.Two));
 
-        [Test]
-        public void TestGetWheelTypeNull()
-        => Assert.That(
-            JsonConvert.DeserializeObject<BikeInfoBase>("{ \"bike_type\" : {  } }").GetWheelType(),
-            Is.Null);
+		[Test]
+		public void TestGetWheelTypeNull()
+		=> Assert.That(
+			JsonConvert.DeserializeObject<BikeInfoBase>("{ \"bike_type\" : {  } }").GetWheelType(),
+			Is.Null);
 
-        [Test]
-        public void TestGetFrom()
-            => Assert.That(
-                JsonConvertRethrow.DeserializeObject<BikeInfoReservedOrBooked>(@"
+		[Test]
+		public void TestGetFrom()
+			=> Assert.That(
+				JsonConvertRethrow.DeserializeObject<BikeInfoReservedOrBooked>(@"
                 {
                     ""start_time"" : ""2022-7-16"",
                  }").GetFrom(),
-                Is.EqualTo(new DateTime(2022, 7, 16)));
+				Is.EqualTo(new DateTime(2022, 7, 16)));
 
-        [Test]
-        public void TestGetFromInvalid()
-            => Assert.That(
-                JsonConvertRethrow.DeserializeObject<BikeInfoReservedOrBooked>(@"
+		[Test]
+		public void TestGetFromInvalid()
+			=> Assert.That(
+				JsonConvertRethrow.DeserializeObject<BikeInfoReservedOrBooked>(@"
                         {
                          }").GetFrom(),
-                Is.EqualTo(DateTime.MinValue));
-    }
+				Is.EqualTo(DateTime.MinValue));
+	}
 }
\ No newline at end of file
diff --git a/TestShareeLib/Model/Connector/Updater/TestBookingFinishedModelFactory.cs b/TestShareeLib/Model/Connector/Updater/TestBookingFinishedModelFactory.cs
index d4309da..f4aef56 100644
--- a/TestShareeLib/Model/Connector/Updater/TestBookingFinishedModelFactory.cs
+++ b/TestShareeLib/Model/Connector/Updater/TestBookingFinishedModelFactory.cs
@@ -6,36 +6,36 @@ using TINK.Repository.Response;
 
 namespace TestShareeLib.Model.Connector.Updater
 {
-    [TestFixture]
-    public class TestBookingFinishedModelFactory
-    {
-        /// <summary>
-        /// COPRI response shortened, part not belonging to user_miniquery discarded.
-        /// </summary>
-        [Test]
-        public void TestCreateMiniSurvey_Co2Saving()
-        {
-            var response = JsonConvert.DeserializeObject<ResponseContainer<DoReturnResponse>>(@"
+	[TestFixture]
+	public class TestBookingFinishedModelFactory
+	{
+		/// <summary>
+		/// COPRI response shortened, part not belonging to user_miniquery discarded.
+		/// </summary>
+		[Test]
+		public void TestCreateMiniSurvey_Co2Saving()
+		{
+			var response = JsonConvert.DeserializeObject<ResponseContainer<DoReturnResponse>>(@"
             {
                ""shareejson"" : {
                     ""co2saving"" : ""Einsparung: 1,95 kg CO2 und 3,00 EUR bei einer Strecke von 10 KM""
                     }
             }");
 
-            var bookingFinshed = response.shareejson.Create();
+			var bookingFinshed = response.shareejson.Create();
 
-            Assert.That(
-                bookingFinshed.Co2Saving,
-                Is.EqualTo("Einsparung: 1,95 kg CO2 und 3,00 EUR bei einer Strecke von 10 KM"));
+			Assert.That(
+				bookingFinshed.Co2Saving,
+				Is.EqualTo("Einsparung: 1,95 kg CO2 und 3,00 EUR bei einer Strecke von 10 KM"));
 
-        }
-        /// <summary>
-        /// COPRI response shortened, part not belonging to user_miniquery discarded.
-        /// </summary>
-        [Test]
-        public void TestCreateMiniSurvey()
-        {
-            var response = JsonConvert.DeserializeObject<ResponseContainer<DoReturnResponse>>(@"
+		}
+		/// <summary>
+		/// COPRI response shortened, part not belonging to user_miniquery discarded.
+		/// </summary>
+		[Test]
+		public void TestCreateMiniSurvey()
+		{
+			var response = JsonConvert.DeserializeObject<ResponseContainer<DoReturnResponse>>(@"
             {
                ""shareejson"" : {
                   ""user_miniquery"" : {
@@ -82,36 +82,36 @@ namespace TestShareeLib.Model.Connector.Updater
 
             ");
 
-            var bookingFinished = response.shareejson.Create();
+			var bookingFinished = response.shareejson.Create();
 
-            Assert.That(
-                bookingFinished,
-                Is.Not.Null);
+			Assert.That(
+				bookingFinished,
+				Is.Not.Null);
 
-            Assert.That(
-                bookingFinished.MiniSurvey.Title,
-                Is.EqualTo("Bitte unterstützen Sie unsere Begleitforschung"));
+			Assert.That(
+				bookingFinished.MiniSurvey.Title,
+				Is.EqualTo("Bitte unterstützen Sie unsere Begleitforschung"));
 
-            Assert.That(
-                bookingFinished.MiniSurvey.Subtitle,
-                Is.EqualTo("Ihre drei Antworten werden anonym gespeichert."));
+			Assert.That(
+				bookingFinished.MiniSurvey.Subtitle,
+				Is.EqualTo("Ihre drei Antworten werden anonym gespeichert."));
 
-            Assert.That(
-                bookingFinished.MiniSurvey.Footer,
-                Is.EqualTo("Herzlichen Dank und viel Spaß bei der nächsten Fahrt!"));
+			Assert.That(
+				bookingFinished.MiniSurvey.Footer,
+				Is.EqualTo("Herzlichen Dank und viel Spaß bei der nächsten Fahrt!"));
 
-            Assert.That(
-                bookingFinished.MiniSurvey.Questions.Count,
-                Is.EqualTo(3));
-        }
+			Assert.That(
+				bookingFinished.MiniSurvey.Questions.Count,
+				Is.EqualTo(3));
+		}
 
-        /// <summary>
-        /// COPRI response shortened, part not belonging to user_miniquery discarded.
-        /// </summary>
-        [Test]
-        public void TestCreateMiniSurvey_Null()
-        {
-            var response = JsonConvert.DeserializeObject<ResponseContainer<DoReturnResponse>>(@"
+		/// <summary>
+		/// COPRI response shortened, part not belonging to user_miniquery discarded.
+		/// </summary>
+		[Test]
+		public void TestCreateMiniSurvey_Null()
+		{
+			var response = JsonConvert.DeserializeObject<ResponseContainer<DoReturnResponse>>(@"
             {
                ""shareejson"" : {
                }
@@ -119,36 +119,36 @@ namespace TestShareeLib.Model.Connector.Updater
 
             ");
 
-            var bookingFinshed = response.shareejson.Create();
+			var bookingFinshed = response.shareejson.Create();
 
-            Assert.That(
-                bookingFinshed,
-                Is.Not.Null);
+			Assert.That(
+				bookingFinshed,
+				Is.Not.Null);
 
-            Assert.That(
-                bookingFinshed.MiniSurvey.Questions.Count,
-                Is.EqualTo(0));
+			Assert.That(
+				bookingFinshed.MiniSurvey.Questions.Count,
+				Is.EqualTo(0));
 
-            Assert.That(
-                bookingFinshed.MiniSurvey.Title,
-                Is.Null);
+			Assert.That(
+				bookingFinshed.MiniSurvey.Title,
+				Is.Null);
 
-            Assert.That(
-                bookingFinshed.MiniSurvey.Subtitle,
-                Is.Null);
+			Assert.That(
+				bookingFinshed.MiniSurvey.Subtitle,
+				Is.Null);
 
-            Assert.That(
-                bookingFinshed.MiniSurvey.Footer,
-                Is.Null);
-        }
+			Assert.That(
+				bookingFinshed.MiniSurvey.Footer,
+				Is.Null);
+		}
 
-        /// <summary>
-        /// COPRI response shortened, part not belonging to user_miniquery discarded.
-        /// </summary>
-        [Test]
-        public void TestCreateMiniSurvey_EmptyQuery()
-        {
-            var response = JsonConvert.DeserializeObject<ResponseContainer<DoReturnResponse>>(@"
+		/// <summary>
+		/// COPRI response shortened, part not belonging to user_miniquery discarded.
+		/// </summary>
+		[Test]
+		public void TestCreateMiniSurvey_EmptyQuery()
+		{
+			var response = JsonConvert.DeserializeObject<ResponseContainer<DoReturnResponse>>(@"
             {
                ""shareejson"" : {
                   ""user_miniquery"" : {
@@ -158,32 +158,32 @@ namespace TestShareeLib.Model.Connector.Updater
 
             ");
 
-            var bookingFinished = response.shareejson.Create();
+			var bookingFinished = response.shareejson.Create();
 
-            Assert.That(
-                bookingFinished,
-                Is.Not.Null);
+			Assert.That(
+				bookingFinished,
+				Is.Not.Null);
 
-            Assert.That(
-                bookingFinished.MiniSurvey.Title,
-                Is.Null);
+			Assert.That(
+				bookingFinished.MiniSurvey.Title,
+				Is.Null);
 
-            Assert.That(
-                bookingFinished.MiniSurvey.Subtitle,
-                Is.Null);
+			Assert.That(
+				bookingFinished.MiniSurvey.Subtitle,
+				Is.Null);
 
-            Assert.That(
-                bookingFinished.MiniSurvey.Footer,
-                Is.Null);
-        }
+			Assert.That(
+				bookingFinished.MiniSurvey.Footer,
+				Is.Null);
+		}
 
-        /// <summary>
-        /// COPRI response shortened, part not belonging to user_miniquery discarded.
-        /// </summary>
-        [Test]
-        public void TestCreateMiniSurvey_InvalidQuestion_KeyNull()
-        {
-            var response = JsonConvert.DeserializeObject<ResponseContainer<DoReturnResponse>>(@"
+		/// <summary>
+		/// COPRI response shortened, part not belonging to user_miniquery discarded.
+		/// </summary>
+		[Test]
+		public void TestCreateMiniSurvey_InvalidQuestion_KeyNull()
+		{
+			var response = JsonConvert.DeserializeObject<ResponseContainer<DoReturnResponse>>(@"
             {
                ""shareejson"" : {
                   ""user_miniquery"" : {
@@ -210,24 +210,24 @@ namespace TestShareeLib.Model.Connector.Updater
 
             ");
 
-            var bookingFinised = response.shareejson.Create();
+			var bookingFinised = response.shareejson.Create();
 
-            Assert.That(
-                bookingFinised,
-                Is.Not.Null);
+			Assert.That(
+				bookingFinised,
+				Is.Not.Null);
 
-            Assert.That(
-                bookingFinised.MiniSurvey.Questions.Count,
-                Is.EqualTo(0));
-        }
+			Assert.That(
+				bookingFinised.MiniSurvey.Questions.Count,
+				Is.EqualTo(0));
+		}
 
-        /// <summary>
-        /// COPRI response shortened, part not belonging to user_miniquery discarded.
-        /// </summary>
-        [Test]
-        public void TestCreateMiniSurvey_InvalidQuestion_ValueNull()
-        {
-            var response = JsonConvert.DeserializeObject<ResponseContainer<DoReturnResponse>>(@"
+		/// <summary>
+		/// COPRI response shortened, part not belonging to user_miniquery discarded.
+		/// </summary>
+		[Test]
+		public void TestCreateMiniSurvey_InvalidQuestion_ValueNull()
+		{
+			var response = JsonConvert.DeserializeObject<ResponseContainer<DoReturnResponse>>(@"
             {
                ""shareejson"" : {
                   ""user_miniquery"" : {
@@ -244,16 +244,16 @@ namespace TestShareeLib.Model.Connector.Updater
 
             ");
 
-            var bookingFinished = response.shareejson.Create();
+			var bookingFinished = response.shareejson.Create();
 
-            Assert.That(
-                bookingFinished,
-                Is.Not.Null);
+			Assert.That(
+				bookingFinished,
+				Is.Not.Null);
 
-            Assert.That(
-                bookingFinished.MiniSurvey.Questions.Count,
-                Is.EqualTo(0));
-        }
+			Assert.That(
+				bookingFinished.MiniSurvey.Questions.Count,
+				Is.EqualTo(0));
+		}
 
-    }
+	}
 }
diff --git a/TestShareeLib/Model/Connector/Updater/TestDriveFactory.cs b/TestShareeLib/Model/Connector/Updater/TestDriveFactory.cs
index 2cc869a..75a23c1 100644
--- a/TestShareeLib/Model/Connector/Updater/TestDriveFactory.cs
+++ b/TestShareeLib/Model/Connector/Updater/TestDriveFactory.cs
@@ -6,47 +6,47 @@ using TINK.Repository.Response;
 
 namespace TestShareeLib.Model.Connector.Updater
 {
-    [TestFixture]
-    public class TestDriveFactory
-    {
-        [Test]
-        public void TestEmpty()
-        {
-            var response = JsonConvert.DeserializeObject<BikeType>(@"");
+	[TestFixture]
+	public class TestDriveFactory
+	{
+		[Test]
+		public void TestEmpty()
+		{
+			var response = JsonConvert.DeserializeObject<BikeType>(@"");
 
-            Assert.That(
-                response.Create().Type,
-                Is.EqualTo(DriveType.SoleHumanPowered));
+			Assert.That(
+				response.Create().Type,
+				Is.EqualTo(DriveType.SoleHumanPowered));
 
-            Assert.That(
-                response.Create().Engine.Manufacturer,
-                Is.Null);
+			Assert.That(
+				response.Create().Engine.Manufacturer,
+				Is.Null);
 
-            Assert.That(
-                response.Create().Battery.CurrentChargePercent,
-                Is.NaN);
+			Assert.That(
+				response.Create().Battery.CurrentChargePercent,
+				Is.NaN);
 
-            Assert.That(
-                response.Create().Battery.CurrentChargeBars,
-                Is.Null);
+			Assert.That(
+				response.Create().Battery.CurrentChargeBars,
+				Is.Null);
 
-            Assert.That(
-                response.Create().Battery.MaxChargeBars,
-                Is.Null);
+			Assert.That(
+				response.Create().Battery.MaxChargeBars,
+				Is.Null);
 
-            Assert.That(
-                response.Create().Battery.IsBackendAccessible,
-                Is.Null);
+			Assert.That(
+				response.Create().Battery.IsBackendAccessible,
+				Is.Null);
 
-            Assert.That(
-                response.Create().Battery.IsHidden,
-                Is.Null);
-        }
+			Assert.That(
+				response.Create().Battery.IsHidden,
+				Is.Null);
+		}
 
-        [Test]
-        public void TestEmptyEngine()
-        {
-            var response = JsonConvert.DeserializeObject<BikeType>(@"
+		[Test]
+		public void TestEmptyEngine()
+		{
+			var response = JsonConvert.DeserializeObject<BikeType>(@"
                           {
                                 ""category"" : ""cargo"",
                                 ""wheels"" : ""2"",
@@ -54,31 +54,31 @@ namespace TestShareeLib.Model.Connector.Updater
                                    }
             }");
 
-            Assert.That(
-                response.Create().Type,
-                Is.EqualTo(DriveType.SoleHumanPowered));
+			Assert.That(
+				response.Create().Type,
+				Is.EqualTo(DriveType.SoleHumanPowered));
 
-            Assert.That(
-                response.Create().Engine.Manufacturer,
-                Is.Null);
+			Assert.That(
+				response.Create().Engine.Manufacturer,
+				Is.Null);
 
-            Assert.That(
-                response.Create().Battery.CurrentChargePercent,
-                Is.NaN);
+			Assert.That(
+				response.Create().Battery.CurrentChargePercent,
+				Is.NaN);
 
-            Assert.That(
-                response.Create().Battery.CurrentChargeBars,
-                Is.Null);
+			Assert.That(
+				response.Create().Battery.CurrentChargeBars,
+				Is.Null);
 
-            Assert.That(
-                response.Create().Battery.MaxChargeBars,
-                Is.Null);
-        }
+			Assert.That(
+				response.Create().Battery.MaxChargeBars,
+				Is.Null);
+		}
 
-        [Test]
-        public void TestEngine()
-        {
-            var response = JsonConvert.DeserializeObject<BikeType>(@"
+		[Test]
+		public void TestEngine()
+		{
+			var response = JsonConvert.DeserializeObject<BikeType>(@"
                           {
                                 ""category"" : ""cargo"",
                                 ""wheels"" : ""2"",
@@ -88,31 +88,31 @@ namespace TestShareeLib.Model.Connector.Updater
 
             }");
 
-            Assert.That(
-                response.Create().Type,
-                Is.EqualTo(DriveType.Pedelec));
+			Assert.That(
+				response.Create().Type,
+				Is.EqualTo(DriveType.Pedelec));
 
-            Assert.That(
-                response.Create().Engine.Manufacturer,
-                Is.EqualTo("dummy"));
+			Assert.That(
+				response.Create().Engine.Manufacturer,
+				Is.EqualTo("dummy"));
 
-            Assert.That(
-                response.Create().Battery.CurrentChargePercent,
-                Is.NaN);
+			Assert.That(
+				response.Create().Battery.CurrentChargePercent,
+				Is.NaN);
 
-            Assert.That(
-                response.Create().Battery.CurrentChargeBars,
-                Is.Null);
+			Assert.That(
+				response.Create().Battery.CurrentChargeBars,
+				Is.Null);
 
-            Assert.That(
-                response.Create().Battery.MaxChargeBars,
-                Is.Null);
-        }
+			Assert.That(
+				response.Create().Battery.MaxChargeBars,
+				Is.Null);
+		}
 
-        [Test]
-        public void TestBatteryValues1()
-        {
-            var response = JsonConvert.DeserializeObject<BikeType>(@"
+		[Test]
+		public void TestBatteryValues1()
+		{
+			var response = JsonConvert.DeserializeObject<BikeType>(@"
                           {
                                 ""category"" : ""cargo"",
                                 ""wheels"" : ""2"",
@@ -128,39 +128,39 @@ namespace TestShareeLib.Model.Connector.Updater
                                  }
             }");
 
-            Assert.That(
-                response.Create().Type,
-                Is.EqualTo(DriveType.Pedelec));
+			Assert.That(
+				response.Create().Type,
+				Is.EqualTo(DriveType.Pedelec));
 
-            Assert.That(
-                response.Create().Engine.Manufacturer,
-                Is.EqualTo("dummy"));
+			Assert.That(
+				response.Create().Engine.Manufacturer,
+				Is.EqualTo("dummy"));
 
-            Assert.That(
-                response.Create().Battery.CurrentChargePercent,
-                Is.EqualTo(70.0));
+			Assert.That(
+				response.Create().Battery.CurrentChargePercent,
+				Is.EqualTo(70.0));
 
-            Assert.That(
-                response.Create().Battery.CurrentChargeBars,
-                Is.EqualTo(4));
+			Assert.That(
+				response.Create().Battery.CurrentChargeBars,
+				Is.EqualTo(4));
 
-            Assert.That(
-                response.Create().Battery.MaxChargeBars,
-                Is.EqualTo(5));
+			Assert.That(
+				response.Create().Battery.MaxChargeBars,
+				Is.EqualTo(5));
 
-            Assert.That(
-                response.Create().Battery.IsBackendAccessible,
-                Is.False);
+			Assert.That(
+				response.Create().Battery.IsBackendAccessible,
+				Is.False);
 
-            Assert.That(
-                response.Create().Battery.IsHidden,
-                Is.False);
-        }
+			Assert.That(
+				response.Create().Battery.IsHidden,
+				Is.False);
+		}
 
-        [Test]
-        public void TestBatteryValues2()
-        {
-            var response = JsonConvert.DeserializeObject<BikeType>(@"
+		[Test]
+		public void TestBatteryValues2()
+		{
+			var response = JsonConvert.DeserializeObject<BikeType>(@"
                           {
                                 ""category"" : ""cargo"",
                                 ""wheels"" : ""2"",
@@ -176,33 +176,33 @@ namespace TestShareeLib.Model.Connector.Updater
                                  }
             }");
 
-            Assert.That(
-                response.Create().Type,
-                Is.EqualTo(DriveType.Pedelec));
+			Assert.That(
+				response.Create().Type,
+				Is.EqualTo(DriveType.Pedelec));
 
-            Assert.That(
-                response.Create().Engine.Manufacturer,
-                Is.EqualTo("dummy2"));
+			Assert.That(
+				response.Create().Engine.Manufacturer,
+				Is.EqualTo("dummy2"));
 
-            Assert.That(
-                response.Create().Battery.CurrentChargePercent,
-                Is.EqualTo(70.3));
+			Assert.That(
+				response.Create().Battery.CurrentChargePercent,
+				Is.EqualTo(70.3));
 
-            Assert.That(
-                response.Create().Battery.CurrentChargeBars,
-                Is.EqualTo(1));
+			Assert.That(
+				response.Create().Battery.CurrentChargeBars,
+				Is.EqualTo(1));
 
-            Assert.That(
-                response.Create().Battery.MaxChargeBars,
-                Is.EqualTo(6));
+			Assert.That(
+				response.Create().Battery.MaxChargeBars,
+				Is.EqualTo(6));
 
-            Assert.That(
-                response.Create().Battery.IsBackendAccessible,
-                Is.True);
+			Assert.That(
+				response.Create().Battery.IsBackendAccessible,
+				Is.True);
 
-            Assert.That(
-                response.Create().Battery.IsHidden,
-                Is.True);
-        }
-    }
+			Assert.That(
+				response.Create().Battery.IsHidden,
+				Is.True);
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Connector/Updater/TestRentalDescription.cs b/TestShareeLib/Model/Connector/Updater/TestRentalDescription.cs
index 0b05e56..c33797c 100644
--- a/TestShareeLib/Model/Connector/Updater/TestRentalDescription.cs
+++ b/TestShareeLib/Model/Connector/Updater/TestRentalDescription.cs
@@ -6,33 +6,33 @@ using TINK.Repository.Response;
 
 namespace TestShareeLib.Model.Connector.Updater
 {
-    [TestFixture]
-    public class TestRentalDescription
-    {
+	[TestFixture]
+	public class TestRentalDescription
+	{
 
-        [Test]
-        public void TestCreateRentalDescriptionEmpyJson()
-        {
-            var response = JsonConvert.DeserializeObject<RentalDescription>(@"");
+		[Test]
+		public void TestCreateRentalDescriptionEmpyJson()
+		{
+			var response = JsonConvert.DeserializeObject<RentalDescription>(@"");
 
-            Assert.That(
-                response.Create().Name,
-                Is.Empty);
+			Assert.That(
+				response.Create().Name,
+				Is.Empty);
 
-            Assert.That(
-                response.Create().TariffEntries.Count,
-                Is.EqualTo(0));
+			Assert.That(
+				response.Create().TariffEntries.Count,
+				Is.EqualTo(0));
 
-            Assert.That(
-                response.Create().InfoEntries.Count,
-                Is.EqualTo(0));
-        }
+			Assert.That(
+				response.Create().InfoEntries.Count,
+				Is.EqualTo(0));
+		}
 
-        [Test]
-        public void TestCreateRentalDescription()
-        {
-            var response = JsonConvertRethrow.DeserializeObject<RentalDescription>(
-            @"{
+		[Test]
+		public void TestCreateRentalDescription()
+		{
+			var response = JsonConvertRethrow.DeserializeObject<RentalDescription>(
+			@"{
                     ""id"": ""1"",
                     ""tarif_elements"" : {
                         ""6"": [
@@ -61,69 +61,69 @@ namespace TestShareeLib.Model.Connector.Updater
 	                }
              }");
 
-            Assert.That(
-                response.Create().Name,
-                Is.EqualTo("REN E-Bike"));
+			Assert.That(
+				response.Create().Name,
+				Is.EqualTo("REN E-Bike"));
 
-            Assert.That(
-                response.Create().Id,
-                Is.EqualTo(1));
+			Assert.That(
+				response.Create().Id,
+				Is.EqualTo(1));
 
-            Assert.That(
-                response.Create().TariffEntries.Count,
-                Is.EqualTo(3));
+			Assert.That(
+				response.Create().TariffEntries.Count,
+				Is.EqualTo(3));
 
-            Assert.That(
-                response.Create().InfoEntries.Count,
-                Is.EqualTo(2));
+			Assert.That(
+				response.Create().InfoEntries.Count,
+				Is.EqualTo(2));
 
-            Assert.That(
-                response.Create().TariffEntries["1"].Description,
-                Is.EqualTo("Mietgebühr"));
+			Assert.That(
+				response.Create().TariffEntries["1"].Description,
+				Is.EqualTo("Mietgebühr"));
 
-            Assert.That(
-                response.Create().TariffEntries["1"].Value,
-                Is.EqualTo("2,00 € / 1 Std"));
+			Assert.That(
+				response.Create().TariffEntries["1"].Value,
+				Is.EqualTo("2,00 € / 1 Std"));
 
-            Assert.That(
-                response.Create().TariffEntries["4"].Description,
-                Is.EqualTo("Max. Gebühr"));
+			Assert.That(
+				response.Create().TariffEntries["4"].Description,
+				Is.EqualTo("Max. Gebühr"));
 
-            Assert.That(
-                response.Create().TariffEntries["4"].Value,
-                Is.EqualTo("40.00 € / Tag"));
+			Assert.That(
+				response.Create().TariffEntries["4"].Value,
+				Is.EqualTo("40.00 € / Tag"));
 
-            Assert.That(
-                response.Create().TariffEntries["6"].Description,
-                Is.EqualTo("Gratis Mietzeit"));
+			Assert.That(
+				response.Create().TariffEntries["6"].Description,
+				Is.EqualTo("Gratis Mietzeit"));
 
-            Assert.That(
-                response.Create().TariffEntries["6"].Value,
-                Is.EqualTo("30 Min  / Tag"));
+			Assert.That(
+				response.Create().TariffEntries["6"].Value,
+				Is.EqualTo("30 Min  / Tag"));
 
-            Assert.That(
-                response.Create().InfoEntries["8"].Key,
-                Is.EqualTo("Tracking"));
+			Assert.That(
+				response.Create().InfoEntries["8"].Key,
+				Is.EqualTo("Tracking"));
 
-            Assert.That(
-                response.Create().InfoEntries["8"].Value,
-                Is.EqualTo("Ich stimme der Speicherung (Tracking) meiner Fahrstrecke zwecks wissenschaftlicher Auswertung und Berechnung der CO2-Einsparung zu!"));
+			Assert.That(
+				response.Create().InfoEntries["8"].Value,
+				Is.EqualTo("Ich stimme der Speicherung (Tracking) meiner Fahrstrecke zwecks wissenschaftlicher Auswertung und Berechnung der CO2-Einsparung zu!"));
 
-            Assert.That(
-                response.Create().InfoEntries["9"].Key,
-                Is.EqualTo("AGB"));
+			Assert.That(
+				response.Create().InfoEntries["9"].Key,
+				Is.EqualTo("AGB"));
 
-            Assert.That(
-                response.Create().InfoEntries["9"].Value,
-                Is.EqualTo("Mit der Mietrad Anmietung wird folgender Betreiber <a href='$varenv->{wwwhost}/site/agb.html' target='_blank'>AGB</a> zugestimmt"));
-        }
+			Assert.That(
+				response.Create().InfoEntries["9"].Value,
+				Is.EqualTo("Mit der Mietrad Anmietung wird folgender Betreiber <a href='$varenv->{wwwhost}/site/agb.html' target='_blank'>AGB</a> zugestimmt"));
+		}
 
 
-        [Test]
-        public void TestCreateRentalDescriptionDupeTarifElements()
-        {
-            var response = JsonConvertRethrow.DeserializeObject<RentalDescription>(
-            @"{
+		[Test]
+		public void TestCreateRentalDescriptionDupeTarifElements()
+		{
+			var response = JsonConvertRethrow.DeserializeObject<RentalDescription>(
+			@"{
                     ""id"": ""1"",
                     ""tarif_elements"" : {
                         ""6"": [
@@ -141,17 +141,17 @@ namespace TestShareeLib.Model.Connector.Updater
                         }
 	            }");
 
-            Assert.That(
-                response.Create().TariffEntries.Count,
-                Is.EqualTo(2));
+			Assert.That(
+				response.Create().TariffEntries.Count,
+				Is.EqualTo(2));
 
-        }
+		}
 
-        [Test]
-        public void TestCreateRentalDescriptionDupeInfoElements()
-        {
-            var response = JsonConvertRethrow.DeserializeObject<RentalDescription>(
-            @"{                   
+		[Test]
+		public void TestCreateRentalDescriptionDupeInfoElements()
+		{
+			var response = JsonConvertRethrow.DeserializeObject<RentalDescription>(
+			@"{                   
 	                ""rental_info"" : {
                         ""9"" : [
 			                ""AGB"",
@@ -164,37 +164,37 @@ namespace TestShareeLib.Model.Connector.Updater
 	                }
              }");
 
-            Assert.That(
-                response.Create().InfoEntries.Count,
-                Is.EqualTo(1));
-        }
+			Assert.That(
+				response.Create().InfoEntries.Count,
+				Is.EqualTo(1));
+		}
 
-        [Test]
-        public void TestCreateRentalDescriptionsNoTariffElements()
-        {
-            var response = JsonConvertRethrow.DeserializeObject<RentalDescription>(
-            @"{                   
+		[Test]
+		public void TestCreateRentalDescriptionsNoTariffElements()
+		{
+			var response = JsonConvertRethrow.DeserializeObject<RentalDescription>(
+			@"{                   
 	                ""rental_info"" : {
 	                }
              }");
 
-            Assert.That(
-                response.Create().TariffEntries,
-                Is.Not.Null);
-        }
+			Assert.That(
+				response.Create().TariffEntries,
+				Is.Not.Null);
+		}
 
-        [Test]
-        public void TestCreateRentalDescriptionsNoInfoElements()
-        {
-            var response = JsonConvertRethrow.DeserializeObject<RentalDescription>(
-            @"{                   
+		[Test]
+		public void TestCreateRentalDescriptionsNoInfoElements()
+		{
+			var response = JsonConvertRethrow.DeserializeObject<RentalDescription>(
+			@"{                   
 	                ""rental_info"" : {
 	                }
              }");
 
-            Assert.That(
-                response.Create().InfoEntries,
-                Is.Not.Null);
-        }
-    }
+			Assert.That(
+				response.Create().InfoEntries,
+				Is.Not.Null);
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Connector/Updater/TestTariffDescriptionFactory.cs b/TestShareeLib/Model/Connector/Updater/TestTariffDescriptionFactory.cs
index 7735de1..f9ab2f8 100644
--- a/TestShareeLib/Model/Connector/Updater/TestTariffDescriptionFactory.cs
+++ b/TestShareeLib/Model/Connector/Updater/TestTariffDescriptionFactory.cs
@@ -5,14 +5,14 @@ using TINK.Repository.Response;
 
 namespace TestShareeLib.Model.Connector.Updater
 {
-    [TestFixture]
-    public class TestTariffDescriptionFactory
-    {
-        [Test]
-        public void TestCreateTariffDescription()
-        {
-            var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
-            @"{
+	[TestFixture]
+	public class TestTariffDescriptionFactory
+	{
+		[Test]
+		public void TestCreateTariffDescription()
+		{
+			var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
+			@"{
                 ""eur_per_hour"" : ""10.50"",
                ""abo_eur_per_month"" : ""920.99"",
                ""free_hours"" : ""1.50"",
@@ -20,32 +20,32 @@ namespace TestShareeLib.Model.Connector.Updater
                ""name"" : ""Tester Basic""
             }");
 
-            Assert.That(
-                tariffDescription.Create().Name,
-                Is.EqualTo("Tester Basic"));
+			Assert.That(
+				tariffDescription.Create().Name,
+				Is.EqualTo("Tester Basic"));
 
-            Assert.That(
-                tariffDescription.Create().Id,
-                Is.EqualTo(5494));
+			Assert.That(
+				tariffDescription.Create().Id,
+				Is.EqualTo(5494));
 
-            Assert.That(
-                tariffDescription.Create().TariffEntries["1"].Value, // Free time per session
-                Is.EqualTo("1.50 hour(s)/day"));  // Did not contain unit before switching signature from TariffDescription to TariffDescription2.
+			Assert.That(
+				tariffDescription.Create().TariffEntries["1"].Value, // Free time per session
+				Is.EqualTo("1.50 hour(s)/day"));  // Did not contain unit before switching signature from TariffDescription to TariffDescription2.
 
-            Assert.That(
-                tariffDescription.Create().TariffEntries["2"].Value, // FeeEuroPerHour
-                Is.EqualTo("10.50 €/hour")); // Did not contain unit before switching signature from TariffDescription to TariffDescription2.
+			Assert.That(
+				tariffDescription.Create().TariffEntries["2"].Value, // FeeEuroPerHour
+				Is.EqualTo("10.50 €/hour")); // Did not contain unit before switching signature from TariffDescription to TariffDescription2.
 
-            Assert.That(
-                tariffDescription.Create().TariffEntries["4"].Value, // Abo euro per month
-                Is.EqualTo("920.99 €/month"));
-        }
+			Assert.That(
+				tariffDescription.Create().TariffEntries["4"].Value, // Abo euro per month
+				Is.EqualTo("920.99 €/month"));
+		}
 
-        [Test]
-        public void TestCreateTariffDescription_Name()
-        {
-            var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
-            @"{
+		[Test]
+		public void TestCreateTariffDescription_Name()
+		{
+			var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
+			@"{
                 ""eur_per_hour"" : ""10.50"",
                ""abo_eur_per_month"" : ""920.99"",
                ""free_hours"" : ""1.50"",
@@ -53,16 +53,16 @@ namespace TestShareeLib.Model.Connector.Updater
                ""name"" : ""Tester Basic""
             }");
 
-            Assert.That(
-                tariffDescription.Create().Name,
-                Is.EqualTo("Tester Basic"));
-        }
+			Assert.That(
+				tariffDescription.Create().Name,
+				Is.EqualTo("Tester Basic"));
+		}
 
-        [Test]
-        public void TestCreateTariffDescription_Number()
-        {
-            var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
-            @"{
+		[Test]
+		public void TestCreateTariffDescription_Number()
+		{
+			var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
+			@"{
                 ""eur_per_hour"" : ""10.50"",
                ""abo_eur_per_month"" : ""920.99"",
                ""free_hours"" : ""1.50"",
@@ -70,16 +70,16 @@ namespace TestShareeLib.Model.Connector.Updater
                ""name"" : ""Tester Basic""
             }");
 
-            Assert.That(
-                tariffDescription.Create().Id,
-                Is.EqualTo(5494));
-        }
+			Assert.That(
+				tariffDescription.Create().Id,
+				Is.EqualTo(5494));
+		}
 
-        [Test]
-        public void TestCreateTariffDescription_FreeTimePerSession()
-        {
-            var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
-            @"{
+		[Test]
+		public void TestCreateTariffDescription_FreeTimePerSession()
+		{
+			var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
+			@"{
                 ""eur_per_hour"" : ""10.50"",
                ""abo_eur_per_month"" : ""920.99"",
                ""free_hours"" : ""1.50"",
@@ -87,16 +87,16 @@ namespace TestShareeLib.Model.Connector.Updater
                ""name"" : ""Tester Basic""
             }");
 
-            Assert.That(
-                tariffDescription.Create().TariffEntries["1"].Value, // Free time per session 
-                Is.EqualTo("1.50 hour(s)/day")); // Did not contain unit before switching signature from TariffDescription to TariffDescription2.
-        }
+			Assert.That(
+				tariffDescription.Create().TariffEntries["1"].Value, // Free time per session 
+				Is.EqualTo("1.50 hour(s)/day")); // Did not contain unit before switching signature from TariffDescription to TariffDescription2.
+		}
 
-        [Test]
-        public void TestCreateTariffDescription_FeeEuroPerHour()
-        {
-            var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
-            @"{
+		[Test]
+		public void TestCreateTariffDescription_FeeEuroPerHour()
+		{
+			var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
+			@"{
                 ""eur_per_hour"" : ""10.50"",
                ""abo_eur_per_month"" : ""920.99"",
                ""free_hours"" : ""1.50"",
@@ -104,16 +104,16 @@ namespace TestShareeLib.Model.Connector.Updater
                ""name"" : ""Tester Basic""
             }");
 
-            Assert.That(
-                tariffDescription.Create().TariffEntries["2"].Value, // FeeEuroPerHour
-                Is.EqualTo("10.50 €/hour")); // Did not contain unit before switching signature from TariffDescription to TariffDescription2.
-        }
+			Assert.That(
+				tariffDescription.Create().TariffEntries["2"].Value, // FeeEuroPerHour
+				Is.EqualTo("10.50 €/hour")); // Did not contain unit before switching signature from TariffDescription to TariffDescription2.
+		}
 
-        [Test]
-        public void TestCreateTariffDescription_AboEuroPerMonth()
-        {
-            var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
-            @"{
+		[Test]
+		public void TestCreateTariffDescription_AboEuroPerMonth()
+		{
+			var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
+			@"{
                 ""eur_per_hour"" : ""10.50"",
                ""abo_eur_per_month"" : ""920.99"",
                ""free_hours"" : ""1.50"",
@@ -121,104 +121,104 @@ namespace TestShareeLib.Model.Connector.Updater
                ""name"" : ""Tester Basic""
             }");
 
-            Assert.That(
-                tariffDescription.Create().TariffEntries["4"].Value, // Abo euro per month
-                Is.EqualTo("920.99 €/month"));
-        }
+			Assert.That(
+				tariffDescription.Create().TariffEntries["4"].Value, // Abo euro per month
+				Is.EqualTo("920.99 €/month"));
+		}
 
-        [Test]
-        public void TestCreateTariffDescription_Name_Empty()
-        {
-            var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
-            @"{}");
+		[Test]
+		public void TestCreateTariffDescription_Name_Empty()
+		{
+			var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
+			@"{}");
 
-            Assert.That(
-                tariffDescription.Create().Name,
-                Is.Null);
-        }
+			Assert.That(
+				tariffDescription.Create().Name,
+				Is.Null);
+		}
 
-        [Test]
-        public void TestCreateTariffDescription_Number_Empty()
-        {
-            var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
-            @"{}");
+		[Test]
+		public void TestCreateTariffDescription_Number_Empty()
+		{
+			var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
+			@"{}");
 
-            Assert.That(
-                tariffDescription.Create().Id,
-                Is.Null);
-        }
+			Assert.That(
+				tariffDescription.Create().Id,
+				Is.Null);
+		}
 
-        [Test]
-        public void TestCreateTariffDescription_FreeTimePerSession_Empty()
-        {
-            var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
-            @"{}");
+		[Test]
+		public void TestCreateTariffDescription_FreeTimePerSession_Empty()
+		{
+			var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
+			@"{}");
 
-            Assert.That(
-                tariffDescription.Create().TariffEntries.ContainsKey("1"), // Free time per session
-                Is.False);
-        }
+			Assert.That(
+				tariffDescription.Create().TariffEntries.ContainsKey("1"), // Free time per session
+				Is.False);
+		}
 
-        [Test]
-        public void TestCreateTariffDescription_FeeEuroPerHour_Empty()
-        {
-            var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
-            @"{}");
+		[Test]
+		public void TestCreateTariffDescription_FeeEuroPerHour_Empty()
+		{
+			var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
+			@"{}");
 
-            Assert.That(
-                tariffDescription.Create().TariffEntries.ContainsKey("2"), // FeeEuroPerHour
-                Is.False);
-        }
+			Assert.That(
+				tariffDescription.Create().TariffEntries.ContainsKey("2"), // FeeEuroPerHour
+				Is.False);
+		}
 
-        [Test]
-        public void TestCreateTariffDescription_AboEuroPerMonth_Empty()
-        {
-            var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
-            @"{}");
+		[Test]
+		public void TestCreateTariffDescription_AboEuroPerMonth_Empty()
+		{
+			var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
+			@"{}");
 
-            Assert.That(
-                tariffDescription.Create().TariffEntries.ContainsKey("4"), // Abo euro per month
-                Is.False);
-        }
+			Assert.That(
+				tariffDescription.Create().TariffEntries.ContainsKey("4"), // Abo euro per month
+				Is.False);
+		}
 
-        [Test]
-        public void TestCreateTariffDescription_Name_Null()
-        {
-            Assert.That(
-                TariffDescriptionFactory.Create(null).Name,
-                Is.Null);
-        }
+		[Test]
+		public void TestCreateTariffDescription_Name_Null()
+		{
+			Assert.That(
+				TariffDescriptionFactory.Create(null).Name,
+				Is.Null);
+		}
 
-        [Test]
-        public void TestCreateTariffDescription_Number_Null()
-        {
-            Assert.That(
-                TariffDescriptionFactory.Create(null).Id,
-                Is.Null);
-        }
+		[Test]
+		public void TestCreateTariffDescription_Number_Null()
+		{
+			Assert.That(
+				TariffDescriptionFactory.Create(null).Id,
+				Is.Null);
+		}
 
-        [Test]
-        public void TestCreateTariffDescription_FreeTimePerSession_Null()
-        {
-            Assert.That(
-               TariffDescriptionFactory.Create(null).TariffEntries.ContainsKey("1"), // Free time per session
-               Is.False);
-        }
+		[Test]
+		public void TestCreateTariffDescription_FreeTimePerSession_Null()
+		{
+			Assert.That(
+			   TariffDescriptionFactory.Create(null).TariffEntries.ContainsKey("1"), // Free time per session
+			   Is.False);
+		}
 
-        [Test]
-        public void TestCreateTariffDescription_FeeEuroPerHour_Null()
-        {
-            Assert.That(
-                TariffDescriptionFactory.Create(null).TariffEntries.ContainsKey("2"), // FeeEuroPerHour
-                Is.False);
-        }
+		[Test]
+		public void TestCreateTariffDescription_FeeEuroPerHour_Null()
+		{
+			Assert.That(
+				TariffDescriptionFactory.Create(null).TariffEntries.ContainsKey("2"), // FeeEuroPerHour
+				Is.False);
+		}
 
-        [Test]
-        public void TestCreateTariffDescription_AboEuroPerMonth_Null()
-        {
-            Assert.That(
-               TariffDescriptionFactory.Create(null).TariffEntries.ContainsKey("4"), // Abo euro per month
-               Is.False);
-        }
-    }
+		[Test]
+		public void TestCreateTariffDescription_AboEuroPerMonth_Null()
+		{
+			Assert.That(
+			   TariffDescriptionFactory.Create(null).TariffEntries.ContainsKey("4"), // Abo euro per month
+			   Is.False);
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Connector/Updater/TestUpdaterJSON.cs b/TestShareeLib/Model/Connector/Updater/TestUpdaterJSON.cs
index a93e269..1e12791 100644
--- a/TestShareeLib/Model/Connector/Updater/TestUpdaterJSON.cs
+++ b/TestShareeLib/Model/Connector/Updater/TestUpdaterJSON.cs
@@ -16,93 +16,93 @@ using static TINK.Repository.CopriCallsMemory;
 namespace TestShareeLib.Model.Connector.Updater
 {
 
-    [TestFixture]
-    public class TestUpdaterJSON
-    {
-        [Test]
-        public void TestGetAllStations()
-        {
-            var l_oStationsTarget = new CopriCallsMemory("MyMerchId", SampleSets.Set2, 1).GetStationsAsync().Result.GetStationsAllMutable();
+	[TestFixture]
+	public class TestUpdaterJSON
+	{
+		[Test]
+		public void TestGetAllStations()
+		{
+			var l_oStationsTarget = new CopriCallsMemory("MyMerchId", SampleSets.Set2, 1).GetStationsAsync().Result.GetStationsAllMutable();
 
-            Assert.AreEqual(9, l_oStationsTarget.Count);
+			Assert.AreEqual(9, l_oStationsTarget.Count);
 
-            // Check first entry.
-            Assert.NotNull(l_oStationsTarget.GetById("4"));
-            Assert.AreEqual("TINK", string.Join(",", l_oStationsTarget.GetById("4").Group.ToArray()));
-            Assert.AreEqual("4", l_oStationsTarget.GetById("4").Id);
-            Assert.AreEqual(47.6586936667, l_oStationsTarget.GetById("4").Position.Latitude);
-            Assert.AreEqual(9.16863116667, l_oStationsTarget.GetById("4").Position.Longitude);
+			// Check first entry.
+			Assert.NotNull(l_oStationsTarget.GetById("4"));
+			Assert.AreEqual("TINK", string.Join(",", l_oStationsTarget.GetById("4").Group.ToArray()));
+			Assert.AreEqual("4", l_oStationsTarget.GetById("4").Id);
+			Assert.AreEqual(47.6586936667, l_oStationsTarget.GetById("4").Position.Latitude);
+			Assert.AreEqual(9.16863116667, l_oStationsTarget.GetById("4").Position.Longitude);
 
-            Assert.NotNull(l_oStationsTarget.GetById("14"));
-            Assert.AreEqual("Konrad", string.Join(",", l_oStationsTarget.GetById("14").Group.ToArray()));
+			Assert.NotNull(l_oStationsTarget.GetById("14"));
+			Assert.AreEqual("Konrad", string.Join(",", l_oStationsTarget.GetById("14").Group.ToArray()));
 
-            Assert.NotNull(l_oStationsTarget.GetById("31"));
-            Assert.AreEqual("TINK,Konrad", string.Join(",", l_oStationsTarget.GetById("31").Group.ToArray()));
-            Assert.AreEqual("Südstadt Station", l_oStationsTarget.GetById("31").StationName);
-        }
+			Assert.NotNull(l_oStationsTarget.GetById("31"));
+			Assert.AreEqual("TINK,Konrad", string.Join(",", l_oStationsTarget.GetById("31").Group.ToArray()));
+			Assert.AreEqual("Südstadt Station", l_oStationsTarget.GetById("31").StationName);
+		}
 
-        [Test]
-        public void TestGetAllStations_OperatorData()
-        {
-            var stations = JsonConvert.DeserializeObject<ResponseContainer<StationsAvailableResponse>>(STATIONS_AVAILABLE_LOGGEDIN_20210720).shareejson.GetStationsAllMutable();
+		[Test]
+		public void TestGetAllStations_OperatorData()
+		{
+			var stations = JsonConvert.DeserializeObject<ResponseContainer<StationsAvailableResponse>>(STATIONS_AVAILABLE_LOGGEDIN_20210720).shareejson.GetStationsAllMutable();
 
-            var station = stations.FirstOrDefault(x => x.Id == "LV_3");
-            Assert.That(
-                station,
-                Is.Not.Null,
-                "Station LV_3 must exist.");
+			var station = stations.FirstOrDefault(x => x.Id == "LV_3");
+			Assert.That(
+				station,
+				Is.Not.Null,
+				"Station LV_3 must exist.");
 
-            Assert.That(
-                station.OperatorData.Color,
-                Is.EqualTo(Color.FromHex("#006269")));
+			Assert.That(
+				station.OperatorData.Color,
+				Is.EqualTo(Color.FromHex("#006269")));
 
-            Assert.That(
-                station.OperatorData.Hours,
-                Is.EqualTo(string.Empty));
+			Assert.That(
+				station.OperatorData.Hours,
+				Is.EqualTo(string.Empty));
 
-            Assert.That(
-                station.OperatorData.Name,
-                Is.EqualTo("LastenVelo Freiburg"));
+			Assert.That(
+				station.OperatorData.Name,
+				Is.EqualTo("LastenVelo Freiburg"));
 
-            Assert.That(
-                station.OperatorData.MailAddressText,
-                Is.EqualTo("info@lastenvelofreiburg.de"));
+			Assert.That(
+				station.OperatorData.MailAddressText,
+				Is.EqualTo("info@lastenvelofreiburg.de"));
 
-            Assert.That(
-                station.OperatorData.PhoneNumberText,
-                Is.EqualTo(string.Empty));
+			Assert.That(
+				station.OperatorData.PhoneNumberText,
+				Is.EqualTo(string.Empty));
 
-            station = stations.FirstOrDefault(x => x.Id == "FR_105");
-            Assert.That(
-                station,
-                Is.Not.Null,
-                "Station FR_105 must exist.");
+			station = stations.FirstOrDefault(x => x.Id == "FR_105");
+			Assert.That(
+				station,
+				Is.Not.Null,
+				"Station FR_105 must exist.");
 
-            Assert.That(
-                station.OperatorData.Color,
-                Is.EqualTo(Color.FromHex("#009699")));
+			Assert.That(
+				station.OperatorData.Color,
+				Is.EqualTo(Color.FromHex("#009699")));
 
-            Assert.That(
-                station.OperatorData.Hours,
-                Is.EqualTo("B�rozeiten: Montag, Mittwoch, Freitag 9-12 Uhr"));
+			Assert.That(
+				station.OperatorData.Hours,
+				Is.EqualTo("B�rozeiten: Montag, Mittwoch, Freitag 9-12 Uhr"));
 
-            Assert.That(
-                station.OperatorData.Name,
-                Is.EqualTo("sharee.bike | TeilRad GmbH"));
+			Assert.That(
+				station.OperatorData.Name,
+				Is.EqualTo("sharee.bike | TeilRad GmbH"));
 
-            Assert.That(
-                station.OperatorData.MailAddressText,
-                Is.EqualTo("hotline@sharee.bike"));
+			Assert.That(
+				station.OperatorData.MailAddressText,
+				Is.EqualTo("hotline@sharee.bike"));
 
-            Assert.That(
-                station.OperatorData.PhoneNumberText,
-                Is.EqualTo("+49 761 45370097"));
-        }
+			Assert.That(
+				station.OperatorData.PhoneNumberText,
+				Is.EqualTo("+49 761 45370097"));
+		}
 
-        [Test]
-        public void TestGetAllStations_OperatorData_NoOperatorData()
-        {
-            var stations = JsonConvert.DeserializeObject<ResponseContainer<StationsAvailableResponse>>(@"
+		[Test]
+		public void TestGetAllStations_OperatorData_NoOperatorData()
+		{
+			var stations = JsonConvert.DeserializeObject<ResponseContainer<StationsAvailableResponse>>(@"
             {
                 ""shareejson"": {
                     ""lang"": ""DE"",
@@ -136,287 +136,287 @@ namespace TestShareeLib.Model.Connector.Updater
                 }
             }").shareejson.GetStationsAllMutable();
 
-            var station = stations.FirstOrDefault(x => x.Id == "LV_3");
+			var station = stations.FirstOrDefault(x => x.Id == "LV_3");
 
-            Assert.That(
-                station.OperatorData.Color,
-                Is.Null);
+			Assert.That(
+				station.OperatorData.Color,
+				Is.Null);
 
-            Assert.That(
-                station.OperatorData.Hours,
-                Is.EqualTo(string.Empty));
+			Assert.That(
+				station.OperatorData.Hours,
+				Is.EqualTo(string.Empty));
 
-            Assert.That(
-                station.OperatorData.Name,
-                Is.EqualTo(string.Empty));
+			Assert.That(
+				station.OperatorData.Name,
+				Is.EqualTo(string.Empty));
 
-            Assert.That(
-                station.OperatorData.MailAddressText,
-                Is.EqualTo(string.Empty));
+			Assert.That(
+				station.OperatorData.MailAddressText,
+				Is.EqualTo(string.Empty));
 
-            Assert.That(
-                station.OperatorData.PhoneNumberText,
-                Is.EqualTo(string.Empty));
+			Assert.That(
+				station.OperatorData.PhoneNumberText,
+				Is.EqualTo(string.Empty));
 
-        }
+		}
 
-        [Test]
-        public void TestUpdateBikesAvailable_BikeNr5GetBooked()
-        {
-            // Bike 5 is availalbe.
-            var l_oBikesTarget = GetBikesAvailable(TinkApp.MerchantId, sampleSet: SampleSets.Set2, stageIndex: 1).GetBikesAvailable(
+		[Test]
+		public void TestUpdateBikesAvailable_BikeNr5GetBooked()
+		{
+			// Bike 5 is availalbe.
+			var l_oBikesTarget = GetBikesAvailable(TinkApp.MerchantId, sampleSet: SampleSets.Set2, stageIndex: 1).GetBikesAvailable(
 );
 
-            Assert.AreEqual(12, l_oBikesTarget.Count, "Bike 5 is available an must be part of available bikes collection");
+			Assert.AreEqual(12, l_oBikesTarget.Count, "Bike 5 is available an must be part of available bikes collection");
 
-            // Verify state of bike 5.
-            Assert.NotNull(l_oBikesTarget.GetById("5"));
-            Assert.AreEqual("5", l_oBikesTarget.GetById("5").Id);
-            Assert.AreEqual(TypeOfBike.Cargo, l_oBikesTarget.GetById("5").TypeOfBike);
-            Assert.AreEqual(WheelType.Two, l_oBikesTarget.GetById("5").WheelType);
-            Assert.AreEqual(InUseStateEnum.Disposable, l_oBikesTarget.GetById("5").State.Value);
-            Assert.IsNull(l_oBikesTarget.GetById("5").State.From); // Sommer/ Winterzeit!
-            Assert.IsNull(l_oBikesTarget.GetById("5").State.Code);
+			// Verify state of bike 5.
+			Assert.NotNull(l_oBikesTarget.GetById("5"));
+			Assert.AreEqual("5", l_oBikesTarget.GetById("5").Id);
+			Assert.AreEqual(TypeOfBike.Cargo, l_oBikesTarget.GetById("5").TypeOfBike);
+			Assert.AreEqual(WheelType.Two, l_oBikesTarget.GetById("5").WheelType);
+			Assert.AreEqual(InUseStateEnum.Disposable, l_oBikesTarget.GetById("5").State.Value);
+			Assert.IsNull(l_oBikesTarget.GetById("5").State.From); // Sommer/ Winterzeit!
+			Assert.IsNull(l_oBikesTarget.GetById("5").State.Code);
 
-            // Bike 5 is reserved.
-            // Count of bikes must decrease and bike #5 no more in list of bikes.
-            l_oBikesTarget = GetBikesAvailable(TinkApp.MerchantId, sampleSet: SampleSets.Set2, stageIndex: 2).GetBikesAvailable(
+			// Bike 5 is reserved.
+			// Count of bikes must decrease and bike #5 no more in list of bikes.
+			l_oBikesTarget = GetBikesAvailable(TinkApp.MerchantId, sampleSet: SampleSets.Set2, stageIndex: 2).GetBikesAvailable(
 );
 
-            Assert.AreEqual(11, l_oBikesTarget.Count, "One bike (nr. 5) got reserved");
-            Assert.Null(l_oBikesTarget.GetById("5"), "Bike 5 got requested and must not be part of available bikes collection");
+			Assert.AreEqual(11, l_oBikesTarget.Count, "One bike (nr. 5) got reserved");
+			Assert.Null(l_oBikesTarget.GetById("5"), "Bike 5 got requested and must not be part of available bikes collection");
 
-            // Bike 5 is booked.  
-            // Count of bikes must decrease and bike #5 no more in list of bikes.
-            l_oBikesTarget = GetBikesAvailable(TinkApp.MerchantId, sampleSet: SampleSets.Set2, stageIndex: 3).GetBikesAvailable(
+			// Bike 5 is booked.  
+			// Count of bikes must decrease and bike #5 no more in list of bikes.
+			l_oBikesTarget = GetBikesAvailable(TinkApp.MerchantId, sampleSet: SampleSets.Set2, stageIndex: 3).GetBikesAvailable(
 );
 
-            Assert.Null(l_oBikesTarget.GetById("5"), "Bike 5 got booked and must not be part of available bikes collection");
-            Assert.IsNull(l_oBikesTarget.GetById("5"));
-        }
+			Assert.Null(l_oBikesTarget.GetById("5"), "Bike 5 got booked and must not be part of available bikes collection");
+			Assert.IsNull(l_oBikesTarget.GetById("5"));
+		}
 
-        [Test]
-        public void TestUpdateBikesOccupied_BikeNr5GetBooked()
-        {
-            var l_oBikesTarget = GetBikesOccupied("4da3044c8657a04ba60e2eaa753bc51a", SampleSets.Set2, 1).GetBikesOccupied(
-                "a@B",
-                () => new DateTime(2017, 11, 28, 14, 8, 14)); // Date time now for bikes which are reserved
+		[Test]
+		public void TestUpdateBikesOccupied_BikeNr5GetBooked()
+		{
+			var l_oBikesTarget = GetBikesOccupied("4da3044c8657a04ba60e2eaa753bc51a", SampleSets.Set2, 1).GetBikesOccupied(
+				"a@B",
+				() => new DateTime(2017, 11, 28, 14, 8, 14)); // Date time now for bikes which are reserved
 
-            // Check initial count of bikes.
-            Assert.AreEqual(
-                2,
-                l_oBikesTarget.Count);
+			// Check initial count of bikes.
+			Assert.AreEqual(
+				2,
+				l_oBikesTarget.Count);
 
-            // Bike 5 is reserved
-            l_oBikesTarget = GetBikesOccupied("4da3044c8657a04ba60e2eaa753bc51a", SampleSets.Set2, 2).GetBikesOccupied(
-                "a@B",
-                () => new DateTime(2017, 11, 28, 14, 08, 36).Add(new TimeSpan(0, 2, 0))); // Date time now for bikes which are reserved
+			// Bike 5 is reserved
+			l_oBikesTarget = GetBikesOccupied("4da3044c8657a04ba60e2eaa753bc51a", SampleSets.Set2, 2).GetBikesOccupied(
+				"a@B",
+				() => new DateTime(2017, 11, 28, 14, 08, 36).Add(new TimeSpan(0, 2, 0))); // Date time now for bikes which are reserved
 
-            Assert.AreEqual(3, l_oBikesTarget.Count, "One bike (nr. 5) got reserved");
+			Assert.AreEqual(3, l_oBikesTarget.Count, "One bike (nr. 5) got reserved");
 
-            Assert.NotNull(l_oBikesTarget.GetById("5"));
-            Assert.AreEqual(InUseStateEnum.Reserved, l_oBikesTarget.GetById("5").State.Value);
-            Assert.AreEqual("5", l_oBikesTarget.GetById("5").Id);
-            Assert.AreEqual(TypeOfBike.Cargo, l_oBikesTarget.GetById("5").TypeOfBike);
-            Assert.AreEqual(WheelType.Two, l_oBikesTarget.GetById("5").WheelType);
-            Assert.AreEqual(DateTime.Parse("2017-11-28 14:07:13.745568+01"), l_oBikesTarget.GetById("5").State.From); // Sommer/ Winterzeit!
+			Assert.NotNull(l_oBikesTarget.GetById("5"));
+			Assert.AreEqual(InUseStateEnum.Reserved, l_oBikesTarget.GetById("5").State.Value);
+			Assert.AreEqual("5", l_oBikesTarget.GetById("5").Id);
+			Assert.AreEqual(TypeOfBike.Cargo, l_oBikesTarget.GetById("5").TypeOfBike);
+			Assert.AreEqual(WheelType.Two, l_oBikesTarget.GetById("5").WheelType);
+			Assert.AreEqual(DateTime.Parse("2017-11-28 14:07:13.745568+01"), l_oBikesTarget.GetById("5").State.From); // Sommer/ Winterzeit!
 
 
-            // Bike 5 is booked
-            l_oBikesTarget = GetBikesOccupied("4da3044c8657a04ba60e2eaa753bc51a", SampleSets.Set2, 3).GetBikesOccupied(
-                "a@B",
-                () => DateTime.Now);
+			// Bike 5 is booked
+			l_oBikesTarget = GetBikesOccupied("4da3044c8657a04ba60e2eaa753bc51a", SampleSets.Set2, 3).GetBikesOccupied(
+				"a@B",
+				() => DateTime.Now);
 
-            Assert.AreEqual(3, l_oBikesTarget.Count, "One bike (nr. 5) got booked");
+			Assert.AreEqual(3, l_oBikesTarget.Count, "One bike (nr. 5) got booked");
 
-            Assert.IsNotNull(l_oBikesTarget.GetById("5"));
-            Assert.AreEqual(InUseStateEnum.Booked, l_oBikesTarget.GetById("5").State.Value);
-            Assert.AreEqual("5", l_oBikesTarget.GetById("5").Id);
-            Assert.AreEqual(TypeOfBike.Cargo, l_oBikesTarget.GetById("5").TypeOfBike);
-            Assert.AreEqual(WheelType.Two, l_oBikesTarget.GetById("5").WheelType);
-            Assert.AreEqual(DateTime.Parse("2017 -11-28 14:08:32.756368+01"), l_oBikesTarget.GetById("5").State.From); // Sommer/ Winterzeit!
-        }
+			Assert.IsNotNull(l_oBikesTarget.GetById("5"));
+			Assert.AreEqual(InUseStateEnum.Booked, l_oBikesTarget.GetById("5").State.Value);
+			Assert.AreEqual("5", l_oBikesTarget.GetById("5").Id);
+			Assert.AreEqual(TypeOfBike.Cargo, l_oBikesTarget.GetById("5").TypeOfBike);
+			Assert.AreEqual(WheelType.Two, l_oBikesTarget.GetById("5").WheelType);
+			Assert.AreEqual(DateTime.Parse("2017 -11-28 14:08:32.756368+01"), l_oBikesTarget.GetById("5").State.From); // Sommer/ Winterzeit!
+		}
 
-        public void TestGetBikesAvailable_BikeNr5GetBooked()
-        {
-            // Bike 5 is availalbe.
-            var l_oBikesTarget = GetBikesAvailable(TinkApp.MerchantId, sampleSet: SampleSets.Set2, stageIndex: 1).GetBikesAvailable();
+		public void TestGetBikesAvailable_BikeNr5GetBooked()
+		{
+			// Bike 5 is availalbe.
+			var l_oBikesTarget = GetBikesAvailable(TinkApp.MerchantId, sampleSet: SampleSets.Set2, stageIndex: 1).GetBikesAvailable();
 
-            Assert.AreEqual(11, l_oBikesTarget.Count, "Bike 5 is available an must be part of available bikes collection");
+			Assert.AreEqual(11, l_oBikesTarget.Count, "Bike 5 is available an must be part of available bikes collection");
 
-            // Verify state of bike 5.
-            Assert.NotNull(l_oBikesTarget.GetById("5"));
-            Assert.AreEqual(5, l_oBikesTarget.GetById("5").Id);
-            Assert.AreEqual(TypeOfBike.Cargo, l_oBikesTarget.GetById("5").TypeOfBike);
-            Assert.AreEqual(WheelType.Two, l_oBikesTarget.GetById("5").WheelType);
-            Assert.AreEqual(InUseStateEnum.Disposable, l_oBikesTarget.GetById("5").State.Value);
-            Assert.IsNull(l_oBikesTarget.GetById("5").State.From); // Sommer/ Winterzeit!
-            Assert.IsNull(l_oBikesTarget.GetById("5").State.Code);
+			// Verify state of bike 5.
+			Assert.NotNull(l_oBikesTarget.GetById("5"));
+			Assert.AreEqual(5, l_oBikesTarget.GetById("5").Id);
+			Assert.AreEqual(TypeOfBike.Cargo, l_oBikesTarget.GetById("5").TypeOfBike);
+			Assert.AreEqual(WheelType.Two, l_oBikesTarget.GetById("5").WheelType);
+			Assert.AreEqual(InUseStateEnum.Disposable, l_oBikesTarget.GetById("5").State.Value);
+			Assert.IsNull(l_oBikesTarget.GetById("5").State.From); // Sommer/ Winterzeit!
+			Assert.IsNull(l_oBikesTarget.GetById("5").State.Code);
 
-            // Bike 5 is reserved.
-            // Count of bikes must decrease and bike #5 no more in list of bikes.
-            l_oBikesTarget = GetBikesAvailable(TinkApp.MerchantId, sampleSet: SampleSets.Set2, stageIndex: 2).GetBikesAvailable();
+			// Bike 5 is reserved.
+			// Count of bikes must decrease and bike #5 no more in list of bikes.
+			l_oBikesTarget = GetBikesAvailable(TinkApp.MerchantId, sampleSet: SampleSets.Set2, stageIndex: 2).GetBikesAvailable();
 
-            Assert.AreEqual(10, l_oBikesTarget.Count, "One bike (nr. 5) got reserved");
-            Assert.Null(l_oBikesTarget.GetById("5"), "Bike 5 got requested and must not be part of available bikes collection");
+			Assert.AreEqual(10, l_oBikesTarget.Count, "One bike (nr. 5) got reserved");
+			Assert.Null(l_oBikesTarget.GetById("5"), "Bike 5 got requested and must not be part of available bikes collection");
 
-            // Bike 5 is booked.  
-            // Count of bikes must decrease and bike #5 no more in list of bikes.
-            l_oBikesTarget = GetBikesAvailable(TinkApp.MerchantId, sampleSet: SampleSets.Set2, stageIndex: 3).GetBikesAvailable();
+			// Bike 5 is booked.  
+			// Count of bikes must decrease and bike #5 no more in list of bikes.
+			l_oBikesTarget = GetBikesAvailable(TinkApp.MerchantId, sampleSet: SampleSets.Set2, stageIndex: 3).GetBikesAvailable();
 
-            Assert.Null(l_oBikesTarget.GetById("5"), "Bike 5 got booked and must not be part of available bikes collection");
-            Assert.IsNull(l_oBikesTarget.GetById("5"));
-        }
+			Assert.Null(l_oBikesTarget.GetById("5"), "Bike 5 got booked and must not be part of available bikes collection");
+			Assert.IsNull(l_oBikesTarget.GetById("5"));
+		}
 
-        [Test]
-        public void TestGetBikesOccupied_BC_BikeNr5GetBooked()
-        {
-            var bikesTarget = GetBikesOccupied("4da3044c8657a04ba60e2eaa753bc51a", SampleSets.Set2, 1).GetBikesOccupied(
-                "a@B",
-                () => new DateTime(2017, 11, 28, 14, 8, 14)); // Date time now for bikes which are reserved
+		[Test]
+		public void TestGetBikesOccupied_BC_BikeNr5GetBooked()
+		{
+			var bikesTarget = GetBikesOccupied("4da3044c8657a04ba60e2eaa753bc51a", SampleSets.Set2, 1).GetBikesOccupied(
+				"a@B",
+				() => new DateTime(2017, 11, 28, 14, 8, 14)); // Date time now for bikes which are reserved
 
-            // Check initial count of bikes.
-            Assert.AreEqual(2, bikesTarget.Count);
+			// Check initial count of bikes.
+			Assert.AreEqual(2, bikesTarget.Count);
 
-            // Bike 5 is reserved
-            bikesTarget = GetBikesOccupied("4da3044c8657a04ba60e2eaa753bc51a", SampleSets.Set2, 2).GetBikesOccupied(
-                "a@B",
-                () => new DateTime(2017, 11, 28, 14, 08, 36).Add(new TimeSpan(0, 2, 0))); // Date time now for bikes which are reserved
+			// Bike 5 is reserved
+			bikesTarget = GetBikesOccupied("4da3044c8657a04ba60e2eaa753bc51a", SampleSets.Set2, 2).GetBikesOccupied(
+				"a@B",
+				() => new DateTime(2017, 11, 28, 14, 08, 36).Add(new TimeSpan(0, 2, 0))); // Date time now for bikes which are reserved
 
-            Assert.AreEqual(3, bikesTarget.Count, "One bike (nr. 5) got reserved");
+			Assert.AreEqual(3, bikesTarget.Count, "One bike (nr. 5) got reserved");
 
-            Assert.NotNull(bikesTarget.GetById("5"));
-            Assert.AreEqual(InUseStateEnum.Reserved, bikesTarget.GetById("5").State.Value);
-            Assert.AreEqual("5", bikesTarget.GetById("5").Id);
-            Assert.AreEqual("Cargo Long", bikesTarget.GetById("5").Description);
-            Assert.AreEqual(TypeOfBike.Cargo, bikesTarget.GetById("5").TypeOfBike);
-            Assert.AreEqual(WheelType.Two, bikesTarget.GetById("5").WheelType);
-            Assert.AreEqual(DateTime.Parse("2017-11-28 14:07:13.745568+01"), bikesTarget.GetById("5").State.From); // Sommer/ Winterzeit!
+			Assert.NotNull(bikesTarget.GetById("5"));
+			Assert.AreEqual(InUseStateEnum.Reserved, bikesTarget.GetById("5").State.Value);
+			Assert.AreEqual("5", bikesTarget.GetById("5").Id);
+			Assert.AreEqual("Cargo Long", bikesTarget.GetById("5").Description);
+			Assert.AreEqual(TypeOfBike.Cargo, bikesTarget.GetById("5").TypeOfBike);
+			Assert.AreEqual(WheelType.Two, bikesTarget.GetById("5").WheelType);
+			Assert.AreEqual(DateTime.Parse("2017-11-28 14:07:13.745568+01"), bikesTarget.GetById("5").State.From); // Sommer/ Winterzeit!
 
-            // Bike 5 is booked
-            bikesTarget = GetBikesOccupied("4da3044c8657a04ba60e2eaa753bc51a", SampleSets.Set2, 3).GetBikesOccupied(
-                "a@B",
-                () => DateTime.Now);
+			// Bike 5 is booked
+			bikesTarget = GetBikesOccupied("4da3044c8657a04ba60e2eaa753bc51a", SampleSets.Set2, 3).GetBikesOccupied(
+				"a@B",
+				() => DateTime.Now);
 
-            Assert.AreEqual(3, bikesTarget.Count, "One bike (nr. 5) got booked");
+			Assert.AreEqual(3, bikesTarget.Count, "One bike (nr. 5) got booked");
 
-            Assert.IsNotNull(bikesTarget.GetById("5"));
-            Assert.AreEqual(InUseStateEnum.Booked, bikesTarget.GetById("5").State.Value);
-            Assert.AreEqual("5", bikesTarget.GetById("5").Id);
-            Assert.AreEqual("Cargo Long", bikesTarget.GetById("5").Description);
-            Assert.AreEqual(TypeOfBike.Cargo, bikesTarget.GetById("5").TypeOfBike);
-            Assert.AreEqual(WheelType.Two, bikesTarget.GetById("5").WheelType);
-            Assert.AreEqual(DateTime.Parse("2017 -11-28 14:08:32.756368+01"), bikesTarget.GetById("5").State.From); // Sommer/ Winterzeit!
-        }
+			Assert.IsNotNull(bikesTarget.GetById("5"));
+			Assert.AreEqual(InUseStateEnum.Booked, bikesTarget.GetById("5").State.Value);
+			Assert.AreEqual("5", bikesTarget.GetById("5").Id);
+			Assert.AreEqual("Cargo Long", bikesTarget.GetById("5").Description);
+			Assert.AreEqual(TypeOfBike.Cargo, bikesTarget.GetById("5").TypeOfBike);
+			Assert.AreEqual(WheelType.Two, bikesTarget.GetById("5").WheelType);
+			Assert.AreEqual(DateTime.Parse("2017 -11-28 14:08:32.756368+01"), bikesTarget.GetById("5").State.From); // Sommer/ Winterzeit!
+		}
 
-        [Test]
-        public void TestGetBikesOccupied_Bt_BikeNr5GetBooked()
-        {
-            var bikesTarget = GetBikesOccupied("5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", SampleSets.ShareeFr01_Set1, 1).GetBikesOccupied(
-                "a@B",
-                () => new DateTime(2017, 11, 28, 14, 8, 14)); // Date time now for bikes which are reserved
+		[Test]
+		public void TestGetBikesOccupied_Bt_BikeNr5GetBooked()
+		{
+			var bikesTarget = GetBikesOccupied("5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", SampleSets.ShareeFr01_Set1, 1).GetBikesOccupied(
+				"a@B",
+				() => new DateTime(2017, 11, 28, 14, 8, 14)); // Date time now for bikes which are reserved
 
-            // Check initial count of bikes.
-            Assert.AreEqual(2, bikesTarget.Count);
+			// Check initial count of bikes.
+			Assert.AreEqual(2, bikesTarget.Count);
 
-            // Bike 5 is reserved
-            bikesTarget = GetBikesOccupied("5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", SampleSets.ShareeFr01_Set1, 2).GetBikesOccupied(
-                "a@B",
-                () => new DateTime(2017, 11, 28, 14, 08, 36).Add(new TimeSpan(0, 2, 0))); // Date time now for bikes which are reserved
+			// Bike 5 is reserved
+			bikesTarget = GetBikesOccupied("5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", SampleSets.ShareeFr01_Set1, 2).GetBikesOccupied(
+				"a@B",
+				() => new DateTime(2017, 11, 28, 14, 08, 36).Add(new TimeSpan(0, 2, 0))); // Date time now for bikes which are reserved
 
-            Assert.AreEqual(3, bikesTarget.Count, "One bike (nr. 5) got reserved");
+			Assert.AreEqual(3, bikesTarget.Count, "One bike (nr. 5) got reserved");
 
-            var btBikeReserved = bikesTarget.GetById("FR_1004") as TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo;
-            Assert.NotNull(btBikeReserved);
-            Assert.AreEqual(InUseStateEnum.Reserved, bikesTarget.GetById("FR_1004").State.Value);
-            Assert.AreEqual("FR_1004", btBikeReserved.Id);
-            Assert.AreEqual("Tester-bike Oliver 2", btBikeReserved.Description);
-            Assert.That(btBikeReserved.TypeOfBike, Is.Null);
-            Assert.That(btBikeReserved.WheelType, Is.Null);
-            Assert.AreEqual(DateTime.Parse("2021-07-04 17:46:36.237404+02"), btBikeReserved.State.From); // Sommer/ Winterzeit!
-            Assert.That(btBikeReserved.State.Code, Is.EqualTo(string.Empty), "Not needed for bt bikes.");
-            Assert.That(
-                btBikeReserved.TariffDescription.TariffEntries["2"].Value, // FeeEuroPerHour
-                Is.EqualTo("3.00 €/hour"));
-            Assert.That(
-                btBikeReserved.TariffDescription.TariffEntries["3"].Value, // MaxFeeEuroPerDay
-                Is.EqualTo("10.00 €/day"));
-            Assert.That(btBikeReserved.TariffDescription.Id, Is.EqualTo(5494));
-            Assert.That(btBikeReserved.TariffDescription.Name, Is.EqualTo("Tester Basic"));
-            Assert.That(btBikeReserved.StationId, Is.EqualTo("FR_103"));
-            Assert.That(btBikeReserved.LockInfo.Id, Is.EqualTo(2302373));
-            Assert.That(btBikeReserved.OperatorUri.AbsoluteUri, Does.Contain("https://shareeapp-fr01.copri.eu"));
-            Assert.That(btBikeReserved.Group.Count, Is.EqualTo(1));
-            Assert.That(btBikeReserved.Group.ToArray()[0], Is.EqualTo("FR_300029"));
+			var btBikeReserved = bikesTarget.GetById("FR_1004") as TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo;
+			Assert.NotNull(btBikeReserved);
+			Assert.AreEqual(InUseStateEnum.Reserved, bikesTarget.GetById("FR_1004").State.Value);
+			Assert.AreEqual("FR_1004", btBikeReserved.Id);
+			Assert.AreEqual("Tester-bike Oliver 2", btBikeReserved.Description);
+			Assert.That(btBikeReserved.TypeOfBike, Is.Null);
+			Assert.That(btBikeReserved.WheelType, Is.Null);
+			Assert.AreEqual(DateTime.Parse("2021-07-04 17:46:36.237404+02"), btBikeReserved.State.From); // Sommer/ Winterzeit!
+			Assert.That(btBikeReserved.State.Code, Is.EqualTo(string.Empty), "Not needed for bt bikes.");
+			Assert.That(
+				btBikeReserved.TariffDescription.TariffEntries["2"].Value, // FeeEuroPerHour
+				Is.EqualTo("3.00 €/hour"));
+			Assert.That(
+				btBikeReserved.TariffDescription.TariffEntries["3"].Value, // MaxFeeEuroPerDay
+				Is.EqualTo("10.00 €/day"));
+			Assert.That(btBikeReserved.TariffDescription.Id, Is.EqualTo(5494));
+			Assert.That(btBikeReserved.TariffDescription.Name, Is.EqualTo("Tester Basic"));
+			Assert.That(btBikeReserved.StationId, Is.EqualTo("FR_103"));
+			Assert.That(btBikeReserved.LockInfo.Id, Is.EqualTo(2302373));
+			Assert.That(btBikeReserved.OperatorUri.AbsoluteUri, Does.Contain("https://shareeapp-fr01.copri.eu"));
+			Assert.That(btBikeReserved.Group.Count, Is.EqualTo(1));
+			Assert.That(btBikeReserved.Group.ToArray()[0], Is.EqualTo("FR_300029"));
 
-            // Bike 5 is booked
-            var btBikeRented = bikesTarget.GetById("1537") as TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo;
+			// Bike 5 is booked
+			var btBikeRented = bikesTarget.GetById("1537") as TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo;
 
-            Assert.IsNotNull(btBikeRented);
-            Assert.AreEqual(InUseStateEnum.Booked, btBikeRented.State.Value);
-            Assert.AreEqual("1537", btBikeRented.Id);
-            Assert.AreEqual("Oliver (Ilockit)", btBikeRented.Description);
-            Assert.That(btBikeRented.TypeOfBike, Is.Null);
-            Assert.That(btBikeRented.WheelType, Is.Null);
-            Assert.AreEqual(DateTime.Parse("2020-10-12 08:38:30.401679+02"), btBikeRented.State.From); // Sommer/ Winterzeit!
-            Assert.AreEqual(string.Empty, btBikeRented.State.Code, "Not needed for bt bikes.");
-            Assert.That(
-                btBikeRented.TariffDescription.TariffEntries["2"].Value, // FeeEuroPerHour 
-                Is.EqualTo("2.50 €/hour"));
-            Assert.That(
-                btBikeRented.TariffDescription.TariffEntries["3"].Value, // MaxFeeEuroPerDay 
-                Is.EqualTo("10.00 €/day"));
-            Assert.That(btBikeRented.TariffDescription.Id, Is.EqualTo(5494));
-            Assert.That(btBikeRented.TariffDescription.Name, Is.EqualTo("Tester Basic"));
-            Assert.That(btBikeRented.StationId, Is.EqualTo("103"));
-            Assert.That(btBikeRented.LockInfo.Id, Is.EqualTo(2200537));
-            Assert.That(btBikeRented.OperatorUri.AbsoluteUri, Does.Contain("https://shareeapp-fr01.copri.eu"));
-            Assert.That(btBikeRented.Group.Count, Is.EqualTo(1));
-            Assert.That(btBikeRented.Group.ToArray()[0], Is.EqualTo("300029"));
-        }
+			Assert.IsNotNull(btBikeRented);
+			Assert.AreEqual(InUseStateEnum.Booked, btBikeRented.State.Value);
+			Assert.AreEqual("1537", btBikeRented.Id);
+			Assert.AreEqual("Oliver (Ilockit)", btBikeRented.Description);
+			Assert.That(btBikeRented.TypeOfBike, Is.Null);
+			Assert.That(btBikeRented.WheelType, Is.Null);
+			Assert.AreEqual(DateTime.Parse("2020-10-12 08:38:30.401679+02"), btBikeRented.State.From); // Sommer/ Winterzeit!
+			Assert.AreEqual(string.Empty, btBikeRented.State.Code, "Not needed for bt bikes.");
+			Assert.That(
+				btBikeRented.TariffDescription.TariffEntries["2"].Value, // FeeEuroPerHour 
+				Is.EqualTo("2.50 €/hour"));
+			Assert.That(
+				btBikeRented.TariffDescription.TariffEntries["3"].Value, // MaxFeeEuroPerDay 
+				Is.EqualTo("10.00 €/day"));
+			Assert.That(btBikeRented.TariffDescription.Id, Is.EqualTo(5494));
+			Assert.That(btBikeRented.TariffDescription.Name, Is.EqualTo("Tester Basic"));
+			Assert.That(btBikeRented.StationId, Is.EqualTo("103"));
+			Assert.That(btBikeRented.LockInfo.Id, Is.EqualTo(2200537));
+			Assert.That(btBikeRented.OperatorUri.AbsoluteUri, Does.Contain("https://shareeapp-fr01.copri.eu"));
+			Assert.That(btBikeRented.Group.Count, Is.EqualTo(1));
+			Assert.That(btBikeRented.Group.ToArray()[0], Is.EqualTo("300029"));
+		}
 
 
-        [Test]
-        public void TestGetBikesAvailable()
-        {
-            var bikesTarget = GetBikesAvailable(TinkApp.MerchantId, sampleSet: SampleSets.Set2, stageIndex: 1).GetBikesAvailable(
+		[Test]
+		public void TestGetBikesAvailable()
+		{
+			var bikesTarget = GetBikesAvailable(TinkApp.MerchantId, sampleSet: SampleSets.Set2, stageIndex: 1).GetBikesAvailable(
 );
 
-            // Verify count of bikes
-            Assert.AreEqual(12, bikesTarget.Count);
+			// Verify count of bikes
+			Assert.AreEqual(12, bikesTarget.Count);
 
-            // Verify properties of bike 5
-            Assert.NotNull(bikesTarget.GetById("5"));
-            Assert.AreEqual("5", bikesTarget.GetById("5").Id);
-            Assert.AreEqual("TINK", bikesTarget.GetById("5").Group.ToArray()[0]);
-            Assert.AreEqual(TypeOfBike.Cargo, bikesTarget.GetById("5").TypeOfBike);
-            Assert.AreEqual(WheelType.Two, bikesTarget.GetById("5").WheelType);
-            Assert.AreEqual(InUseStateEnum.Disposable, bikesTarget.GetById("5").State.Value);
-            Assert.IsNull(bikesTarget.GetById("5").State.From); // Sommer/ Winterzeit!
-            Assert.IsNull(bikesTarget.GetById("5").State.Code);
+			// Verify properties of bike 5
+			Assert.NotNull(bikesTarget.GetById("5"));
+			Assert.AreEqual("5", bikesTarget.GetById("5").Id);
+			Assert.AreEqual("TINK", bikesTarget.GetById("5").Group.ToArray()[0]);
+			Assert.AreEqual(TypeOfBike.Cargo, bikesTarget.GetById("5").TypeOfBike);
+			Assert.AreEqual(WheelType.Two, bikesTarget.GetById("5").WheelType);
+			Assert.AreEqual(InUseStateEnum.Disposable, bikesTarget.GetById("5").State.Value);
+			Assert.IsNull(bikesTarget.GetById("5").State.From); // Sommer/ Winterzeit!
+			Assert.IsNull(bikesTarget.GetById("5").State.Code);
 
-            // Verify properties of bike 52
-            Assert.NotNull(bikesTarget.GetById("52"));
-            Assert.AreEqual("52", bikesTarget.GetById("52").Id);
-            Assert.AreEqual("Konrad", bikesTarget.GetById("52").Group.ToArray()[0]);
-        }
+			// Verify properties of bike 52
+			Assert.NotNull(bikesTarget.GetById("52"));
+			Assert.AreEqual("52", bikesTarget.GetById("52").Id);
+			Assert.AreEqual("Konrad", bikesTarget.GetById("52").Group.ToArray()[0]);
+		}
 
-        [Test]
-        public void TestGetBikesOccupied()
-        {
-            var l_oBikesTarget = GetBikesOccupied(TinkApp.MerchantId, SampleSets.Set2, 1).GetBikesOccupied(
-                "a@b",
-                () => DateTime.Now);
+		[Test]
+		public void TestGetBikesOccupied()
+		{
+			var l_oBikesTarget = GetBikesOccupied(TinkApp.MerchantId, SampleSets.Set2, 1).GetBikesOccupied(
+				"a@b",
+				() => DateTime.Now);
 
-            // Verify count of bikes
-            Assert.AreEqual(2, l_oBikesTarget.Count);
-        }
+			// Verify count of bikes
+			Assert.AreEqual(2, l_oBikesTarget.Count);
+		}
 
-        [Test]
-        public void TestGetBikesAll_BikesAvaialbleResponse()
-        {
-            var availableResponse = JsonConvert.DeserializeObject<BikesAvailableResponse>(
-                @"{
+		[Test]
+		public void TestGetBikesAll_BikesAvaialbleResponse()
+		{
+			var availableResponse = JsonConvert.DeserializeObject<BikesAvailableResponse>(
+				@"{
                     ""bikes"" : {
                         ""2352"" : {
                         ""description"" : ""Cargo Long"",
@@ -436,26 +436,26 @@ namespace TestShareeLib.Model.Connector.Updater
                    }
                 }");
 
-            var bikes = UpdaterJSON.GetBikesAll(
-                availableResponse?.bikes?.Values,
-                null,
-                "Heinz.Mustermann@posteo.de",
-                () => DateTime.Now);
+			var bikes = UpdaterJSON.GetBikesAll(
+				availableResponse?.bikes?.Values,
+				null,
+				"Heinz.Mustermann@posteo.de",
+				() => DateTime.Now);
 
-            Assert.AreEqual(
-                2,
-                bikes.Count);
+			Assert.AreEqual(
+				2,
+				bikes.Count);
 
-            Assert.AreEqual(
-                1,
-                bikes.Where(x => x is TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo).Count(),
-                "There must be one ILockitBike and one BC bike (BikeInfo class).");
-        }
-        [Test]
-        public void TestGetBikesAll_BikesAvaialbleResponse_InvalidState()
-        {
-            var availableResponse = JsonConvert.DeserializeObject<BikesAvailableResponse>(
-                @"{
+			Assert.AreEqual(
+				1,
+				bikes.Where(x => x is TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo).Count(),
+				"There must be one ILockitBike and one BC bike (BikeInfo class).");
+		}
+		[Test]
+		public void TestGetBikesAll_BikesAvaialbleResponse_InvalidState()
+		{
+			var availableResponse = JsonConvert.DeserializeObject<BikesAvailableResponse>(
+				@"{
                     ""bikes"" : {
                         ""2352"" : {
                         ""description"" : ""Cargo Long"",
@@ -467,23 +467,23 @@ namespace TestShareeLib.Model.Connector.Updater
                    }
                 }");
 
-            var bikes = UpdaterJSON.GetBikesAll(
-                availableResponse?.bikes?.Values,
-                null,
-                "Heinz.Mustermann@posteo.de",
-                () => DateTime.Now);
+			var bikes = UpdaterJSON.GetBikesAll(
+				availableResponse?.bikes?.Values,
+				null,
+				"Heinz.Mustermann@posteo.de",
+				() => DateTime.Now);
 
-            Assert.AreEqual(
-                0,
-                bikes.Count,
-                "State of a element of BikesAvailableResponse must never be reserved.");
-        }
+			Assert.AreEqual(
+				0,
+				bikes.Count,
+				"State of a element of BikesAvailableResponse must never be reserved.");
+		}
 
-        [Test]
-        public void TestGetBikesAll_BikesAvaialbleResponse_InvalidStation()
-        {
-            var availableResponse = JsonConvert.DeserializeObject<BikesAvailableResponse>(
-                @"{
+		[Test]
+		public void TestGetBikesAll_BikesAvaialbleResponse_InvalidStation()
+		{
+			var availableResponse = JsonConvert.DeserializeObject<BikesAvailableResponse>(
+				@"{
                     ""bikes"" : {
                         ""2352"" : {
                         ""description"" : ""Cargo Long"",
@@ -495,23 +495,23 @@ namespace TestShareeLib.Model.Connector.Updater
                    }
                 }");
 
-            var bikes = UpdaterJSON.GetBikesAll(
-                availableResponse?.bikes?.Values,
-                null,
-                "Heinz.Mustermann@posteo.de",
-                () => DateTime.Now);
+			var bikes = UpdaterJSON.GetBikesAll(
+				availableResponse?.bikes?.Values,
+				null,
+				"Heinz.Mustermann@posteo.de",
+				() => DateTime.Now);
 
-            Assert.AreEqual(
-                0,
-                bikes.Count,
-                "Station of a element of BikesAvailableResponse must always be defined.");
-        }
+			Assert.AreEqual(
+				0,
+				bikes.Count,
+				"Station of a element of BikesAvailableResponse must always be defined.");
+		}
 
-        [Test]
-        public void TestGetBikesAll_BikesAvaialbleResponse_DuplicateId()
-        {
-            var availableResponse = JsonConvert.DeserializeObject<BikesAvailableResponse>(
-                @"{
+		[Test]
+		public void TestGetBikesAll_BikesAvaialbleResponse_DuplicateId()
+		{
+			var availableResponse = JsonConvert.DeserializeObject<BikesAvailableResponse>(
+				@"{
                     ""bikes"" : {
                         ""2352"" : {
                         ""description"" : ""Cargo Long"",
@@ -530,23 +530,23 @@ namespace TestShareeLib.Model.Connector.Updater
                    }
                 }");
 
-            var bikes = UpdaterJSON.GetBikesAll(
-                availableResponse?.bikes?.Values,
-                null,
-                "Heinz.Mustermann@posteo.de",
-                () => DateTime.Now);
+			var bikes = UpdaterJSON.GetBikesAll(
+				availableResponse?.bikes?.Values,
+				null,
+				"Heinz.Mustermann@posteo.de",
+				() => DateTime.Now);
 
-            Assert.AreEqual(
-                0,
-                bikes.Count,
-                "Ids of a elements of BikesAvailableResponse must be unique.");
-        }
+			Assert.AreEqual(
+				0,
+				bikes.Count,
+				"Ids of a elements of BikesAvailableResponse must be unique.");
+		}
 
-        [Test]
-        public void TestGetBikesAll_BikesReservedOccupiedResponse_DuplicateId()
-        {
-            var reservedOccupiedResponse = JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(
-                @"{
+		[Test]
+		public void TestGetBikesAll_BikesReservedOccupiedResponse_DuplicateId()
+		{
+			var reservedOccupiedResponse = JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(
+				@"{
                       ""bikes_occupied"" : {
                          ""87785"" : {
                                 ""station"" : ""2"",
@@ -567,23 +567,23 @@ namespace TestShareeLib.Model.Connector.Updater
                     }
                  }");
 
-            var bikes = UpdaterJSON.GetBikesAll(
-                null,
-                reservedOccupiedResponse?.bikes_occupied?.Values,
-                "Heinz.Mustermann@posteo.de",
-                () => DateTime.Now);
+			var bikes = UpdaterJSON.GetBikesAll(
+				null,
+				reservedOccupiedResponse?.bikes_occupied?.Values,
+				"Heinz.Mustermann@posteo.de",
+				() => DateTime.Now);
 
-            Assert.AreEqual(
-                0,
-                bikes.Count,
-                "Ids of a elements of BikesAvailableResponse must be unique.");
-        }
+			Assert.AreEqual(
+				0,
+				bikes.Count,
+				"Ids of a elements of BikesAvailableResponse must be unique.");
+		}
 
-        [Test]
-        public void TestGetBikesAll_BikesReservedOccupiedResponse()
-        {
-            var reservedOccupiedResponse = JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(
-                @"{
+		[Test]
+		public void TestGetBikesAll_BikesReservedOccupiedResponse()
+		{
+			var reservedOccupiedResponse = JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(
+				@"{
                       ""bikes_occupied"" : {
                          ""87785"" : {
                              ""station"" : ""2"",
@@ -605,46 +605,46 @@ namespace TestShareeLib.Model.Connector.Updater
                     }
                  }");
 
-            var bikes = UpdaterJSON.GetBikesAll(
-                null,
-                reservedOccupiedResponse?.bikes_occupied?.Values,
-                "Heinz.Mustermann@posteo.de",
-                () => DateTime.Now);
+			var bikes = UpdaterJSON.GetBikesAll(
+				null,
+				reservedOccupiedResponse?.bikes_occupied?.Values,
+				"Heinz.Mustermann@posteo.de",
+				() => DateTime.Now);
 
-            Assert.AreEqual(
-                2,
-                bikes.Count,
-                "Ids of a elements of BikesAvailableResponse must be unique.");
+			Assert.AreEqual(
+				2,
+				bikes.Count,
+				"Ids of a elements of BikesAvailableResponse must be unique.");
 
-            Assert.AreEqual(
-                1,
-                bikes.Where(x => x is TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo).Count(),
-                "There must be one ILockitBike and one BC bike (BikeInfo class).");
-        }
+			Assert.AreEqual(
+				1,
+				bikes.Where(x => x is TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo).Count(),
+				"There must be one ILockitBike and one BC bike (BikeInfo class).");
+		}
 
-        [Test]
-        public void TestLoad_Reserved_CalculateAuthKeys()
-        {
-            // Construct requested bike.
-            var bike = new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
-                    new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("17", LockModel.ILockIt),
-                    new Drive(),
-                    22,
-                    new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                    new[] { (byte)1, (byte)3, (byte)4 },
-                    new[] { (byte)11, (byte)3, (byte)1 },
-                    new[] { (byte)12, (byte)7, (byte)4 },
-                    DateTime.Now,
-                    "a@b",
-                    "1",
-                    null,
-                    null,
-                    () => DateTime.Now,
-                    false, /*isDemo*/
-                    null /*group*/),
-                "My Station Name");
+		[Test]
+		public void TestLoad_Reserved_CalculateAuthKeys()
+		{
+			// Construct requested bike.
+			var bike = new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
+					new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("17", LockModel.ILockIt),
+					new Drive(),
+					22,
+					new Guid("0000f00d-1212-efde-1523-785fef13d123"),
+					new[] { (byte)1, (byte)3, (byte)4 },
+					new[] { (byte)11, (byte)3, (byte)1 },
+					new[] { (byte)12, (byte)7, (byte)4 },
+					DateTime.Now,
+					"a@b",
+					"1",
+					null,
+					null,
+					() => DateTime.Now,
+					false, /*isDemo*/
+					null /*group*/),
+				"My Station Name");
 
-            var response = JsonConvert.DeserializeObject<BikeInfoReservedOrBooked>(@"
+			var response = JsonConvert.DeserializeObject<BikeInfoReservedOrBooked>(@"
             {
                 ""Ilockit_ID"": ""ISHAREIT+0815"",
                 ""state"": ""requested"",
@@ -653,32 +653,32 @@ namespace TestShareeLib.Model.Connector.Updater
                 ""K_u"": ""[99, 104, 120, 121, 63, 99, -10, -110, 94, 70, 15, -112, -6, 101, 117, -90, -113, -54, -90, -95, 0, 0, 0, 0]"",
             }");
 
-            // Update from new auth keys.
-            bike.Load(response, "a@b");
+			// Update from new auth keys.
+			bike.Load(response, "a@b");
 
-            // Verify that keys are correctly updated.
-            Assert.IsTrue(new byte[] { 256 - 18, 256 - 80, 20, 256 - 90, 3, 69, 96, 4, 256 - 35, 75, 256 - 95, 102, 7, 121, 256 - 122, 15 }.SequenceEqual(bike.LockInfo.Seed));
-            Assert.IsTrue(new byte[] { 99, 104, 120, 121, 63, 99, 256 - 10, 256 - 110, 94, 70, 15, 256 - 112, 256 - 6, 101, 117, 256 - 90, 256 - 113, 256 - 54, 256 - 90, 256 - 95, 0, 0, 0, 0 }.SequenceEqual(bike.LockInfo.UserKey));
-        }
+			// Verify that keys are correctly updated.
+			Assert.IsTrue(new byte[] { 256 - 18, 256 - 80, 20, 256 - 90, 3, 69, 96, 4, 256 - 35, 75, 256 - 95, 102, 7, 121, 256 - 122, 15 }.SequenceEqual(bike.LockInfo.Seed));
+			Assert.IsTrue(new byte[] { 99, 104, 120, 121, 63, 99, 256 - 10, 256 - 110, 94, 70, 15, 256 - 112, 256 - 6, 101, 117, 256 - 90, 256 - 113, 256 - 54, 256 - 90, 256 - 95, 0, 0, 0, 0 }.SequenceEqual(bike.LockInfo.UserKey));
+		}
 
-        [Test]
-        public void TestLoad_Booked_CalculateAuthKeys()
-        {
-            // Construct occupied bike.
-            var bike = new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
-                    new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("17", LockModel.ILockIt), new Drive(),
-                    22,
-                    new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                    new[] { (byte)1, (byte)3, (byte)4 },
-                    new[] { (byte)11, (byte)3, (byte)1 },
-                    new[] { (byte)12, (byte)7, (byte)4 },
-                    DateTime.Now,
-                    "a@b",
-                    "1",
-                    null /*operator uri*/),
-                "My Station Name");
+		[Test]
+		public void TestLoad_Booked_CalculateAuthKeys()
+		{
+			// Construct occupied bike.
+			var bike = new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
+					new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("17", LockModel.ILockIt), new Drive(),
+					22,
+					new Guid("0000f00d-1212-efde-1523-785fef13d123"),
+					new[] { (byte)1, (byte)3, (byte)4 },
+					new[] { (byte)11, (byte)3, (byte)1 },
+					new[] { (byte)12, (byte)7, (byte)4 },
+					DateTime.Now,
+					"a@b",
+					"1",
+					null /*operator uri*/),
+				"My Station Name");
 
-            var response = JsonConvert.DeserializeObject<BikeInfoReservedOrBooked>(@"
+			var response = JsonConvert.DeserializeObject<BikeInfoReservedOrBooked>(@"
             {
                 ""Ilockit_ID"": ""ISHAREIT+0815"",
                 ""state"": ""occupied"",
@@ -687,39 +687,39 @@ namespace TestShareeLib.Model.Connector.Updater
                 ""K_u"": ""[99, 104, 120, 121, 63, 99, -10, -110, 94, 70, 15, -112, -6, 101, 117, -90, -113, -54, -90, -95, 0, 0, 0, 0]"",
             }");
 
-            // Update from new auth keys.
-            bike.Load(response, "a@b");
+			// Update from new auth keys.
+			bike.Load(response, "a@b");
 
-            // Verify that keys are correctly updated.
-            Assert.IsTrue(new byte[] { 256 - 18, 256 - 80, 20, 256 - 90, 3, 69, 96, 4, 256 - 35, 75, 256 - 95, 102, 7, 121, 256 - 122, 15 }.SequenceEqual(bike.LockInfo.Seed));
-            Assert.IsTrue(new byte[] { 99, 104, 120, 121, 63, 99, 256 - 10, 256 - 110, 94, 70, 15, 256 - 112, 256 - 6, 101, 117, 256 - 90, 256 - 113, 256 - 54, 256 - 90, 256 - 95, 0, 0, 0, 0 }.SequenceEqual(bike.LockInfo.UserKey));
-        }
+			// Verify that keys are correctly updated.
+			Assert.IsTrue(new byte[] { 256 - 18, 256 - 80, 20, 256 - 90, 3, 69, 96, 4, 256 - 35, 75, 256 - 95, 102, 7, 121, 256 - 122, 15 }.SequenceEqual(bike.LockInfo.Seed));
+			Assert.IsTrue(new byte[] { 99, 104, 120, 121, 63, 99, 256 - 10, 256 - 110, 94, 70, 15, 256 - 112, 256 - 6, 101, 117, 256 - 90, 256 - 113, 256 - 54, 256 - 90, 256 - 95, 0, 0, 0, 0 }.SequenceEqual(bike.LockInfo.UserKey));
+		}
 
-        [Test]
-        public void TestLoad_Reserved_DoBook()
-        {
-            // Construct requested bike.
-            var bike = new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
-                    new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("17", LockModel.ILockIt),
-                    new Drive(),
-                    22,
-                    new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                    new[] { (byte)1, (byte)3, (byte)4 },
-                    new[] { (byte)11, (byte)3, (byte)1 },
-                    new[] { (byte)12, (byte)7, (byte)4 },
-                    DateTime.Now,
-                    "a@b",
-                    "1",
-                    null,
-                    null,
-                    () => DateTime.Now,
-                    false, /*isDemo*/
-                    null /*group*/),
-                "My Station Name");
+		[Test]
+		public void TestLoad_Reserved_DoBook()
+		{
+			// Construct requested bike.
+			var bike = new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
+					new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("17", LockModel.ILockIt),
+					new Drive(),
+					22,
+					new Guid("0000f00d-1212-efde-1523-785fef13d123"),
+					new[] { (byte)1, (byte)3, (byte)4 },
+					new[] { (byte)11, (byte)3, (byte)1 },
+					new[] { (byte)12, (byte)7, (byte)4 },
+					DateTime.Now,
+					"a@b",
+					"1",
+					null,
+					null,
+					() => DateTime.Now,
+					false, /*isDemo*/
+					null /*group*/),
+				"My Station Name");
 
-            Assert.AreEqual(InUseStateEnum.Reserved, bike.State.Value);
+			Assert.AreEqual(InUseStateEnum.Reserved, bike.State.Value);
 
-            var response = JsonConvert.DeserializeObject<BikeInfoReservedOrBooked>(@"
+			var response = JsonConvert.DeserializeObject<BikeInfoReservedOrBooked>(@"
             {
                 ""Ilockit_ID"": ""ISHAREIT+0815"",
                 ""state"": ""occupied"",
@@ -728,17 +728,17 @@ namespace TestShareeLib.Model.Connector.Updater
                 ""K_u"": ""[99, 104, 120, 121, 63, 99, -10, -110, 94, 70, 15, -112, -6, 101, 117, -90, -113, -54, -90, -95, 0, 0, 0, 0]"",
             }");
 
-            // Update from new auth keys.
-            bike.Load(response, "a@b");
+			// Update from new auth keys.
+			bike.Load(response, "a@b");
 
-            Assert.AreEqual(InUseStateEnum.Booked, bike.State.Value);
-        }
+			Assert.AreEqual(InUseStateEnum.Booked, bike.State.Value);
+		}
 
-        /// <summary> Verifies loading a default user without special permissions.</summary>
-        [Test]
-        public void TestGetAccount_DebugLevelNone()
-        {
-            var response = JsonConvert.DeserializeObject<AuthorizationResponse>(@"
+		/// <summary> Verifies loading a default user without special permissions.</summary>
+		[Test]
+		public void TestGetAccount_DebugLevelNone()
+		{
+			var response = JsonConvert.DeserializeObject<AuthorizationResponse>(@"
             {
                   ""response_state"" : ""OK: nothing todo "",
                   ""user_group"" : [ ""300029"", ""300001"" ],
@@ -751,18 +751,18 @@ namespace TestShareeLib.Model.Connector.Updater
                   ""apiserver"" : ""https://shareeapp-fr01.copri.eu""
                }");
 
-            var account = response.GetAccount("merch123", "hallo@welt", "0815");
+			var account = response.GetAccount("merch123", "hallo@welt", "0815");
 
-            Assert.That(
-                account.DebugLevel,
-                Is.EqualTo(Permissions.None));
-        }
+			Assert.That(
+				account.DebugLevel,
+				Is.EqualTo(Permissions.None));
+		}
 
-        /// <summary> Verifies loading a admin user with all special permissions.</summary>
-        [Test]
-        public void TestGetAccount_DebugLevelAll()
-        {
-            var response = JsonConvert.DeserializeObject<AuthorizationResponse>(@"
+		/// <summary> Verifies loading a admin user with all special permissions.</summary>
+		[Test]
+		public void TestGetAccount_DebugLevelAll()
+		{
+			var response = JsonConvert.DeserializeObject<AuthorizationResponse>(@"
             {
                   ""response_state"" : ""OK: nothing todo "",
                   ""user_group"" : [ ""300029"", ""300001"" ],
@@ -775,18 +775,18 @@ namespace TestShareeLib.Model.Connector.Updater
                   ""apiserver"" : ""https://shareeapp-fr01.copri.eu""
                }");
 
-            var account = response.GetAccount("merch123", "hallo@welt", "0815");
+			var account = response.GetAccount("merch123", "hallo@welt", "0815");
 
-            Assert.That(
-                account.DebugLevel,
-                Is.EqualTo(Permissions.All));
-        }
+			Assert.That(
+				account.DebugLevel,
+				Is.EqualTo(Permissions.All));
+		}
 
-        /// <summary> Verifies loading a admin user with all special permissions.</summary>
-        [Test]
-        public void TestGetAccount_DebugLevel_Logging()
-        {
-            var response = JsonConvert.DeserializeObject<AuthorizationResponse>(@"
+		/// <summary> Verifies loading a admin user with all special permissions.</summary>
+		[Test]
+		public void TestGetAccount_DebugLevel_Logging()
+		{
+			var response = JsonConvert.DeserializeObject<AuthorizationResponse>(@"
             {
                   ""response_state"" : ""OK: nothing todo "",
                   ""user_group"" : [ ""300029"", ""300001"" ],
@@ -799,11 +799,11 @@ namespace TestShareeLib.Model.Connector.Updater
                   ""apiserver"" : ""https://shareeapp-fr01.copri.eu""
                }");
 
-            var account = response.GetAccount("merch123", "hallo@welt", "0815");
+			var account = response.GetAccount("merch123", "hallo@welt", "0815");
 
-            Assert.That(
-                account.DebugLevel,
-                Is.EqualTo(Permissions.PickLoggingLevel));
-        }
-    }
+			Assert.That(
+				account.DebugLevel,
+				Is.EqualTo(Permissions.PickLoggingLevel));
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Map/TestMapSpan.cs b/TestShareeLib/Model/Map/TestMapSpan.cs
index d389817..8d4c2ce 100644
--- a/TestShareeLib/Model/Map/TestMapSpan.cs
+++ b/TestShareeLib/Model/Map/TestMapSpan.cs
@@ -4,55 +4,55 @@ using TINK.Model.Map;
 
 namespace TestShareeLib.Model.Map
 {
-    [TestFixture]
-    public class TestMapSpan
-    {
-        [Test]
-        public void TestCtor()
-        {
-            var mapSpan = MapSpanFactory.Create(PositionFactory.Create(12, 13), 11);
+	[TestFixture]
+	public class TestMapSpan
+	{
+		[Test]
+		public void TestCtor()
+		{
+			var mapSpan = MapSpanFactory.Create(PositionFactory.Create(12, 13), 11);
 
-            Assert.That(mapSpan.GetType(), Is.EqualTo(typeof(MapSpan)), "Object under test is not of expected type.");
+			Assert.That(mapSpan.GetType(), Is.EqualTo(typeof(MapSpan)), "Object under test is not of expected type.");
 
-            Assert.That(
-                mapSpan.Radius,
-                Is.EqualTo(11.0));
+			Assert.That(
+				mapSpan.Radius,
+				Is.EqualTo(11.0));
 
-            Assert.That(
-                mapSpan.Center.Longitude,
-                Is.EqualTo(13.0));
-        }
+			Assert.That(
+				mapSpan.Center.Longitude,
+				Is.EqualTo(13.0));
+		}
 
-        [Test]
-        public void TestGetIsValid()
-        {
-            Assert.That(
-                MapSpan.GetIsValid(PositionFactory.Create(14, 99), 2.9),
-                Is.True);
-        }
+		[Test]
+		public void TestGetIsValid()
+		{
+			Assert.That(
+				MapSpan.GetIsValid(PositionFactory.Create(14, 99), 2.9),
+				Is.True);
+		}
 
-        [Test]
-        public void TestGetIsValidInvalidCenter()
-        {
-            Assert.That(
-                MapSpan.GetIsValid(PositionFactory.Create(), 2.9),
-                Is.False);
-        }
+		[Test]
+		public void TestGetIsValidInvalidCenter()
+		{
+			Assert.That(
+				MapSpan.GetIsValid(PositionFactory.Create(), 2.9),
+				Is.False);
+		}
 
-        [Test]
-        public void TestGetIsValidInvalidCenterNull()
-        {
-            Assert.That(
-                MapSpan.GetIsValid(null, 2.9),
-                Is.False);
-        }
+		[Test]
+		public void TestGetIsValidInvalidCenterNull()
+		{
+			Assert.That(
+				MapSpan.GetIsValid(null, 2.9),
+				Is.False);
+		}
 
-        [Test]
-        public void TestGetIsValidInvalidRadius()
-        {
-            Assert.That(
-                MapSpan.GetIsValid(PositionFactory.Create(14, 99), double.NaN),
-                Is.False);
-        }
-    }
+		[Test]
+		public void TestGetIsValidInvalidRadius()
+		{
+			Assert.That(
+				MapSpan.GetIsValid(PositionFactory.Create(14, 99), double.NaN),
+				Is.False);
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Map/TestMapSpanFactory.cs b/TestShareeLib/Model/Map/TestMapSpanFactory.cs
index 27a2d4f..5ed166c 100644
--- a/TestShareeLib/Model/Map/TestMapSpanFactory.cs
+++ b/TestShareeLib/Model/Map/TestMapSpanFactory.cs
@@ -4,23 +4,23 @@ using TINK.Model.Map;
 
 namespace TestShareeLib.Model.Map
 {
-    [TestFixture]
-    public class TestMapSpanFactory
-    {
-        [Test]
-        public void TestCreatePositon()
-        {
-            Assert.That(
-                MapSpanFactory.Create(PositionFactory.Create(12, 13), 11).GetType(),
-                Is.EqualTo(typeof(MapSpan)));
-        }
+	[TestFixture]
+	public class TestMapSpanFactory
+	{
+		[Test]
+		public void TestCreatePositon()
+		{
+			Assert.That(
+				MapSpanFactory.Create(PositionFactory.Create(12, 13), 11).GetType(),
+				Is.EqualTo(typeof(MapSpan)));
+		}
 
-        [Test]
-        public void TestCreateNullPositon()
-        {
-            Assert.That(
-                MapSpanFactory.Create().GetType(),
-                Is.EqualTo(typeof(NullMapSpan)));
-        }
-    }
+		[Test]
+		public void TestCreateNullPositon()
+		{
+			Assert.That(
+				MapSpanFactory.Create().GetType(),
+				Is.EqualTo(typeof(NullMapSpan)));
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Map/TestNullMapSpan.cs b/TestShareeLib/Model/Map/TestNullMapSpan.cs
index 69d0cd1..230a9e8 100644
--- a/TestShareeLib/Model/Map/TestNullMapSpan.cs
+++ b/TestShareeLib/Model/Map/TestNullMapSpan.cs
@@ -3,27 +3,27 @@ using TINK.Model.Map;
 
 namespace TestShareeLib.Model.Map
 {
-    [TestFixture]
-    internal class TestNullMapSpan
-    {
-        [Test]
-        public void TestCtor()
-        {
-            var mapSpan = MapSpanFactory.Create();
+	[TestFixture]
+	internal class TestNullMapSpan
+	{
+		[Test]
+		public void TestCtor()
+		{
+			var mapSpan = MapSpanFactory.Create();
 
-            Assert.That(mapSpan.GetType(), Is.EqualTo(typeof(NullMapSpan)), "Object under test is not of expected type.");
+			Assert.That(mapSpan.GetType(), Is.EqualTo(typeof(NullMapSpan)), "Object under test is not of expected type.");
 
-            Assert.That(
-                mapSpan.IsValid,
-                Is.False);
+			Assert.That(
+				mapSpan.IsValid,
+				Is.False);
 
-            Assert.That(
-                mapSpan.Radius,
-                Is.EqualTo(double.NaN));
+			Assert.That(
+				mapSpan.Radius,
+				Is.EqualTo(double.NaN));
 
-            Assert.That(
-                mapSpan.Center.Longitude,
-                Is.EqualTo(double.NaN));
-        }
-    }
+			Assert.That(
+				mapSpan.Center.Longitude,
+				Is.EqualTo(double.NaN));
+		}
+	}
 }
diff --git a/TestShareeLib/Model/MiniSurvey/TestMiniSurveyModel.cs b/TestShareeLib/Model/MiniSurvey/TestMiniSurveyModel.cs
index 206b5b2..bdb60a2 100644
--- a/TestShareeLib/Model/MiniSurvey/TestMiniSurveyModel.cs
+++ b/TestShareeLib/Model/MiniSurvey/TestMiniSurveyModel.cs
@@ -3,16 +3,16 @@ using TINK.Model.MiniSurvey;
 
 namespace TestShareeLib.Model.MiniSurvey
 {
-    [TestFixture]
-    public class TestMiniSurveyModel
-    {
-        [Test]
-        public void TestCtor()
-        {
-            Assert.That(
-                new MiniSurveyModel().Questions.Count,
-                Is.EqualTo(0),
-                "Question collection must not be null");
-        }
-    }
+	[TestFixture]
+	public class TestMiniSurveyModel
+	{
+		[Test]
+		public void TestCtor()
+		{
+			Assert.That(
+				new MiniSurveyModel().Questions.Count,
+				Is.EqualTo(0),
+				"Question collection must not be null");
+		}
+	}
 }
diff --git a/TestShareeLib/Model/MiniSurvey/TestQuestionModel.cs b/TestShareeLib/Model/MiniSurvey/TestQuestionModel.cs
index fcb5659..09d413c 100644
--- a/TestShareeLib/Model/MiniSurvey/TestQuestionModel.cs
+++ b/TestShareeLib/Model/MiniSurvey/TestQuestionModel.cs
@@ -3,14 +3,14 @@ using TINK.Model.MiniSurvey;
 
 namespace TestShareeLib.Model.MiniSurvey
 {
-    [TestFixture]
-    public class TestQuestionModel
-    {
-        public void TestCtro()
-        {
-            Assert.That(
-                    new QuestionModel().PossibleAnswers.Count,
-                    Is.EqualTo(1));
-        }
-    }
+	[TestFixture]
+	public class TestQuestionModel
+	{
+		public void TestCtro()
+		{
+			Assert.That(
+					new QuestionModel().PossibleAnswers.Count,
+					Is.EqualTo(1));
+		}
+	}
 }
diff --git a/TestShareeLib/Model/Settings/TestJsonSettingsDictionary.cs b/TestShareeLib/Model/Settings/TestJsonSettingsDictionary.cs
index cf67f30..a8f4886 100644
--- a/TestShareeLib/Model/Settings/TestJsonSettingsDictionary.cs
+++ b/TestShareeLib/Model/Settings/TestJsonSettingsDictionary.cs
@@ -8,169 +8,169 @@ using TINK.Settings;
 
 namespace TestTINKLib.Model.Settings
 {
-    [TestFixture]
-    public class TestJsonSettingsDictionary
-    {
-        /// <summary> Verifies that empty log fiel leads to expected default value and doesn not throw exceptions.</summary>
-        [Test]
-        public void TestGetCopriHostUri_NoFile()
-        {
-            Assert.IsNull(JsonSettingsDictionary.GetCopriHostUri(new Dictionary<string, string>()));
-        }
+	[TestFixture]
+	public class TestJsonSettingsDictionary
+	{
+		/// <summary> Verifies that empty log fiel leads to expected default value and doesn not throw exceptions.</summary>
+		[Test]
+		public void TestGetCopriHostUri_NoFile()
+		{
+			Assert.IsNull(JsonSettingsDictionary.GetCopriHostUri(new Dictionary<string, string>()));
+		}
 
-        /// <summary> Verifies that empty log file leads to expected default value and doesn not throw exceptions.</summary>
-        [Test]
-        public void TestGetPolling()
-        {
-            // Serialize parameters.
-            var l_oDict = new Dictionary<string, string>()
-                .SetPollingParameters(new PollingParameters(new TimeSpan(0, 0, 0, 15, 0), false));
+		/// <summary> Verifies that empty log file leads to expected default value and doesn not throw exceptions.</summary>
+		[Test]
+		public void TestGetPolling()
+		{
+			// Serialize parameters.
+			var l_oDict = new Dictionary<string, string>()
+				.SetPollingParameters(new PollingParameters(new TimeSpan(0, 0, 0, 15, 0), false));
 
-            // Deserialize parameters.
-            Assert.AreEqual(
-                new PollingParameters(new TimeSpan(0, 0, 0, 15, 0), false),
-                l_oDict.GetPollingParameters());
-        }
+			// Deserialize parameters.
+			Assert.AreEqual(
+				new PollingParameters(new TimeSpan(0, 0, 0, 15, 0), false),
+				l_oDict.GetPollingParameters());
+		}
 
-        /// <summary> Verifies that empty log fiel leads to expected default value and doesn not throw exceptions.</summary>
-        [Test]
-        public void TestGetPolling_NoFile()
-        {
-            Assert.IsNull(JsonSettingsDictionary.GetPollingParameters(new Dictionary<string, string>()));
-        }
+		/// <summary> Verifies that empty log fiel leads to expected default value and doesn not throw exceptions.</summary>
+		[Test]
+		public void TestGetPolling_NoFile()
+		{
+			Assert.IsNull(JsonSettingsDictionary.GetPollingParameters(new Dictionary<string, string>()));
+		}
 
-        [Test]
-        public void TestGetGetCopriHostUri()
-        {
-            var l_oDict = new Dictionary<string, string>()
-                .SetCopriHostUri("http://1.2.3.4");
-            Assert.AreEqual(
-                new Uri("http://1.2.3.4"),
-                JsonSettingsDictionary.GetCopriHostUri(l_oDict));
-        }
+		[Test]
+		public void TestGetGetCopriHostUri()
+		{
+			var l_oDict = new Dictionary<string, string>()
+				.SetCopriHostUri("http://1.2.3.4");
+			Assert.AreEqual(
+				new Uri("http://1.2.3.4"),
+				JsonSettingsDictionary.GetCopriHostUri(l_oDict));
+		}
 
-        /// <summary> Verifies that empty log fiel leads to expected default value and doesn not throw exceptions.</summary>
-        [Test]
-        public void TestGetLoggingLevel()
-        {
-            var l_oDictionary = new Dictionary<string, string>()
-                .SetMinimumLoggingLevel(0); // Verbose = 0
-            Assert.AreEqual(
-                LogEventLevel.Verbose,
-                JsonSettingsDictionary.GetMinimumLoggingLevel(l_oDictionary)); // LogEventLevel.Error = 4
-        }
+		/// <summary> Verifies that empty log fiel leads to expected default value and doesn not throw exceptions.</summary>
+		[Test]
+		public void TestGetLoggingLevel()
+		{
+			var l_oDictionary = new Dictionary<string, string>()
+				.SetMinimumLoggingLevel(0); // Verbose = 0
+			Assert.AreEqual(
+				LogEventLevel.Verbose,
+				JsonSettingsDictionary.GetMinimumLoggingLevel(l_oDictionary)); // LogEventLevel.Error = 4
+		}
 
-        /// <summary> Verifies that empty log fiel leads to expected default value and doesn not throw exceptions.</summary>
-        [Test]
-        public void TestGetLoggingLevel_NoFile()
-        {
-            Assert.IsNull(JsonSettingsDictionary.GetMinimumLoggingLevel(new Dictionary<string, string>()));
-        }
+		/// <summary> Verifies that empty log fiel leads to expected default value and doesn not throw exceptions.</summary>
+		[Test]
+		public void TestGetLoggingLevel_NoFile()
+		{
+			Assert.IsNull(JsonSettingsDictionary.GetMinimumLoggingLevel(new Dictionary<string, string>()));
+		}
 
-        [Test]
-        public void TestGetAppVersion_FirstInstall()
-        {
-            var l_oDict = new Dictionary<string, string>();
-            Assert.IsNull(JsonSettingsDictionary.GetAppVersion(l_oDict));
-        }
+		[Test]
+		public void TestGetAppVersion_FirstInstall()
+		{
+			var l_oDict = new Dictionary<string, string>();
+			Assert.IsNull(JsonSettingsDictionary.GetAppVersion(l_oDict));
+		}
 
-        [Test]
-        public void TestGetAppVersion_LegacyTo115()
-        {
-            var l_oDict = new Dictionary<string, string> { { "AppVersion", "7.2.3.9" } };
-            Assert.AreEqual(new Version(7, 2, 3, 9), JsonSettingsDictionary.GetAppVersion(l_oDict));
+		[Test]
+		public void TestGetAppVersion_LegacyTo115()
+		{
+			var l_oDict = new Dictionary<string, string> { { "AppVersion", "7.2.3.9" } };
+			Assert.AreEqual(new Version(7, 2, 3, 9), JsonSettingsDictionary.GetAppVersion(l_oDict));
 
-            l_oDict = new Dictionary<string, string> { { "AppVersion", "7.2.3" } };
-            Assert.AreEqual(new Version(7, 2, 3), JsonSettingsDictionary.GetAppVersion(l_oDict));
-        }
+			l_oDict = new Dictionary<string, string> { { "AppVersion", "7.2.3" } };
+			Assert.AreEqual(new Version(7, 2, 3), JsonSettingsDictionary.GetAppVersion(l_oDict));
+		}
 
-        [Test]
-        public void TestGetAppVersion_Json()
-        {
-            var l_oDict = new Dictionary<string, string> { { "AppVersion", "\"3.1.2.117\"" } };
-            Assert.AreEqual(new Version(3, 1, 2, 117), JsonSettingsDictionary.GetAppVersion(l_oDict));
-        }
+		[Test]
+		public void TestGetAppVersion_Json()
+		{
+			var l_oDict = new Dictionary<string, string> { { "AppVersion", "\"3.1.2.117\"" } };
+			Assert.AreEqual(new Version(3, 1, 2, 117), JsonSettingsDictionary.GetAppVersion(l_oDict));
+		}
 
-        [Test]
-        public void TestSetAppVersion_Json()
-        {
-            var l_oDict = new Dictionary<string, string>()
-                .SetAppVersion(new Version(47, 12, 3));
-            Assert.AreEqual(new Version(47, 12, 3), JsonSettingsDictionary.GetAppVersion(l_oDict));
-        }
+		[Test]
+		public void TestSetAppVersion_Json()
+		{
+			var l_oDict = new Dictionary<string, string>()
+				.SetAppVersion(new Version(47, 12, 3));
+			Assert.AreEqual(new Version(47, 12, 3), JsonSettingsDictionary.GetAppVersion(l_oDict));
+		}
 
-        [Test]
-        public void TestGetShowWhatsNew_FirstInstall()
-        {
-            var l_oDict = new Dictionary<string, string>();
-            Assert.IsNull(JsonSettingsDictionary.GetWhatsNew(l_oDict));
-        }
+		[Test]
+		public void TestGetShowWhatsNew_FirstInstall()
+		{
+			var l_oDict = new Dictionary<string, string>();
+			Assert.IsNull(JsonSettingsDictionary.GetWhatsNew(l_oDict));
+		}
 
-        [Test]
-        public void TestGetShowWhatsNew_Json()
-        {
-            var l_oDict = new Dictionary<string, string> { { "ShowWhatsNew", "\"3.1.2.117\"" } };
-            Assert.AreEqual(new Version(3, 1, 2, 117), JsonSettingsDictionary.GetWhatsNew(l_oDict));
+		[Test]
+		public void TestGetShowWhatsNew_Json()
+		{
+			var l_oDict = new Dictionary<string, string> { { "ShowWhatsNew", "\"3.1.2.117\"" } };
+			Assert.AreEqual(new Version(3, 1, 2, 117), JsonSettingsDictionary.GetWhatsNew(l_oDict));
 
-            l_oDict = new Dictionary<string, string> { { "ShowWhatsNew", "\"3.1.2\"" } };
-            Assert.AreEqual(new Version(3, 1, 2), JsonSettingsDictionary.GetWhatsNew(l_oDict));
-        }
+			l_oDict = new Dictionary<string, string> { { "ShowWhatsNew", "\"3.1.2\"" } };
+			Assert.AreEqual(new Version(3, 1, 2), JsonSettingsDictionary.GetWhatsNew(l_oDict));
+		}
 
-        [Test]
-        public void TestSetShowWhats_Json()
-        {
-            var l_oDict = new Dictionary<string, string>()
-                .SetWhatsNew(new Version(47, 12, 3));
-            Assert.AreEqual(new Version(47, 12, 3), JsonSettingsDictionary.GetWhatsNew(l_oDict));
-        }
+		[Test]
+		public void TestSetShowWhats_Json()
+		{
+			var l_oDict = new Dictionary<string, string>()
+				.SetWhatsNew(new Version(47, 12, 3));
+			Assert.AreEqual(new Version(47, 12, 3), JsonSettingsDictionary.GetWhatsNew(l_oDict));
+		}
 
-        [Test]
-        public void TestGetEntryTNoLegacySettingsKeyNull() => Assert.That(
-            JsonSettingsDictionary.GetEntry<string>(null, new Dictionary<string, string>()),
-            Is.Null);
+		[Test]
+		public void TestGetEntryTNoLegacySettingsKeyNull() => Assert.That(
+			JsonSettingsDictionary.GetEntry<string>(null, new Dictionary<string, string>()),
+			Is.Null);
 
-        [Test]
-        public void TestGetEntryTNoLegacySettingsNull() => Assert.That(
-            JsonSettingsDictionary.GetEntry<string>("Hi", null),
-            Is.Null);
+		[Test]
+		public void TestGetEntryTNoLegacySettingsNull() => Assert.That(
+			JsonSettingsDictionary.GetEntry<string>("Hi", null),
+			Is.Null);
 
-        [Test]
-        public void TestGetEntryTNoLegacyEntryNotFound() => Assert.That(
-            JsonSettingsDictionary.GetEntry<string>("Hi", new Dictionary<string, string> { { "Ho", @"""Hu""" } }),
-            Is.Null);
+		[Test]
+		public void TestGetEntryTNoLegacyEntryNotFound() => Assert.That(
+			JsonSettingsDictionary.GetEntry<string>("Hi", new Dictionary<string, string> { { "Ho", @"""Hu""" } }),
+			Is.Null);
 
-        [Test]
-        public void TestGetEntryTNoLegacyEntryFound() => Assert.That(
-         JsonSettingsDictionary.GetEntry<string>("Hi", new Dictionary<string, string> { { "Hi", @"""Ho""" } }),
-         Is.EqualTo("Ho"));
+		[Test]
+		public void TestGetEntryTNoLegacyEntryFound() => Assert.That(
+		 JsonSettingsDictionary.GetEntry<string>("Hi", new Dictionary<string, string> { { "Hi", @"""Ho""" } }),
+		 Is.EqualTo("Ho"));
 
-        [Test]
-        public void TestGetEntryT() => Assert.That(
-         JsonSettingsDictionary.GetEntry<string>("Hi", new Dictionary<string, string> { { "Hi", @"""Ho""" } }, (value) => @"""Hey"""),
-         Is.EqualTo("Hey"));
+		[Test]
+		public void TestGetEntryT() => Assert.That(
+		 JsonSettingsDictionary.GetEntry<string>("Hi", new Dictionary<string, string> { { "Hi", @"""Ho""" } }, (value) => @"""Hey"""),
+		 Is.EqualTo("Hey"));
 
-        [Test]
-        public void TestGetActiveTheme() => Assert.That(
-            JsonSettingsDictionary.GetActiveTheme(new Dictionary<string, string> { { "Theme", @"""Konrad""" } }),
-            Is.EqualTo(typeof(TINK.Themes.Konrad).Name));
+		[Test]
+		public void TestGetActiveTheme() => Assert.That(
+			JsonSettingsDictionary.GetActiveTheme(new Dictionary<string, string> { { "Theme", @"""Konrad""" } }),
+			Is.EqualTo(typeof(TINK.Themes.Konrad).Name));
 
-        [Test]
-        public void TestGetActiveThemeLegacy() => Assert.That(
-            JsonSettingsDictionary.GetActiveTheme(new Dictionary<string, string> { { "Theme", @"""TINK.Themes.Konrad""" } }),
-            Is.EqualTo(typeof(TINK.Themes.Konrad).Name));
+		[Test]
+		public void TestGetActiveThemeLegacy() => Assert.That(
+			JsonSettingsDictionary.GetActiveTheme(new Dictionary<string, string> { { "Theme", @"""TINK.Themes.Konrad""" } }),
+			Is.EqualTo(typeof(TINK.Themes.Konrad).Name));
 
-        [Test]
-        public void TestSetActiveTheme()
-        {
-            var settings = JsonSettingsDictionary.SetActiveTheme(new Dictionary<string, string>(), @"Konrad");
-            Assert.That(
-                settings,
-                Contains.Key("Theme"));
+		[Test]
+		public void TestSetActiveTheme()
+		{
+			var settings = JsonSettingsDictionary.SetActiveTheme(new Dictionary<string, string>(), @"Konrad");
+			Assert.That(
+				settings,
+				Contains.Key("Theme"));
 
-            settings = JsonSettingsDictionary.SetActiveTheme(new Dictionary<string, string>(), @"Konrad");
-            Assert.That(
-                settings["Theme"],
-                Is.EqualTo(JsonConvert.SerializeObject(typeof(TINK.Themes.Konrad).Name)));
-        }
-    }
+			settings = JsonSettingsDictionary.SetActiveTheme(new Dictionary<string, string>(), @"Konrad");
+			Assert.That(
+				settings["Theme"],
+				Is.EqualTo(JsonConvert.SerializeObject(typeof(TINK.Themes.Konrad).Name)));
+		}
+	}
 }
diff --git a/TestShareeLib/Model/State/TestStateBookedInfoSerializeJSON.cs b/TestShareeLib/Model/State/TestStateBookedInfoSerializeJSON.cs
index 65fdf7d..1c0b3eb 100644
--- a/TestShareeLib/Model/State/TestStateBookedInfoSerializeJSON.cs
+++ b/TestShareeLib/Model/State/TestStateBookedInfoSerializeJSON.cs
@@ -8,37 +8,37 @@ using TINK.Model.State;
 namespace TestTINKLib.Fixtures.Bike
 {
 
-    [TestFixture]
-    public class TestStateBookedInfoSerializeJSON
-    {
-        [Test]
-        public void TestSerializeJSON()
-        {
-            // Create object to test.
-            var l_oInfoSource = new StateOccupiedInfo(
-                new DateTime(2017, 09, 20, 23, 05, 0),
-                "Heinz@mueller",
-                "17 xxb");
+	[TestFixture]
+	public class TestStateBookedInfoSerializeJSON
+	{
+		[Test]
+		public void TestSerializeJSON()
+		{
+			// Create object to test.
+			var l_oInfoSource = new StateOccupiedInfo(
+				new DateTime(2017, 09, 20, 23, 05, 0),
+				"Heinz@mueller",
+				"17 xxb");
 
-            // Serialize object and verify.
-            var l_oDetected = JsonConvert.SerializeObject(l_oInfoSource);
-            const string EXPECTED = @"
+			// Serialize object and verify.
+			var l_oDetected = JsonConvert.SerializeObject(l_oInfoSource);
+			const string EXPECTED = @"
                 {
                     ""From"":""2017 - 09 - 20T23: 05:00"",
                     ""MailAddress"":""Heinz@mueller"",
                     ""Code"":""17 xxb""
                 }";
-            Assert.AreEqual(
-                TestHelper.PrepareXmlForStringCompare(EXPECTED.Replace("\n", string.Empty).Replace("\r", string.Empty)),
-                TestHelper.PrepareXmlForStringCompare(l_oDetected.Replace("\n", string.Empty).Replace("\r", string.Empty)));
+			Assert.AreEqual(
+				TestHelper.PrepareXmlForStringCompare(EXPECTED.Replace("\n", string.Empty).Replace("\r", string.Empty)),
+				TestHelper.PrepareXmlForStringCompare(l_oDetected.Replace("\n", string.Empty).Replace("\r", string.Empty)));
 
-            // Deserialize object and verify.
-            var l_oInfoTarget = JsonConvert.DeserializeObject<StateOccupiedInfo>(l_oDetected);
-            Assert.AreEqual(InUseStateEnum.Booked, l_oInfoTarget.Value);
-            Assert.AreEqual("Heinz@mueller", l_oInfoTarget.MailAddress);
-            Assert.AreEqual("17 xxb", l_oInfoTarget.Code);
-            Assert.AreEqual(new DateTime(2017, 9, 20, 23, 5, 0), l_oInfoTarget.From);
-        }
+			// Deserialize object and verify.
+			var l_oInfoTarget = JsonConvert.DeserializeObject<StateOccupiedInfo>(l_oDetected);
+			Assert.AreEqual(InUseStateEnum.Booked, l_oInfoTarget.Value);
+			Assert.AreEqual("Heinz@mueller", l_oInfoTarget.MailAddress);
+			Assert.AreEqual("17 xxb", l_oInfoTarget.Code);
+			Assert.AreEqual(new DateTime(2017, 9, 20, 23, 5, 0), l_oInfoTarget.From);
+		}
 
-    }
+	}
 }
diff --git a/TestShareeLib/Model/Station/TestData.cs b/TestShareeLib/Model/Station/TestData.cs
index 9d2de3c..c35afb1 100644
--- a/TestShareeLib/Model/Station/TestData.cs
+++ b/TestShareeLib/Model/Station/TestData.cs
@@ -2,57 +2,57 @@
 
 namespace TestShareeLib.Model.Station
 {
-    [TestFixture]
-    public class TestData
-    {
-        [Test]
-        public void TestCtor()
-        {
-            var data = new TINK.Model.Station.Operator.Data();
-            Assert.That(
-                data.Color,
-                Is.Null);
+	[TestFixture]
+	public class TestData
+	{
+		[Test]
+		public void TestCtor()
+		{
+			var data = new TINK.Model.Station.Operator.Data();
+			Assert.That(
+				data.Color,
+				Is.Null);
 
-            Assert.That(
-                data.Hours,
-                Is.EqualTo(string.Empty));
+			Assert.That(
+				data.Hours,
+				Is.EqualTo(string.Empty));
 
-            Assert.That(
-                data.Name,
-                Is.EqualTo(string.Empty));
+			Assert.That(
+				data.Name,
+				Is.EqualTo(string.Empty));
 
-            Assert.That(
-                data.MailAddressText,
-                Is.EqualTo(string.Empty));
+			Assert.That(
+				data.MailAddressText,
+				Is.EqualTo(string.Empty));
 
-            Assert.That(
-                data.PhoneNumberText,
-                Is.EqualTo(string.Empty));
-        }
+			Assert.That(
+				data.PhoneNumberText,
+				Is.EqualTo(string.Empty));
+		}
 
-        [Test]
-        public void TestCtor_Null()
-        {
-            var data = new TINK.Model.Station.Operator.Data(null, null, null, null, null);
-            Assert.That(
-                data.Color,
-                Is.Null);
+		[Test]
+		public void TestCtor_Null()
+		{
+			var data = new TINK.Model.Station.Operator.Data(null, null, null, null, null);
+			Assert.That(
+				data.Color,
+				Is.Null);
 
-            Assert.That(
-                data.Hours,
-                Is.EqualTo(string.Empty));
+			Assert.That(
+				data.Hours,
+				Is.EqualTo(string.Empty));
 
-            Assert.That(
-                data.Name,
-                Is.EqualTo(string.Empty));
+			Assert.That(
+				data.Name,
+				Is.EqualTo(string.Empty));
 
-            Assert.That(
-                data.MailAddressText,
-                Is.EqualTo(string.Empty));
+			Assert.That(
+				data.MailAddressText,
+				Is.EqualTo(string.Empty));
 
-            Assert.That(
-                data.PhoneNumberText,
-                Is.EqualTo(string.Empty));
-        }
-    }
+			Assert.That(
+				data.PhoneNumberText,
+				Is.EqualTo(string.Empty));
+		}
+	}
 }
diff --git a/TestShareeLib/Model/TestBikeCollectionFilter.cs b/TestShareeLib/Model/TestBikeCollectionFilter.cs
index b293556..3790116 100644
--- a/TestShareeLib/Model/TestBikeCollectionFilter.cs
+++ b/TestShareeLib/Model/TestBikeCollectionFilter.cs
@@ -8,81 +8,81 @@ using TINK.Model.Bikes.BikeInfoNS.DriveNS;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Bike
 {
-    [TestFixture]
-    public class TestBikeCollectionFilter
-    {
-        [Test]
-        public void TestGetAtStation()
-        {
-            var coll = new BikeCollection(
-                new Dictionary<string, TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo>
-                {
-                    {"3", new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("7", LockModel.ILockIt), new Drive(), "3" /* Stadion id */) },
-                    {"7", new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("8", LockModel.ILockIt), new Drive(), "12" /* Stadion id */) },
-                    {"12", new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("33", LockModel.ILockIt), new Drive(), "12" /* Stadion id */) }
-                });
+	[TestFixture]
+	public class TestBikeCollectionFilter
+	{
+		[Test]
+		public void TestGetAtStation()
+		{
+			var coll = new BikeCollection(
+				new Dictionary<string, TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo>
+				{
+					{"3", new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("7", LockModel.ILockIt), new Drive(), "3" /* Stadion id */) },
+					{"7", new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("8", LockModel.ILockIt), new Drive(), "12" /* Stadion id */) },
+					{"12", new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("33", LockModel.ILockIt), new Drive(), "12" /* Stadion id */) }
+				});
 
-            Assert.AreEqual(
-                0,
-                BikeCollectionFilter.GetAtStation(null, "12").Count);
+			Assert.AreEqual(
+				0,
+				BikeCollectionFilter.GetAtStation(null, "12").Count);
 
-            Assert.AreEqual(
-                0,
-                coll.GetAtStation(null).Count);
+			Assert.AreEqual(
+				0,
+				coll.GetAtStation(null).Count);
 
-            Assert.AreEqual(
-                0,
-                coll.GetAtStation("22").Count);
+			Assert.AreEqual(
+				0,
+				coll.GetAtStation("22").Count);
 
-            Assert.AreEqual(
-                1,
-                coll.GetAtStation("3").Count);
+			Assert.AreEqual(
+				1,
+				coll.GetAtStation("3").Count);
 
-            Assert.AreEqual(
-                2,
-                coll.GetAtStation("12").Count);
-        }
+			Assert.AreEqual(
+				2,
+				coll.GetAtStation("12").Count);
+		}
 
-        [Test]
-        public void TestGetLockIt_Null()
-        {
-            Assert.That(
-                BikeCollectionFilter.GetLockIt(null).Count,
-                Is.EqualTo(0));
-        }
+		[Test]
+		public void TestGetLockIt_Null()
+		{
+			Assert.That(
+				BikeCollectionFilter.GetLockIt(null).Count,
+				Is.EqualTo(0));
+		}
 
-        [Test]
-        public void TestGetLockIt_NoLockIt()
-        {
-            // Holds no LockIt bikes
-            var coll = new BikeCollection(
-                new Dictionary<string, TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo>
-                {
-                    {"7", new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("8", LockModel.ILockIt), new Drive(), "12" /* Stadion id */) },
-                    {"12", new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("33", LockModel.ILockIt), new Drive(), "12" /* Stadion id */) }
-                });
+		[Test]
+		public void TestGetLockIt_NoLockIt()
+		{
+			// Holds no LockIt bikes
+			var coll = new BikeCollection(
+				new Dictionary<string, TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo>
+				{
+					{"7", new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("8", LockModel.ILockIt), new Drive(), "12" /* Stadion id */) },
+					{"12", new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("33", LockModel.ILockIt), new Drive(), "12" /* Stadion id */) }
+				});
 
-            Assert.AreEqual(
-                0,
-                coll.GetLockIt().Count);
-        }
+			Assert.AreEqual(
+				0,
+				coll.GetLockIt().Count);
+		}
 
-        [Test]
-        public void TestGetLockIt()
-        {
+		[Test]
+		public void TestGetLockIt()
+		{
 
-            // Holds no LockIt bike with matching station number.
-            var coll = new BikeCollection(
-                new Dictionary<string, TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo>
-                {
-                        {"7", new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("8", LockModel.ILockIt), new Drive(), "12" /* Stadion id */) },
-                        {"11", new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("33", LockModel.ILockIt), new Drive(), 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "12" /* Stadion id */) },
-                        {"12", new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("33", LockModel.ILockIt), new Drive(), "12" /* Stadion id */) }
-                });
+			// Holds no LockIt bike with matching station number.
+			var coll = new BikeCollection(
+				new Dictionary<string, TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo>
+				{
+						{"7", new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("8", LockModel.ILockIt), new Drive(), "12" /* Stadion id */) },
+						{"11", new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("33", LockModel.ILockIt), new Drive(), 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "12" /* Stadion id */) },
+						{"12", new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("33", LockModel.ILockIt), new Drive(), "12" /* Stadion id */) }
+				});
 
-            Assert.AreEqual(
-                1,
-                coll.GetLockIt().Count);
-        }
-    }
+			Assert.AreEqual(
+				1,
+				coll.GetLockIt().Count);
+		}
+	}
 }
diff --git a/TestShareeLib/Model/TestBookingFinishedModel.cs b/TestShareeLib/Model/TestBookingFinishedModel.cs
index fe1ef08..c19fdf6 100644
--- a/TestShareeLib/Model/TestBookingFinishedModel.cs
+++ b/TestShareeLib/Model/TestBookingFinishedModel.cs
@@ -3,16 +3,16 @@ using TINK.Model;
 
 namespace TestShareeLib.Model
 {
-    [TestFixture]
-    public class TestBookingFinishedModel
-    {
-        [Test]
-        public void TestCtor()
-        {
-            Assert.That(
-                new BookingFinishedModel().MiniSurvey,
-                Is.Not.Null,
-                "Avoid object not set to eqception.");
-        }
-    }
+	[TestFixture]
+	public class TestBookingFinishedModel
+	{
+		[Test]
+		public void TestCtor()
+		{
+			Assert.That(
+				new BookingFinishedModel().MiniSurvey,
+				Is.Not.Null,
+				"Avoid object not set to eqception.");
+		}
+	}
 }
diff --git a/TestShareeLib/Model/TestJsonSettingsDictionary.cs b/TestShareeLib/Model/TestJsonSettingsDictionary.cs
index a9aa5f5..25dd54d 100644
--- a/TestShareeLib/Model/TestJsonSettingsDictionary.cs
+++ b/TestShareeLib/Model/TestJsonSettingsDictionary.cs
@@ -7,120 +7,120 @@ using TINK.Settings;
 
 namespace TestTINKLib.Fixtures.ObjectTests
 {
-    [TestFixture]
-    public class TestJsonSettingsDictionary
-    {
-        /// <summary> Verifies that empty log fiel leads to expected default value and doesn not throw exceptions.</summary>
-        [Test]
-        public void TestGetCopriHostUri_NoFile()
-        {
-            Assert.IsNull(JsonSettingsDictionary.GetCopriHostUri(new Dictionary<string, string>()));
-        }
+	[TestFixture]
+	public class TestJsonSettingsDictionary
+	{
+		/// <summary> Verifies that empty log fiel leads to expected default value and doesn not throw exceptions.</summary>
+		[Test]
+		public void TestGetCopriHostUri_NoFile()
+		{
+			Assert.IsNull(JsonSettingsDictionary.GetCopriHostUri(new Dictionary<string, string>()));
+		}
 
-        /// <summary> Verifies that empty log file leads to expected default value and doesn not throw exceptions.</summary>
-        [Test]
-        public void TestGetPolling()
-        {
-            // Serialize parameters.
-            var l_oDict = new Dictionary<string, string>()
-                .SetPollingParameters(new PollingParameters(new TimeSpan(0, 0, 0, 15, 0), false));
+		/// <summary> Verifies that empty log file leads to expected default value and doesn not throw exceptions.</summary>
+		[Test]
+		public void TestGetPolling()
+		{
+			// Serialize parameters.
+			var l_oDict = new Dictionary<string, string>()
+				.SetPollingParameters(new PollingParameters(new TimeSpan(0, 0, 0, 15, 0), false));
 
-            // Deserialize parameters.
-            Assert.AreEqual(
-                new PollingParameters(new TimeSpan(0, 0, 0, 15, 0), false),
-                l_oDict.GetPollingParameters());
-        }
+			// Deserialize parameters.
+			Assert.AreEqual(
+				new PollingParameters(new TimeSpan(0, 0, 0, 15, 0), false),
+				l_oDict.GetPollingParameters());
+		}
 
-        /// <summary> Verifies that empty log fiel leads to expected default value and doesn not throw exceptions.</summary>
-        [Test]
-        public void TestGetPolling_NoFile()
-        {
-            Assert.IsNull(JsonSettingsDictionary.GetPollingParameters(new Dictionary<string, string>()));
-        }
+		/// <summary> Verifies that empty log fiel leads to expected default value and doesn not throw exceptions.</summary>
+		[Test]
+		public void TestGetPolling_NoFile()
+		{
+			Assert.IsNull(JsonSettingsDictionary.GetPollingParameters(new Dictionary<string, string>()));
+		}
 
-        [Test]
-        public void TestGetGetCopriHostUri()
-        {
-            var l_oDict = new Dictionary<string, string>()
-                .SetCopriHostUri("http://1.2.3.4");
-            Assert.AreEqual(
-                new Uri("http://1.2.3.4"),
-                JsonSettingsDictionary.GetCopriHostUri(l_oDict));
-        }
+		[Test]
+		public void TestGetGetCopriHostUri()
+		{
+			var l_oDict = new Dictionary<string, string>()
+				.SetCopriHostUri("http://1.2.3.4");
+			Assert.AreEqual(
+				new Uri("http://1.2.3.4"),
+				JsonSettingsDictionary.GetCopriHostUri(l_oDict));
+		}
 
-        /// <summary> Verifies that empty log fiel leads to expected default value and doesn not throw exceptions.</summary>
-        [Test]
-        public void TestGetLoggingLevel()
-        {
-            var l_oDictionary = new Dictionary<string, string>()
-                .SetMinimumLoggingLevel(0); // Verbose = 0
-            Assert.AreEqual(
-                LogEventLevel.Verbose,
-                JsonSettingsDictionary.GetMinimumLoggingLevel(l_oDictionary)); // LogEventLevel.Error = 4
-        }
+		/// <summary> Verifies that empty log fiel leads to expected default value and doesn not throw exceptions.</summary>
+		[Test]
+		public void TestGetLoggingLevel()
+		{
+			var l_oDictionary = new Dictionary<string, string>()
+				.SetMinimumLoggingLevel(0); // Verbose = 0
+			Assert.AreEqual(
+				LogEventLevel.Verbose,
+				JsonSettingsDictionary.GetMinimumLoggingLevel(l_oDictionary)); // LogEventLevel.Error = 4
+		}
 
-        /// <summary> Verifies that empty log fiel leads to expected default value and doesn not throw exceptions.</summary>
-        [Test]
-        public void TestGetLoggingLevel_NoFile()
-        {
-            Assert.IsNull(JsonSettingsDictionary.GetMinimumLoggingLevel(new Dictionary<string, string>()));
-        }
+		/// <summary> Verifies that empty log fiel leads to expected default value and doesn not throw exceptions.</summary>
+		[Test]
+		public void TestGetLoggingLevel_NoFile()
+		{
+			Assert.IsNull(JsonSettingsDictionary.GetMinimumLoggingLevel(new Dictionary<string, string>()));
+		}
 
-        [Test]
-        public void TestGetAppVersion_FirstInstall()
-        {
-            var l_oDict = new Dictionary<string, string>();
-            Assert.IsNull(JsonSettingsDictionary.GetAppVersion(l_oDict));
-        }
+		[Test]
+		public void TestGetAppVersion_FirstInstall()
+		{
+			var l_oDict = new Dictionary<string, string>();
+			Assert.IsNull(JsonSettingsDictionary.GetAppVersion(l_oDict));
+		}
 
-        [Test]
-        public void TestGetAppVersion_LegacyTo115()
-        {
-            var l_oDict = new Dictionary<string, string> { { "AppVersion", "7.2.3.9" } };
-            Assert.AreEqual(new Version(7, 2, 3, 9), JsonSettingsDictionary.GetAppVersion(l_oDict));
+		[Test]
+		public void TestGetAppVersion_LegacyTo115()
+		{
+			var l_oDict = new Dictionary<string, string> { { "AppVersion", "7.2.3.9" } };
+			Assert.AreEqual(new Version(7, 2, 3, 9), JsonSettingsDictionary.GetAppVersion(l_oDict));
 
-            l_oDict = new Dictionary<string, string> { { "AppVersion", "7.2.3" } };
-            Assert.AreEqual(new Version(7, 2, 3), JsonSettingsDictionary.GetAppVersion(l_oDict));
-        }
+			l_oDict = new Dictionary<string, string> { { "AppVersion", "7.2.3" } };
+			Assert.AreEqual(new Version(7, 2, 3), JsonSettingsDictionary.GetAppVersion(l_oDict));
+		}
 
-        [Test]
-        public void TestGetAppVersion_Json()
-        {
-            var l_oDict = new Dictionary<string, string> { { "AppVersion", "\"3.1.2.117\"" } };
-            Assert.AreEqual(new Version(3, 1, 2, 117), JsonSettingsDictionary.GetAppVersion(l_oDict));
-        }
+		[Test]
+		public void TestGetAppVersion_Json()
+		{
+			var l_oDict = new Dictionary<string, string> { { "AppVersion", "\"3.1.2.117\"" } };
+			Assert.AreEqual(new Version(3, 1, 2, 117), JsonSettingsDictionary.GetAppVersion(l_oDict));
+		}
 
-        [Test]
-        public void TestSetAppVersion_Json()
-        {
-            var l_oDict = new Dictionary<string, string>()
-                .SetAppVersion(new Version(47, 12, 3));
-            Assert.AreEqual(new Version(47, 12, 3), JsonSettingsDictionary.GetAppVersion(l_oDict));
-        }
+		[Test]
+		public void TestSetAppVersion_Json()
+		{
+			var l_oDict = new Dictionary<string, string>()
+				.SetAppVersion(new Version(47, 12, 3));
+			Assert.AreEqual(new Version(47, 12, 3), JsonSettingsDictionary.GetAppVersion(l_oDict));
+		}
 
-        [Test]
-        public void TestGetShowWhatsNew_FirstInstall()
-        {
-            var l_oDict = new Dictionary<string, string>();
-            Assert.IsNull(JsonSettingsDictionary.GetWhatsNew(l_oDict));
-        }
+		[Test]
+		public void TestGetShowWhatsNew_FirstInstall()
+		{
+			var l_oDict = new Dictionary<string, string>();
+			Assert.IsNull(JsonSettingsDictionary.GetWhatsNew(l_oDict));
+		}
 
-        [Test]
-        public void TestGetShowWhatsNew_Json()
-        {
-            var l_oDict = new Dictionary<string, string> { { "ShowWhatsNew", "\"3.1.2.117\"" } };
-            Assert.AreEqual(new Version(3, 1, 2, 117), JsonSettingsDictionary.GetWhatsNew(l_oDict));
+		[Test]
+		public void TestGetShowWhatsNew_Json()
+		{
+			var l_oDict = new Dictionary<string, string> { { "ShowWhatsNew", "\"3.1.2.117\"" } };
+			Assert.AreEqual(new Version(3, 1, 2, 117), JsonSettingsDictionary.GetWhatsNew(l_oDict));
 
-            l_oDict = new Dictionary<string, string> { { "ShowWhatsNew", "\"3.1.2\"" } };
-            Assert.AreEqual(new Version(3, 1, 2), JsonSettingsDictionary.GetWhatsNew(l_oDict));
-        }
+			l_oDict = new Dictionary<string, string> { { "ShowWhatsNew", "\"3.1.2\"" } };
+			Assert.AreEqual(new Version(3, 1, 2), JsonSettingsDictionary.GetWhatsNew(l_oDict));
+		}
 
-        [Test]
-        public void TestSetShowWhats_Json()
-        {
-            var l_oDict = new Dictionary<string, string>()
-                .SetWhatsNew(new Version(47, 12, 3));
-            Assert.AreEqual(new Version(47, 12, 3), JsonSettingsDictionary.GetWhatsNew(l_oDict));
-        }
-    }
+		[Test]
+		public void TestSetShowWhats_Json()
+		{
+			var l_oDict = new Dictionary<string, string>()
+				.SetWhatsNew(new Version(47, 12, 3));
+			Assert.AreEqual(new Version(47, 12, 3), JsonSettingsDictionary.GetWhatsNew(l_oDict));
+		}
+	}
 }
diff --git a/TestShareeLib/Model/TestNullPosition.cs b/TestShareeLib/Model/TestNullPosition.cs
index 14114c6..da721dc 100644
--- a/TestShareeLib/Model/TestNullPosition.cs
+++ b/TestShareeLib/Model/TestNullPosition.cs
@@ -3,26 +3,26 @@ using TINK.Model;
 
 namespace TestShareeLib.Model
 {
-    [TestFixture]
-    public class TestNullPosition
-    {
-        [Test]
-        public void TestCtor()
-        {
-            var positon = PositionFactory.Create();
-            Assert.That(positon.GetType(), Is.EqualTo(typeof(NullPostion)), "Object under test is not of expected type.");
+	[TestFixture]
+	public class TestNullPosition
+	{
+		[Test]
+		public void TestCtor()
+		{
+			var positon = PositionFactory.Create();
+			Assert.That(positon.GetType(), Is.EqualTo(typeof(NullPostion)), "Object under test is not of expected type.");
 
-            Assert.That(
-                positon.IsValid,
-                Is.False);
+			Assert.That(
+				positon.IsValid,
+				Is.False);
 
-            Assert.That(
-                positon.Longitude,
-                Is.EqualTo(double.NaN));
+			Assert.That(
+				positon.Longitude,
+				Is.EqualTo(double.NaN));
 
-            Assert.That(
-                positon.Latitude,
-                Is.EqualTo(double.NaN));
-        }
-    }
+			Assert.That(
+				positon.Latitude,
+				Is.EqualTo(double.NaN));
+		}
+	}
 }
diff --git a/TestShareeLib/Model/TestPosition.cs b/TestShareeLib/Model/TestPosition.cs
index c3b20bf..754c126 100644
--- a/TestShareeLib/Model/TestPosition.cs
+++ b/TestShareeLib/Model/TestPosition.cs
@@ -3,73 +3,73 @@ using TINK.Model;
 
 namespace TestShareeLib.Model
 {
-    [TestFixture]
-    public class TestPosition
-    {
-        [Test]
-        public void TestEquals()
-        {
-            var positonA = PositionFactory.Create(12, 13);
-            var positonB = PositionFactory.Create(12, 13);
+	[TestFixture]
+	public class TestPosition
+	{
+		[Test]
+		public void TestEquals()
+		{
+			var positonA = PositionFactory.Create(12, 13);
+			var positonB = PositionFactory.Create(12, 13);
 
-            Assert.That(positonA.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
-            Assert.That(positonB.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
+			Assert.That(positonA.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
+			Assert.That(positonB.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
 
-            Assert.That(
-                positonA.Equals(positonB),
-                Is.True);
-        }
+			Assert.That(
+				positonA.Equals(positonB),
+				Is.True);
+		}
 
-        [Test]
-        public void TestEqualsNotEquaLong()
-        {
-            var positonA = PositionFactory.Create(12, 13);
-            var positonB = PositionFactory.Create(13, 13);
+		[Test]
+		public void TestEqualsNotEquaLong()
+		{
+			var positonA = PositionFactory.Create(12, 13);
+			var positonB = PositionFactory.Create(13, 13);
 
-            Assert.That(positonA.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
-            Assert.That(positonB.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
+			Assert.That(positonA.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
+			Assert.That(positonB.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
 
-            Assert.That(
-                positonA.Equals(positonB),
-                Is.False);
-        }
+			Assert.That(
+				positonA.Equals(positonB),
+				Is.False);
+		}
 
-        [Test]
-        public void TestEqualsNotEquaLat()
-        {
-            var positonA = PositionFactory.Create(12, 13);
-            var positonB = PositionFactory.Create(12, 12);
+		[Test]
+		public void TestEqualsNotEquaLat()
+		{
+			var positonA = PositionFactory.Create(12, 13);
+			var positonB = PositionFactory.Create(12, 12);
 
-            Assert.That(positonA.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
-            Assert.That(positonB.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
+			Assert.That(positonA.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
+			Assert.That(positonB.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
 
-            Assert.That(
-                positonA.Equals(positonB),
-                Is.False);
-        }
+			Assert.That(
+				positonA.Equals(positonB),
+				Is.False);
+		}
 
-        [Test]
-        public void TestGetIsValid()
-        {
-            Assert.That(
-                Position.GetIsValid(1, 2),
-                Is.True);
-        }
+		[Test]
+		public void TestGetIsValid()
+		{
+			Assert.That(
+				Position.GetIsValid(1, 2),
+				Is.True);
+		}
 
-        [Test]
-        public void TestGetIsValidInvalidLong()
-        {
-            Assert.That(
-                Position.GetIsValid(double.NaN, 2),
-                Is.False);
-        }
+		[Test]
+		public void TestGetIsValidInvalidLong()
+		{
+			Assert.That(
+				Position.GetIsValid(double.NaN, 2),
+				Is.False);
+		}
 
-        [Test]
-        public void TestGetIsValidInvalidLat()
-        {
-            Assert.That(
-                Position.GetIsValid(2, double.NaN),
-                Is.False);
-        }
-    }
+		[Test]
+		public void TestGetIsValidInvalidLat()
+		{
+			Assert.That(
+				Position.GetIsValid(2, double.NaN),
+				Is.False);
+		}
+	}
 }
diff --git a/TestShareeLib/Model/TestPositionFactory.cs b/TestShareeLib/Model/TestPositionFactory.cs
index 8080b86..bc26c4b 100644
--- a/TestShareeLib/Model/TestPositionFactory.cs
+++ b/TestShareeLib/Model/TestPositionFactory.cs
@@ -3,23 +3,23 @@ using TINK.Model;
 
 namespace TestShareeLib.Model
 {
-    [TestFixture]
-    public class TestPositionFactory
-    {
-        [Test]
-        public void TestCreatePosition()
-        {
-            Assert.That(
-                PositionFactory.Create(9.55, 8.33).GetType(),
-                Is.EqualTo(typeof(Position)));
-        }
+	[TestFixture]
+	public class TestPositionFactory
+	{
+		[Test]
+		public void TestCreatePosition()
+		{
+			Assert.That(
+				PositionFactory.Create(9.55, 8.33).GetType(),
+				Is.EqualTo(typeof(Position)));
+		}
 
-        [Test]
-        public void TestCreateNullPosition()
-        {
-            Assert.That(
-                PositionFactory.Create().GetType(),
-                Is.EqualTo(typeof(NullPostion)));
-        }
-    }
+		[Test]
+		public void TestCreateNullPosition()
+		{
+			Assert.That(
+				PositionFactory.Create().GetType(),
+				Is.EqualTo(typeof(NullPostion)));
+		}
+	}
 }
diff --git a/TestShareeLib/Model/TestTinkApp.cs b/TestShareeLib/Model/TestTinkApp.cs
index 0a80976..e109979 100644
--- a/TestShareeLib/Model/TestTinkApp.cs
+++ b/TestShareeLib/Model/TestTinkApp.cs
@@ -16,72 +16,72 @@ using TINK.Services.Permissions;
 
 namespace TestTINKLib.Fixtures.UseCases.Logout
 {
-    [TestFixture]
-    public class TestTinkApp
-    {
-        [Test]
-        public void Logout()
-        {
-            var accountStore = Substitute.For<IStore>();
-            var locksService = Substitute.For<ILocksService>();
-            var device = Substitute.For<ISmartDevice>();
-            var specialFolder = Substitute.For<ISpecialFolder>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var account = Substitute.For<IAccount>();
+	[TestFixture]
+	public class TestTinkApp
+	{
+		[Test]
+		public void Logout()
+		{
+			var accountStore = Substitute.For<IStore>();
+			var locksService = Substitute.For<ILocksService>();
+			var device = Substitute.For<ISmartDevice>();
+			var specialFolder = Substitute.For<ISpecialFolder>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var account = Substitute.For<IAccount>();
 
-            accountStore.Load().Returns(account);
-            account.Mail.Returns("javaminister@gmail.com");
-            account.Pwd.Returns("*********");
-            account.SessionCookie.Returns("6103_112e96b36ba33de245943c5ffaf369cd_");
+			accountStore.Load().Returns(account);
+			account.Mail.Returns("javaminister@gmail.com");
+			account.Pwd.Returns("*********");
+			account.SessionCookie.Returns("6103_112e96b36ba33de245943c5ffaf369cd_");
 
-            // No user logged in is initial state to verify.
-            var l_oTinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                     activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: "NotRelevantActiveGeoloactionServiceName",
-                   activeUri: new Uri(CopriServerUriList.TINK_DEVEL)),
-                accountStore,
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => string.IsNullOrEmpty(sessionCookie)
-                 ? new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001())
-                 : new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
-                merchantId: "MyMerchId",
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: permissions,
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: locksService, // Cipher
-                device: device,
-                specialFolder: specialFolder,
-                cipher: null,
-                theme: null,
-                currentVersion: new Version(3, 2, 0, 115),
-                lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to 
+			// No user logged in is initial state to verify.
+			var l_oTinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					 activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: "NotRelevantActiveGeoloactionServiceName",
+				   activeUri: new Uri(CopriServerUriList.TINK_DEVEL)),
+				accountStore,
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => string.IsNullOrEmpty(sessionCookie)
+				 ? new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001())
+				 : new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
+				merchantId: "MyMerchId",
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: permissions,
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: locksService, // Cipher
+				device: device,
+				specialFolder: specialFolder,
+				cipher: null,
+				theme: null,
+				currentVersion: new Version(3, 2, 0, 115),
+				lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to 
 
-            Assert.IsTrue(l_oTinkApp.ActiveUser.IsLoggedIn);
-            // There are 6 bikes available and 2, one reserved and one rented by javaminsiter.
-            Assert.AreEqual(
-                10,
-                l_oTinkApp.GetConnector(true).Query.GetBikesAsync().Result.Response.Count,
-                "Sum of bikes is 6 occupied plus 2 occupied.");
-            Assert.AreEqual(2,
-                l_oTinkApp.GetConnector(true).Query.GetBikesOccupiedAsync().Result.Response.Count,
-                "Javaminster occupies 2 bikes.");
-            Assert.AreEqual("6103_112e96b36ba33de245943c5ffaf369cd_", l_oTinkApp.GetConnector(true).Command.SessionCookie);
+			Assert.IsTrue(l_oTinkApp.ActiveUser.IsLoggedIn);
+			// There are 6 bikes available and 2, one reserved and one rented by javaminsiter.
+			Assert.AreEqual(
+				10,
+				l_oTinkApp.GetConnector(true).Query.GetBikesAsync().Result.Response.Count,
+				"Sum of bikes is 6 occupied plus 2 occupied.");
+			Assert.AreEqual(2,
+				l_oTinkApp.GetConnector(true).Query.GetBikesOccupiedAsync().Result.Response.Count,
+				"Javaminster occupies 2 bikes.");
+			Assert.AreEqual("6103_112e96b36ba33de245943c5ffaf369cd_", l_oTinkApp.GetConnector(true).Command.SessionCookie);
 
-            // Log user out.
-            l_oTinkApp.GetConnector(true).Command.DoLogout().Wait();
-            l_oTinkApp.ActiveUser.Logout();
+			// Log user out.
+			l_oTinkApp.GetConnector(true).Command.DoLogout().Wait();
+			l_oTinkApp.ActiveUser.Logout();
 
-            Assert.IsFalse(l_oTinkApp.ActiveUser.IsLoggedIn);
-            Assert.AreEqual(
-                8,
-                l_oTinkApp.GetConnector(true).Query.GetBikesAsync().Result.Response.Count,
-                "Sum of bikes is 6 occupied, no one occupied because no user is logged in");
-            Assert.AreEqual(
-                0,
-                l_oTinkApp.GetConnector(true).Query.GetBikesOccupiedAsync().Result.Response.Count,
-                "If no user is logged in no occupied bikes are shown.");
-            Assert.IsNull(l_oTinkApp.GetConnector(true).Command.SessionCookie);
-        }
-    }
+			Assert.IsFalse(l_oTinkApp.ActiveUser.IsLoggedIn);
+			Assert.AreEqual(
+				8,
+				l_oTinkApp.GetConnector(true).Query.GetBikesAsync().Result.Response.Count,
+				"Sum of bikes is 6 occupied, no one occupied because no user is logged in");
+			Assert.AreEqual(
+				0,
+				l_oTinkApp.GetConnector(true).Query.GetBikesOccupiedAsync().Result.Response.Count,
+				"If no user is logged in no occupied bikes are shown.");
+			Assert.IsNull(l_oTinkApp.GetConnector(true).Command.SessionCookie);
+		}
+	}
 }
diff --git a/TestShareeLib/Model/TestTinkAppLogin.cs b/TestShareeLib/Model/TestTinkAppLogin.cs
index dcf7c73..35a5bb0 100644
--- a/TestShareeLib/Model/TestTinkAppLogin.cs
+++ b/TestShareeLib/Model/TestTinkAppLogin.cs
@@ -17,67 +17,67 @@ using TINK.Services.Permissions;
 
 namespace TestShareeLib.UseCases.Login
 {
-    [TestFixture]
-    public class TestTinkApp
-    {
-        [Test]
-        public async Task Login()
-        {
-            var accountStore = Substitute.For<IStore>();
-            var locksService = Substitute.For<ILocksService>();
-            var device = Substitute.For<ISmartDevice>();
-            var specialFolder = Substitute.For<ISpecialFolder>();
-            var permissions = Substitute.For<ILocationPermission>();
+	[TestFixture]
+	public class TestTinkApp
+	{
+		[Test]
+		public async Task Login()
+		{
+			var accountStore = Substitute.For<IStore>();
+			var locksService = Substitute.For<ILocksService>();
+			var device = Substitute.For<ISmartDevice>();
+			var specialFolder = Substitute.For<ISpecialFolder>();
+			var permissions = Substitute.For<ILocationPermission>();
 
-            // No user logged in is initial state to verify.
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: "NotRelevantActiveGeoloactionServiceName",
-                    activeUri: new Uri(CopriServerUriList.TINK_DEVEL)),
-                accountStore,
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => string.IsNullOrEmpty(sessionCookie)
-     ? new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001())
-     : new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
-                merchantId: "MyMerchId",
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: permissions,
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: locksService, // Cipher
-                device: device,
-                specialFolder: specialFolder,
-                cipher: null,
-                theme: null,
-                currentVersion: new Version(3, 2, 0, 115),
-                lastVersion: new Version(3, 0, 173) /* Current app version. Must be larger or equal 3.0.173 to lastVersion*/);
+			// No user logged in is initial state to verify.
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: "NotRelevantActiveGeoloactionServiceName",
+					activeUri: new Uri(CopriServerUriList.TINK_DEVEL)),
+				accountStore,
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => string.IsNullOrEmpty(sessionCookie)
+	 ? new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001())
+	 : new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
+				merchantId: "MyMerchId",
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: permissions,
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: locksService, // Cipher
+				device: device,
+				specialFolder: specialFolder,
+				cipher: null,
+				theme: null,
+				currentVersion: new Version(3, 2, 0, 115),
+				lastVersion: new Version(3, 0, 173) /* Current app version. Must be larger or equal 3.0.173 to lastVersion*/);
 
-            // Verifiy initial state.
-            Assert.IsFalse(tinkApp.ActiveUser.IsLoggedIn);
-            Assert.AreEqual(
-                8,
-                tinkApp.GetConnector(true).Query.GetBikesAsync().Result.Response.Count,
-                "Sum of bikes is 6 occupied, no one occupied because no user is logged in");
-            Assert.AreEqual(
-                0,
-                tinkApp.GetConnector(true).Query.GetBikesOccupiedAsync().Result.Response.Count,
-                "If no user is logged in no occupied bikes are shown.");
-            Assert.IsNull(tinkApp.GetConnector(true).Command.SessionCookie);
+			// Verifiy initial state.
+			Assert.IsFalse(tinkApp.ActiveUser.IsLoggedIn);
+			Assert.AreEqual(
+				8,
+				tinkApp.GetConnector(true).Query.GetBikesAsync().Result.Response.Count,
+				"Sum of bikes is 6 occupied, no one occupied because no user is logged in");
+			Assert.AreEqual(
+				0,
+				tinkApp.GetConnector(true).Query.GetBikesOccupiedAsync().Result.Response.Count,
+				"If no user is logged in no occupied bikes are shown.");
+			Assert.IsNull(tinkApp.GetConnector(true).Command.SessionCookie);
 
-            // Log in user.
-            var account = tinkApp.GetConnector(true).Command.DoLogin("javaminister@gmail.com", "*********", "HwId1000000000000").Result;
-            await tinkApp.ActiveUser.Login(account);
+			// Log in user.
+			var account = tinkApp.GetConnector(true).Command.DoLogin("javaminister@gmail.com", "*********", "HwId1000000000000").Result;
+			await tinkApp.ActiveUser.Login(account);
 
-            Assert.IsTrue(tinkApp.ActiveUser.IsLoggedIn);
-            Assert.AreEqual(
-                10,
-                tinkApp.GetConnector(true).Query.GetBikesAsync().Result.Response.Count,
-                "Sum of bikes is 6 occupied plus 2 occupied.");
-            Assert.AreEqual(
-                2,
-                tinkApp.GetConnector(true).Query.GetBikesOccupiedAsync().Result.Response.Count,
-                "Javaminster occupies 2 bikes.");
-            Assert.AreEqual("6103_112e96b36ba33de245943c5ffaf369cd_oiF2kahH", tinkApp.GetConnector(true).Command.SessionCookie);
-        }
-    }
+			Assert.IsTrue(tinkApp.ActiveUser.IsLoggedIn);
+			Assert.AreEqual(
+				10,
+				tinkApp.GetConnector(true).Query.GetBikesAsync().Result.Response.Count,
+				"Sum of bikes is 6 occupied plus 2 occupied.");
+			Assert.AreEqual(
+				2,
+				tinkApp.GetConnector(true).Query.GetBikesOccupiedAsync().Result.Response.Count,
+				"Javaminster occupies 2 bikes.");
+			Assert.AreEqual("6103_112e96b36ba33de245943c5ffaf369cd_oiF2kahH", tinkApp.GetConnector(true).Command.SessionCookie);
+		}
+	}
 }
diff --git a/TestShareeLib/Model/TestWhatsNew.cs b/TestShareeLib/Model/TestWhatsNew.cs
index 82f95fe..3570408 100644
--- a/TestShareeLib/Model/TestWhatsNew.cs
+++ b/TestShareeLib/Model/TestWhatsNew.cs
@@ -8,181 +8,181 @@ using Xamarin.Essentials;
 
 namespace TestTINKLib.Fixtures.ObjectTests
 {
-    [TestFixture]
-    public class TestWhatsNew
-    {
-        [Test]
-        public void TestIsMessagesConsistent()
-        {
-            foreach (AppFlavor app in Enum.GetValues(typeof(AppFlavor)))
-            {
-                foreach (DevicePlatform platform in new List<DevicePlatform> { DevicePlatform.iOS, DevicePlatform.Android })
-                    Assert.That(
-                        () => new WhatsNew(
-                            WhatsNew.AllFlavorsAndPlatformMessages[WhatsNew.AllFlavorsAndPlatformMessages.Count - 1].Version,
-                            WhatsNew.AllFlavorsAndPlatformMessages[0].Version,
-                            WhatsNew.AllFlavorsAndPlatformMessages[0].Version,
-                            app,
-                            platform).WhatsNewText,
-                       Throws.Nothing,
-                       "Invalid entries detected.");
-            }
-        }
+	[TestFixture]
+	public class TestWhatsNew
+	{
+		[Test]
+		public void TestIsMessagesConsistent()
+		{
+			foreach (AppFlavor app in Enum.GetValues(typeof(AppFlavor)))
+			{
+				foreach (DevicePlatform platform in new List<DevicePlatform> { DevicePlatform.iOS, DevicePlatform.Android })
+					Assert.That(
+						() => new WhatsNew(
+							WhatsNew.AllFlavorsAndPlatformMessages[WhatsNew.AllFlavorsAndPlatformMessages.Count - 1].Version,
+							WhatsNew.AllFlavorsAndPlatformMessages[0].Version,
+							WhatsNew.AllFlavorsAndPlatformMessages[0].Version,
+							app,
+							platform).WhatsNewText,
+					   Throws.Nothing,
+					   "Invalid entries detected.");
+			}
+		}
 
-        [Test]
-        public void TestIsShowRequired_CleanInstall()
-        {
-            Assert.IsFalse(new WhatsNew(
-                new Version(2, 4), /* Current version */
-                null, // last version
-                null, /* Whats new was never shown */
-                AppFlavor.ShareeBike,
-                DevicePlatform.Android).IsShowRequired);
-        }
+		[Test]
+		public void TestIsShowRequired_CleanInstall()
+		{
+			Assert.IsFalse(new WhatsNew(
+				new Version(2, 4), /* Current version */
+				null, // last version
+				null, /* Whats new was never shown */
+				AppFlavor.ShareeBike,
+				DevicePlatform.Android).IsShowRequired);
+		}
 
-        /// <summary>
-        /// This test verified old implementedation which worked with the different versions to determine whenther whats new has to be shown or not.
-        /// Test updated to new implmentedation (based on filtering of AllFlavorsAndPlatformMessages)
-        /// </summary>
-        [Test]
-        public void TestIsShowRequired_Update_VersionWhichSupporsWhatsNew()
-        {
-            Assert.IsTrue(
-                new WhatsNew(
-                    new Version(3, 0, 335), /* Current version */
-                    new Version(3, 0, 333), /* last version */
-                    new Version(3, 0, 111),  /* Version when whats new was shown */
-                    AppFlavor.ShareeBike,
-                    DevicePlatform.Android).IsShowRequired,
-                "If whats new was last shonw for version 3.0.111 and current version is 2.0.335 info must be shown");
-        }
+		/// <summary>
+		/// This test verified old implementedation which worked with the different versions to determine whenther whats new has to be shown or not.
+		/// Test updated to new implmentedation (based on filtering of AllFlavorsAndPlatformMessages)
+		/// </summary>
+		[Test]
+		public void TestIsShowRequired_Update_VersionWhichSupporsWhatsNew()
+		{
+			Assert.IsTrue(
+				new WhatsNew(
+					new Version(3, 0, 335), /* Current version */
+					new Version(3, 0, 333), /* last version */
+					new Version(3, 0, 111),  /* Version when whats new was shown */
+					AppFlavor.ShareeBike,
+					DevicePlatform.Android).IsShowRequired,
+				"If whats new was last shonw for version 3.0.111 and current version is 2.0.335 info must be shown");
+		}
 
 
-        /// <summary>
-        /// This test verified old implementedation which worked with the different versions to determine whenther whats new has to be shown or not.
-        /// Test updated to new implmentedation (based on filtering of AllFlavorsAndPlatformMessages)
-        /// </summary>
-        [Test]
-        public void TestIsShowRequired_Update_VersionWithoutWhatsNew()
-        {
-            Assert.IsTrue(
-                new WhatsNew(
-                    new Version(3, 0, 335), /* Current version */
-                    new Version(3, 0, 333), /* last version */
-                    null,  /* Whats new was never shown */
-                    AppFlavor.ShareeBike,
-                    DevicePlatform.Android).IsShowRequired,
-                "If whats new was never shown but last version was 3.0.333 (not clean install) info must be shown");
-        }
+		/// <summary>
+		/// This test verified old implementedation which worked with the different versions to determine whenther whats new has to be shown or not.
+		/// Test updated to new implmentedation (based on filtering of AllFlavorsAndPlatformMessages)
+		/// </summary>
+		[Test]
+		public void TestIsShowRequired_Update_VersionWithoutWhatsNew()
+		{
+			Assert.IsTrue(
+				new WhatsNew(
+					new Version(3, 0, 335), /* Current version */
+					new Version(3, 0, 333), /* last version */
+					null,  /* Whats new was never shown */
+					AppFlavor.ShareeBike,
+					DevicePlatform.Android).IsShowRequired,
+				"If whats new was never shown but last version was 3.0.333 (not clean install) info must be shown");
+		}
 
-        [Test]
-        public void TestIsShowRequired_False()
-        {
-            Assert.IsFalse(
-                new WhatsNew(new Version(2, 5), new Version(2, 5), new Version(2, 5), AppFlavor.ShareeBike, DevicePlatform.Android).IsShowRequired,
-                "Whats new must never be presented twice.");
-        }
+		[Test]
+		public void TestIsShowRequired_False()
+		{
+			Assert.IsFalse(
+				new WhatsNew(new Version(2, 5), new Version(2, 5), new Version(2, 5), AppFlavor.ShareeBike, DevicePlatform.Android).IsShowRequired,
+				"Whats new must never be presented twice.");
+		}
 
-        [Test]
-        public void TestIsShowRequired_False_Errors()
-        {
-            Assert.IsFalse(new WhatsNew(null, new Version(2, 6), new Version(2, 5), AppFlavor.ShareeBike, DevicePlatform.Android).IsShowRequired);
-            Assert.IsFalse(new WhatsNew(new Version(2, 6), null, new Version(2, 5), AppFlavor.ShareeBike, DevicePlatform.Android).IsShowRequired);
-            Assert.IsFalse(new WhatsNew(null, null, new Version(2, 5), AppFlavor.ShareeBike, DevicePlatform.Android).IsShowRequired);
-        }
+		[Test]
+		public void TestIsShowRequired_False_Errors()
+		{
+			Assert.IsFalse(new WhatsNew(null, new Version(2, 6), new Version(2, 5), AppFlavor.ShareeBike, DevicePlatform.Android).IsShowRequired);
+			Assert.IsFalse(new WhatsNew(new Version(2, 6), null, new Version(2, 5), AppFlavor.ShareeBike, DevicePlatform.Android).IsShowRequired);
+			Assert.IsFalse(new WhatsNew(null, null, new Version(2, 5), AppFlavor.ShareeBike, DevicePlatform.Android).IsShowRequired);
+		}
 
-        [Test]
-        public void TestWhatsNewText_MajorUpdate()
-        {
-            Assert.AreEqual(
-                "<p><b>3.0.0.115</b><br/>Benutzeroberfläche verbessert.\r\n\r\n" +
-                "</p><p><b>3.0.120</b><br/>Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\nOfflineanzeige Stationen/ Räderinfo.\r\n\r\n</p>",
-                WhatsNewViewModel.GetWhatNextHtmlText(new WhatsNew(new Version(3, 0, 120), new Version(3, 0, 0, 114), new Version(3, 0, 0, 114), AppFlavor.ShareeBike, DevicePlatform.Android).WhatsNewText),
-                "Current version is 30.0.120, last whats new was shown in version 3.0.0.114: Two changes to be notified about.");
-        }
+		[Test]
+		public void TestWhatsNewText_MajorUpdate()
+		{
+			Assert.AreEqual(
+				"<p><b>3.0.0.115</b><br/>Benutzeroberfläche verbessert.\r\n\r\n" +
+				"</p><p><b>3.0.120</b><br/>Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\nOfflineanzeige Stationen/ Räderinfo.\r\n\r\n</p>",
+				WhatsNewViewModel.GetWhatNextHtmlText(new WhatsNew(new Version(3, 0, 120), new Version(3, 0, 0, 114), new Version(3, 0, 0, 114), AppFlavor.ShareeBike, DevicePlatform.Android).WhatsNewText),
+				"Current version is 30.0.120, last whats new was shown in version 3.0.0.114: Two changes to be notified about.");
+		}
 
-        [Test]
-        public void TestWhatsNewText_MinorUpdate()
-        {
-            Assert.AreEqual(
-                "<p><b>3.0.120</b><br/>Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\nOfflineanzeige Stationen/ Räderinfo.\r\n\r\n</p>",
-                WhatsNewViewModel.GetWhatNextHtmlText(new WhatsNew(new Version(3, 0, 120), new Version(3, 0, 0, 115), new Version(3, 0, 0, 115), AppFlavor.ShareeBike, DevicePlatform.Android).WhatsNewText));
-        }
+		[Test]
+		public void TestWhatsNewText_MinorUpdate()
+		{
+			Assert.AreEqual(
+				"<p><b>3.0.120</b><br/>Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\nOfflineanzeige Stationen/ Räderinfo.\r\n\r\n</p>",
+				WhatsNewViewModel.GetWhatNextHtmlText(new WhatsNew(new Version(3, 0, 120), new Version(3, 0, 0, 115), new Version(3, 0, 0, 115), AppFlavor.ShareeBike, DevicePlatform.Android).WhatsNewText));
+		}
 
-        [Test]
-        public void TestWhatsNewGetFileredMessages_GeneralMessage()
-        {
-            Assert.That(
-                 new WhatsNew(new Version(3, 0, 335), new Version(3, 0), new Version(3, 0), AppFlavor.ShareeBike, DevicePlatform.iOS, new WhatsNewMessages
-                    {
-                        {
-                            new Version(3, 0, 0, 115),
-                            "Benutzeroberfläche verbessert.\r\n\r\n"
-                        }
-                    }).WhatsNewText.Count(),
-                    Is.EqualTo(1));
-        }
+		[Test]
+		public void TestWhatsNewGetFileredMessages_GeneralMessage()
+		{
+			Assert.That(
+				 new WhatsNew(new Version(3, 0, 335), new Version(3, 0), new Version(3, 0), AppFlavor.ShareeBike, DevicePlatform.iOS, new WhatsNewMessages
+					{
+						{
+							new Version(3, 0, 0, 115),
+							"Benutzeroberfläche verbessert.\r\n\r\n"
+						}
+					}).WhatsNewText.Count(),
+					Is.EqualTo(1));
+		}
 
-        [Test]
-        public void TestWhatsNewGetFileredMessages_MeinKonradOnly_Included()
-        {
-            Assert.That(
-                 new WhatsNew(new Version(3, 0, 335), new Version(3, 0), new Version(3, 0), AppFlavor.MeinKonrad, DevicePlatform.iOS, new WhatsNewMessages
-                    {
-                        {
-                            new Version(3, 0, 0, 115),
-                            "Benutzeroberfläche verbessert.\r\n\r\n",
-                            new List<AppFlavor> {AppFlavor.MeinKonrad}
-                        }
-                    }).WhatsNewText.Count(),
-                    Is.EqualTo(1));
-        }
+		[Test]
+		public void TestWhatsNewGetFileredMessages_MeinKonradOnly_Included()
+		{
+			Assert.That(
+				 new WhatsNew(new Version(3, 0, 335), new Version(3, 0), new Version(3, 0), AppFlavor.MeinKonrad, DevicePlatform.iOS, new WhatsNewMessages
+					{
+						{
+							new Version(3, 0, 0, 115),
+							"Benutzeroberfläche verbessert.\r\n\r\n",
+							new List<AppFlavor> {AppFlavor.MeinKonrad}
+						}
+					}).WhatsNewText.Count(),
+					Is.EqualTo(1));
+		}
 
-        [Test]
-        public void TestWhatsNewGetFileredMessages_MeinKonradOnly_Excluded()
-        {
-            Assert.That(
-                 new WhatsNew(new Version(3, 0, 335), new Version(3, 0), new Version(3, 0), AppFlavor.ShareeBike, DevicePlatform.iOS, new WhatsNewMessages
-                    {
-                        {
-                            new Version(3, 0, 0, 115),
-                            "Benutzeroberfläche verbessert.\r\n\r\n",
-                            new List<AppFlavor> {AppFlavor.MeinKonrad}
-                        }
-                    }).WhatsNewText.Count(),
-                    Is.EqualTo(0));
-        }
+		[Test]
+		public void TestWhatsNewGetFileredMessages_MeinKonradOnly_Excluded()
+		{
+			Assert.That(
+				 new WhatsNew(new Version(3, 0, 335), new Version(3, 0), new Version(3, 0), AppFlavor.ShareeBike, DevicePlatform.iOS, new WhatsNewMessages
+					{
+						{
+							new Version(3, 0, 0, 115),
+							"Benutzeroberfläche verbessert.\r\n\r\n",
+							new List<AppFlavor> {AppFlavor.MeinKonrad}
+						}
+					}).WhatsNewText.Count(),
+					Is.EqualTo(0));
+		}
 
-        [Test]
-        public void TestWhatsNewGetFileredMessages_iOSOnly_Included()
-        {
-            Assert.That(
-                 new WhatsNew(new Version(3, 0, 335), new Version(3, 0), new Version(3, 0), AppFlavor.ShareeBike, DevicePlatform.iOS, new WhatsNewMessages
-                    {
-                        {
-                            new Version(3, 0, 0, 115),
-                            "Benutzeroberfläche verbessert.\r\n\r\n",
-                            null,
-                            new List<DevicePlatform> {DevicePlatform.iOS}
-                        }
-                    }).WhatsNewText.Count(),
-                    Is.EqualTo(1));
-        }
+		[Test]
+		public void TestWhatsNewGetFileredMessages_iOSOnly_Included()
+		{
+			Assert.That(
+				 new WhatsNew(new Version(3, 0, 335), new Version(3, 0), new Version(3, 0), AppFlavor.ShareeBike, DevicePlatform.iOS, new WhatsNewMessages
+					{
+						{
+							new Version(3, 0, 0, 115),
+							"Benutzeroberfläche verbessert.\r\n\r\n",
+							null,
+							new List<DevicePlatform> {DevicePlatform.iOS}
+						}
+					}).WhatsNewText.Count(),
+					Is.EqualTo(1));
+		}
 
-        [Test]
-        public void TestWhatsNewGetFileredMessages_iOSOnly_Exclued()
-        {
-            Assert.That(
-                 new WhatsNew(new Version(3, 0, 335), new Version(3, 0), new Version(3, 0), AppFlavor.ShareeBike, DevicePlatform.Android, new WhatsNewMessages
-                    {
-                        {
-                            new Version(3, 0, 0, 115),
-                            "Benutzeroberfläche verbessert.\r\n\r\n",
-                            null,
-                            new List<DevicePlatform> {DevicePlatform.iOS}
-                        }
-                    }).WhatsNewText.Count(),
-                    Is.EqualTo(0));
-        }
-    }
+		[Test]
+		public void TestWhatsNewGetFileredMessages_iOSOnly_Exclued()
+		{
+			Assert.That(
+				 new WhatsNew(new Version(3, 0, 335), new Version(3, 0), new Version(3, 0), AppFlavor.ShareeBike, DevicePlatform.Android, new WhatsNewMessages
+					{
+						{
+							new Version(3, 0, 0, 115),
+							"Benutzeroberfläche verbessert.\r\n\r\n",
+							null,
+							new List<DevicePlatform> {DevicePlatform.iOS}
+						}
+					}).WhatsNewText.Count(),
+					Is.EqualTo(0));
+		}
+	}
 }
diff --git a/TestShareeLib/Model/TestWhatsNewMessage.cs b/TestShareeLib/Model/TestWhatsNewMessage.cs
index ddcafca..2759334 100644
--- a/TestShareeLib/Model/TestWhatsNewMessage.cs
+++ b/TestShareeLib/Model/TestWhatsNewMessage.cs
@@ -8,445 +8,445 @@ using Xamarin.Essentials;
 
 namespace TestShareeLib.Model
 {
-    [TestFixture]
-    public class TestWhatsNewMessage
-    {
-        [Test]
-        public void TestAdd_Text()
-        {
-            Assert.That(
-                new WhatsNewMessages
-                {
-                    {
-                        new Version(3, 0, 115),
-                        "Whats new text."
-                    }
-                }[0].Message,
-            Is.EqualTo("Whats new text."));
-        }
+	[TestFixture]
+	public class TestWhatsNewMessage
+	{
+		[Test]
+		public void TestAdd_Text()
+		{
+			Assert.That(
+				new WhatsNewMessages
+				{
+					{
+						new Version(3, 0, 115),
+						"Whats new text."
+					}
+				}[0].Message,
+			Is.EqualTo("Whats new text."));
+		}
 
-        [Test]
-        public void TestAdd_Text_Null()
-        {
-            Assert.That(
-                new WhatsNewMessages
-                {
-                    {
-                        new Version(3, 0, 115),
-                        null
-                    }
-                }.Count,
-            Is.EqualTo(0));
-        }
+		[Test]
+		public void TestAdd_Text_Null()
+		{
+			Assert.That(
+				new WhatsNewMessages
+				{
+					{
+						new Version(3, 0, 115),
+						null
+					}
+				}.Count,
+			Is.EqualTo(0));
+		}
 
-        [Test]
-        public void Test_Add_Version()
-        {
-            Assert.That(
-                new WhatsNewMessages
-                {
-                    {
-                        new Version(3, 0, 115),
-                        "Whats new text."
-                    }
-                }[0].Version,
-            Is.EqualTo(new Version(3, 0, 115)));
-        }
+		[Test]
+		public void Test_Add_Version()
+		{
+			Assert.That(
+				new WhatsNewMessages
+				{
+					{
+						new Version(3, 0, 115),
+						"Whats new text."
+					}
+				}[0].Version,
+			Is.EqualTo(new Version(3, 0, 115)));
+		}
 
-        [Test]
-        public void Test_Add_Version_Null()
-        {
-            Assert.That(
-                new WhatsNewMessages
-                {
-                    {
-                        null,
-                        "Whats new text."
-                    }
-                }.Count,
-            Is.EqualTo(0));
-        }
-        [Test]
-        public void Test_Add_Flavors_GeneralEntry()
-        {
-            Assert.That(
-                new WhatsNewMessages
-                {
-                    {
-                        new Version(3, 0, 115),
-                        "Whats new text."
-                    }
-                }[0].Flavors.Count,
-            Is.EqualTo(0));
-        }
+		[Test]
+		public void Test_Add_Version_Null()
+		{
+			Assert.That(
+				new WhatsNewMessages
+				{
+					{
+						null,
+						"Whats new text."
+					}
+				}.Count,
+			Is.EqualTo(0));
+		}
+		[Test]
+		public void Test_Add_Flavors_GeneralEntry()
+		{
+			Assert.That(
+				new WhatsNewMessages
+				{
+					{
+						new Version(3, 0, 115),
+						"Whats new text."
+					}
+				}[0].Flavors.Count,
+			Is.EqualTo(0));
+		}
 
-        [Test]
-        public void Test_Add_Flavors_ShareeBike()
-        {
-            Assert.That(
-                new WhatsNewMessages
-                {
-                    {
-                        new Version(3, 0, 115),
-                        "Whats new text.",
-                        new List<AppFlavor> { AppFlavor.MeinKonrad }
-                    }
-                }[0].Flavors,
-            Is.EqualTo(new List<AppFlavor> { AppFlavor.MeinKonrad }));
-        }
+		[Test]
+		public void Test_Add_Flavors_ShareeBike()
+		{
+			Assert.That(
+				new WhatsNewMessages
+				{
+					{
+						new Version(3, 0, 115),
+						"Whats new text.",
+						new List<AppFlavor> { AppFlavor.MeinKonrad }
+					}
+				}[0].Flavors,
+			Is.EqualTo(new List<AppFlavor> { AppFlavor.MeinKonrad }));
+		}
 
-        [Test]
-        public void TestPlatforms_Add_Platform_GeneralEntry()
-        {
-            Assert.That(
-                new WhatsNewMessages
-                {
-                    {
-                        new Version(3, 0, 115),
-                        "Whats new text."
-                    }
-                }[0].Platforms.Count,
-            Is.EqualTo(0));
-        }
+		[Test]
+		public void TestPlatforms_Add_Platform_GeneralEntry()
+		{
+			Assert.That(
+				new WhatsNewMessages
+				{
+					{
+						new Version(3, 0, 115),
+						"Whats new text."
+					}
+				}[0].Platforms.Count,
+			Is.EqualTo(0));
+		}
 
-        [Test]
-        public void TestPlatforms_Add_Platform_IOs()
-        {
-            Assert.That(
-                new WhatsNewMessages
-                {
-                    {
-                        new Version(3, 0, 115),
-                        "Whats new text.",
-                        null,
-                        new List<DevicePlatform> { DevicePlatform.iOS }
-                    }
-                }[0].Platforms,
-            Is.EqualTo(new List<DevicePlatform> { DevicePlatform.iOS }));
-        }
+		[Test]
+		public void TestPlatforms_Add_Platform_IOs()
+		{
+			Assert.That(
+				new WhatsNewMessages
+				{
+					{
+						new Version(3, 0, 115),
+						"Whats new text.",
+						null,
+						new List<DevicePlatform> { DevicePlatform.iOS }
+					}
+				}[0].Platforms,
+			Is.EqualTo(new List<DevicePlatform> { DevicePlatform.iOS }));
+		}
 
-        [Test]
-        public void TestWhatsNewText_MajorUpdate_Lastenradbayern_iOS()
-        {
-            var whatsNew = new WhatsNew(new Version(3, 0, 120),
-                        new Version(3, 0, 0, 114),
-                        new Version(3, 0, 0, 114),
-                        AppFlavor.LastenradBayern,
-                        DevicePlatform.iOS,
-                        new WhatsNewMessages {
-                            {
-                                new Version(3, 0, 0, 113),
-                                "3.0.0.113 verbessert.\r\n\r\n"
-                            },
-                            {
-                                new Version(3, 0, 0, 115),
-                                "Benutzeroberfläche verbessert.\r\n\r\n"
-                            },
-                            {
-                                new Version(3, 0, 0, 116),
-                                "sharee.bike und Lastenrad Bayern verbessert unter iOS und Android.\r\n\r\n",
-                                new List<AppFlavor> {AppFlavor.ShareeBike, AppFlavor.LastenradBayern}
-                            },
-                            {
-                                new Version(3, 0, 0, 117),
-                                "iOS Implementierungen verbessert.\r\n\r\n",
-                                null,
-                                new List<DevicePlatform> { DevicePlatform.iOS }
-                            },
-                            {
-                                new Version(3, 0, 0, 118),
-                                "iOS version Lastenrad Bayern verbessert.\r\n\r\n",
-                                new List<AppFlavor> { AppFlavor.LastenradBayern },
-                                new List<DevicePlatform> { DevicePlatform.iOS }
-                            },
-                            {
-                                new Version(3, 0, 0, 119),
-                                "In Mein konrad unter Droid in 119 was anderes als unter iOS gemacht.\r\n\r\n",
-                                new List<AppFlavor> { AppFlavor.MeinKonrad },
-                                new List<DevicePlatform> { DevicePlatform.Android }
-                            },
-                            {
-                                new Version(3, 0, 0, 119),
-                                "In Mein konrad unter iOS in 119 was anderes als unter Droid gemacht.\r\n\r\n",
-                                new List<AppFlavor> { AppFlavor.MeinKonrad },
-                                new List<DevicePlatform> { DevicePlatform.iOS }
-                            },
+		[Test]
+		public void TestWhatsNewText_MajorUpdate_Lastenradbayern_iOS()
+		{
+			var whatsNew = new WhatsNew(new Version(3, 0, 120),
+						new Version(3, 0, 0, 114),
+						new Version(3, 0, 0, 114),
+						AppFlavor.LastenradBayern,
+						DevicePlatform.iOS,
+						new WhatsNewMessages {
+							{
+								new Version(3, 0, 0, 113),
+								"3.0.0.113 verbessert.\r\n\r\n"
+							},
+							{
+								new Version(3, 0, 0, 115),
+								"Benutzeroberfläche verbessert.\r\n\r\n"
+							},
+							{
+								new Version(3, 0, 0, 116),
+								"sharee.bike und Lastenrad Bayern verbessert unter iOS und Android.\r\n\r\n",
+								new List<AppFlavor> {AppFlavor.ShareeBike, AppFlavor.LastenradBayern}
+							},
+							{
+								new Version(3, 0, 0, 117),
+								"iOS Implementierungen verbessert.\r\n\r\n",
+								null,
+								new List<DevicePlatform> { DevicePlatform.iOS }
+							},
+							{
+								new Version(3, 0, 0, 118),
+								"iOS version Lastenrad Bayern verbessert.\r\n\r\n",
+								new List<AppFlavor> { AppFlavor.LastenradBayern },
+								new List<DevicePlatform> { DevicePlatform.iOS }
+							},
+							{
+								new Version(3, 0, 0, 119),
+								"In Mein konrad unter Droid in 119 was anderes als unter iOS gemacht.\r\n\r\n",
+								new List<AppFlavor> { AppFlavor.MeinKonrad },
+								new List<DevicePlatform> { DevicePlatform.Android }
+							},
+							{
+								new Version(3, 0, 0, 119),
+								"In Mein konrad unter iOS in 119 was anderes als unter Droid gemacht.\r\n\r\n",
+								new List<AppFlavor> { AppFlavor.MeinKonrad },
+								new List<DevicePlatform> { DevicePlatform.iOS }
+							},
 
-                            {
-                            new Version(3, 0, 120),
-                                "Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\n" +
-                                    "Offlineanzeige Stationen/ Räderinfo.\r\n\r\n"
-                            },
-                            {
-                            new Version(3, 0, 121),
-                                "3.0.121 verbessert.\r\n\r\n"
-                            }
-                        });
+							{
+							new Version(3, 0, 120),
+								"Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\n" +
+									"Offlineanzeige Stationen/ Räderinfo.\r\n\r\n"
+							},
+							{
+							new Version(3, 0, 121),
+								"3.0.121 verbessert.\r\n\r\n"
+							}
+						});
 
-            Assert.AreEqual(
-                "<p><b>3.0.0.115</b><br/>Benutzeroberfläche verbessert.\r\n\r\n</p>" +
-                "<p><b>3.0.0.116</b><br/>sharee.bike und Lastenrad Bayern verbessert unter iOS und Android.\r\n\r\n</p>" +
-                "<p><b>3.0.0.117</b><br/>iOS Implementierungen verbessert.\r\n\r\n</p>" +
-                "<p><b>3.0.0.118</b><br/>iOS version Lastenrad Bayern verbessert.\r\n\r\n</p>" +
-                "<p><b>3.0.120</b><br/>Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\nOfflineanzeige Stationen/ Räderinfo.\r\n\r\n</p>",
-                WhatsNewViewModel.GetWhatNextHtmlText(whatsNew.WhatsNewText));
-        }
+			Assert.AreEqual(
+				"<p><b>3.0.0.115</b><br/>Benutzeroberfläche verbessert.\r\n\r\n</p>" +
+				"<p><b>3.0.0.116</b><br/>sharee.bike und Lastenrad Bayern verbessert unter iOS und Android.\r\n\r\n</p>" +
+				"<p><b>3.0.0.117</b><br/>iOS Implementierungen verbessert.\r\n\r\n</p>" +
+				"<p><b>3.0.0.118</b><br/>iOS version Lastenrad Bayern verbessert.\r\n\r\n</p>" +
+				"<p><b>3.0.120</b><br/>Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\nOfflineanzeige Stationen/ Räderinfo.\r\n\r\n</p>",
+				WhatsNewViewModel.GetWhatNextHtmlText(whatsNew.WhatsNewText));
+		}
 
-        [Test]
-        public void TestWhatsNewText_MajorUpdate_ShareeBike_iOS()
-        {
-            var whatsNew = new WhatsNew(new Version(3, 0, 120),
-                        new Version(3, 0, 0, 114),
-                        new Version(3, 0, 0, 114),
-                        AppFlavor.ShareeBike,
-                        DevicePlatform.iOS,
-                        new WhatsNewMessages {
-                            {
-                                new Version(3, 0, 0, 113),
-                                "3.0.0.113 verbessert.\r\n\r\n"
-                            },
-                            {
-                                new Version(3, 0, 0, 115),
-                                "Benutzeroberfläche verbessert.\r\n\r\n"
-                            },
-                            {
-                                new Version(3, 0, 0, 116),
-                                "sharee.bike und Lastenrad Bayern verbessert unter iOS und Android.\r\n\r\n",
-                                new List<AppFlavor> {AppFlavor.ShareeBike, AppFlavor.LastenradBayern}
-                            },
-                            {
-                                new Version(3, 0, 0, 117),
-                                "iOS Implementierungen verbessert.\r\n\r\n",
-                                null,
-                                new List<DevicePlatform> { DevicePlatform.iOS }
-                            },
-                            {
-                                new Version(3, 0, 0, 118),
-                                "iOS version Lastenrad Bayern verbessert.\r\n\r\n",
-                                new List<AppFlavor> { AppFlavor.LastenradBayern },
-                                new List<DevicePlatform> { DevicePlatform.iOS }
-                            },
-                            {
-                                new Version(3, 0, 0, 119),
-                                "In Mein konrad unter Droid in 119 was anderes als unter iOS gemacht.\r\n\r\n",
-                                new List<AppFlavor> { AppFlavor.MeinKonrad },
-                                new List<DevicePlatform> { DevicePlatform.Android }
-                            },
-                            {
-                                new Version(3, 0, 0, 119),
-                                "In Mein konrad unter iOS in 119 was anderes als unter Droid gemacht.\r\n\r\n",
-                                new List<AppFlavor> { AppFlavor.MeinKonrad },
-                                new List<DevicePlatform> { DevicePlatform.iOS }
-                            },
+		[Test]
+		public void TestWhatsNewText_MajorUpdate_ShareeBike_iOS()
+		{
+			var whatsNew = new WhatsNew(new Version(3, 0, 120),
+						new Version(3, 0, 0, 114),
+						new Version(3, 0, 0, 114),
+						AppFlavor.ShareeBike,
+						DevicePlatform.iOS,
+						new WhatsNewMessages {
+							{
+								new Version(3, 0, 0, 113),
+								"3.0.0.113 verbessert.\r\n\r\n"
+							},
+							{
+								new Version(3, 0, 0, 115),
+								"Benutzeroberfläche verbessert.\r\n\r\n"
+							},
+							{
+								new Version(3, 0, 0, 116),
+								"sharee.bike und Lastenrad Bayern verbessert unter iOS und Android.\r\n\r\n",
+								new List<AppFlavor> {AppFlavor.ShareeBike, AppFlavor.LastenradBayern}
+							},
+							{
+								new Version(3, 0, 0, 117),
+								"iOS Implementierungen verbessert.\r\n\r\n",
+								null,
+								new List<DevicePlatform> { DevicePlatform.iOS }
+							},
+							{
+								new Version(3, 0, 0, 118),
+								"iOS version Lastenrad Bayern verbessert.\r\n\r\n",
+								new List<AppFlavor> { AppFlavor.LastenradBayern },
+								new List<DevicePlatform> { DevicePlatform.iOS }
+							},
+							{
+								new Version(3, 0, 0, 119),
+								"In Mein konrad unter Droid in 119 was anderes als unter iOS gemacht.\r\n\r\n",
+								new List<AppFlavor> { AppFlavor.MeinKonrad },
+								new List<DevicePlatform> { DevicePlatform.Android }
+							},
+							{
+								new Version(3, 0, 0, 119),
+								"In Mein konrad unter iOS in 119 was anderes als unter Droid gemacht.\r\n\r\n",
+								new List<AppFlavor> { AppFlavor.MeinKonrad },
+								new List<DevicePlatform> { DevicePlatform.iOS }
+							},
 
-                            {
-                            new Version(3, 0, 120),
-                                "Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\n" +
-                                    "Offlineanzeige Stationen/ Räderinfo.\r\n\r\n"
-                            },
-                            {
-                            new Version(3, 0, 121),
-                                "3.0.121 verbessert.\r\n\r\n"
-                            }
-                        });
+							{
+							new Version(3, 0, 120),
+								"Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\n" +
+									"Offlineanzeige Stationen/ Räderinfo.\r\n\r\n"
+							},
+							{
+							new Version(3, 0, 121),
+								"3.0.121 verbessert.\r\n\r\n"
+							}
+						});
 
-            Assert.AreEqual(
-                "<p><b>3.0.0.115</b><br/>Benutzeroberfläche verbessert.\r\n\r\n</p>" +
-                "<p><b>3.0.0.116</b><br/>sharee.bike und Lastenrad Bayern verbessert unter iOS und Android.\r\n\r\n</p>" +
-                "<p><b>3.0.0.117</b><br/>iOS Implementierungen verbessert.\r\n\r\n</p>" +
-                "<p><b>3.0.120</b><br/>Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\nOfflineanzeige Stationen/ Räderinfo.\r\n\r\n</p>",
-                WhatsNewViewModel.GetWhatNextHtmlText(whatsNew.WhatsNewText));
-        }
+			Assert.AreEqual(
+				"<p><b>3.0.0.115</b><br/>Benutzeroberfläche verbessert.\r\n\r\n</p>" +
+				"<p><b>3.0.0.116</b><br/>sharee.bike und Lastenrad Bayern verbessert unter iOS und Android.\r\n\r\n</p>" +
+				"<p><b>3.0.0.117</b><br/>iOS Implementierungen verbessert.\r\n\r\n</p>" +
+				"<p><b>3.0.120</b><br/>Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\nOfflineanzeige Stationen/ Räderinfo.\r\n\r\n</p>",
+				WhatsNewViewModel.GetWhatNextHtmlText(whatsNew.WhatsNewText));
+		}
 
-        [Test]
-        public void TestWhatsNewText_MajorUpdate_ShareeBike_Android()
-        {
-            var whatsNew = new WhatsNew(new Version(3, 0, 120),
-                        new Version(3, 0, 0, 114),
-                        new Version(3, 0, 0, 114),
-                        AppFlavor.ShareeBike,
-                        DevicePlatform.Android,
-                        new WhatsNewMessages {
-                            {
-                                new Version(3, 0, 0, 113),
-                                "3.0.0.113 verbessert.\r\n\r\n"
-                            },
-                            {
-                                new Version(3, 0, 0, 115),
-                                "Benutzeroberfläche verbessert.\r\n\r\n"
-                            },
-                            {
-                                new Version(3, 0, 0, 116),
-                                "sharee.bike und Lastenrad Bayern verbessert unter iOS und Android.\r\n\r\n",
-                                new List<AppFlavor> {AppFlavor.ShareeBike, AppFlavor.LastenradBayern}
-                            },
-                            {
-                                new Version(3, 0, 0, 117),
-                                "iOS Implementierungen verbessert.\r\n\r\n",
-                                null,
-                                new List<DevicePlatform> { DevicePlatform.iOS }
-                            },
-                            {
-                                new Version(3, 0, 0, 118),
-                                "iOS version Lastenrad Bayern verbessert.\r\n\r\n",
-                                new List<AppFlavor> { AppFlavor.LastenradBayern },
-                                new List<DevicePlatform> { DevicePlatform.iOS }
-                            },
-                            {
-                                new Version(3, 0, 0, 119),
-                                "In Mein konrad unter Droid in 119 was anderes als unter iOS gemacht.\r\n\r\n",
-                                new List<AppFlavor> { AppFlavor.MeinKonrad },
-                                new List<DevicePlatform> { DevicePlatform.Android }
-                            },
-                            {
-                                new Version(3, 0, 0, 119),
-                                "In Mein konrad unter iOS in 119 was anderes als unter Droid gemacht.\r\n\r\n",
-                                new List<AppFlavor> { AppFlavor.MeinKonrad },
-                                new List<DevicePlatform> { DevicePlatform.iOS }
-                            },
-                            {
-                            new Version(3, 0, 120),
-                                "Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\n" +
-                                    "Offlineanzeige Stationen/ Räderinfo.\r\n\r\n"
-                            },
-                            {
-                            new Version(3, 0, 121),
-                                "3.0.121 verbessert.\r\n\r\n"
-                            }
-                        });
+		[Test]
+		public void TestWhatsNewText_MajorUpdate_ShareeBike_Android()
+		{
+			var whatsNew = new WhatsNew(new Version(3, 0, 120),
+						new Version(3, 0, 0, 114),
+						new Version(3, 0, 0, 114),
+						AppFlavor.ShareeBike,
+						DevicePlatform.Android,
+						new WhatsNewMessages {
+							{
+								new Version(3, 0, 0, 113),
+								"3.0.0.113 verbessert.\r\n\r\n"
+							},
+							{
+								new Version(3, 0, 0, 115),
+								"Benutzeroberfläche verbessert.\r\n\r\n"
+							},
+							{
+								new Version(3, 0, 0, 116),
+								"sharee.bike und Lastenrad Bayern verbessert unter iOS und Android.\r\n\r\n",
+								new List<AppFlavor> {AppFlavor.ShareeBike, AppFlavor.LastenradBayern}
+							},
+							{
+								new Version(3, 0, 0, 117),
+								"iOS Implementierungen verbessert.\r\n\r\n",
+								null,
+								new List<DevicePlatform> { DevicePlatform.iOS }
+							},
+							{
+								new Version(3, 0, 0, 118),
+								"iOS version Lastenrad Bayern verbessert.\r\n\r\n",
+								new List<AppFlavor> { AppFlavor.LastenradBayern },
+								new List<DevicePlatform> { DevicePlatform.iOS }
+							},
+							{
+								new Version(3, 0, 0, 119),
+								"In Mein konrad unter Droid in 119 was anderes als unter iOS gemacht.\r\n\r\n",
+								new List<AppFlavor> { AppFlavor.MeinKonrad },
+								new List<DevicePlatform> { DevicePlatform.Android }
+							},
+							{
+								new Version(3, 0, 0, 119),
+								"In Mein konrad unter iOS in 119 was anderes als unter Droid gemacht.\r\n\r\n",
+								new List<AppFlavor> { AppFlavor.MeinKonrad },
+								new List<DevicePlatform> { DevicePlatform.iOS }
+							},
+							{
+							new Version(3, 0, 120),
+								"Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\n" +
+									"Offlineanzeige Stationen/ Räderinfo.\r\n\r\n"
+							},
+							{
+							new Version(3, 0, 121),
+								"3.0.121 verbessert.\r\n\r\n"
+							}
+						});
 
-            Assert.AreEqual(
-                "<p><b>3.0.0.115</b><br/>Benutzeroberfläche verbessert.\r\n\r\n</p>" +
-                "<p><b>3.0.0.116</b><br/>sharee.bike und Lastenrad Bayern verbessert unter iOS und Android.\r\n\r\n</p>" +
-                "<p><b>3.0.120</b><br/>Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\nOfflineanzeige Stationen/ Räderinfo.\r\n\r\n</p>",
-                WhatsNewViewModel.GetWhatNextHtmlText(whatsNew.WhatsNewText));
-        }
+			Assert.AreEqual(
+				"<p><b>3.0.0.115</b><br/>Benutzeroberfläche verbessert.\r\n\r\n</p>" +
+				"<p><b>3.0.0.116</b><br/>sharee.bike und Lastenrad Bayern verbessert unter iOS und Android.\r\n\r\n</p>" +
+				"<p><b>3.0.120</b><br/>Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\nOfflineanzeige Stationen/ Räderinfo.\r\n\r\n</p>",
+				WhatsNewViewModel.GetWhatNextHtmlText(whatsNew.WhatsNewText));
+		}
 
-        [Test]
-        public void TestWhatsNewText_MajorUpdate_Meinkonrad_Android()
-        {
-            var whatsNew = new WhatsNew(new Version(3, 0, 120),
-                        new Version(3, 0, 0, 114),
-                        new Version(3, 0, 0, 114),
-                        AppFlavor.MeinKonrad,
-                        DevicePlatform.Android,
-                        new WhatsNewMessages {
-                            {
-                                new Version(3, 0, 0, 113),
-                                "3.0.0.113 verbessert.\r\n\r\n"
-                            },
-                            {
-                                new Version(3, 0, 0, 115),
-                                "Benutzeroberfläche verbessert.\r\n\r\n"
-                            },
-                            {
-                                new Version(3, 0, 0, 116),
-                                "sharee.bike und Lastenrad Bayern verbessert unter iOS und Android.\r\n\r\n",
-                                new List<AppFlavor> {AppFlavor.ShareeBike, AppFlavor.LastenradBayern}
-                            },
-                            {
-                                new Version(3, 0, 0, 117),
-                                "iOS Implementierungen verbessert.\r\n\r\n",
-                                null,
-                                new List<DevicePlatform> { DevicePlatform.iOS }
-                            },
-                            {
-                                new Version(3, 0, 0, 118),
-                                "iOS version Lastenrad Bayern verbessert.\r\n\r\n",
-                                new List<AppFlavor> { AppFlavor.LastenradBayern },
-                                new List<DevicePlatform> { DevicePlatform.iOS }
-                            },
-                            {
-                                new Version(3, 0, 0, 119),
-                                "In Mein konrad unter Droid in 119 was anderes als unter iOS gemacht.\r\n\r\n",
-                                new List<AppFlavor> { AppFlavor.MeinKonrad },
-                                new List<DevicePlatform> { DevicePlatform.Android }
-                            },
-                            {
-                                new Version(3, 0, 0, 119),
-                                "In Mein konrad unter iOS in 119 was anderes als unter Droid gemacht.\r\n\r\n",
-                                new List<AppFlavor> { AppFlavor.MeinKonrad },
-                                new List<DevicePlatform> { DevicePlatform.iOS }
-                            },
-                            {
-                            new Version(3, 0, 120),
-                                "Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\n" +
-                                    "Offlineanzeige Stationen/ Räderinfo.\r\n\r\n"
-                            },
-                            {
-                            new Version(3, 0, 121),
-                                "3.0.121 verbessert.\r\n\r\n"
-                            }                        });
+		[Test]
+		public void TestWhatsNewText_MajorUpdate_Meinkonrad_Android()
+		{
+			var whatsNew = new WhatsNew(new Version(3, 0, 120),
+						new Version(3, 0, 0, 114),
+						new Version(3, 0, 0, 114),
+						AppFlavor.MeinKonrad,
+						DevicePlatform.Android,
+						new WhatsNewMessages {
+							{
+								new Version(3, 0, 0, 113),
+								"3.0.0.113 verbessert.\r\n\r\n"
+							},
+							{
+								new Version(3, 0, 0, 115),
+								"Benutzeroberfläche verbessert.\r\n\r\n"
+							},
+							{
+								new Version(3, 0, 0, 116),
+								"sharee.bike und Lastenrad Bayern verbessert unter iOS und Android.\r\n\r\n",
+								new List<AppFlavor> {AppFlavor.ShareeBike, AppFlavor.LastenradBayern}
+							},
+							{
+								new Version(3, 0, 0, 117),
+								"iOS Implementierungen verbessert.\r\n\r\n",
+								null,
+								new List<DevicePlatform> { DevicePlatform.iOS }
+							},
+							{
+								new Version(3, 0, 0, 118),
+								"iOS version Lastenrad Bayern verbessert.\r\n\r\n",
+								new List<AppFlavor> { AppFlavor.LastenradBayern },
+								new List<DevicePlatform> { DevicePlatform.iOS }
+							},
+							{
+								new Version(3, 0, 0, 119),
+								"In Mein konrad unter Droid in 119 was anderes als unter iOS gemacht.\r\n\r\n",
+								new List<AppFlavor> { AppFlavor.MeinKonrad },
+								new List<DevicePlatform> { DevicePlatform.Android }
+							},
+							{
+								new Version(3, 0, 0, 119),
+								"In Mein konrad unter iOS in 119 was anderes als unter Droid gemacht.\r\n\r\n",
+								new List<AppFlavor> { AppFlavor.MeinKonrad },
+								new List<DevicePlatform> { DevicePlatform.iOS }
+							},
+							{
+							new Version(3, 0, 120),
+								"Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\n" +
+									"Offlineanzeige Stationen/ Räderinfo.\r\n\r\n"
+							},
+							{
+							new Version(3, 0, 121),
+								"3.0.121 verbessert.\r\n\r\n"
+							}                        });
 
-            Assert.AreEqual(
-                "<p><b>3.0.0.115</b><br/>Benutzeroberfläche verbessert.\r\n\r\n</p>" +
-                "<p><b>3.0.0.119</b><br/>In Mein konrad unter Droid in 119 was anderes als unter iOS gemacht.\r\n\r\n</p>" +
-                "<p><b>3.0.120</b><br/>Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\nOfflineanzeige Stationen/ Räderinfo.\r\n\r\n</p>",
-                WhatsNewViewModel.GetWhatNextHtmlText(whatsNew.WhatsNewText));
-        }
+			Assert.AreEqual(
+				"<p><b>3.0.0.115</b><br/>Benutzeroberfläche verbessert.\r\n\r\n</p>" +
+				"<p><b>3.0.0.119</b><br/>In Mein konrad unter Droid in 119 was anderes als unter iOS gemacht.\r\n\r\n</p>" +
+				"<p><b>3.0.120</b><br/>Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\nOfflineanzeige Stationen/ Räderinfo.\r\n\r\n</p>",
+				WhatsNewViewModel.GetWhatNextHtmlText(whatsNew.WhatsNewText));
+		}
 
-        [Test]
-        public void TestWhatsNewText_MajorUpdate_Meinkonrad_iOS()
-        {
-            var whatsNew = new WhatsNew(new Version(3, 0, 120),
-                        new Version(3, 0, 0, 114),
-                        new Version(3, 0, 0, 114),
-                        AppFlavor.MeinKonrad,
-                        DevicePlatform.iOS,
-                        new WhatsNewMessages {
-                            {
-                                new Version(3, 0, 0, 113),
-                                "3.0.0.113 verbessert.\r\n\r\n"
-                            },
-                            {
-                                new Version(3, 0, 0, 115),
-                                "Benutzeroberfläche verbessert.\r\n\r\n"
-                            },
-                            {
-                                new Version(3, 0, 0, 116),
-                                "sharee.bike und Lastenrad Bayern verbessert unter iOS und Android.\r\n\r\n",
-                                new List<AppFlavor> {AppFlavor.ShareeBike, AppFlavor.LastenradBayern}
-                            },
-                            {
-                                new Version(3, 0, 0, 117),
-                                "iOS Implementierungen verbessert.\r\n\r\n",
-                                null,
-                                new List<DevicePlatform> { DevicePlatform.iOS }
-                            },
-                            {
-                                new Version(3, 0, 0, 118),
-                                "iOS version Lastenrad Bayern verbessert.\r\n\r\n",
-                                new List<AppFlavor> { AppFlavor.LastenradBayern },
-                                new List<DevicePlatform> { DevicePlatform.iOS }
-                            },
-                            {
-                                new Version(3, 0, 0, 119),
-                                "In Mein konrad unter Droid in 119 was anderes als unter iOS gemacht.\r\n\r\n",
-                                new List<AppFlavor> { AppFlavor.MeinKonrad },
-                                new List<DevicePlatform> { DevicePlatform.Android }
-                            },
-                            {
-                                new Version(3, 0, 0, 119),
-                                "In Mein konrad unter iOS in 119 was anderes als unter Droid gemacht.\r\n\r\n",
-                                new List<AppFlavor> { AppFlavor.MeinKonrad },
-                                new List<DevicePlatform> { DevicePlatform.iOS }
-                            },
-                            {
-                            new Version(3, 0, 120),
-                                "Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\n" +
-                                    "Offlineanzeige Stationen/ Räderinfo.\r\n\r\n"
-                            },
-                            {
-                            new Version(3, 0, 121),
-                                "3.0.121 verbessert.\r\n\r\n"
-                            }                        });
+		[Test]
+		public void TestWhatsNewText_MajorUpdate_Meinkonrad_iOS()
+		{
+			var whatsNew = new WhatsNew(new Version(3, 0, 120),
+						new Version(3, 0, 0, 114),
+						new Version(3, 0, 0, 114),
+						AppFlavor.MeinKonrad,
+						DevicePlatform.iOS,
+						new WhatsNewMessages {
+							{
+								new Version(3, 0, 0, 113),
+								"3.0.0.113 verbessert.\r\n\r\n"
+							},
+							{
+								new Version(3, 0, 0, 115),
+								"Benutzeroberfläche verbessert.\r\n\r\n"
+							},
+							{
+								new Version(3, 0, 0, 116),
+								"sharee.bike und Lastenrad Bayern verbessert unter iOS und Android.\r\n\r\n",
+								new List<AppFlavor> {AppFlavor.ShareeBike, AppFlavor.LastenradBayern}
+							},
+							{
+								new Version(3, 0, 0, 117),
+								"iOS Implementierungen verbessert.\r\n\r\n",
+								null,
+								new List<DevicePlatform> { DevicePlatform.iOS }
+							},
+							{
+								new Version(3, 0, 0, 118),
+								"iOS version Lastenrad Bayern verbessert.\r\n\r\n",
+								new List<AppFlavor> { AppFlavor.LastenradBayern },
+								new List<DevicePlatform> { DevicePlatform.iOS }
+							},
+							{
+								new Version(3, 0, 0, 119),
+								"In Mein konrad unter Droid in 119 was anderes als unter iOS gemacht.\r\n\r\n",
+								new List<AppFlavor> { AppFlavor.MeinKonrad },
+								new List<DevicePlatform> { DevicePlatform.Android }
+							},
+							{
+								new Version(3, 0, 0, 119),
+								"In Mein konrad unter iOS in 119 was anderes als unter Droid gemacht.\r\n\r\n",
+								new List<AppFlavor> { AppFlavor.MeinKonrad },
+								new List<DevicePlatform> { DevicePlatform.iOS }
+							},
+							{
+							new Version(3, 0, 120),
+								"Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\n" +
+									"Offlineanzeige Stationen/ Räderinfo.\r\n\r\n"
+							},
+							{
+							new Version(3, 0, 121),
+								"3.0.121 verbessert.\r\n\r\n"
+							}                        });
 
-            Assert.AreEqual(
-                "<p><b>3.0.0.115</b><br/>Benutzeroberfläche verbessert.\r\n\r\n</p>" +
-                "<p><b>3.0.0.117</b><br/>iOS Implementierungen verbessert.\r\n\r\n</p>" +
-                "<p><b>3.0.0.119</b><br/>In Mein konrad unter iOS in 119 was anderes als unter Droid gemacht.\r\n\r\n</p>" +
-                "<p><b>3.0.120</b><br/>Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\nOfflineanzeige Stationen/ Räderinfo.\r\n\r\n</p>",
-                WhatsNewViewModel.GetWhatNextHtmlText(whatsNew.WhatsNewText));
-        }
-    }
+			Assert.AreEqual(
+				"<p><b>3.0.0.115</b><br/>Benutzeroberfläche verbessert.\r\n\r\n</p>" +
+				"<p><b>3.0.0.117</b><br/>iOS Implementierungen verbessert.\r\n\r\n</p>" +
+				"<p><b>3.0.0.119</b><br/>In Mein konrad unter iOS in 119 was anderes als unter Droid gemacht.\r\n\r\n</p>" +
+				"<p><b>3.0.120</b><br/>Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\nOfflineanzeige Stationen/ Räderinfo.\r\n\r\n</p>",
+				WhatsNewViewModel.GetWhatNextHtmlText(whatsNew.WhatsNewText));
+		}
+	}
 }
diff --git a/TestShareeLib/Repository/Request/TestQueryBuilderHelper.cs b/TestShareeLib/Repository/Request/TestQueryBuilderHelper.cs
index 446c913..1ff41c0 100644
--- a/TestShareeLib/Repository/Request/TestQueryBuilderHelper.cs
+++ b/TestShareeLib/Repository/Request/TestQueryBuilderHelper.cs
@@ -3,43 +3,43 @@ using TINK.Repository.Request;
 
 namespace TestShareeLib.Repository.Request
 {
-    [TestFixture]
-    public class TestQueryBuilderHelper
-    {
-        [Test]
-        public void TestGetSessionIdQueryElement()
-            => Assert.That(
-                QueryBuilderHelper.GetSessionIdQueryElement("?", "123", "456"),
-                Is.EqualTo("?sessionid=456123"));
+	[TestFixture]
+	public class TestQueryBuilderHelper
+	{
+		[Test]
+		public void TestGetSessionIdQueryElement()
+			=> Assert.That(
+				QueryBuilderHelper.GetSessionIdQueryElement("?", "123", "456"),
+				Is.EqualTo("?sessionid=456123"));
 
-        [Test]
-        public void TestGetSessionIdQueryElementMerchantNull()
-            => Assert.That(
-                QueryBuilderHelper.GetSessionIdQueryElement("?", null, "456"),
-                Is.EqualTo("?sessionid=456"));
+		[Test]
+		public void TestGetSessionIdQueryElementMerchantNull()
+			=> Assert.That(
+				QueryBuilderHelper.GetSessionIdQueryElement("?", null, "456"),
+				Is.EqualTo("?sessionid=456"));
 
-        [Test]
-        public void TestGetSessionIdQueryElementSessionCookieNull()
-            => Assert.That(
-                QueryBuilderHelper.GetSessionIdQueryElement("?", "123", null),
-                Is.EqualTo("?sessionid=123"));
+		[Test]
+		public void TestGetSessionIdQueryElementSessionCookieNull()
+			=> Assert.That(
+				QueryBuilderHelper.GetSessionIdQueryElement("?", "123", null),
+				Is.EqualTo("?sessionid=123"));
 
-        [Test]
-        public void TestGetSessionIdQueryElementNull()
-            => Assert.That(
-                QueryBuilderHelper.GetSessionIdQueryElement("?", null),
-                Is.EqualTo(""));
+		[Test]
+		public void TestGetSessionIdQueryElementNull()
+			=> Assert.That(
+				QueryBuilderHelper.GetSessionIdQueryElement("?", null),
+				Is.EqualTo(""));
 
-        [Test]
-        public void TestGetLanguageQueryElement()
-        => Assert.That(
-            QueryBuilderHelper.GetLanguageQueryElement("&", "de"),
-            Is.EqualTo("&lang=de"));
+		[Test]
+		public void TestGetLanguageQueryElement()
+		=> Assert.That(
+			QueryBuilderHelper.GetLanguageQueryElement("&", "de"),
+			Is.EqualTo("&lang=de"));
 
-        [Test]
-        public void TestGetLanguageQueryElementNull()
-            => Assert.That(
-                QueryBuilderHelper.GetLanguageQueryElement("&", ""),
-                Is.EqualTo(""));
-    }
+		[Test]
+		public void TestGetLanguageQueryElementNull()
+			=> Assert.That(
+				QueryBuilderHelper.GetLanguageQueryElement("&", ""),
+				Is.EqualTo(""));
+	}
 }
diff --git a/TestShareeLib/Repository/Request/TestRequestBuilder.cs b/TestShareeLib/Repository/Request/TestRequestBuilder.cs
index e4fed79..c9582f9 100644
--- a/TestShareeLib/Repository/Request/TestRequestBuilder.cs
+++ b/TestShareeLib/Repository/Request/TestRequestBuilder.cs
@@ -5,89 +5,89 @@ using TINK.Repository.Request;
 
 namespace TestShareeLib.Repository.Request
 {
-    [TestFixture]
-    public class TestRequestBuilder
-    {
-        [Test]
-        public void TestDoAuthorize()
-        {
-            Assert.AreEqual(
-                "request=authorization&merchant_id=123&user_id=abc%40cde&user_pw=%2B%3F&hw_id=789",
-                new RequestBuilder("123", null /*UI language */).DoAuthorization("abc@cde", "+?", "789"));
-        }
+	[TestFixture]
+	public class TestRequestBuilder
+	{
+		[Test]
+		public void TestDoAuthorize()
+		{
+			Assert.AreEqual(
+				"request=authorization&merchant_id=123&user_id=abc%40cde&user_pw=%2B%3F&hw_id=789",
+				new RequestBuilder("123", null /*UI language */).DoAuthorization("abc@cde", "+?", "789"));
+		}
 
-        [Test]
-        public void TestDoAuthorizeLangfr()
-        {
-            Assert.That(
-                new RequestBuilder("123", "fr" /*UI language */).DoAuthorization("abc@cde", "+?", "789"),
-                Is.EqualTo("request=authorization&merchant_id=123&user_id=abc%40cde&user_pw=%2B%3F&hw_id=789&lang=fr"));
-        }
-        [Test]
-        public void TestDoAuthout()
-        {
-            Assert.Throws<CallNotRequiredException>(() =>
-               new RequestBuilder("123", null /*UI language */).DoAuthout());
-        }
+		[Test]
+		public void TestDoAuthorizeLangfr()
+		{
+			Assert.That(
+				new RequestBuilder("123", "fr" /*UI language */).DoAuthorization("abc@cde", "+?", "789"),
+				Is.EqualTo("request=authorization&merchant_id=123&user_id=abc%40cde&user_pw=%2B%3F&hw_id=789&lang=fr"));
+		}
+		[Test]
+		public void TestDoAuthout()
+		{
+			Assert.Throws<CallNotRequiredException>(() =>
+			   new RequestBuilder("123", null /*UI language */).DoAuthout());
+		}
 
-        [Test]
-        public void TestGetBikesAvailable()
-        {
-            Assert.AreEqual(
-                "request=bikes_available&system=all&authcookie=123",
-                new RequestBuilder("123", null /*UI language */).GetBikesAvailable());
-        }
+		[Test]
+		public void TestGetBikesAvailable()
+		{
+			Assert.AreEqual(
+				"request=bikes_available&system=all&authcookie=123",
+				new RequestBuilder("123", null /*UI language */).GetBikesAvailable());
+		}
 
-        [Test]
-        public void TestGetBikesAvailableLangUk()
-        {
-            Assert.That(
-                new RequestBuilder("123", "uk").GetBikesAvailable(),
-                Is.EqualTo("request=bikes_available&system=all&authcookie=123&lang=uk"));
-        }
+		[Test]
+		public void TestGetBikesAvailableLangUk()
+		{
+			Assert.That(
+				new RequestBuilder("123", "uk").GetBikesAvailable(),
+				Is.EqualTo("request=bikes_available&system=all&authcookie=123&lang=uk"));
+		}
 
-        [Test]
-        public void TestGetBikesOccupied()
-        {
-            Assert.Throws<NotSupportedException>(() =>
-                new RequestBuilder("123", null /*UI language */).GetBikesOccupied());
-        }
+		[Test]
+		public void TestGetBikesOccupied()
+		{
+			Assert.Throws<NotSupportedException>(() =>
+				new RequestBuilder("123", null /*UI language */).GetBikesOccupied());
+		}
 
-        [Test]
-        public void TestGetStations()
-        {
-            Assert.AreEqual(
-                "request=stations_available&authcookie=123",
-                new RequestBuilder("123", null /*UI language */).GetStations());
-        }
+		[Test]
+		public void TestGetStations()
+		{
+			Assert.AreEqual(
+				"request=stations_available&authcookie=123",
+				new RequestBuilder("123", null /*UI language */).GetStations());
+		}
 
-        [Test]
-        public void TestGetStationsLangDe()
-        {
-            Assert.That(
-                new RequestBuilder("123", "de").GetStations(),
-                Is.EqualTo("request=stations_available&authcookie=123&lang=de"));
-        }
+		[Test]
+		public void TestGetStationsLangDe()
+		{
+			Assert.That(
+				new RequestBuilder("123", "de").GetStations(),
+				Is.EqualTo("request=stations_available&authcookie=123&lang=de"));
+		}
 
-        [Test]
-        public void TestDoReserve()
-        {
-            Assert.Throws<NotSupportedException>(() =>
-                new RequestBuilder("123", null /*UI language */).DoReserve("42"));
-        }
+		[Test]
+		public void TestDoReserve()
+		{
+			Assert.Throws<NotSupportedException>(() =>
+				new RequestBuilder("123", null /*UI language */).DoReserve("42"));
+		}
 
-        [Test]
-        public void TestDoCancelReservation()
-        {
-            Assert.Throws<NotSupportedException>(() =>
-                new RequestBuilder("123", null /*UI language */).DoCancelReservation("42"));
-        }
+		[Test]
+		public void TestDoCancelReservation()
+		{
+			Assert.Throws<NotSupportedException>(() =>
+				new RequestBuilder("123", null /*UI language */).DoCancelReservation("42"));
+		}
 
-        [Test]
-        public void TestDoSubmitFeedback()
-        {
-            Assert.Throws<NotSupportedException>(() =>
-                new RequestBuilder("123", null /*UI language */).DoSubmitFeedback("bike3", 3, "Hi", false));
-        }
-    }
+		[Test]
+		public void TestDoSubmitFeedback()
+		{
+			Assert.Throws<NotSupportedException>(() =>
+				new RequestBuilder("123", null /*UI language */).DoSubmitFeedback("bike3", 3, "Hi", false));
+		}
+	}
 }
diff --git a/TestShareeLib/Repository/Request/TestRequestBuilderLoggedIn.cs b/TestShareeLib/Repository/Request/TestRequestBuilderLoggedIn.cs
index 46cb1c5..bc9fff3 100644
--- a/TestShareeLib/Repository/Request/TestRequestBuilderLoggedIn.cs
+++ b/TestShareeLib/Repository/Request/TestRequestBuilderLoggedIn.cs
@@ -6,301 +6,301 @@ using TINK.Repository.Request;
 
 namespace TestShareeLib.Repository.Request
 {
-    [TestFixture]
-    public class TestRequestBuilderLoggedIn
-    {
+	[TestFixture]
+	public class TestRequestBuilderLoggedIn
+	{
 
-        [Test]
-        public void TestDoAuthorize()
-        {
-            Assert.Throws<CallNotRequiredException>(() => new RequestBuilderLoggedIn("123", null /*UI language */, "456").DoAuthorization("abc@cde", "+?", "789"));
-        }
+		[Test]
+		public void TestDoAuthorize()
+		{
+			Assert.Throws<CallNotRequiredException>(() => new RequestBuilderLoggedIn("123", null /*UI language */, "456").DoAuthorization("abc@cde", "+?", "789"));
+		}
 
-        [Test]
-        public void TestDoAuthout()
-        {
-            Assert.AreEqual(
-                "request=authout&authcookie=456123",
-               new RequestBuilderLoggedIn("123", null /*UI language */, "456").DoAuthout());
-        }
+		[Test]
+		public void TestDoAuthout()
+		{
+			Assert.AreEqual(
+				"request=authout&authcookie=456123",
+			   new RequestBuilderLoggedIn("123", null /*UI language */, "456").DoAuthout());
+		}
 
-        [Test]
-        public void TestDoAuthoutLangDe()
-            => Assert.That(
-               new RequestBuilderLoggedIn("123", "de", "456").DoAuthout(),
-            Is.EqualTo("request=authout&authcookie=456123&lang=de"));
+		[Test]
+		public void TestDoAuthoutLangDe()
+			=> Assert.That(
+			   new RequestBuilderLoggedIn("123", "de", "456").DoAuthout(),
+			Is.EqualTo("request=authout&authcookie=456123&lang=de"));
 
-        [Test]
-        public void TestGetBikesAvailable()
-        {
-            Assert.AreEqual(
-                "request=bikes_available&system=all&authcookie=456123",
-                new RequestBuilderLoggedIn("123", null /*UI language */, "456").GetBikesAvailable());
-        }
+		[Test]
+		public void TestGetBikesAvailable()
+		{
+			Assert.AreEqual(
+				"request=bikes_available&system=all&authcookie=456123",
+				new RequestBuilderLoggedIn("123", null /*UI language */, "456").GetBikesAvailable());
+		}
 
-        [Test]
-        public void TestGetBikesAvailable_Null()
-        {
-            Assert.Throws<ArgumentException>(() =>
-                new RequestBuilderLoggedIn("123", null /*UI language */, null).GetBikesAvailable());
+		[Test]
+		public void TestGetBikesAvailable_Null()
+		{
+			Assert.Throws<ArgumentException>(() =>
+				new RequestBuilderLoggedIn("123", null /*UI language */, null).GetBikesAvailable());
 
-            Assert.Throws<ArgumentException>(() =>
-                new RequestBuilderLoggedIn("123", null /*UI language */, string.Empty).GetBikesAvailable());
-        }
+			Assert.Throws<ArgumentException>(() =>
+				new RequestBuilderLoggedIn("123", null /*UI language */, string.Empty).GetBikesAvailable());
+		}
 
-        [Test]
-        public void TestGetBikesOccupied()
-        {
-            Assert.AreEqual(
-                "request=user_bikes_occupied&system=all&genkey=1&authcookie=456123",
-                new RequestBuilderLoggedIn("123", null /*UI language */, "456").GetBikesOccupied());
-        }
+		[Test]
+		public void TestGetBikesOccupied()
+		{
+			Assert.AreEqual(
+				"request=user_bikes_occupied&system=all&genkey=1&authcookie=456123",
+				new RequestBuilderLoggedIn("123", null /*UI language */, "456").GetBikesOccupied());
+		}
 
-        [Test]
-        public void TestGetBikesOccupied_Null()
-        {
-            Assert.Throws<ArgumentException>(() =>
-                new RequestBuilderLoggedIn("123", null /*UI language */, null).GetBikesOccupied());
+		[Test]
+		public void TestGetBikesOccupied_Null()
+		{
+			Assert.Throws<ArgumentException>(() =>
+				new RequestBuilderLoggedIn("123", null /*UI language */, null).GetBikesOccupied());
 
-            Assert.Throws<ArgumentException>(() =>
-                new RequestBuilderLoggedIn("123", null /*UI language */, "").GetBikesOccupied());
-        }
+			Assert.Throws<ArgumentException>(() =>
+				new RequestBuilderLoggedIn("123", null /*UI language */, "").GetBikesOccupied());
+		}
 
-        [Test]
-        public void TestGetStations()
-        {
-            Assert.AreEqual(
-                "request=stations_available&authcookie=456123",
-                new RequestBuilderLoggedIn("123", null /*UI language */, "456").GetStations());
-        }
+		[Test]
+		public void TestGetStations()
+		{
+			Assert.AreEqual(
+				"request=stations_available&authcookie=456123",
+				new RequestBuilderLoggedIn("123", null /*UI language */, "456").GetStations());
+		}
 
-        [Test]
-        public void TestGetStations_Null()
-        {
-            Assert.Throws<ArgumentException>(() =>
-                new RequestBuilderLoggedIn("123", null /*UI language */, string.Empty).GetStations());
+		[Test]
+		public void TestGetStations_Null()
+		{
+			Assert.Throws<ArgumentException>(() =>
+				new RequestBuilderLoggedIn("123", null /*UI language */, string.Empty).GetStations());
 
-            Assert.Throws<ArgumentException>(() =>
-                new RequestBuilderLoggedIn("123", null /*UI language */, null).GetStations());
-        }
+			Assert.Throws<ArgumentException>(() =>
+				new RequestBuilderLoggedIn("123", null /*UI language */, null).GetStations());
+		}
 
-        [Test]
-        public void TestDoReserve()
-        {
-            Assert.AreEqual(
-                "request=booking_request&bike=42&authcookie=456123",
-                new RequestBuilderLoggedIn("123", null /*UI language */, "456").DoReserve("42"));
-        }
+		[Test]
+		public void TestDoReserve()
+		{
+			Assert.AreEqual(
+				"request=booking_request&bike=42&authcookie=456123",
+				new RequestBuilderLoggedIn("123", null /*UI language */, "456").DoReserve("42"));
+		}
 
-        [Test]
-        public void TestDoCancelReservation()
-        {
-            Assert.AreEqual(
-                "request=booking_cancel&bike=42&authcookie=456123",
-                new RequestBuilderLoggedIn("123", null /*UI language */, "456").DoCancelReservation("42"));
-        }
+		[Test]
+		public void TestDoCancelReservation()
+		{
+			Assert.AreEqual(
+				"request=booking_cancel&bike=42&authcookie=456123",
+				new RequestBuilderLoggedIn("123", null /*UI language */, "456").DoCancelReservation("42"));
+		}
 
-        [Test]
-        public void TestCalculateAuthParameters()
-            => Assert.That(
-                new RequestBuilderLoggedIn("123", "zh", "456").CalculateAuthParameters("42"),
-                Is.EqualTo("request=booking_update&bike=42&authcookie=456123&genkey=1&lang=zh"));
+		[Test]
+		public void TestCalculateAuthParameters()
+			=> Assert.That(
+				new RequestBuilderLoggedIn("123", "zh", "456").CalculateAuthParameters("42"),
+				Is.EqualTo("request=booking_update&bike=42&authcookie=456123&genkey=1&lang=zh"));
 
-        [Test]
-        public void TestStartReturningBike()
-            => Assert.That(
-                new RequestBuilderLoggedIn("123", "zh", "456").StartReturningBike("42"),
-                Is.EqualTo("request=booking_update&bike=42&lock_state=locking&authcookie=456123&lang=zh"));
+		[Test]
+		public void TestStartReturningBike()
+			=> Assert.That(
+				new RequestBuilderLoggedIn("123", "zh", "456").StartReturningBike("42"),
+				Is.EqualTo("request=booking_update&bike=42&lock_state=locking&authcookie=456123&lang=zh"));
 
-        [Test]
-        public void TestDoBook()
-        {
-            Assert.AreEqual(
-                "request=booking_update&bike=42&authcookie=456123&Ilockit_GUID=0000f00d-1212-efde-1523-785fef13d123&state=occupied&lock_state=unlocked&voltage=33.21",
-                new RequestBuilderLoggedIn("123", null /*UI language */, "456").DoBook("42", new Guid("0000f00d-1212-efde-1523-785fef13d123"), 33.21));
-        }
+		[Test]
+		public void TestDoBook()
+		{
+			Assert.AreEqual(
+				"request=booking_update&bike=42&authcookie=456123&Ilockit_GUID=0000f00d-1212-efde-1523-785fef13d123&state=occupied&lock_state=unlocked&voltage=33.21",
+				new RequestBuilderLoggedIn("123", null /*UI language */, "456").DoBook("42", new Guid("0000f00d-1212-efde-1523-785fef13d123"), 33.21));
+		}
 
-        [Test]
-        public void TestDoBookNoBatery()
-        {
-            Assert.AreEqual(
-                "request=booking_update&bike=42&authcookie=456123&Ilockit_GUID=0000f00d-1212-efde-1523-785fef13d123&state=occupied&lock_state=unlocked",
-                new RequestBuilderLoggedIn("123", null /*UI language */, "456").DoBook("42", new Guid("0000f00d-1212-efde-1523-785fef13d123"), double.NaN));
-        }
+		[Test]
+		public void TestDoBookNoBatery()
+		{
+			Assert.AreEqual(
+				"request=booking_update&bike=42&authcookie=456123&Ilockit_GUID=0000f00d-1212-efde-1523-785fef13d123&state=occupied&lock_state=unlocked",
+				new RequestBuilderLoggedIn("123", null /*UI language */, "456").DoBook("42", new Guid("0000f00d-1212-efde-1523-785fef13d123"), double.NaN));
+		}
 
-        [Test]
-        public void TestBookAndStartOpening()
-            => Assert.That(
-                new RequestBuilderLoggedIn("123", null /*UI language */, "456").BookAvailableAndStartOpening("42"),
-                Is.EqualTo("request=booking_request&bike=42&authcookie=456123&state=occupied&lock_state=unlocking"));
+		[Test]
+		public void TestBookAndStartOpening()
+			=> Assert.That(
+				new RequestBuilderLoggedIn("123", null /*UI language */, "456").BookAvailableAndStartOpening("42"),
+				Is.EqualTo("request=booking_request&bike=42&authcookie=456123&state=occupied&lock_state=unlocking"));
 
-        [Test]
-        public void TestBookReservedAndStartOpening()
-            => Assert.That(
-                new RequestBuilderLoggedIn("123", null /*UI language */, "456").BookReservedAndStartOpening("42"),
-                Is.EqualTo("request=booking_update&bike=42&authcookie=456123&state=occupied&lock_state=unlocking"));
+		[Test]
+		public void TestBookReservedAndStartOpening()
+			=> Assert.That(
+				new RequestBuilderLoggedIn("123", null /*UI language */, "456").BookReservedAndStartOpening("42"),
+				Is.EqualTo("request=booking_update&bike=42&authcookie=456123&state=occupied&lock_state=unlocking"));
 
-        [Test]
-        public void TestReturnAndStartClosing()
-        {
-            Assert.That(
-                new RequestBuilderLoggedIn("123", null /*UI language */, "456").ReturnAndStartClosing("42", null),
-                Is.EqualTo("request=booking_update&bike=42&authcookie=456123&state=available&lock_state=locking"));
-        }
+		[Test]
+		public void TestReturnAndStartClosing()
+		{
+			Assert.That(
+				new RequestBuilderLoggedIn("123", null /*UI language */, "456").ReturnAndStartClosing("42", null),
+				Is.EqualTo("request=booking_update&bike=42&authcookie=456123&state=available&lock_state=locking"));
+		}
 
-        [Test]
-        public void TestDoSubmitMiniSurvey()
-        {
-            Assert.That(
-                new RequestBuilderLoggedIn("Merchy", null /*UI language */, "Keksi").DoSubmitMiniSurvey(new Dictionary<string, string> { { "q1", "opt5" }, { "q2", "opt4" }, { "q3", "der Freitext" } }),
-                Is.EqualTo("request=user_minianswer&q1=opt5&q2=opt4&q3=der+Freitext&authcookie=KeksiMerchy"));
-        }
+		[Test]
+		public void TestDoSubmitMiniSurvey()
+		{
+			Assert.That(
+				new RequestBuilderLoggedIn("Merchy", null /*UI language */, "Keksi").DoSubmitMiniSurvey(new Dictionary<string, string> { { "q1", "opt5" }, { "q2", "opt4" }, { "q3", "der Freitext" } }),
+				Is.EqualTo("request=user_minianswer&q1=opt5&q2=opt4&q3=der+Freitext&authcookie=KeksiMerchy"));
+		}
 
-        [Test]
-        public void TestDoSubmitMiniSurveyNull()
-        {
-            Assert.That(
-                new RequestBuilderLoggedIn("Merchy", null /*UI language */, "Keksi").DoSubmitMiniSurvey(null),
-                Is.EqualTo("request=user_minianswer&authcookie=KeksiMerchy"));
-        }
+		[Test]
+		public void TestDoSubmitMiniSurveyNull()
+		{
+			Assert.That(
+				new RequestBuilderLoggedIn("Merchy", null /*UI language */, "Keksi").DoSubmitMiniSurvey(null),
+				Is.EqualTo("request=user_minianswer&authcookie=KeksiMerchy"));
+		}
 
-        [Test]
-        public void TestDoSubmitMiniSurveyEmptyDict()
-        {
-            Assert.That(
-                new RequestBuilderLoggedIn("Merchy", null /*UI language */, "Keksi").DoSubmitMiniSurvey(new Dictionary<string, string>()),
-                Is.EqualTo("request=user_minianswer&authcookie=KeksiMerchy"));
-        }
+		[Test]
+		public void TestDoSubmitMiniSurveyEmptyDict()
+		{
+			Assert.That(
+				new RequestBuilderLoggedIn("Merchy", null /*UI language */, "Keksi").DoSubmitMiniSurvey(new Dictionary<string, string>()),
+				Is.EqualTo("request=user_minianswer&authcookie=KeksiMerchy"));
+		}
 
-        [Test]
-        public void TestDoSubmitMiniSurveyFilterInvalidEntries()
-        {
-            Assert.That(
-                new RequestBuilderLoggedIn("Merchy", null /*UI language */, "Keksi").DoSubmitMiniSurvey(new Dictionary<string, string> { { "q1", "opt5" }, { "", "opt99" }, { "q99", "" }, { "q2", "opt4" }, { "q3", "der Freitext" } }),
-                Is.EqualTo("request=user_minianswer&q1=opt5&q2=opt4&q3=der+Freitext&authcookie=KeksiMerchy"));
-        }
+		[Test]
+		public void TestDoSubmitMiniSurveyFilterInvalidEntries()
+		{
+			Assert.That(
+				new RequestBuilderLoggedIn("Merchy", null /*UI language */, "Keksi").DoSubmitMiniSurvey(new Dictionary<string, string> { { "q1", "opt5" }, { "", "opt99" }, { "q99", "" }, { "q2", "opt4" }, { "q3", "der Freitext" } }),
+				Is.EqualTo("request=user_minianswer&q1=opt5&q2=opt4&q3=der+Freitext&authcookie=KeksiMerchy"));
+		}
 
-        [Test]
-        public void TestUpateLockingStateGeolocationIsNull()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
-            Assert.That(
-                builder.UpateLockingState("12", lock_state.locked, null, 15.03),
-                Is.EqualTo("request=booking_update&bike=12&lock_state=locked&voltage=15.03&authcookie=MySessionCookieMyMeranctIt"));
-        }
+		[Test]
+		public void TestUpateLockingStateGeolocationIsNull()
+		{
+			var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
+			Assert.That(
+				builder.UpateLockingState("12", lock_state.locked, null, 15.03),
+				Is.EqualTo("request=booking_update&bike=12&lock_state=locked&voltage=15.03&authcookie=MySessionCookieMyMeranctIt"));
+		}
 
-        [Test]
-        public void TestUpateLockingStateGeolocationIsNullBatteryPercentageIsNAN()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
-            Assert.That(
-                builder.UpateLockingState("12", lock_state.locked, null, double.NaN),
-                Is.EqualTo("request=booking_update&bike=12&lock_state=locked&authcookie=MySessionCookieMyMeranctIt"));
-        }
+		[Test]
+		public void TestUpateLockingStateGeolocationIsNullBatteryPercentageIsNAN()
+		{
+			var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
+			Assert.That(
+				builder.UpateLockingState("12", lock_state.locked, null, double.NaN),
+				Is.EqualTo("request=booking_update&bike=12&lock_state=locked&authcookie=MySessionCookieMyMeranctIt"));
+		}
 
-        [Test]
-        public void TestUpateLockingStateGeolocation_AccuraycyNull()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
-            Assert.That(
-                builder.UpateLockingState("12", lock_state.locked, new LocationDto.Builder { Latitude = 21, Longitude = 17, Age = new TimeSpan(0, 0, 0, 0, 70) }.Build(), 12),
-                Is.EqualTo("request=booking_update&bike=12&gps=21,17&gps_age=0.07&lock_state=locked&voltage=12&authcookie=MySessionCookieMyMeranctIt"));
-        }
+		[Test]
+		public void TestUpateLockingStateGeolocation_AccuraycyNull()
+		{
+			var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
+			Assert.That(
+				builder.UpateLockingState("12", lock_state.locked, new LocationDto.Builder { Latitude = 21, Longitude = 17, Age = new TimeSpan(0, 0, 0, 0, 70) }.Build(), 12),
+				Is.EqualTo("request=booking_update&bike=12&gps=21,17&gps_age=0.07&lock_state=locked&voltage=12&authcookie=MySessionCookieMyMeranctIt"));
+		}
 
-        [Test]
-        public void TestUpateLockingStateGeolocation_AccuraycyNullBatteryPercentageIsNAN()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
-            Assert.That(
-                builder.UpateLockingState("12", lock_state.locked, new LocationDto.Builder { Latitude = 21, Longitude = 17, Age = new TimeSpan(0, 0, 0, 0, 70) }.Build(), double.NaN),
-                Is.EqualTo("request=booking_update&bike=12&gps=21,17&gps_age=0.07&lock_state=locked&authcookie=MySessionCookieMyMeranctIt"));
-        }
+		[Test]
+		public void TestUpateLockingStateGeolocation_AccuraycyNullBatteryPercentageIsNAN()
+		{
+			var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
+			Assert.That(
+				builder.UpateLockingState("12", lock_state.locked, new LocationDto.Builder { Latitude = 21, Longitude = 17, Age = new TimeSpan(0, 0, 0, 0, 70) }.Build(), double.NaN),
+				Is.EqualTo("request=booking_update&bike=12&gps=21,17&gps_age=0.07&lock_state=locked&authcookie=MySessionCookieMyMeranctIt"));
+		}
 
-        [Test]
-        public void TestUpateLockingStateGeolocation()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
-            Assert.That(
-                builder.UpateLockingState("12", lock_state.locked, new LocationDto.Builder { Latitude = 21, Longitude = 17, Accuracy = 5.7, Age = new TimeSpan(0, 0, 0, 0, 70) }.Build(), 98),
-                Is.EqualTo("request=booking_update&bike=12&gps=21,17&gps_accuracy=5.7&gps_age=0.07&lock_state=locked&voltage=98&authcookie=MySessionCookieMyMeranctIt"));
-        }
+		[Test]
+		public void TestUpateLockingStateGeolocation()
+		{
+			var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
+			Assert.That(
+				builder.UpateLockingState("12", lock_state.locked, new LocationDto.Builder { Latitude = 21, Longitude = 17, Accuracy = 5.7, Age = new TimeSpan(0, 0, 0, 0, 70) }.Build(), 98),
+				Is.EqualTo("request=booking_update&bike=12&gps=21,17&gps_accuracy=5.7&gps_age=0.07&lock_state=locked&voltage=98&authcookie=MySessionCookieMyMeranctIt"));
+		}
 
-        [Test]
-        public void TestDoReturnGeolocationIsNull()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
-            Assert.That(
-                builder.DoReturn("12", null, null),
-                Is.EqualTo("request=booking_update&bike=12&authcookie=MySessionCookieMyMeranctIt&state=available&lock_state=locked"));
-        }
+		[Test]
+		public void TestDoReturnGeolocationIsNull()
+		{
+			var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
+			Assert.That(
+				builder.DoReturn("12", null, null),
+				Is.EqualTo("request=booking_update&bike=12&authcookie=MySessionCookieMyMeranctIt&state=available&lock_state=locked"));
+		}
 
-        [Test]
-        public void TestDoReturnGeolocation_AccuraycyNull()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
-            Assert.That(
-                builder.DoReturn(
-                    "12",
-                    new LocationDto.Builder { Latitude = 21, Longitude = 17, Age = new TimeSpan(0, 0, 0, 0, 70) }.Build(),
-                    null),
-                Is.EqualTo("request=booking_update&bike=12&authcookie=MySessionCookieMyMeranctIt&state=available&gps=21,17&gps_age=0.07&lock_state=locked"));
-        }
+		[Test]
+		public void TestDoReturnGeolocation_AccuraycyNull()
+		{
+			var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
+			Assert.That(
+				builder.DoReturn(
+					"12",
+					new LocationDto.Builder { Latitude = 21, Longitude = 17, Age = new TimeSpan(0, 0, 0, 0, 70) }.Build(),
+					null),
+				Is.EqualTo("request=booking_update&bike=12&authcookie=MySessionCookieMyMeranctIt&state=available&gps=21,17&gps_age=0.07&lock_state=locked"));
+		}
 
-        [Test]
-        public void TestDoReturnGeolocation()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
-            Assert.That(
-                builder.DoReturn(
-                    "12",
-                    new LocationDto.Builder { Latitude = 21, Longitude = 17, Accuracy = 5.7, Age = new TimeSpan(0, 0, 0, 0, 70) }.Build(),
-                    null),
-                Is.EqualTo("request=booking_update&bike=12&authcookie=MySessionCookieMyMeranctIt&state=available&gps=21,17&gps_accuracy=5.7&gps_age=0.07&lock_state=locked"));
-        }
+		[Test]
+		public void TestDoReturnGeolocation()
+		{
+			var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
+			Assert.That(
+				builder.DoReturn(
+					"12",
+					new LocationDto.Builder { Latitude = 21, Longitude = 17, Accuracy = 5.7, Age = new TimeSpan(0, 0, 0, 0, 70) }.Build(),
+					null),
+				Is.EqualTo("request=booking_update&bike=12&authcookie=MySessionCookieMyMeranctIt&state=available&gps=21,17&gps_accuracy=5.7&gps_age=0.07&lock_state=locked"));
+		}
 
-        [Test]
-        public void TestDoSubmitFeedback_Ok()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
-            Assert.That(
-                builder.DoSubmitFeedback("Radl22"),
-                Is.EqualTo("request=user_feedback&bike=Radl22&authcookie=MySessionCookieMyMeranctIt"));
-        }
+		[Test]
+		public void TestDoSubmitFeedback_Ok()
+		{
+			var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
+			Assert.That(
+				builder.DoSubmitFeedback("Radl22"),
+				Is.EqualTo("request=user_feedback&bike=Radl22&authcookie=MySessionCookieMyMeranctIt"));
+		}
 
-        [Test]
-        public void TestDoSubmitFeedback_BikeBroken()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
-            Assert.That(
-                builder.DoSubmitFeedback("Cycle33", null, isBikeBroken: true),
-                Is.EqualTo("request=user_feedback&bike=Cycle33&bike_broken=1&authcookie=MySessionCookieMyMeranctIt"));
-        }
+		[Test]
+		public void TestDoSubmitFeedback_BikeBroken()
+		{
+			var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
+			Assert.That(
+				builder.DoSubmitFeedback("Cycle33", null, isBikeBroken: true),
+				Is.EqualTo("request=user_feedback&bike=Cycle33&bike_broken=1&authcookie=MySessionCookieMyMeranctIt"));
+		}
 
-        [Test]
-        public void TestDoSubmitFeedback_Message()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
-            Assert.That(
-                builder.DoSubmitFeedback("Mühle", null, "Uno due tre"),
-                Is.EqualTo("request=user_feedback&bike=Mühle&message=Uno+due+tre&authcookie=MySessionCookieMyMeranctIt"));
-        }
+		[Test]
+		public void TestDoSubmitFeedback_Message()
+		{
+			var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
+			Assert.That(
+				builder.DoSubmitFeedback("Mühle", null, "Uno due tre"),
+				Is.EqualTo("request=user_feedback&bike=Mühle&message=Uno+due+tre&authcookie=MySessionCookieMyMeranctIt"));
+		}
 
-        [Test]
-        public void TestDoSubmitFeedback_ErrorMessage()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
-            Assert.That(
-                builder.DoSubmitFeedback("bike12", null, "Uno due tre", true),
-                Is.EqualTo("request=user_feedback&bike=bike12&bike_broken=1&message=Uno+due+tre&authcookie=MySessionCookieMyMeranctIt"));
-        }
+		[Test]
+		public void TestDoSubmitFeedback_ErrorMessage()
+		{
+			var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
+			Assert.That(
+				builder.DoSubmitFeedback("bike12", null, "Uno due tre", true),
+				Is.EqualTo("request=user_feedback&bike=bike12&bike_broken=1&message=Uno+due+tre&authcookie=MySessionCookieMyMeranctIt"));
+		}
 
-        [Test]
-        public void TestDoSubmitFeedback_ChargeLevel()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
-            Assert.That(
-                builder.DoSubmitFeedback("bike12", 3, "Uno due tre", true),
-                Is.EqualTo("request=user_feedback&bike=bike12&charge_current_bars=3&bike_broken=1&message=Uno+due+tre&authcookie=MySessionCookieMyMeranctIt"));
-        }
-    }
+		[Test]
+		public void TestDoSubmitFeedback_ChargeLevel()
+		{
+			var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
+			Assert.That(
+				builder.DoSubmitFeedback("bike12", 3, "Uno due tre", true),
+				Is.EqualTo("request=user_feedback&bike=bike12&charge_current_bars=3&bike_broken=1&message=Uno+due+tre&authcookie=MySessionCookieMyMeranctIt"));
+		}
+	}
 }
diff --git a/TestShareeLib/Repository/Response/TestJsonConvert.cs b/TestShareeLib/Repository/Response/TestJsonConvert.cs
index 86e9428..3df7e18 100644
--- a/TestShareeLib/Repository/Response/TestJsonConvert.cs
+++ b/TestShareeLib/Repository/Response/TestJsonConvert.cs
@@ -4,15 +4,15 @@ using TINK.Repository.Response;
 
 namespace TestShareeLib.Model.Repository.Response
 {
-    [TestFixture]
-    public class TestJsonConvert
-    {
-        [Test]
-        public void TestDeserializeObject()
-        {
-            Assert.That(
-                () => JsonConvertRethrow.DeserializeObject<TariffDescription>(
-                    @"{
+	[TestFixture]
+	public class TestJsonConvert
+	{
+		[Test]
+		public void TestDeserializeObject()
+		{
+			Assert.That(
+				() => JsonConvertRethrow.DeserializeObject<TariffDescription>(
+					@"{
                         ""eur_per_hour"" : ""10.00"",
                         ""abo_eur_per_month"" : ""920.00"",
                         ""free_hours"" : ""3.00"",
@@ -20,7 +20,7 @@ namespace TestShareeLib.Model.Repository.Response
 -- this is not JSON !
                         ""name"" : ""Tester Basic""
                     }"),
-                Throws.InstanceOf<DeserializationException>());
-        }
-    }
+				Throws.InstanceOf<DeserializationException>());
+		}
+	}
 }
diff --git a/TestShareeLib/Repository/Response/TestMiniSurvey.cs b/TestShareeLib/Repository/Response/TestMiniSurvey.cs
index 35f075b..4250340 100644
--- a/TestShareeLib/Repository/Response/TestMiniSurvey.cs
+++ b/TestShareeLib/Repository/Response/TestMiniSurvey.cs
@@ -6,20 +6,20 @@ using TINK.Repository.Response;
 
 namespace TestShareeLib.Repository.Response
 {
-    [TestFixture]
-    public class TestMiniSurvey
-    {
-        [DataContract]
-        public class MiniSurveyTestContainer
-        {
-            [DataMember]
-            public MiniSurveyResponse user_miniquery { get; set; }
-        }
+	[TestFixture]
+	public class TestMiniSurvey
+	{
+		[DataContract]
+		public class MiniSurveyTestContainer
+		{
+			[DataMember]
+			public MiniSurveyResponse user_miniquery { get; set; }
+		}
 
-        [Test]
-        public void TestCtor()
-        {
-            var mini = JsonConvert.DeserializeObject<MiniSurveyTestContainer>(@"{
+		[Test]
+		public void TestCtor()
+		{
+			var mini = JsonConvert.DeserializeObject<MiniSurveyTestContainer>(@"{
                 ""user_miniquery"" : {
                     ""footer"" : ""Herzlichen Dank und viel Spaß bei der nächsten Fahrt!"",
                     ""subtitle"" : ""Ihre drei Antworten werden anonym gespeichert."",
@@ -61,93 +61,93 @@ namespace TestShareeLib.Repository.Response
                      },
                 }");
 
-            Assert.That(
-                mini.user_miniquery.title,
-                Is.EqualTo("Bitte unterstützen Sie unsere Begleitforschung"));
+			Assert.That(
+				mini.user_miniquery.title,
+				Is.EqualTo("Bitte unterstützen Sie unsere Begleitforschung"));
 
-            Assert.That(
-                mini.user_miniquery.subtitle,
-                Is.EqualTo("Ihre drei Antworten werden anonym gespeichert."));
+			Assert.That(
+				mini.user_miniquery.subtitle,
+				Is.EqualTo("Ihre drei Antworten werden anonym gespeichert."));
 
-            Assert.That(
-                mini.user_miniquery.subtitle,
-                Is.EqualTo("Ihre drei Antworten werden anonym gespeichert."));
+			Assert.That(
+				mini.user_miniquery.subtitle,
+				Is.EqualTo("Ihre drei Antworten werden anonym gespeichert."));
 
-            Assert.That(
-                mini.user_miniquery.questions.Count,
-                Is.EqualTo(3));
+			Assert.That(
+				mini.user_miniquery.questions.Count,
+				Is.EqualTo(3));
 
-            Assert.That(
-                mini.user_miniquery.questions.Count,
-                Is.EqualTo(3));
+			Assert.That(
+				mini.user_miniquery.questions.Count,
+				Is.EqualTo(3));
 
-            // Verify first question.
-            var query = mini.user_miniquery.questions.OrderBy(x => x.Key).ToArray()[0];
+			// Verify first question.
+			var query = mini.user_miniquery.questions.OrderBy(x => x.Key).ToArray()[0];
 
-            Assert.That(
-                query.Value.quest_text,
-                Is.EqualTo("1. Was war der Hauptzweck dieser Ausleihe?"));
+			Assert.That(
+				query.Value.quest_text,
+				Is.EqualTo("1. Was war der Hauptzweck dieser Ausleihe?"));
 
-            Assert.That(
-                query.Value.type,
-                Is.EqualTo("check_one"));
+			Assert.That(
+				query.Value.type,
+				Is.EqualTo("check_one"));
 
-            Assert.That(
-                query.Value.query.Count,
-                Is.EqualTo(6));
+			Assert.That(
+				query.Value.query.Count,
+				Is.EqualTo(6));
 
-            var answer = query.Value.query.OrderBy(x => x.Key).ToArray()[0];
+			var answer = query.Value.query.OrderBy(x => x.Key).ToArray()[0];
 
-            Assert.That(
-                answer.Value,
-                Is.EqualTo("a. Einkauf"));
+			Assert.That(
+				answer.Value,
+				Is.EqualTo("a. Einkauf"));
 
-            answer = query.Value.query.OrderBy(x => x.Key).ToArray()[2];
-            Assert.That(
-                answer.Value,
-                Is.EqualTo("c. Lastentransport"));
+			answer = query.Value.query.OrderBy(x => x.Key).ToArray()[2];
+			Assert.That(
+				answer.Value,
+				Is.EqualTo("c. Lastentransport"));
 
-            // Verify second question.
-            query = mini.user_miniquery.questions.OrderBy(x => x.Key).ToArray()[1];
+			// Verify second question.
+			query = mini.user_miniquery.questions.OrderBy(x => x.Key).ToArray()[1];
 
-            Assert.That(
-                query.Value.quest_text,
-                Is.EqualTo("2. Welches Verkehrsmittel hätten Sie ansonsten benutzt?"));
+			Assert.That(
+				query.Value.quest_text,
+				Is.EqualTo("2. Welches Verkehrsmittel hätten Sie ansonsten benutzt?"));
 
-            Assert.That(
-                query.Value.type,
-                Is.EqualTo("check_one"));
+			Assert.That(
+				query.Value.type,
+				Is.EqualTo("check_one"));
 
-            Assert.That(
-                query.Value.query.Count,
-                Is.EqualTo(7));
+			Assert.That(
+				query.Value.query.Count,
+				Is.EqualTo(7));
 
-            answer = query.Value.query.OrderBy(x => x.Key).ToArray()[1];
+			answer = query.Value.query.OrderBy(x => x.Key).ToArray()[1];
 
-            Assert.That(
-                answer.Value,
-                Is.EqualTo("b. Motorrad oder Motorroller"));
+			Assert.That(
+				answer.Value,
+				Is.EqualTo("b. Motorrad oder Motorroller"));
 
-            // Verify thired question.
-            query = mini.user_miniquery.questions.OrderBy(x => x.Key).ToArray()[2];
+			// Verify thired question.
+			query = mini.user_miniquery.questions.OrderBy(x => x.Key).ToArray()[2];
 
-            Assert.That(
-                query.Value.quest_text,
-                Is.EqualTo("3. Haben Sie Anmerkungen oder Anregungen?"));
+			Assert.That(
+				query.Value.quest_text,
+				Is.EqualTo("3. Haben Sie Anmerkungen oder Anregungen?"));
 
-            Assert.That(
-                query.Value.type,
-                Is.EqualTo("text"));
+			Assert.That(
+				query.Value.type,
+				Is.EqualTo("text"));
 
-            Assert.That(
-                query.Value.query.Count,
-                Is.EqualTo(1));
+			Assert.That(
+				query.Value.query.Count,
+				Is.EqualTo(1));
 
-            answer = query.Value.query.OrderBy(x => x.Key).ToArray()[0];
+			answer = query.Value.query.OrderBy(x => x.Key).ToArray()[0];
 
-            Assert.That(
-                answer.Value,
-                Is.EqualTo(""));
-        }
-    }
+			Assert.That(
+				answer.Value,
+				Is.EqualTo(""));
+		}
+	}
 }
diff --git a/TestShareeLib/Repository/Response/TestRentalDescription.cs b/TestShareeLib/Repository/Response/TestRentalDescription.cs
index 45eb42e..73dc74d 100644
--- a/TestShareeLib/Repository/Response/TestRentalDescription.cs
+++ b/TestShareeLib/Repository/Response/TestRentalDescription.cs
@@ -4,14 +4,14 @@ using TINK.Repository.Response;
 
 namespace TestShareeLib.Repository.Response
 {
-    [TestFixture]
-    public class TestRentalDescription
-    {
-        [Test]
-        public void TestDeserialize()
-        {
-            var tariffDescription = JsonConvertRethrow.DeserializeObject<RentalDescription>(
-            @"{
+	[TestFixture]
+	public class TestRentalDescription
+	{
+		[Test]
+		public void TestDeserialize()
+		{
+			var tariffDescription = JsonConvertRethrow.DeserializeObject<RentalDescription>(
+			@"{
                     ""id"": ""1"",
                     ""tarif_elements"" : {
                         ""6"": [
@@ -40,121 +40,121 @@ namespace TestShareeLib.Repository.Response
 	                }
                 }");
 
-            Assert.That(
-                tariffDescription.id,
-                Is.EqualTo("1"));
+			Assert.That(
+				tariffDescription.id,
+				Is.EqualTo("1"));
 
-            Assert.That(
-                tariffDescription.name,
-                Is.EqualTo("REN E-Bike"));
+			Assert.That(
+				tariffDescription.name,
+				Is.EqualTo("REN E-Bike"));
 
-            var tariffEntires = tariffDescription.tarif_elements.OrderBy(x => x.Key).Select(x => x.Value).ToList();
-            Assert.That(
-                tariffEntires.Count,
-                Is.EqualTo(3));
+			var tariffEntires = tariffDescription.tarif_elements.OrderBy(x => x.Key).Select(x => x.Value).ToList();
+			Assert.That(
+				tariffEntires.Count,
+				Is.EqualTo(3));
 
-            Assert.That(
-                tariffEntires[0][0],
-                Is.EqualTo("Mietgebühr"));
+			Assert.That(
+				tariffEntires[0][0],
+				Is.EqualTo("Mietgebühr"));
 
-            Assert.That(
-                tariffEntires[0][1],
-                Is.EqualTo("2,00 € / 1 Std"));
+			Assert.That(
+				tariffEntires[0][1],
+				Is.EqualTo("2,00 € / 1 Std"));
 
-            Assert.That(
-                tariffEntires[1][0],
-                Is.EqualTo("Max. Gebühr"));
+			Assert.That(
+				tariffEntires[1][0],
+				Is.EqualTo("Max. Gebühr"));
 
-            Assert.That(
-                tariffEntires[1][1],
-                Is.EqualTo("40.00 € / Tag"));
+			Assert.That(
+				tariffEntires[1][1],
+				Is.EqualTo("40.00 € / Tag"));
 
-            Assert.That(
-                tariffEntires[2][0],
-                Is.EqualTo("Gratis Mietzeit"));
+			Assert.That(
+				tariffEntires[2][0],
+				Is.EqualTo("Gratis Mietzeit"));
 
-            Assert.That(
-                tariffEntires[2][1],
-                Is.EqualTo("30 Min  / Tag"));
+			Assert.That(
+				tariffEntires[2][1],
+				Is.EqualTo("30 Min  / Tag"));
 
-            var rentalInfo = tariffDescription.rental_info.OrderBy(x => x.Key).Select(x => x.Value).ToList();
-            Assert.That(
-                rentalInfo.Count,
-                Is.EqualTo(2));
+			var rentalInfo = tariffDescription.rental_info.OrderBy(x => x.Key).Select(x => x.Value).ToList();
+			Assert.That(
+				rentalInfo.Count,
+				Is.EqualTo(2));
 
-            Assert.That(
-                rentalInfo[0][0],
-                Is.EqualTo("Tracking"));
+			Assert.That(
+				rentalInfo[0][0],
+				Is.EqualTo("Tracking"));
 
-            Assert.That(
-                rentalInfo[0][1],
-                Is.EqualTo("Ich stimme der Speicherung (Tracking) meiner Fahrstrecke zwecks wissenschaftlicher Auswertung und Berechnung der CO2-Einsparung zu!"));
+			Assert.That(
+				rentalInfo[0][1],
+				Is.EqualTo("Ich stimme der Speicherung (Tracking) meiner Fahrstrecke zwecks wissenschaftlicher Auswertung und Berechnung der CO2-Einsparung zu!"));
 
-            Assert.That(
-                rentalInfo[1][0],
-                Is.EqualTo("AGB"));
+			Assert.That(
+				rentalInfo[1][0],
+				Is.EqualTo("AGB"));
 
-            Assert.That(
-                rentalInfo[1][1],
-                Is.EqualTo("Mit der Mietrad Anmietung wird folgender Betreiber <a href='$varenv->{wwwhost}/site/agb.html' target='_blank'>AGB</a> zugestimmt"));
-        }
+			Assert.That(
+				rentalInfo[1][1],
+				Is.EqualTo("Mit der Mietrad Anmietung wird folgender Betreiber <a href='$varenv->{wwwhost}/site/agb.html' target='_blank'>AGB</a> zugestimmt"));
+		}
 
-        /// <summary>
-        /// Verifies that missing elements are initialized correctly.
-        /// </summary>
-        [Test]
-        public void TestDeserialize_Missing()
-        {
-            var tariffDescription = JsonConvertRethrow.DeserializeObject<RentalDescription>(
-            @"{
+		/// <summary>
+		/// Verifies that missing elements are initialized correctly.
+		/// </summary>
+		[Test]
+		public void TestDeserialize_Missing()
+		{
+			var tariffDescription = JsonConvertRethrow.DeserializeObject<RentalDescription>(
+			@"{
                ""id"" : ""5494"",
                ""name"" : ""Tester Basic""
             }");
 
-            Assert.That(
-                tariffDescription.id,
-                Is.EqualTo("5494"));
+			Assert.That(
+				tariffDescription.id,
+				Is.EqualTo("5494"));
 
-            Assert.That(
-                tariffDescription.name,
-                Is.EqualTo("Tester Basic"));
+			Assert.That(
+				tariffDescription.name,
+				Is.EqualTo("Tester Basic"));
 
-            Assert.That(
-                tariffDescription.tarif_elements,
-                Is.Null);
+			Assert.That(
+				tariffDescription.tarif_elements,
+				Is.Null);
 
-            Assert.That(
-                tariffDescription.rental_info,
-                Is.Null);
-        }
+			Assert.That(
+				tariffDescription.rental_info,
+				Is.Null);
+		}
 
-        /// <summary>
-        /// Verifies that unknown elemts in JSON to not lead to firing of exceptions.
-        /// </summary> 
-        [Test]
-        public void TestDeserialize_NewElement()
-        {
-            var tariffDescription = JsonConvertRethrow.DeserializeObject<RentalDescription>(
-            @"{
+		/// <summary>
+		/// Verifies that unknown elemts in JSON to not lead to firing of exceptions.
+		/// </summary> 
+		[Test]
+		public void TestDeserialize_NewElement()
+		{
+			var tariffDescription = JsonConvertRethrow.DeserializeObject<RentalDescription>(
+			@"{
                ""id"" : ""5494"",
                ""name"" : ""Tester Basic"",
                ""FancyNewElement"" : ""Yeah""
             }");
 
-            Assert.That(
-                tariffDescription.id,
-                Is.EqualTo("5494"));
+			Assert.That(
+				tariffDescription.id,
+				Is.EqualTo("5494"));
 
-            Assert.That(
-                tariffDescription.name,
-                Is.EqualTo("Tester Basic"));
-        }
+			Assert.That(
+				tariffDescription.name,
+				Is.EqualTo("Tester Basic"));
+		}
 
-        [Test]
-        public void TestDeserializeDuplicateKey()
-        {
-            var tariffDescription = JsonConvertRethrow.DeserializeObject<RentalDescription>(
-            @"{
+		[Test]
+		public void TestDeserializeDuplicateKey()
+		{
+			var tariffDescription = JsonConvertRethrow.DeserializeObject<RentalDescription>(
+			@"{
                     ""id"": ""1"",
                     ""tarif_elements"" : {
                         ""6"": [
@@ -183,10 +183,10 @@ namespace TestShareeLib.Repository.Response
 	                }
                 }");
 
-            Assert.That(
-                tariffDescription.tarif_elements.Count,
-                Is.EqualTo(2),
-                "Dupliate elements are supposed to be ignored.");
-        }
-    }
+			Assert.That(
+				tariffDescription.tarif_elements.Count,
+				Is.EqualTo(2),
+				"Dupliate elements are supposed to be ignored.");
+		}
+	}
 }
diff --git a/TestShareeLib/Repository/Response/TestTariffDescription.cs b/TestShareeLib/Repository/Response/TestTariffDescription.cs
index 918d4aa..41ba1d5 100644
--- a/TestShareeLib/Repository/Response/TestTariffDescription.cs
+++ b/TestShareeLib/Repository/Response/TestTariffDescription.cs
@@ -3,14 +3,14 @@ using TINK.Repository.Response;
 
 namespace TestShareeLib.Repository.Response
 {
-    [TestFixture]
-    public class TestTariffDescription
-    {
-        [Test]
-        public void TestDeserialize()
-        {
-            var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
-            @"{
+	[TestFixture]
+	public class TestTariffDescription
+	{
+		[Test]
+		public void TestDeserialize()
+		{
+			var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
+			@"{
                 ""eur_per_hour"" : ""10.00"",
                ""abo_eur_per_month"" : ""920.00"",
                ""free_hours"" : ""3.00"",
@@ -18,80 +18,80 @@ namespace TestShareeLib.Repository.Response
                ""name"" : ""Tester Basic""
             }");
 
-            Assert.That(
-                tariffDescription.eur_per_hour,
-                Is.EqualTo("10.00"));
+			Assert.That(
+				tariffDescription.eur_per_hour,
+				Is.EqualTo("10.00"));
 
-            Assert.That(
-                tariffDescription.abo_eur_per_month,
-                Is.EqualTo("920.00"));
+			Assert.That(
+				tariffDescription.abo_eur_per_month,
+				Is.EqualTo("920.00"));
 
-            Assert.That(
-                tariffDescription.free_hours,
-                Is.EqualTo("3.00"));
+			Assert.That(
+				tariffDescription.free_hours,
+				Is.EqualTo("3.00"));
 
-            Assert.That(
-                tariffDescription.number,
-                Is.EqualTo("5494"));
+			Assert.That(
+				tariffDescription.number,
+				Is.EqualTo("5494"));
 
-            Assert.That(
-                tariffDescription.name,
-                Is.EqualTo("Tester Basic"));
-        }
+			Assert.That(
+				tariffDescription.name,
+				Is.EqualTo("Tester Basic"));
+		}
 
-        /// <summary>
-        /// Verifies that missing elements are initialized correctly.
-        /// </summary>
-        [Test]
-        public void TestDeserialize_Missing()
-        {
-            var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
-            @"{
+		/// <summary>
+		/// Verifies that missing elements are initialized correctly.
+		/// </summary>
+		[Test]
+		public void TestDeserialize_Missing()
+		{
+			var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
+			@"{
                ""number"" : ""5494"",
                ""name"" : ""Tester Basic""
             }");
 
-            Assert.That(
-                tariffDescription.eur_per_hour,
-                Is.Null);
+			Assert.That(
+				tariffDescription.eur_per_hour,
+				Is.Null);
 
-            Assert.That(
-                tariffDescription.abo_eur_per_month,
-                Is.Null);
+			Assert.That(
+				tariffDescription.abo_eur_per_month,
+				Is.Null);
 
-            Assert.That(
-                tariffDescription.free_hours,
-                Is.Null);
+			Assert.That(
+				tariffDescription.free_hours,
+				Is.Null);
 
-            Assert.That(
-                tariffDescription.number,
-                Is.EqualTo("5494"));
+			Assert.That(
+				tariffDescription.number,
+				Is.EqualTo("5494"));
 
-            Assert.That(
-                tariffDescription.name,
-                Is.EqualTo("Tester Basic"));
-        }
+			Assert.That(
+				tariffDescription.name,
+				Is.EqualTo("Tester Basic"));
+		}
 
-        /// <summary>
-        /// Verifies that unknown elemts in JSON to not lead to firing of exceptions.
-        /// </summary>
-        [Test]
-        public void TestDeserialize_NewElement()
-        {
-            var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
-            @"{
+		/// <summary>
+		/// Verifies that unknown elemts in JSON to not lead to firing of exceptions.
+		/// </summary>
+		[Test]
+		public void TestDeserialize_NewElement()
+		{
+			var tariffDescription = JsonConvertRethrow.DeserializeObject<TariffDescription>(
+			@"{
                ""number"" : ""5494"",
                ""name"" : ""Tester Basic"",
                ""FancyNewElement"" : ""Yeah""
             }");
 
-            Assert.That(
-                tariffDescription.number,
-                Is.EqualTo("5494"));
+			Assert.That(
+				tariffDescription.number,
+				Is.EqualTo("5494"));
 
-            Assert.That(
-                tariffDescription.name,
-                Is.EqualTo("Tester Basic"));
-        }
-    }
+			Assert.That(
+				tariffDescription.name,
+				Is.EqualTo("Tester Basic"));
+		}
+	}
 }
diff --git a/TestShareeLib/Repository/TestAppContextInfo.cs b/TestShareeLib/Repository/TestAppContextInfo.cs
index ea199c9..2d7d22c 100644
--- a/TestShareeLib/Repository/TestAppContextInfo.cs
+++ b/TestShareeLib/Repository/TestAppContextInfo.cs
@@ -4,33 +4,33 @@ using TINK.Repository;
 
 namespace TestShareeLib.Repository
 {
-    [TestFixture]
-    public class TestAppContextInfo
-    {
-        [Test]
-        public void TestCtor()
-        {
-            var l_oInfo = new AppContextInfo("123", "app.name", new Version(1, 2));
-            Assert.That(
-                l_oInfo.UserAgent,
-                Is.EqualTo("app.name/1.2"));
+	[TestFixture]
+	public class TestAppContextInfo
+	{
+		[Test]
+		public void TestCtor()
+		{
+			var l_oInfo = new AppContextInfo("123", "app.name", new Version(1, 2));
+			Assert.That(
+				l_oInfo.UserAgent,
+				Is.EqualTo("app.name/1.2"));
 
-        }
+		}
 
-        [Test]
-        public void TestCtorEmtyMerchant()
-        {
-            Assert.That(
-                () => new AppContextInfo("", "app.name", new Version(1, 2)),
-                Throws.TypeOf<ArgumentNullException>());
-        }
+		[Test]
+		public void TestCtorEmtyMerchant()
+		{
+			Assert.That(
+				() => new AppContextInfo("", "app.name", new Version(1, 2)),
+				Throws.TypeOf<ArgumentNullException>());
+		}
 
-        [Test]
-        public void TestCtorEmtyAppName()
-        {
-            Assert.That(
-                () => new AppContextInfo("123", "", new Version(1, 2)),
-                Throws.TypeOf<ArgumentNullException>());
-        }
-    }
+		[Test]
+		public void TestCtorEmtyAppName()
+		{
+			Assert.That(
+				() => new AppContextInfo("123", "", new Version(1, 2)),
+				Throws.TypeOf<ArgumentNullException>());
+		}
+	}
 }
diff --git a/TestShareeLib/Repository/TestCopriCallsHttps.cs b/TestShareeLib/Repository/TestCopriCallsHttps.cs
index c7434aa..bc7cd98 100644
--- a/TestShareeLib/Repository/TestCopriCallsHttps.cs
+++ b/TestShareeLib/Repository/TestCopriCallsHttps.cs
@@ -2,16 +2,16 @@
 
 namespace UITest.Fixtures.Connector
 {
-    [TestFixture]
-    public class TestCopriCallsHttps
-    {
-        public const string CATEGORY_REQUIRESCOPRI = "RequiresCOPRI";
+	[TestFixture]
+	public class TestCopriCallsHttps
+	{
+		public const string CATEGORY_REQUIRESCOPRI = "RequiresCOPRI";
 
-        public const string CATEGORY_USESLIVESERVER = "RequiresCOPRI.Live";
+		public const string CATEGORY_USESLIVESERVER = "RequiresCOPRI.Live";
 
-        public const string CATEGORY_USESDEVELSERVER = "RequiresCOPRI.Devel";
+		public const string CATEGORY_USESDEVELSERVER = "RequiresCOPRI.Devel";
 
-        public const string TESTAGENT = "TestShareeLib";
+		public const string TESTAGENT = "TestShareeLib";
 
-    }
+	}
 }
diff --git a/TestShareeLib/Repository/TestCopriCallsMonkeyStore.cs b/TestShareeLib/Repository/TestCopriCallsMonkeyStore.cs
index 693a7c7..ed3e0f3 100644
--- a/TestShareeLib/Repository/TestCopriCallsMonkeyStore.cs
+++ b/TestShareeLib/Repository/TestCopriCallsMonkeyStore.cs
@@ -7,77 +7,77 @@ using TINK.Repository.Response;
 
 namespace UITest.Fixtures.ObjectTests.Connector
 {
-    [TestFixture]
-    public class TestCopriCallsMonkeyStore
-    {
-        [Test]
-        public void TestConstruct()
-        {
-            var bikesAvailable = JsonConvert.DeserializeObject<BikesAvailableResponse>(CopriCallsMonkeyStore.BIKESAVAILABLE);
-            Assert.NotNull(bikesAvailable?.bikes);
+	[TestFixture]
+	public class TestCopriCallsMonkeyStore
+	{
+		[Test]
+		public void TestConstruct()
+		{
+			var bikesAvailable = JsonConvert.DeserializeObject<BikesAvailableResponse>(CopriCallsMonkeyStore.BIKESAVAILABLE);
+			Assert.NotNull(bikesAvailable?.bikes);
 
-            var bikesOccupied = JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(CopriCallsMonkeyStore.BIKESOCCUPIED);
-            Assert.NotNull(bikesOccupied?.bikes_occupied);
+			var bikesOccupied = JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(CopriCallsMonkeyStore.BIKESOCCUPIED);
+			Assert.NotNull(bikesOccupied?.bikes_occupied);
 
-            var stations = JsonConvert.DeserializeObject<StationsAvailableResponse>(CopriCallsMonkeyStore.STATIONSALL);
-            Assert.NotNull(stations?.stations);
-        }
+			var stations = JsonConvert.DeserializeObject<StationsAvailableResponse>(CopriCallsMonkeyStore.STATIONSALL);
+			Assert.NotNull(stations?.stations);
+		}
 
-        [Test]
-        public async Task TestGetStations()
-        {
-            if (string.IsNullOrEmpty(Barrel.ApplicationId))
-            {
-                Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
-            }
+		[Test]
+		public async Task TestGetStations()
+		{
+			if (string.IsNullOrEmpty(Barrel.ApplicationId))
+			{
+				Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
+			}
 
-            try
-            {
-                var cache = new CopriCallsMonkeyStore("123456789", null /*UI language */);
-                Assert.AreEqual(0, (await cache.GetStationsAsync()).stations.Count);
-            }
-            finally
-            {
-                Barrel.Current.EmptyAll();
-            }
-        }
+			try
+			{
+				var cache = new CopriCallsMonkeyStore("123456789", null /*UI language */);
+				Assert.AreEqual(0, (await cache.GetStationsAsync()).stations.Count);
+			}
+			finally
+			{
+				Barrel.Current.EmptyAll();
+			}
+		}
 
-        [Test]
-        public async Task TestGetBikesAvailable()
-        {
-            if (string.IsNullOrEmpty(Barrel.ApplicationId))
-            {
-                Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
-            }
+		[Test]
+		public async Task TestGetBikesAvailable()
+		{
+			if (string.IsNullOrEmpty(Barrel.ApplicationId))
+			{
+				Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
+			}
 
-            try
-            {
-                var cache = new CopriCallsMonkeyStore("123456789", null /*UI language */);
-                Assert.AreEqual(0, (await cache.GetBikesAvailableAsync()).bikes.Count);
-            }
-            finally
-            {
-                Barrel.Current.EmptyAll();
-            }
-        }
+			try
+			{
+				var cache = new CopriCallsMonkeyStore("123456789", null /*UI language */);
+				Assert.AreEqual(0, (await cache.GetBikesAvailableAsync()).bikes.Count);
+			}
+			finally
+			{
+				Barrel.Current.EmptyAll();
+			}
+		}
 
-        [Test]
-        public async Task TestGetBikesOccupied()
-        {
-            if (string.IsNullOrEmpty(Barrel.ApplicationId))
-            {
-                Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
-            }
+		[Test]
+		public async Task TestGetBikesOccupied()
+		{
+			if (string.IsNullOrEmpty(Barrel.ApplicationId))
+			{
+				Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
+			}
 
-            try
-            {
-                var cache = new CopriCallsMonkeyStore("123456789", "abc");
-                Assert.AreEqual(0, (await cache.GetBikesOccupiedAsync()).bikes_occupied.Count);
-            }
-            finally
-            {
-                Barrel.Current.EmptyAll();
-            }
-        }
-    }
+			try
+			{
+				var cache = new CopriCallsMonkeyStore("123456789", "abc");
+				Assert.AreEqual(0, (await cache.GetBikesOccupiedAsync()).bikes_occupied.Count);
+			}
+			finally
+			{
+				Barrel.Current.EmptyAll();
+			}
+		}
+	}
 }
diff --git a/TestShareeLib/Repository/TestCopriCallsStatic.cs b/TestShareeLib/Repository/TestCopriCallsStatic.cs
index c1c3501..7ba44f6 100644
--- a/TestShareeLib/Repository/TestCopriCallsStatic.cs
+++ b/TestShareeLib/Repository/TestCopriCallsStatic.cs
@@ -5,13 +5,13 @@ using TINK.Repository.Response;
 
 namespace TestShareeLib.Repository
 {
-    [TestFixture]
-    public class TestCopriCallsStatic
-    {
-        [Test]
-        public void TestDeserializeResponse_Factory_SupportedVersion()
-        {
-            var response = @"
+	[TestFixture]
+	public class TestCopriCallsStatic
+	{
+		[Test]
+		public void TestDeserializeResponse_Factory_SupportedVersion()
+		{
+			var response = @"
                 {
                     ""shareejson"" :
                     {   
@@ -19,16 +19,16 @@ namespace TestShareeLib.Repository
                     }
                 }";
 
-            Assert.That(
-                response.DeserializeResponse(version => new ResponseBase()).copri_version,
-                Is.EqualTo("4.1.5.7"));
-        }
+			Assert.That(
+				response.DeserializeResponse(version => new ResponseBase()).copri_version,
+				Is.EqualTo("4.1.5.7"));
+		}
 
-        [Test]
-        public void TestDeserializeResponse_Factory_UnspportedVersion()
-        {
-            // Future version
-            var response = @"
+		[Test]
+		public void TestDeserializeResponse_Factory_UnspportedVersion()
+		{
+			// Future version
+			var response = @"
                 {
                     ""shareejson"" :
                     {   
@@ -36,24 +36,24 @@ namespace TestShareeLib.Repository
                     }
                 }";
 
-            var factoryObject = JsonConvert.DeserializeObject<ResponseContainer<ResponseBase>>(
-                @"{
+			var factoryObject = JsonConvert.DeserializeObject<ResponseContainer<ResponseBase>>(
+				@"{
                     ""shareejson"" :
                     {   
                         ""copri_version"" : ""9.9.9.9"" 
                     }
                 }");
 
-            Assert.That(
-                response.DeserializeResponse(version => factoryObject).shareejson.copri_version,
-                Is.EqualTo("9.9.9.9"));
-        }
+			Assert.That(
+				response.DeserializeResponse(version => factoryObject).shareejson.copri_version,
+				Is.EqualTo("9.9.9.9"));
+		}
 
-        [Test]
-        public void TestDeserializeResponse_Exception_SupportedVersion()
-        {
-            // Future version
-            var response = @"
+		[Test]
+		public void TestDeserializeResponse_Exception_SupportedVersion()
+		{
+			// Future version
+			var response = @"
                 {
                     ""shareejson"" :
                     {   
@@ -61,16 +61,16 @@ namespace TestShareeLib.Repository
                     }
                 }";
 
-            Assert.That(
-                response.DeserializeResponse<ResponseBase>(version => new System.Exception("hello")).copri_version,
-                Is.EqualTo("4.1.5.7"),
-                "No exception must be thrown because version 4.1.x is supported.");
-        }
+			Assert.That(
+				response.DeserializeResponse<ResponseBase>(version => new System.Exception("hello")).copri_version,
+				Is.EqualTo("4.1.5.7"),
+				"No exception must be thrown because version 4.1.x is supported.");
+		}
 
-        [Test]
-        public void TestDeserializeResponse_Exception_UnspportedVersion()
-        {
-            var response = @"
+		[Test]
+		public void TestDeserializeResponse_Exception_UnspportedVersion()
+		{
+			var response = @"
                 {
                     ""shareejson"" :
                     {   
@@ -78,9 +78,9 @@ namespace TestShareeLib.Repository
                     }
                 }";
 
-            Assert.That(
-                () => response.DeserializeResponse<ResponseBase>(version => new System.Exception("Ho")).copri_version,
-                Throws.InstanceOf<System.Exception>());
-        }
-    }
+			Assert.That(
+				() => response.DeserializeResponse<ResponseBase>(version => new System.Exception("Ho")).copri_version,
+				Throws.InstanceOf<System.Exception>());
+		}
+	}
 }
diff --git a/TestShareeLib/Services/CopriApi/TestGeneralData.cs b/TestShareeLib/Services/CopriApi/TestGeneralData.cs
index 2c2d8f8..b61140c 100644
--- a/TestShareeLib/Services/CopriApi/TestGeneralData.cs
+++ b/TestShareeLib/Services/CopriApi/TestGeneralData.cs
@@ -6,69 +6,69 @@ using TINK.Services.CopriApi;
 
 namespace TestShareeLib.Services.CopriApi
 {
-    [TestFixture]
-    public class TestGeneralData
-    {
-        [Test]
-        public void TestCtor()
-        {
-            Assert.That(
-                new GeneralData().MerchantMessage,
-                Is.EqualTo(""));
+	[TestFixture]
+	public class TestGeneralData
+	{
+		[Test]
+		public void TestCtor()
+		{
+			Assert.That(
+				new GeneralData().MerchantMessage,
+				Is.EqualTo(""));
 
-            Assert.That(
-                new GeneralData().ApiVersion,
-                Is.EqualTo(new Version(0, 0)));
+			Assert.That(
+				new GeneralData().ApiVersion,
+				Is.EqualTo(new Version(0, 0)));
 
-            Assert.That(
-                new GeneralData().InitialMapSpan?.IsValid,
-                Is.False,
-                "Object not not be null but invalid.");
-        }
+			Assert.That(
+				new GeneralData().InitialMapSpan?.IsValid,
+				Is.False,
+				"Object not not be null but invalid.");
+		}
 
-        [Test]
-        public void TestMessage()
-        {
-            Assert.That(
-                new GeneralData(
-                    MapSpanFactory.Create(),
-                    "Hello",
-                    null,
-                    new ResourceUrls()).MerchantMessage,
-                Is.EqualTo("Hello"));
-        }
+		[Test]
+		public void TestMessage()
+		{
+			Assert.That(
+				new GeneralData(
+					MapSpanFactory.Create(),
+					"Hello",
+					null,
+					new ResourceUrls()).MerchantMessage,
+				Is.EqualTo("Hello"));
+		}
 
-        [Test]
-        public void TestVersion()
-        {
-            Assert.That(
-                new GeneralData(
-                    MapSpanFactory.Create(),
-                    null,
-                    new Version(1, 2),
-                    new ResourceUrls()).ApiVersion,
-                Is.EqualTo(new Version(1, 2)));
-        }
+		[Test]
+		public void TestVersion()
+		{
+			Assert.That(
+				new GeneralData(
+					MapSpanFactory.Create(),
+					null,
+					new Version(1, 2),
+					new ResourceUrls()).ApiVersion,
+				Is.EqualTo(new Version(1, 2)));
+		}
 
 
-        [Test]
-        public void TestInitialMapSpan()
-        {
-            Assert.That(
-                new GeneralData(
-                    MapSpanFactory.Create(PositionFactory.Create(0, 8), 15),
-                    null,
-                    new Version(1, 2),
-                    new ResourceUrls()).InitialMapSpan.Center.Longitude,
-                Is.EqualTo(8));
+		[Test]
+		public void TestInitialMapSpan()
+		{
+			Assert.That(
+				new GeneralData(
+					MapSpanFactory.Create(PositionFactory.Create(0, 8), 15),
+					null,
+					new Version(1, 2),
+					new ResourceUrls()).InitialMapSpan.Center.Longitude,
+				Is.EqualTo(8));
 
-            Assert.That(
-                new GeneralData(
-                    MapSpanFactory.Create(PositionFactory.Create(0, 8), 15),
-                    null,
-                    new Version(1, 2),
-                    new ResourceUrls()).InitialMapSpan.Radius,
-                Is.EqualTo(15));
-        }
-    }
+			Assert.That(
+				new GeneralData(
+					MapSpanFactory.Create(PositionFactory.Create(0, 8), 15),
+					null,
+					new Version(1, 2),
+					new ResourceUrls()).InitialMapSpan.Radius,
+				Is.EqualTo(15));
+		}
+	}
 }
diff --git a/TestShareeLib/Services/CopriApi/TestResult.cs b/TestShareeLib/Services/CopriApi/TestResult.cs
index acb6256..be093dd 100644
--- a/TestShareeLib/Services/CopriApi/TestResult.cs
+++ b/TestShareeLib/Services/CopriApi/TestResult.cs
@@ -7,27 +7,27 @@ using TINK.Services.CopriApi;
 
 namespace TestShareeLib.Services.CopriApi
 {
-    [TestFixture]
-    public class TestResult
-    {
-        [Test]
-        public void TestCtor()
-        {
-            Assert.That(
-                new Result<object>(typeof(TestResult), new TestResult(), null).GeneralData,
-                Is.Not.Null);
-        }
+	[TestFixture]
+	public class TestResult
+	{
+		[Test]
+		public void TestCtor()
+		{
+			Assert.That(
+				new Result<object>(typeof(TestResult), new TestResult(), null).GeneralData,
+				Is.Not.Null);
+		}
 
-        [Test]
-        public void TestGeneralData()
-        {
-            Assert.That(
-                new Result<object>(typeof(TestResult), new TestResult(), new GeneralData(
-                    MapSpanFactory.Create(),
-                    "Hello",
-                    new Version(0, 0),
-                    new ResourceUrls())).GeneralData.MerchantMessage,
-                Is.EqualTo("Hello"));
-        }
-    }
+		[Test]
+		public void TestGeneralData()
+		{
+			Assert.That(
+				new Result<object>(typeof(TestResult), new TestResult(), new GeneralData(
+					MapSpanFactory.Create(),
+					"Hello",
+					new Version(0, 0),
+					new ResourceUrls())).GeneralData.MerchantMessage,
+				Is.EqualTo("Hello"));
+		}
+	}
 }
diff --git a/TestShareeLib/Services/TestServicesContainerMutable.cs b/TestShareeLib/Services/TestServicesContainerMutable.cs
index 4929dc2..2a27fa2 100644
--- a/TestShareeLib/Services/TestServicesContainerMutable.cs
+++ b/TestShareeLib/Services/TestServicesContainerMutable.cs
@@ -5,64 +5,64 @@ using TINK.Services;
 
 namespace TestShareeLib.Services
 {
-    [TestFixture]
-    public class TestServicesContainerMutable
-    {
-        [Test]
-        public void TestCtor()
-        {
-            var typeA = new MyTypeA();
-            var typeB = new MyTypeB();
+	[TestFixture]
+	public class TestServicesContainerMutable
+	{
+		[Test]
+		public void TestCtor()
+		{
+			var typeA = new MyTypeA();
+			var typeB = new MyTypeB();
 
-            var serviceContainer = new ServicesContainerMutableT<object>(
-                new List<object> { typeA, typeB, typeB },
-                typeA.GetType().FullName);
+			var serviceContainer = new ServicesContainerMutableT<object>(
+				new List<object> { typeA, typeB, typeB },
+				typeA.GetType().FullName);
 
-            Assert.That(
-                serviceContainer,
-                Is.EqualTo(new List<object> { typeA, typeB }).AsCollection);
+			Assert.That(
+				serviceContainer,
+				Is.EqualTo(new List<object> { typeA, typeB }).AsCollection);
 
-            Assert.That(
-                serviceContainer.Active,
-                Is.EqualTo(typeA));
-        }
+			Assert.That(
+				serviceContainer.Active,
+				Is.EqualTo(typeA));
+		}
 
-        [Test]
-        public void TestSetActive()
-        {
-            var typeA = new MyTypeA();
-            var typeB = new MyTypeB();
+		[Test]
+		public void TestSetActive()
+		{
+			var typeA = new MyTypeA();
+			var typeB = new MyTypeB();
 
-            var serviceContainer = new ServicesContainerMutableT<object>(
-                new List<object> { typeA, typeB },
-                typeA.GetType().FullName);
+			var serviceContainer = new ServicesContainerMutableT<object>(
+				new List<object> { typeA, typeB },
+				typeA.GetType().FullName);
 
-            serviceContainer.SetActive(typeB.GetType().FullName);
+			serviceContainer.SetActive(typeB.GetType().FullName);
 
-            Assert.That(
-                serviceContainer.Active,
-                Is.EqualTo(typeB));
-        }
+			Assert.That(
+				serviceContainer.Active,
+				Is.EqualTo(typeB));
+		}
 
-        [Test]
-        public void TestSetActiveNotExists()
-        {
-            var typeA = new MyTypeA();
-            var typeB = new MyTypeB();
+		[Test]
+		public void TestSetActiveNotExists()
+		{
+			var typeA = new MyTypeA();
+			var typeB = new MyTypeB();
 
-            var serviceContainer = new ServicesContainerMutableT<object>(
-                new List<object> { typeA, typeB },
-                typeA.GetType().FullName);
+			var serviceContainer = new ServicesContainerMutableT<object>(
+				new List<object> { typeA, typeB },
+				typeA.GetType().FullName);
 
-            Assert.That(
-                () => serviceContainer.SetActive(new MyTypeC().GetType().FullName),
-                Throws.TypeOf<ArgumentException>());
-        }
+			Assert.That(
+				() => serviceContainer.SetActive(new MyTypeC().GetType().FullName),
+				Throws.TypeOf<ArgumentException>());
+		}
 
-        private class MyTypeA { }
+		private class MyTypeA { }
 
-        private class MyTypeB { }
+		private class MyTypeB { }
 
-        private class MyTypeC { }
-    }
+		private class MyTypeC { }
+	}
 }
diff --git a/TestShareeLib/TestShareeLib.csproj b/TestShareeLib/TestShareeLib.csproj
index 180954f..91c81c3 100644
--- a/TestShareeLib/TestShareeLib.csproj
+++ b/TestShareeLib/TestShareeLib.csproj
@@ -32,7 +32,7 @@
     <PackageReference Include="NSubstitute" Version="4.4.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
     <PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
   </ItemGroup>
 
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedClosed.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedClosed.cs
index efe9818..5c06fea 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedClosed.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedClosed.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
@@ -24,1317 +24,1318 @@ using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
 
 namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    [TestFixture]
-    public class TestBookedClosed
-    {
-        /// <summary>
-        /// Test construction of object.
-        /// </summary>
-        [Test]
-        public void Testctor()
-        {
-            var handler = new BookedClosed(
-                Substitute.For<IBikeInfoMutable>(),
-                () => true, // isConnectedDelegate
-                (isConnexted) => Substitute.For<IConnector>(),
-                Substitute.For<IGeolocation>(),
-                Substitute.For<ILocksService>(),
-                () => Substitute.For<IPollingUpdateTaskManager>(),
-                Substitute.For<ISmartDevice>(),
-                Substitute.For<IViewService>(),
-                Substitute.For<IBikesViewModel>(),
-                Substitute.For<IUser>());
-
-            // Verify prerequisites.
-            Assert.AreEqual("Return bike", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual("Open lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Return bike.
-        /// Comment: User deceide to abort returning bike
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestReturnCancel()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(false));
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                viewService.DisplayAlert(string.Empty, "Return bike Nr. 0?", "Yes", "No");
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Return bike.
-        /// Final state: Disposable closed
-        /// </summary>
-        [Test]
-        public void TestReturnOutOfReach()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].GetDeviceState().Returns(DeviceState.Disconnected); // Simulate bike out of reach. 
-
-            bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Returning bike...";
-                connector.Command.DoReturn(bike, Arg.Is<LocationDto>(x => x == null));
-                bikesViewModel.ActionText = "Disconnecting lock...";
-                locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Return bike.
-        /// Final state: Disposable closed
-        /// </summary>
-        [Test]
-        public void TestReturnLockInReach()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach. If bike is out of reach bluetooth state changes to unknown.
-
-            geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>()).Returns(Task.FromResult(
-                new Xamarin.Essentials.Location(7, 9)
-                ));
-
-            bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Query location...";
-                bikesViewModel.ActionText = "Returning bike...";
-                connector.Command.DoReturn(bike, Arg.Is<LocationDto>(x => x != null));
-                bikesViewModel.ActionText = "Disconnecting lock...";
-                locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Return bike.
-        /// Final state: Disposable closed
-        /// </summary>
-        [Test]
-        public void TestReturnLockInReachNoGeolocation()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach. If bike is out of reach bluetooth state changes to unknown.
-
-            geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>()).Returns<Xamarin.Essentials.Location>(x => throw new Exception());
-
-            bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Query location...";
-                bikesViewModel.ActionText = "Returning bike...";
-                connector.Command.DoReturn(bike, Arg.Is<LocationDto>(x => x == null));
-                bikesViewModel.ActionText = "Disconnecting lock...";
-                locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Return bike.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestReturnReturnFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach. If bike is out of reach bluetooth state changes to unknown.
-
-            connector.Command.DoReturn(bike, Arg.Any<LocationDto>()).Returns<BookingFinishedModel>(x => throw new WebConnectFailureException("Context info", new Exception("hoppla")));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Returning bike...";
-                connector.Command.DoReturn(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAdvancedAlert(
-                    "Connection error when returning the bike!",
-                    "Internet must be available when returning the bike.\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?",
-                    "Context info",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Return bike.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestReturnReturnFailsNotAtStationException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach. If bike is out of reach bluetooth state changes to unknown.
-
-            NotAtStationException.IsNotAtStation("Failure 2178: bike 1545 out of GEO fencing. 15986 meter distance to next station 42. OK: bike 1545 locked confirmed", out NotAtStationException notAtStationException);
-
-            connector.Command.DoReturn(bike, Arg.Any<LocationDto>()).Returns<BookingFinishedModel>(x =>
-                throw notAtStationException);
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Returning bike...";
-                connector.Command.DoReturn(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error returning bike!", "Returning bike outside of station is not possible. Distance to station 42 is 15986 m.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Return bike.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestReturnReturnFailsNoGPSDataException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach. If bike is out of reach bluetooth state changes to unknown.
-
-            NoGPSDataException.IsNoGPSData("Failure 2245: No GPS data, state change forbidden.", out NoGPSDataException noGPSDataException);
-
-            connector.Command.DoReturn(bike, Arg.Any<LocationDto>()).Returns<BookingFinishedModel>(x =>
-                throw noGPSDataException);
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Returning bike...";
-                connector.Command.DoReturn(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error returning bike!", "Returning bike at an unknown location is not possible.\r\nBike can be returned if\r\n- location information is available when closing lock\r\n- bike is in reach and location information is available when pressing button \"Return bike\"", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Return bike.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestReturnReturnFailsResponseException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach. If bike is out of reach bluetooth state changes to unknown.
-
-            connector.Command.DoReturn(bike, Arg.Any<LocationDto>()).Returns<BookingFinishedModel>(x =>
-                throw new ReturnBikeException(JsonConvert.DeserializeObject<DoReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Returning bike...";
-                connector.Command.DoReturn(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAdvancedAlert("Statusfehler beim Zurückgeben des Rads!", "Outer message.", "Some invalid data received!", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Return bike.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestReturnReturnFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach. If bike is out of reach bluetooth state changes to unknown.
-
-            connector.Command.DoReturn(bike, Arg.Any<LocationDto>()).Returns<BookingFinishedModel>(x => throw new Exception("Exception message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Returning bike...";
-                connector.Command.DoReturn(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error returning bike!", "Exception message.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock
-        /// Final state: Booked opened.
-        /// </summary>
-        [Test]
-        public void TestOpen()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, null);
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestOpenOpenFailsOutOfReachException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Closed);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error while opening lock!", "Lock cannot be opened until bike is near.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Disconnected" after action
-            Assert.AreEqual(nameof(BookedDisconnected), subsequent.ButtonText);
-            Assert.IsFalse(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestOpenOpenFailsCouldntOpenBoldBlockedException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenBoldIsBlockedException());
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Closed);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error while opening lock!", "Lock is blocked. Please ensure that no obstacle prevents lock from opening and try again.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Unknown" after action
-            Assert.AreEqual("Open lock", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-
-        /// <summary>
-        /// Use case: Open lock
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestOpenOpenFailsCouldntOpenInconsistentStateExecptionClosed()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenInconsistentStateExecption(LockingState.Closed));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Closed);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error while opening lock!", "After try to open lock state closed is reported.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestOpenOpenFailsCouldntOpenInconsistentStateExecption()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenBoldWasBlockedException());
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Closed);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Lock can not be opened!", "Lock was blocked and might still be. Please ensure that no obstacle prevents lock from opening and try again.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Disconnected" after action
-            Assert.AreEqual("Open lock", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestOpenOpenFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Closed);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error while opening lock!", "Exception message.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Disconnected" after action
-            Assert.AreEqual(nameof(BookedDisconnected), subsequent.ButtonText);
-            Assert.IsFalse(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock
-        /// Final state: Booked opened.
-        /// </summary>
-        [Test]
-        public void TestOpenGetBatteryPercentageAsyncThrowsOutOfReachException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
-
-            locks[0].GetBatteryPercentageAsync().Returns<Task<double>>(x => throw new OutOfReachException());
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Battery status can only be read when bike is nearby.";
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, null);
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock
-        /// Final state: Booked opened.
-        /// </summary>
-        [Test]
-        public void TestOpenGetBatteryPercentageAsyncThrowsExcepton()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
-
-            locks[0].GetBatteryPercentageAsync().Returns<Task<double>>(x => throw new Exception());
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Battery status cannot be read.";
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, null);
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock
-        /// Final state: Booked open.
-        /// </summary>
-        [Test]
-        public void TestOpenUpdateLockingStateFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns(LockitLockingState.Open);
-
-            connector.Command.UpdateLockingStateAsync(bike, null).Returns(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Open);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, null);
-                bikesViewModel.ActionText = "No web error on updating locking status.";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock
-        /// Final state: Booked open.
-        /// </summary>
-        [Test]
-        public void TestOpenUpdateLockingStateFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns(LockitLockingState.Open);
-
-            connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new Exception("Exception message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Open);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "Connection error on updating locking status.";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock
-        /// Final state: Booked open.
-        /// </summary>
-        [Test]
-        public void TestOpenUpdateLockingStateFailsResponseException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns(LockitLockingState.Open);
-
-            connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x =>
-                throw new ReturnBikeException(JsonConvert.DeserializeObject<DoReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Open);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "Status error on updating lock state.";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-    }
+	[TestFixture]
+	public class TestBookedClosed
+	{
+		/// <summary>
+		/// Test construction of object.
+		/// </summary>
+		[Test]
+		public void Testctor()
+		{
+			var handler = new BookedClosed(
+				Substitute.For<IBikeInfoMutable>(),
+				() => true, // isConnectedDelegate
+				(isConnexted) => Substitute.For<IConnector>(),
+				Substitute.For<IGeolocation>(),
+				Substitute.For<ILocksService>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
+				Substitute.For<ISmartDevice>(),
+				Substitute.For<IViewService>(),
+				Substitute.For<IBikesViewModel>(),
+				Substitute.For<IUser>());
+
+			// Verify prerequisites.
+			//Assert.AreEqual("Return bike", handler.ButtonText);
+			//Assert.IsTrue(handler.IsButtonVisible);
+			Assert.AreEqual("Open lock", handler.LockitButtonText);
+			Assert.IsTrue(handler.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Return bike.
+		/// Comment: User deceide to abort returning bike
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestReturnCancel()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(false));
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				viewService.DisplayAlert(string.Empty, "Return bike Nr. 0?", "Yes", "No");
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Return bike.
+		/// Final state: Disposable closed
+		/// </summary>
+		[Test]
+		public void TestReturnOutOfReach()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].GetDeviceState().Returns(DeviceState.Disconnected); // Simulate bike out of reach. 
+
+			bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Returning bike...";
+				connector.Command.DoReturn(bike, Arg.Is<LocationDto>(x => x == null));
+				bikesViewModel.ActionText = "Disconnecting lock...";
+				locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Reserve bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
+			Assert.IsFalse(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Return bike.
+		/// Final state: Disposable closed
+		/// </summary>
+		[Test]
+		public void TestReturnLockInReach()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach. If bike is out of reach bluetooth state changes to unknown.
+
+			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>()).Returns(Task.FromResult(
+				new Xamarin.Essentials.Location(7, 9)
+				));
+
+			bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Query location...";
+				bikesViewModel.ActionText = "Returning bike...";
+				connector.Command.DoReturn(bike, Arg.Is<LocationDto>(x => x != null));
+				bikesViewModel.ActionText = "Disconnecting lock...";
+				locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Reserve bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
+			Assert.IsFalse(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Return bike.
+		/// Final state: Disposable closed
+		/// </summary>
+		[Test]
+		public void TestReturnLockInReachNoGeolocation()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach. If bike is out of reach bluetooth state changes to unknown.
+
+			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>()).Returns<Xamarin.Essentials.Location>(x => throw new Exception());
+
+			bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Query location...";
+				bikesViewModel.ActionText = "Returning bike...";
+				connector.Command.DoReturn(bike, Arg.Is<LocationDto>(x => x == null));
+				bikesViewModel.ActionText = "Disconnecting lock...";
+				locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Reserve bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
+			Assert.IsFalse(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Return bike.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestReturnReturnFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach. If bike is out of reach bluetooth state changes to unknown.
+
+			connector.Command.DoReturn(bike, Arg.Any<LocationDto>()).Returns<BookingFinishedModel>(x => throw new WebConnectFailureException("Context info", new Exception("hoppla")));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Returning bike...";
+				connector.Command.DoReturn(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAdvancedAlert(
+					"Connection error when returning the bike!",
+					"Internet must be available when returning the bike.\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?",
+					"Context info",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Return bike.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestReturnReturnFailsNotAtStationException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach. If bike is out of reach bluetooth state changes to unknown.
+
+			NotAtStationException.IsNotAtStation("Failure 2178: bike 1545 out of GEO fencing. 15986 meter distance to next station 42. OK: bike 1545 locked confirmed", out NotAtStationException notAtStationException);
+
+			connector.Command.DoReturn(bike, Arg.Any<LocationDto>()).Returns<BookingFinishedModel>(x =>
+				throw notAtStationException);
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Returning bike...";
+				connector.Command.DoReturn(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error returning bike!", "Returning bike outside of station is not possible. Distance to station 42 is 15986 m.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Return bike.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestReturnReturnFailsNoGPSDataException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach. If bike is out of reach bluetooth state changes to unknown.
+
+			NoGPSDataException.IsNoGPSData("Failure 2245: No GPS data, state change forbidden.", out NoGPSDataException noGPSDataException);
+
+			connector.Command.DoReturn(bike, Arg.Any<LocationDto>()).Returns<BookingFinishedModel>(x =>
+				throw noGPSDataException);
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Returning bike...";
+				connector.Command.DoReturn(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error returning bike!", "Returning bike at an unknown location is not possible.\r\nBike can be returned if\r\n- location information is available when closing lock\r\n- bike is in reach and location information is available when pressing button \"Return bike\"", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Return bike.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestReturnReturnFailsResponseException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach. If bike is out of reach bluetooth state changes to unknown.
+
+			connector.Command.DoReturn(bike, Arg.Any<LocationDto>()).Returns<BookingFinishedModel>(x =>
+				throw new ReturnBikeException(JsonConvert.DeserializeObject<DoReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Returning bike...";
+				connector.Command.DoReturn(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAdvancedAlert("Statusfehler beim Zurückgeben des Rads!", "Outer message.", "Some invalid data received!", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Return bike.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestReturnReturnFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach. If bike is out of reach bluetooth state changes to unknown.
+
+			connector.Command.DoReturn(bike, Arg.Any<LocationDto>()).Returns<BookingFinishedModel>(x => throw new Exception("Exception message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Returning bike...";
+				connector.Command.DoReturn(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error returning bike!", "Exception message.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Booked opened.
+		/// </summary>
+		[Test]
+		public void TestOpen()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, null);
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Open" after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestOpenOpenFailsOutOfReachException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Closed);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error while opening lock!", "Lock cannot be opened until bike is near.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Disconnected" after action
+			Assert.AreEqual(nameof(BookedDisconnected), subsequent.ButtonText);
+			Assert.IsFalse(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestOpenOpenFailsCouldntOpenBoldBlockedException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenBoldIsBlockedException());
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Closed);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error while opening lock!", "Lock is blocked. Please ensure that no obstacle prevents lock from opening and try again.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Unknown" after action
+			Assert.AreEqual("Open lock", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestOpenOpenFailsCouldntOpenInconsistentStateExecptionClosed()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenInconsistentStateExecption(LockingState.Closed));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Closed);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error while opening lock!", "After try to open lock state closed is reported.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Closed" after action
+			// Following two assertions are deactivated temporarily in context of issue https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/440/.
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestOpenOpenFailsCouldntOpenInconsistentStateExecption()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenBoldWasBlockedException());
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Closed);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Lock can not be opened!", "Lock was blocked and might still be. Please ensure that no obstacle prevents lock from opening and try again.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Disconnected" after action
+			Assert.AreEqual("Open lock", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestOpenOpenFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Closed);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error while opening lock!", "Exception message.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Disconnected" after action
+			Assert.AreEqual(nameof(BookedDisconnected), subsequent.ButtonText);
+			Assert.IsFalse(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Booked opened.
+		/// </summary>
+		[Test]
+		public void TestOpenGetBatteryPercentageAsyncThrowsOutOfReachException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
+
+			locks[0].GetBatteryPercentageAsync().Returns<Task<double>>(x => throw new OutOfReachException());
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Battery status can only be read when bike is nearby.";
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, null);
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Open" after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Booked opened.
+		/// </summary>
+		[Test]
+		public void TestOpenGetBatteryPercentageAsyncThrowsExcepton()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
+
+			locks[0].GetBatteryPercentageAsync().Returns<Task<double>>(x => throw new Exception());
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Battery status cannot be read.";
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, null);
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Closed" after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Booked open.
+		/// </summary>
+		[Test]
+		public void TestOpenUpdateLockingStateFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns(LockitLockingState.Open);
+
+			connector.Command.UpdateLockingStateAsync(bike, null).Returns(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Open);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, null);
+				bikesViewModel.ActionText = "No web error on updating locking status.";
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Open" after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Booked open.
+		/// </summary>
+		[Test]
+		public void TestOpenUpdateLockingStateFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns(LockitLockingState.Open);
+
+			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new Exception("Exception message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Open);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "Connection error on updating locking status.";
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Open" after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Booked open.
+		/// </summary>
+		[Test]
+		public void TestOpenUpdateLockingStateFailsResponseException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns(LockitLockingState.Open);
+
+			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x =>
+				throw new ReturnBikeException(JsonConvert.DeserializeObject<DoReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Open);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "Status error on updating lock state.";
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Open" after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedDisconnected.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedDisconnected.cs
index a183711..1182159 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedDisconnected.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedDisconnected.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using NSubstitute;
 using NUnit.Framework;
@@ -19,443 +19,443 @@ using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
 
 namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    [TestFixture]
-    public class TestBookedDisconnected
-    {
-        /// <summary>
-        /// Test construction of object.
-        /// </summary>
-        [Test]
-        public void Testctor()
-        {
-            var handler = new BookedDisconnected(
-                Substitute.For<IBikeInfoMutable>(),
-                () => true, // isConnectedDelegate
-                (isConnexted) => Substitute.For<IConnector>(),
-                Substitute.For<IGeolocation>(),
-                Substitute.For<ILocksService>(),
-                () => Substitute.For<IPollingUpdateTaskManager>(),
-                Substitute.For<ISmartDevice>(),
-                Substitute.For<IViewService>(),
-                Substitute.For<IBikesViewModel>(),
-                Substitute.For<IUser>());
+	[TestFixture]
+	public class TestBookedDisconnected
+	{
+		/// <summary>
+		/// Test construction of object.
+		/// </summary>
+		[Test]
+		public void Testctor()
+		{
+			var handler = new BookedDisconnected(
+				Substitute.For<IBikeInfoMutable>(),
+				() => true, // isConnectedDelegate
+				(isConnexted) => Substitute.For<IConnector>(),
+				Substitute.For<IGeolocation>(),
+				Substitute.For<ILocksService>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
+				Substitute.For<ISmartDevice>(),
+				Substitute.For<IViewService>(),
+				Substitute.For<IBikesViewModel>(),
+				Substitute.For<IUser>());
 
-            // Verify prerequisites.
-            Assert.AreEqual("BookedDisconnected", handler.ButtonText);
-            Assert.IsFalse(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
+			// Verify prerequisites.
+			Assert.AreEqual("BookedDisconnected", handler.ButtonText);
+			Assert.IsFalse(handler.IsButtonVisible);
+			Assert.AreEqual("Search lock", handler.LockitButtonText);
+			Assert.IsTrue(handler.IsLockitButtonVisible);
+		}
 
-        [Test]
-        public void TestNotSupported()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		[Test]
+		public void TestNotSupported()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new BookedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new BookedDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
-            // Verify that nothing happened because request is not supported.
-            Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
-            Assert.IsFalse(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
+			// Verify that nothing happened because request is not supported.
+			Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
+			Assert.IsFalse(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Booked open
-        /// </summary>
-        [Test]
-        public void TestSearch()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
+		/// <summary>
+		/// Use case: Search.
+		/// Final state: Booked open
+		/// </summary>
+		[Test]
+		public void TestSearch()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+			var timeOuts = Substitute.For<ITimeOutProvider>();
 
-            var handler = new BookedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new BookedDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
 
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
-                .Returns(Task.FromResult(new LockInfoTdo.Builder { State = LockitLockingState.Open }.Build()));
-            locks.TimeOut.Returns(timeOuts);
+			locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
+				.Returns(Task.FromResult(new LockInfoTdo.Builder { State = LockitLockingState.Open }.Build()));
+			locks.TimeOut.Returns(timeOuts);
 
-            bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.State.Value.Returns(InUseStateEnum.Booked);
 
-            var subsequent = handler.HandleRequestOption2().Result;
+			var subsequent = handler.HandleRequestOption2().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                connector.Command.CalculateAuthKeys(bike);
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Request server...";
+				connector.Command.CalculateAuthKeys(bike);
+				bikesViewModel.ActionText = "Searching lock...";
+				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Booked unknown
-        /// </summary>
-        [Test]
-        public void TestSearchCalculateAuthKeysFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Search.
+		/// Final state: Booked unknown
+		/// </summary>
+		[Test]
+		public void TestSearchCalculateAuthKeysFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new BookedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new BookedDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            connector.Command.CalculateAuthKeys(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("Tst")));
+			connector.Command.CalculateAuthKeys(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("Tst")));
 
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.UnknownFromHardwareError);
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.UnknownFromHardwareError);
 
-            var subsequent = handler.HandleRequestOption2().Result;
+			var subsequent = handler.HandleRequestOption2().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error when connecting with lock!", "Internet must be reachable to connect to lock of rented bike.\r\nContext info\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Request server...";
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error when connecting with lock!", "Internet must be reachable to connect to lock of rented bike.\r\nContext info\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("BookedDisconnected", handler.ButtonText);
-            Assert.IsFalse(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("BookedDisconnected", handler.ButtonText);
+			Assert.IsFalse(handler.IsButtonVisible);
+			Assert.AreEqual("Search lock", handler.LockitButtonText);
+			Assert.IsTrue(handler.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Booked unknown
-        /// </summary>
-        [Test]
-        public void TestSearchCalculateAuthKeysFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Search.
+		/// Final state: Booked unknown
+		/// </summary>
+		[Test]
+		public void TestSearchCalculateAuthKeysFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new BookedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new BookedDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            connector.Command.CalculateAuthKeys(bike).Returns(x => throw new Exception("Exception message."));
+			connector.Command.CalculateAuthKeys(bike).Returns(x => throw new Exception("Exception message."));
 
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.UnknownFromHardwareError);
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.UnknownFromHardwareError);
 
-            var subsequent = handler.HandleRequestOption2().Result;
+			var subsequent = handler.HandleRequestOption2().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error when connecting with lock!", "Communication error during lock search.\r\nException message.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Request server...";
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error when connecting with lock!", "Communication error during lock search.\r\nException message.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("BookedDisconnected", handler.ButtonText);
-            Assert.IsFalse(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("BookedDisconnected", handler.ButtonText);
+			Assert.IsFalse(handler.IsButtonVisible);
+			Assert.AreEqual("Search lock", handler.LockitButtonText);
+			Assert.IsTrue(handler.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Booked unknown
-        /// </summary>
-        [Test]
-        public void TestSearchConnectFailsOutOfReachException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
+		/// <summary>
+		/// Use case: Search.
+		/// Final state: Booked unknown
+		/// </summary>
+		[Test]
+		public void TestSearchConnectFailsOutOfReachException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+			var timeOuts = Substitute.For<ITimeOutProvider>();
 
-            var handler = new BookedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new BookedDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
-                .Returns<Task<LockInfoTdo>>(x => { throw new OutOfReachException(); });
-            locks.TimeOut.Returns(timeOuts);
+			locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
+				.Returns<Task<LockInfoTdo>>(x => { throw new OutOfReachException(); });
+			locks.TimeOut.Returns(timeOuts);
 
-            bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.State.Value.Returns(InUseStateEnum.Booked);
 
-            var subsequent = handler.HandleRequestOption2().Result;
+			var subsequent = handler.HandleRequestOption2().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                connector.Command.CalculateAuthKeys(bike);
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Error when connecting with lock!",
-                    "Lock can only be found when rented bike is nearby.",
-                    "Retry",
-                    "Cancel");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Request server...";
+				connector.Command.CalculateAuthKeys(bike);
+				bikesViewModel.ActionText = "Searching lock...";
+				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Error when connecting with lock!",
+					"Lock can only be found when rented bike is nearby.",
+					"Retry",
+					"Cancel");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("BookedDisconnected", handler.ButtonText);
-            Assert.IsFalse(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("BookedDisconnected", handler.ButtonText);
+			Assert.IsFalse(handler.IsButtonVisible);
+			Assert.AreEqual("Search lock", handler.LockitButtonText);
+			Assert.IsTrue(handler.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Booked unknown
-        /// </summary>
-        [Test]
-        public void TestSearchConnectFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
+		/// <summary>
+		/// Use case: Search.
+		/// Final state: Booked unknown
+		/// </summary>
+		[Test]
+		public void TestSearchConnectFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+			var timeOuts = Substitute.For<ITimeOutProvider>();
 
-            var handler = new BookedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new BookedDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
-                .Returns<Task<LockInfoTdo>>(x => throw new Exception("Exception message."));
-            locks.TimeOut.Returns(timeOuts);
+			locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
+				.Returns<Task<LockInfoTdo>>(x => throw new Exception("Exception message."));
+			locks.TimeOut.Returns(timeOuts);
 
-            bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.State.Value.Returns(InUseStateEnum.Booked);
 
-            var subsequent = handler.HandleRequestOption2().Result;
+			var subsequent = handler.HandleRequestOption2().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                connector.Command.CalculateAuthKeys(bike);
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAdvancedAlert(
-                    "Error when connecting with lock!",
-                    "Lock of rented bike cannot be be connected right now.",
-                    "",
-                    "Retry",
-                    "Cancel");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Request server...";
+				connector.Command.CalculateAuthKeys(bike);
+				bikesViewModel.ActionText = "Searching lock...";
+				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAdvancedAlert(
+					"Error when connecting with lock!",
+					"Your mobile device does not connect to the bike lock. Please step as close as possible to the bike and try again.",
+					"",
+					"Retry",
+					"Cancel");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("BookedDisconnected", handler.ButtonText);
-            Assert.IsFalse(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("BookedDisconnected", handler.ButtonText);
+			Assert.IsFalse(handler.IsButtonVisible);
+			Assert.AreEqual("Search lock", handler.LockitButtonText);
+			Assert.IsTrue(handler.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Booked unknown
-        /// </summary>
-        [Test]
-        public void TestSearchConnectNotOpen()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
+		/// <summary>
+		/// Use case: Search.
+		/// Final state: Booked unknown
+		/// </summary>
+		[Test]
+		public void TestSearchConnectNotOpen()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+			var timeOuts = Substitute.For<ITimeOutProvider>();
 
-            var handler = new BookedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new BookedDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
 
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
-                .Returns(new LockInfoTdo.Builder { State = null }.Build());
-            locks.TimeOut.Returns(timeOuts);
+			locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
+				.Returns(new LockInfoTdo.Builder { State = null }.Build());
+			locks.TimeOut.Returns(timeOuts);
 
-            bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.State.Value.Returns(InUseStateEnum.Booked);
 
-            var subsequent = handler.HandleRequestOption2().Result;
+			var subsequent = handler.HandleRequestOption2().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                connector.Command.CalculateAuthKeys(bike);
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error when connecting with lock!", "Schlossstatus des gemieteten Rads konnte nicht ermittelt werden.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Request server...";
+				connector.Command.CalculateAuthKeys(bike);
+				bikesViewModel.ActionText = "Searching lock...";
+				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error when connecting with lock!", "Schlossstatus des gemieteten Rads konnte nicht ermittelt werden.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("BookedDisconnected", handler.ButtonText);
-            Assert.IsFalse(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
-    }
+			// Verify state after action
+			Assert.AreEqual("BookedDisconnected", handler.ButtonText);
+			Assert.IsFalse(handler.IsButtonVisible);
+			Assert.AreEqual("Search lock", handler.LockitButtonText);
+			Assert.IsTrue(handler.IsLockitButtonVisible);
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedOpen.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedOpen.cs
index 0cbdfa5..b7f5454 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedOpen.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedOpen.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
@@ -25,1387 +25,1391 @@ using Xamarin.Essentials;
 
 namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    [TestFixture]
-    public class TestBookedOpen
-    {
-        /// <summary>
-        /// Test construction of object.
-        /// </summary>
-        [Test]
-        public void Testctor()
-        {
-            var handler = new BookedOpen(
-                Substitute.For<IBikeInfoMutable>(),
-                () => true, // isConnectedDelegate
-                (isConnexted) => Substitute.For<IConnector>(),
-                Substitute.For<IGeolocation>(),
-                Substitute.For<ILocksService>(),
-                () => Substitute.For<IPollingUpdateTaskManager>(),
-                Substitute.For<ISmartDevice>(),
-                Substitute.For<IViewService>(),
-                Substitute.For<IBikesViewModel>(),
-                Substitute.For<IUser>());
-
-            // Verify prerequisites.
-            Assert.AreEqual("Close lock & return bike", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual("Close lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock and return. 
-        /// Comment: User cancels operation.
-        /// Final state: Booked and open.
-        /// Similar to TestReservedClosed::TestBookAndOpenCancelBook
-        /// </summary>
-        [Test]
-        public void TestCloseAndReturnCancelReturn()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0 Allround Mono?", "Yes", "No").Returns(Task.FromResult(false));
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock and return.
-        /// Final state: Disposable closed.
-        /// Similar to TestReservedClosed::TestBookAndOpen
-        /// </summary>
-        [Test]
-        public void TestCloseAndReturn()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].CloseAsync()
-                .Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed)); // Return lock state indicating success
-
-            geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>()).Returns(Task.FromResult(new Location(1, 2)));
-
-            bike.State.Value.Returns(InUseStateEnum.Disposable); // Return call leads to setting of state to disposable.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>()); // Geolocation must be retrieved
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Starting bike return...";
-                connector.Command.StartReturningBike(bike); // Notify about start
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Query location...";
-                bikesViewModel.ActionText = "Returning bike...";
-                connector.Command.DoReturn(bike, Arg.Is<LocationDto>(x => x.Latitude == 1 && x.Longitude == 2), Arg.Any<ISmartDevice>()); // Booking must be performed
-                bikesViewModel.ActionText = "Disconnecting lock...";
-                locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Disposable Closed" after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock and return.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCloseAndReturnCloseFailsOutOfReachException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].CloseAsync()
-                .Returns<LockitLockingState?>(x => throw new OutOfReachException());
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "Start query location...";
-                geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Starting bike return...";
-                connector.Command.StartReturningBike(bike); // Notify about start
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "";
-                bike.LockInfo.State = LockingState.UnknownDisconnected;
-                connector.Command.UpdateLockingStateAsync(Arg.Any<IBikeInfoMutable>());
-                viewService.DisplayAlert("Lock can not be closed!", "Lock cannot be closed until bike is near.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Disconnected" after action
-            Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
-            Assert.IsFalse(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        [Test]
-        public void TestCloseAndReturnStartReturningBikeWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-            connector.Command.StartReturningBike(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("hoppla")));
-
-            bike.LockInfo.State.Returns(LockingState.Open);     // If locking fails bike remains open.
-            bike.State.Value.Returns(InUseStateEnum.Booked);    // Booking state remains unchanged if closing fails.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "Start query location...";
-                geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Starting bike return...";
-                connector.Command.StartReturningBike(bike); // Notify about start
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAdvancedAlert(
-                    "Connection error when returning the bike!",
-                    "Internet must be available when returning the bike.\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?",
-                    "Context info",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked open" after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        [Test]
-        public void TestCloseAndReturnStartReturningBikeException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-            connector.Command.StartReturningBike(bike).Returns(x => throw new Exception("Context info", new Exception("hoppla")));
-
-            bike.LockInfo.State.Returns(LockingState.Open);     // If locking fails bike remains open.
-            bike.State.Value.Returns(InUseStateEnum.Booked);    // Booking state remains unchanged if closing fails.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "Start query location...";
-                geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Starting bike return...";
-                connector.Command.StartReturningBike(bike); // Notify about start
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Error returning bike!",
-                    "Context info",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked open" after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock and return.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCloseAndReturnCloseFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].CloseAsync()
-                .Returns<LockitLockingState?>(x => throw new Exception("Blu"));
-
-            bike.LockInfo.State.Returns(LockingState.Open); // If locking fails bike remains open.
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "Start query location...";
-                geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Starting bike return...";
-                connector.Command.StartReturningBike(bike); // Notify about start
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "";
-                bike.LockInfo.State = LockingState.UnknownDisconnected;
-                connector.Command.UpdateLockingStateAsync(Arg.Any<IBikeInfoMutable>());
-                viewService.DisplayAlert("Lock can not be closed!", "Blu", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked open" after action
-            Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
-            Assert.IsFalse(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock and return.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCloseAndReturnCloseFailsCouldntCloseMovingException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].CloseAsync()
-                .Returns<LockitLockingState?>(x => throw new CouldntCloseMovingException());
-
-            //bike.LockInfo.State.Returns(LockingState.Open); // If locking fails bike remains open.
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "Start query location...";
-                geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Starting bike return...";
-                connector.Command.StartReturningBike(bike); // Notify about start
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "";
-                bike.LockInfo.State = LockingState.Open;
-                connector.Command.UpdateLockingStateAsync(Arg.Any<IBikeInfoMutable>());
-                viewService.DisplayAlert(
-                    "Lock can not be closed!",
-                    "Lock can only be closed if bike is not moving. Please park bike and try again.",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked open" after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock and return.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCloseAndReturnCloseFailsNotClosed()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].CloseAsync()
-                .Returns(LockitLockingState.Open);
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "Start query location...";
-                geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Starting bike return...";
-                connector.Command.StartReturningBike(bike); // Notify about start
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bike.LockInfo.State = LockingState.Open;
-                bikesViewModel.ActionText = "";
-                connector.Command.UpdateLockingStateAsync(Arg.Any<IBikeInfoMutable>());
-                viewService.DisplayAlert("Lock can not be closed!", "After try to close lock state open is reported.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked open" after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock and return.
-        /// Final state: Booked locked.
-        /// </summary>
-        [Test]
-        public async Task TestCloseAndReturnGetGeolocationFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].CloseAsync()
-                .Returns(LockitLockingState.Closed);
-
-            geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>()).Returns(Task.FromException<Location>(new Exception("noloc")));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
-
-            var subsequent = await handler.HandleRequestOption1();
-
-            await locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Starting bike return...";
-                connector.Command.StartReturningBike(bike); // Notify about start
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Query location...";
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAdvancedAlert("Error Query Location!", "Closing the lock and ending the rental is not possible.", "noloc", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked closed" after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock and return.
-        /// Final state: Booked locked.
-        /// </summary>
-        [Test]
-        public void TestCloseAndReturnReturnFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].CloseAsync()
-                .Returns(LockitLockingState.Closed);
-
-            connector.Command.DoReturn(bike, Arg.Any<LocationDto>(), Arg.Any<ISmartDevice>()).Returns<BookingFinishedModel>(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "Start query location...";
-                geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Starting bike return...";
-                connector.Command.StartReturningBike(bike); // Notify about start
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Query location...";
-                bikesViewModel.ActionText = "Returning bike...";
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAdvancedAlert(
-                    "Connection error when returning the bike!",
-                    "Internet must be available when returning the bike.\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?",
-                    "Context info",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked closed" after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock and return.
-        /// Final state: Booked locked.
-        /// </summary>
-        [Test]
-        public void TestCloseAndReturnReturnFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].CloseAsync()
-                .Returns(LockitLockingState.Closed);
-
-            connector.Command.DoReturn(bike, Arg.Any<LocationDto>(), Arg.Any<ISmartDevice>()).Returns<BookingFinishedModel>(x => throw new System.Exception("Exception message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "Start query location...";
-                geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Starting bike return...";
-                connector.Command.StartReturningBike(bike); // Notify about start
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Query location...";
-                bikesViewModel.ActionText = "Returning bike...";
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error returning bike!", "Exception message.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked closed" after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock and return.
-        /// Final state: Booked locked.
-        /// </summary>
-        [Test]
-        public void TestCloseAndReturnReturnFailsNotAtStationException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].CloseAsync()
-                .Returns(LockitLockingState.Closed);
-
-            NotAtStationException.IsNotAtStation("Failure 2178: bike 1545 out of GEO fencing. 15986 meter distance to next station 77. OK: bike 1545 locked confirmed", out NotAtStationException notAtStationException);
-
-            connector.Command.DoReturn(bike, Arg.Any<LocationDto>(), Arg.Any<ISmartDevice>()).Returns<BookingFinishedModel>(x =>
-                throw notAtStationException);
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "Start query location...";
-                geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Starting bike return...";
-                connector.Command.StartReturningBike(bike); // Notify about start
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Query location...";
-                bikesViewModel.ActionText = "Returning bike...";
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error returning bike!", "Returning bike outside of station is not possible. Distance to station 77 is 15986 m.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked closed" after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock and return.
-        /// Final state: Booked locked.
-        /// </summary>
-        [Test]
-        public void TestCloseAndReturnReturnFailsNoGPSDataException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].CloseAsync()
-                .Returns(LockitLockingState.Closed);
-
-            NoGPSDataException.IsNoGPSData("Failure 2245: No GPS data, state change forbidden.", out NoGPSDataException noGPSDataException);
-
-            connector.Command.DoReturn(bike, Arg.Any<LocationDto>(), Arg.Any<ISmartDevice>()).Returns<BookingFinishedModel>(x =>
-                throw noGPSDataException);
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "Start query location...";
-                geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Starting bike return...";
-                connector.Command.StartReturningBike(bike); // Notify about start
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Query location...";
-                bikesViewModel.ActionText = "Returning bike...";
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error returning bike!", "Returning bike at an unknown location is not possible.\r\nBike can only be returned if  bike is in reach and location information is available.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked closed" after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock and return.
-        /// Final state: Booked locked.
-        /// </summary>
-        [Test]
-        public void TestCloseAndReturnReturnFailsResponseException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].CloseAsync()
-                .Returns(LockitLockingState.Closed);
-
-            connector.Command.DoReturn(bike, Arg.Any<LocationDto>(), Arg.Any<ISmartDevice>()).Returns<BookingFinishedModel>(x =>
-                throw new ReturnBikeException(JsonConvert.DeserializeObject<DoReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "Start query location...";
-                geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Starting bike return...";
-                connector.Command.StartReturningBike(bike); // Notify about start
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Query location...";
-                bikesViewModel.ActionText = "Returning bike...";
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAdvancedAlert("Statusfehler beim Zurückgeben des Rads!", "Outer message.", "Some invalid data received!", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked closed" after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock
-        /// Final state: Booked closed.
-        /// </summary>
-        [Test]
-        public void TestClose()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].CloseAsync()
-                .Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed)); // Return lock state indicating success
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCloseCloseFailsOutOfReachException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].CloseAsync()
-                .Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Open);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Lock can not be closed!", "Lock cannot be closed until bike is near.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked disconnected" after action
-            Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
-            Assert.IsFalse(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCloseCloseFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].CloseAsync()
-                .Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Open);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Lock can not be closed!", "Exception message.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Disconnected" after action
-            Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
-            Assert.IsFalse(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock
-        /// Final state: Booked closed.
-        /// </summary>
-        [Test]
-        public void TestCloseUpdateLockingStateFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].CloseAsync()
-                .Returns(LockitLockingState.Closed); // Return lock state indicating success
-
-            connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "No web error on updating locking status.";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: close lock
-        /// Final state: Booked closed.
-        /// </summary>
-        [Test]
-        public void TestCloseUpdateLockingStateFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].CloseAsync()
-                .Returns(LockitLockingState.Closed); // Return lock state indicating success
-
-            connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new Exception("Exception message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "Connection error on updating locking status.";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: close lock
-        /// Final state: Booked closed.
-        /// </summary>
-        [Test]
-        public void TestCloseUpdateLockingStateFailsResponseException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].CloseAsync()
-                .Returns(LockitLockingState.Closed); // Return lock state indicating success
-
-            connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x =>
-                throw new ReturnBikeException(JsonConvert.DeserializeObject<DoReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "Status error on updating lock state.";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-    }
+	[TestFixture]
+	public class TestBookedOpen
+	{
+		/// <summary>
+		/// Test construction of object.
+		/// </summary>
+		[Test]
+		public void Testctor()
+		{
+			var handler = new BookedOpen(
+				Substitute.For<IBikeInfoMutable>(),
+				() => true, // isConnectedDelegate
+				(isConnexted) => Substitute.For<IConnector>(),
+				Substitute.For<IGeolocation>(),
+				Substitute.For<ILocksService>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
+				Substitute.For<ISmartDevice>(),
+				Substitute.For<IViewService>(),
+				Substitute.For<IBikesViewModel>(),
+				Substitute.For<IUser>());
+
+			// Verify prerequisites.
+			Assert.AreEqual("Close lock & return bike", handler.ButtonText);
+			Assert.IsTrue(handler.IsButtonVisible);
+			Assert.AreEqual("Close lock", handler.LockitButtonText);
+			Assert.IsTrue(handler.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Close lock and return. 
+		/// Comment: User cancels operation.
+		/// Final state: Booked and open.
+		/// Similar to TestReservedClosed::TestBookAndOpenCancelBook
+		/// </summary>
+		[Test]
+		public void TestCloseAndReturnCancelReturn()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0 Allround Mono?", "Yes", "No").Returns(Task.FromResult(false));
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Close lock and return.
+		/// Final state: Disposable closed.
+		/// Similar to TestReservedClosed::TestBookAndOpen
+		/// </summary>
+		[Test]
+		public void TestCloseAndReturn()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].CloseAsync()
+				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed)); // Return lock state indicating success
+
+			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>()).Returns(Task.FromResult(new Location(1, 2)));
+
+			bike.State.Value.Returns(InUseStateEnum.Disposable); // Return call leads to setting of state to disposable.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>()); // Geolocation must be retrieved
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Starting bike return...";
+				connector.Command.StartReturningBike(bike); // Notify about start
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Query location...";
+				bikesViewModel.ActionText = "Returning bike...";
+				connector.Command.DoReturn(bike, Arg.Is<LocationDto>(x => x.Latitude == 1 && x.Longitude == 2), Arg.Any<ISmartDevice>()); // Booking must be performed
+				bikesViewModel.ActionText = "Disconnecting lock...";
+				locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Disposable Closed" after action
+			Assert.AreEqual("Reserve bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
+			Assert.IsFalse(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Close lock and return.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestCloseAndReturnCloseFailsOutOfReachException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].CloseAsync()
+				.Returns<LockitLockingState?>(x => throw new OutOfReachException());
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "Start query location...";
+				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Starting bike return...";
+				connector.Command.StartReturningBike(bike); // Notify about start
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "";
+				bike.LockInfo.State = LockingState.UnknownDisconnected;
+				connector.Command.UpdateLockingStateAsync(Arg.Any<IBikeInfoMutable>());
+				viewService.DisplayAlert("Lock can not be closed!", "Lock cannot be closed until bike is near.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Disconnected" after action
+			Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
+			Assert.IsFalse(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		[Test]
+		public void TestCloseAndReturnStartReturningBikeWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			connector.Command.StartReturningBike(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("hoppla")));
+
+			bike.LockInfo.State.Returns(LockingState.Open);     // If locking fails bike remains open.
+			bike.State.Value.Returns(InUseStateEnum.Booked);    // Booking state remains unchanged if closing fails.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "Start query location...";
+				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Starting bike return...";
+				connector.Command.StartReturningBike(bike); // Notify about start
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAdvancedAlert(
+					"Connection error when returning the bike!",
+					"Internet must be available when returning the bike.\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?",
+					"Context info",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked open" after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		[Test]
+		public void TestCloseAndReturnStartReturningBikeException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			connector.Command.StartReturningBike(bike).Returns(x => throw new Exception("Context info", new Exception("hoppla")));
+
+			bike.LockInfo.State.Returns(LockingState.Open);     // If locking fails bike remains open.
+			bike.State.Value.Returns(InUseStateEnum.Booked);    // Booking state remains unchanged if closing fails.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "Start query location...";
+				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Starting bike return...";
+				connector.Command.StartReturningBike(bike); // Notify about start
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Error returning bike!",
+					"Context info",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked open" after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Close lock and return.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestCloseAndReturnCloseFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].CloseAsync()
+				.Returns<LockitLockingState?>(x => throw new Exception("Blu"));
+
+			bike.LockInfo.State.Returns(LockingState.Open); // If locking fails bike remains open.
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "Start query location...";
+				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Starting bike return...";
+				connector.Command.StartReturningBike(bike); // Notify about start
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "";
+				bike.LockInfo.State = LockingState.UnknownDisconnected;
+				connector.Command.UpdateLockingStateAsync(Arg.Any<IBikeInfoMutable>());
+				viewService.DisplayAlert("Lock can not be closed!", "Blu", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked open" after action
+			Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
+			Assert.IsFalse(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Close lock and return.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestCloseAndReturnCloseFailsCouldntCloseMovingException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].CloseAsync()
+				.Returns<LockitLockingState?>(x => throw new CouldntCloseMovingException());
+
+			//bike.LockInfo.State.Returns(LockingState.Open); // If locking fails bike remains open.
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "Start query location...";
+				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Starting bike return...";
+				connector.Command.StartReturningBike(bike); // Notify about start
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "";
+				bike.LockInfo.State = LockingState.Open;
+				connector.Command.UpdateLockingStateAsync(Arg.Any<IBikeInfoMutable>());
+				viewService.DisplayAlert(
+					"Lock can not be closed!",
+					"Lock can only be closed if bike is not moving. Please park bike and try again.",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked open" after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Close lock and return.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestCloseAndReturnCloseFailsNotClosed()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].CloseAsync()
+				.Returns(LockitLockingState.Open);
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "Start query location...";
+				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Starting bike return...";
+				connector.Command.StartReturningBike(bike); // Notify about start
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bike.LockInfo.State = LockingState.Open;
+				bikesViewModel.ActionText = "";
+				connector.Command.UpdateLockingStateAsync(Arg.Any<IBikeInfoMutable>());
+				viewService.DisplayAlert("Lock can not be closed!", "After try to close lock state open is reported.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked open" after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Close lock and return.
+		/// Final state: Booked locked.
+		/// </summary>
+		[Test]
+		public async Task TestCloseAndReturnGetGeolocationFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].CloseAsync()
+				.Returns(LockitLockingState.Closed);
+
+			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>()).Returns(Task.FromException<Location>(new Exception("noloc")));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
+
+			var subsequent = await handler.HandleRequestOption1();
+
+			await locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Starting bike return...";
+				connector.Command.StartReturningBike(bike); // Notify about start
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Query location...";
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAdvancedAlert("Error Query Location!", "Closing the lock and ending the rental is not possible.", "noloc", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked closed" after action
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Close lock and return.
+		/// Final state: Booked locked.
+		/// </summary>
+		[Test]
+		public void TestCloseAndReturnReturnFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].CloseAsync()
+				.Returns(LockitLockingState.Closed);
+
+			connector.Command.DoReturn(bike, Arg.Any<LocationDto>(), Arg.Any<ISmartDevice>()).Returns<BookingFinishedModel>(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "Start query location...";
+				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Starting bike return...";
+				connector.Command.StartReturningBike(bike); // Notify about start
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Query location...";
+				bikesViewModel.ActionText = "Returning bike...";
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAdvancedAlert(
+					"Connection error when returning the bike!",
+					"Internet must be available when returning the bike.\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?",
+					"Context info",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked closed" after action
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Close lock and return.
+		/// Final state: Booked locked.
+		/// </summary>
+		[Test]
+		public void TestCloseAndReturnReturnFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].CloseAsync()
+				.Returns(LockitLockingState.Closed);
+
+			connector.Command.DoReturn(bike, Arg.Any<LocationDto>(), Arg.Any<ISmartDevice>()).Returns<BookingFinishedModel>(x => throw new System.Exception("Exception message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "Start query location...";
+				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Starting bike return...";
+				connector.Command.StartReturningBike(bike); // Notify about start
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Query location...";
+				bikesViewModel.ActionText = "Returning bike...";
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error returning bike!", "Exception message.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked closed" after action
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Close lock and return.
+		/// Final state: Booked locked.
+		/// </summary>
+		[Test]
+		public void TestCloseAndReturnReturnFailsNotAtStationException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].CloseAsync()
+				.Returns(LockitLockingState.Closed);
+
+			NotAtStationException.IsNotAtStation("Failure 2178: bike 1545 out of GEO fencing. 15986 meter distance to next station 77. OK: bike 1545 locked confirmed", out NotAtStationException notAtStationException);
+
+			connector.Command.DoReturn(bike, Arg.Any<LocationDto>(), Arg.Any<ISmartDevice>()).Returns<BookingFinishedModel>(x =>
+				throw notAtStationException);
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
+
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "Start query location...";
+				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Starting bike return...";
+				connector.Command.StartReturningBike(bike); // Notify about start
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Query location...";
+				bikesViewModel.ActionText = "Returning bike...";
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error returning bike!", "Returning bike outside of station is not possible. Distance to station 77 is 15986 m.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked closed" after action
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Close lock and return.
+		/// Final state: Booked locked.
+		/// </summary>
+		[Test]
+		public void TestCloseAndReturnReturnFailsNoGPSDataException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].CloseAsync()
+				.Returns(LockitLockingState.Closed);
+
+			NoGPSDataException.IsNoGPSData("Failure 2245: No GPS data, state change forbidden.", out NoGPSDataException noGPSDataException);
+
+			connector.Command.DoReturn(bike, Arg.Any<LocationDto>(), Arg.Any<ISmartDevice>()).Returns<BookingFinishedModel>(x =>
+				throw noGPSDataException);
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "Start query location...";
+				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Starting bike return...";
+				connector.Command.StartReturningBike(bike); // Notify about start
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Query location...";
+				bikesViewModel.ActionText = "Returning bike...";
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error returning bike!", "Returning bike at an unknown location is not possible.\r\nBike can only be returned if  bike is in reach and location information is available.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked closed" after action
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Close lock and return.
+		/// Final state: Booked locked.
+		/// </summary>
+		[Test]
+		public void TestCloseAndReturnReturnFailsResponseException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Close lock and return bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].CloseAsync()
+				.Returns(LockitLockingState.Closed);
+
+			connector.Command.DoReturn(bike, Arg.Any<LocationDto>(), Arg.Any<ISmartDevice>()).Returns<BookingFinishedModel>(x =>
+				throw new ReturnBikeException(JsonConvert.DeserializeObject<DoReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "Start query location...";
+				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Starting bike return...";
+				connector.Command.StartReturningBike(bike); // Notify about start
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Query location...";
+				bikesViewModel.ActionText = "Returning bike...";
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAdvancedAlert("Statusfehler beim Zurückgeben des Rads!", "Outer message.", "Some invalid data received!", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked closed" after action
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Close lock
+		/// Final state: Booked closed.
+		/// </summary>
+		[Test]
+		public void TestClose()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].CloseAsync()
+				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed)); // Return lock state indicating success
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Closed" after action
+			// Following two assertions are deactivated temporarily in context of issue https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/440/.
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Close lock
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestCloseCloseFailsOutOfReachException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].CloseAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Open);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Lock can not be closed!", "Lock cannot be closed until bike is near.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked disconnected" after action
+			Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
+			Assert.IsFalse(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Close lock
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestCloseCloseFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].CloseAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Open);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Lock can not be closed!", "Exception message.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Disconnected" after action
+			Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
+			Assert.IsFalse(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Close lock
+		/// Final state: Booked closed.
+		/// </summary>
+		[Test]
+		public void TestCloseUpdateLockingStateFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].CloseAsync()
+				.Returns(LockitLockingState.Closed); // Return lock state indicating success
+
+			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "No web error on updating locking status.";
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Closed" after action
+			// Following two assertions are deactivated temporarily in context of issue https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/440/.
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: close lock
+		/// Final state: Booked closed.
+		/// </summary>
+		[Test]
+		public void TestCloseUpdateLockingStateFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].CloseAsync()
+				.Returns(LockitLockingState.Closed); // Return lock state indicating success
+
+			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new Exception("Exception message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "Connection error on updating locking status.";
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Closed" after action
+			// Following two assertions are deactivated temporarily in context of issue https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/440/.
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: close lock
+		/// Final state: Booked closed.
+		/// </summary>
+		[Test]
+		public void TestCloseUpdateLockingStateFailsResponseException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].CloseAsync()
+				.Returns(LockitLockingState.Closed); // Return lock state indicating success
+
+			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x =>
+				throw new ReturnBikeException(JsonConvert.DeserializeObject<DoReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "Status error on updating lock state.";
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Closed" after action
+			// Following two assertions are deactivated temporarily in context of issue https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/440/.
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedUnknown.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedUnknown.cs
index 3c2874a..f054a7d 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedUnknown.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedUnknown.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using NSubstitute;
@@ -22,1086 +22,1090 @@ using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
 
 namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    [TestFixture]
-    public class TestBookedUnknown
-    {
-
-        /// <summary>
-        /// Test construction of object.
-        /// </summary>
-        [Test]
-        public void Testctor()
-        {
-            var handler = new BookedUnknown(
-                Substitute.For<IBikeInfoMutable>(),
-                () => true, // isConnectedDelegate
-                (isConnexted) => Substitute.For<IConnector>(),
-                Substitute.For<IGeolocation>(),
-                Substitute.For<ILocksService>(),
-                () => Substitute.For<IPollingUpdateTaskManager>(),
-                Substitute.For<ISmartDevice>(),
-                Substitute.For<IViewService>(),
-                Substitute.For<IBikesViewModel>(),
-                Substitute.For<IUser>());
-
-            // Verify prerequisites.
-            Assert.AreEqual("Open lock", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual("Close lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Opens lock
-        /// Final state: Booked opened.
-        /// </summary>
-        [Test]
-        public void TestOpen()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedUnknown(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, null);
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestOpenOpenFailsOutOfReachException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedUnknown(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Closed);
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error while opening lock!", "Lock cannot be opened until bike is near.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Disconnected" after action
-            Assert.AreEqual(nameof(BookedDisconnected), subsequent.ButtonText);
-            Assert.IsFalse(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestOpenOpenFailsCouldntOpenBoldBlockedException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedUnknown(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenBoldIsBlockedException());
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Closed);
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error while opening lock!", "Lock is blocked. Please ensure that no obstacle prevents lock from opening and try again.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Unknown" after action
-            Assert.AreEqual("Open lock", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestOpenOpenFailsCouldntOpenInconsistentStateExecptionClosed()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedUnknown(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenInconsistentStateExecption(LockingState.Closed));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Closed);
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error while opening lock!", "After try to open lock state closed is reported.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestOpenOpenFailsCouldntOpenInconsistentStateExecption()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedUnknown(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenBoldWasBlockedException());
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Closed);
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Lock can not be opened!", "Lock was blocked and might still be. Please ensure that no obstacle prevents lock from opening and try again.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Disconnected" after action
-            Assert.AreEqual("Open lock", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestOpenOpenFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedUnknown(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Closed);
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error while opening lock!", "Exception message.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Disconnected" after action
-            Assert.AreEqual(nameof(BookedDisconnected), subsequent.ButtonText);
-            Assert.IsFalse(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Opens lock
-        /// Final state: Booked opened.
-        /// </summary>
-        [Test]
-        public void TestOpenGetBatteryPercentageAsyncThrowsOutOfReachException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedUnknown(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
-
-            locks[0].GetBatteryPercentageAsync().Returns<Task<double>>(x => throw new OutOfReachException());
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Battery status can only be read when bike is nearby.";
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, null);
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-
-        /// <summary>
-        /// Use case: Opens lock
-        /// Final state: Booked opened.
-        /// </summary>
-        [Test]
-        public void TestOpenGetBatteryPercentageAsyncThrowsExcepton()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedUnknown(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
-
-            locks[0].GetBatteryPercentageAsync().Returns<Task<double>>(x => throw new Exception());
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Battery status cannot be read.";
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, null);
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock
-        /// Final state: Booked open.
-        /// </summary>
-        [Test]
-        public void TestOpenUpdateLockingStateFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedUnknown(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns(LockitLockingState.Open);
-
-            connector.Command.UpdateLockingStateAsync(bike, null).Returns(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Open);
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, null);
-                bikesViewModel.ActionText = "No web error on updating locking status.";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock
-        /// Final state: Booked open.
-        /// </summary>
-        [Test]
-        public void TestOpenUpdateLockingStateFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedUnknown(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns(LockitLockingState.Open);
-
-            connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new Exception("Exception message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Open);
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "Connection error on updating locking status.";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock
-        /// Final state: Booked open.
-        /// </summary>
-        [Test]
-        public void TestOpenUpdateLockingStateFailsResponseException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedUnknown(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].OpenAsync()
-                .Returns(LockitLockingState.Open);
-
-            connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x =>
-                throw new ReturnBikeException(JsonConvert.DeserializeObject<ReservationCancelReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Open);
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "Status error on updating lock state.";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock
-        /// Final state: Booked closed.
-        /// </summary>
-        [Test]
-        public void TestClose()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedUnknown(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].CloseAsync()
-                .Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed)); // Return lock state indicating success
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCloseCloseFailsOutOfReachException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedUnknown(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].CloseAsync()
-                .Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Open);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Lock can not be closed!", "Lock cannot be closed until bike is near.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked disconnected" after action
-            Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
-            Assert.IsFalse(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCloseCloseFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedUnknown(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].CloseAsync()
-                .Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Open);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Lock can not be closed!", "Exception message.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Disconnected" after action
-            Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
-            Assert.IsFalse(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock
-        /// Final state: Booked closed.
-        /// </summary>
-        [Test]
-        public void TestCloseUpdateLockingStateFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedUnknown(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].CloseAsync()
-                .Returns(LockitLockingState.Closed); // Return lock state indicating success
-
-            connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "No web error on updating locking status.";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: close lock
-        /// Final state: Booked closed.
-        /// </summary>
-        [Test]
-        public void TestCloseUpdateLockingStateFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedUnknown(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].CloseAsync()
-                .Returns(LockitLockingState.Closed); // Return lock state indicating success
-
-            connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new Exception("Exception message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "Connection error on updating locking status.";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: close lock
-        /// Final state: Booked closed.
-        /// </summary>
-        [Test]
-        public void TestCloseUpdateLockingStateFailsResponseException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedUnknown(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].CloseAsync()
-                .Returns(LockitLockingState.Closed); // Return lock state indicating success
-
-            connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x =>
-                throw new ReturnBikeException(JsonConvert.DeserializeObject<ReservationCancelReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "Status error on updating lock state.";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-    }
+	[TestFixture]
+	public class TestBookedUnknown
+	{
+
+		/// <summary>
+		/// Test construction of object.
+		/// </summary>
+		[Test]
+		public void Testctor()
+		{
+			var handler = new BookedUnknown(
+				Substitute.For<IBikeInfoMutable>(),
+				() => true, // isConnectedDelegate
+				(isConnexted) => Substitute.For<IConnector>(),
+				Substitute.For<IGeolocation>(),
+				Substitute.For<ILocksService>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
+				Substitute.For<ISmartDevice>(),
+				Substitute.For<IViewService>(),
+				Substitute.For<IBikesViewModel>(),
+				Substitute.For<IUser>());
+
+			// Verify prerequisites.
+			Assert.AreEqual("Open lock", handler.ButtonText);
+			Assert.IsTrue(handler.IsButtonVisible);
+			Assert.AreEqual("Close lock", handler.LockitButtonText);
+			Assert.IsTrue(handler.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Opens lock
+		/// Final state: Booked opened.
+		/// </summary>
+		[Test]
+		public void TestOpen()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, null);
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Open" after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestOpenOpenFailsOutOfReachException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Closed);
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error while opening lock!", "Lock cannot be opened until bike is near.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Disconnected" after action
+			Assert.AreEqual(nameof(BookedDisconnected), subsequent.ButtonText);
+			Assert.IsFalse(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestOpenOpenFailsCouldntOpenBoldBlockedException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenBoldIsBlockedException());
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Closed);
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error while opening lock!", "Lock is blocked. Please ensure that no obstacle prevents lock from opening and try again.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Unknown" after action
+			Assert.AreEqual("Open lock", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestOpenOpenFailsCouldntOpenInconsistentStateExecptionClosed()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenInconsistentStateExecption(LockingState.Closed));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Closed);
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error while opening lock!", "After try to open lock state closed is reported.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Closed" after action
+			// Following two assertions are deactivated temporarily in context of issue https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/440/.
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestOpenOpenFailsCouldntOpenInconsistentStateExecption()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenBoldWasBlockedException());
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Closed);
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Lock can not be opened!", "Lock was blocked and might still be. Please ensure that no obstacle prevents lock from opening and try again.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Disconnected" after action
+			Assert.AreEqual("Open lock", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestOpenOpenFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Closed);
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error while opening lock!", "Exception message.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Disconnected" after action
+			Assert.AreEqual(nameof(BookedDisconnected), subsequent.ButtonText);
+			Assert.IsFalse(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Opens lock
+		/// Final state: Booked opened.
+		/// </summary>
+		[Test]
+		public void TestOpenGetBatteryPercentageAsyncThrowsOutOfReachException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
+
+			locks[0].GetBatteryPercentageAsync().Returns<Task<double>>(x => throw new OutOfReachException());
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Battery status can only be read when bike is nearby.";
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, null);
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Open" after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+
+		/// <summary>
+		/// Use case: Opens lock
+		/// Final state: Booked opened.
+		/// </summary>
+		[Test]
+		public void TestOpenGetBatteryPercentageAsyncThrowsExcepton()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
+
+			locks[0].GetBatteryPercentageAsync().Returns<Task<double>>(x => throw new Exception());
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Battery status cannot be read.";
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, null);
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Open" after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Booked open.
+		/// </summary>
+		[Test]
+		public void TestOpenUpdateLockingStateFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns(LockitLockingState.Open);
+
+			connector.Command.UpdateLockingStateAsync(bike, null).Returns(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Open);
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, null);
+				bikesViewModel.ActionText = "No web error on updating locking status.";
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Open" after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Booked open.
+		/// </summary>
+		[Test]
+		public void TestOpenUpdateLockingStateFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns(LockitLockingState.Open);
+
+			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new Exception("Exception message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Open);
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "Connection error on updating locking status.";
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Open" after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Booked open.
+		/// </summary>
+		[Test]
+		public void TestOpenUpdateLockingStateFailsResponseException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].OpenAsync()
+				.Returns(LockitLockingState.Open);
+
+			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x =>
+				throw new ReturnBikeException(JsonConvert.DeserializeObject<ReservationCancelReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Open);
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "Status error on updating lock state.";
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Open" after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Close lock
+		/// Final state: Booked closed.
+		/// </summary>
+		[Test]
+		public void TestClose()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].CloseAsync()
+				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed)); // Return lock state indicating success
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Open" after action
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Close lock
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestCloseCloseFailsOutOfReachException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].CloseAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Open);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Lock can not be closed!", "Lock cannot be closed until bike is near.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked disconnected" after action
+			Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
+			Assert.IsFalse(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Close lock
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestCloseCloseFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].CloseAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Open);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Lock can not be closed!", "Exception message.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Disconnected" after action
+			Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
+			Assert.IsFalse(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Close lock
+		/// Final state: Booked closed.
+		/// </summary>
+		[Test]
+		public void TestCloseUpdateLockingStateFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].CloseAsync()
+				.Returns(LockitLockingState.Closed); // Return lock state indicating success
+
+			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "No web error on updating locking status.";
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Closed" after action
+			// Following two assertions are deactivated temporarily in context of issue https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/440/.
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: close lock
+		/// Final state: Booked closed.
+		/// </summary>
+		[Test]
+		public void TestCloseUpdateLockingStateFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].CloseAsync()
+				.Returns(LockitLockingState.Closed); // Return lock state indicating success
+
+			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new Exception("Exception message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "Connection error on updating locking status.";
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Closed" after action
+			// Following two assertions are deactivated temporarily in context of issue https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/440/.
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: close lock
+		/// Final state: Booked closed.
+		/// </summary>
+		[Test]
+		public void TestCloseUpdateLockingStateFailsResponseException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new BookedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].CloseAsync()
+				.Returns(LockitLockingState.Closed); // Return lock state indicating success
+
+			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x =>
+				throw new ReturnBikeException(JsonConvert.DeserializeObject<ReservationCancelReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "Status error on updating lock state.";
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Closed" after action
+			// Following two assertions are deactivated temporarily in context of issue https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/440/.
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+	}
 }
 
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableDisconnected.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableDisconnected.cs
index ec0ce35..6cf7aca 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableDisconnected.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableDisconnected.cs
@@ -19,571 +19,571 @@ using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
 
 namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    [TestFixture]
-    public class TestDisposableDisconnected
-    {
-        /// <summary>
-        /// Test construction of object.
-        /// </summary>
-        [Test]
-        public void Testctor()
-        {
-            var handler = new DisposableDisconnected(
-                Substitute.For<IBikeInfoMutable>(),
-                () => true, // isConnectedDelegate
-                (isConnexted) => Substitute.For<IConnector>(),
-                Substitute.For<IGeolocation>(),
-                Substitute.For<ILocksService>(),
-                () => Substitute.For<IPollingUpdateTaskManager>(),
-                Substitute.For<ISmartDevice>(),
-                Substitute.For<IViewService>(),
-                Substitute.For<IBikesViewModel>(),
-                Substitute.For<IUser>());
-
-            // Verify prerequisites.
-            Assert.AreEqual("Reserve bike", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", handler.LockitButtonText);
-            Assert.IsFalse(handler.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Cancel reservation.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestReserveAndConnectCancel()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(false));
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No");
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Reserve bike.
-        /// Final state: Reserved closed.
-        /// </summary>
-        [Test]
-        public void TestReserveAndConnect()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
-
-            var handler = new DisposableDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
-                .Returns(Task.FromResult(new LockInfoTdo.Builder { State = LockitLockingState.Closed }.Build())); // Return lock state indicating success
-
-            locks.TimeOut.Returns(timeOuts);
-
-            viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].OpenAsync()
-                .Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Booking call leads to setting of state to booked.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reserving bike...";
-                connector.Command.DoReserve(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "";
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be opened
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, null);
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Reserve bike.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestReserveAndConnectReserveFailsBookingDeclinedException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(true));
-
-            connector.Command.DoReserve(bike).Returns(x => throw new BookingDeclinedException(7)); // Booking must be performed
-
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reserving bike...";
-                connector.Command.DoReserve(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Hint", string.Format("A reservation of bike {0} was rejected because the maximum allowed number of {1} reservations/ rentals had already been made.", 0, 7), "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Reserve bike.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestReserveAndConnectReserveFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(true));
-
-            connector.Command.DoReserve(bike).Returns<Task>(x => throw new WebConnectFailureException("Context info.", new Exception("chub")));
-
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reserving bike...";
-                connector.Command.DoReserve(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Connection error when reserving the bike!", "Context info.\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Reserve bike.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestReserveAndConnectReserveFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(true));
-
-            connector.Command.DoReserve(bike).Returns<Task>(x => throw new Exception("Exception message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reserving bike...";
-                connector.Command.DoReserve(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error when reserving the bike!", "Exception message.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Reserve bike.
-        /// Final state: Reserved unknown.
-        /// </summary>
-        [Test]
-        public void TestReserveAndConnectConnectOutOfReachException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
-
-            var handler = new DisposableDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>()).Returns<LockInfoTdo>(x => throw new OutOfReachException());
-            locks.TimeOut.Returns(timeOuts);
-
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requsthandler factory queries lock state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reserving bike...";
-                connector.Command.DoReserve(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "Lock out of reach";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Reserve bike.
-        /// Final state: Reserved unknown.
-        /// </summary>
-        [Test]
-        public void TestReserveAndConnectConnectException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
-
-            var handler = new DisposableDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>()).Returns<LockInfoTdo>(x => throw new Exception("Exception message."));
-            locks.TimeOut.Returns(timeOuts);
-
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requsthandler factory queries lock state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reserving bike...";
-                connector.Command.DoReserve(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "Lock not found";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Reserve bike.
-        /// Final state: Reserved unknown.
-        /// </summary>
-        [Test]
-        public void TestReserveAndConnectConnectStateUnknown()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
-
-            var handler = new DisposableDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks.TimeOut.Returns(timeOuts);
-
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.UnknownFromHardwareError); // Connect did not throw an exception but lock state is still unknown.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reserving bike...";
-                connector.Command.DoReserve(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        [Test]
-        public void TestNotsupported()
-        {
-            var handler = new DisposableDisconnected(
-                Substitute.For<IBikeInfoMutable>(),
-                () => true, // isConnectedDelegate
-                (isConnexted) => Substitute.For<IConnector>(),
-                Substitute.For<IGeolocation>(),
-                Substitute.For<ILocksService>(),
-                () => Substitute.For<IPollingUpdateTaskManager>(),
-                Substitute.For<ISmartDevice>(),
-                Substitute.For<IViewService>(),
-                Substitute.For<IBikesViewModel>(),
-                Substitute.For<IUser>());
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-    }
+	[TestFixture]
+	public class TestDisposableDisconnected
+	{
+		/// <summary>
+		/// Test construction of object.
+		/// </summary>
+		[Test]
+		public void Testctor()
+		{
+			var handler = new DisposableDisconnected(
+				Substitute.For<IBikeInfoMutable>(),
+				() => true, // isConnectedDelegate
+				(isConnexted) => Substitute.For<IConnector>(),
+				Substitute.For<IGeolocation>(),
+				Substitute.For<ILocksService>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
+				Substitute.For<ISmartDevice>(),
+				Substitute.For<IViewService>(),
+				Substitute.For<IBikesViewModel>(),
+				Substitute.For<IUser>());
+
+			// Verify prerequisites.
+			Assert.AreEqual("Reserve bike", handler.ButtonText);
+			Assert.IsTrue(handler.IsButtonVisible);
+			Assert.AreEqual("DisposableDisconnected", handler.LockitButtonText);
+			Assert.IsFalse(handler.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Cancel reservation.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestReserveAndConnectCancel()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new DisposableDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(false));
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No");
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Reserve bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
+			Assert.IsFalse(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Reserve bike.
+		/// Final state: Reserved closed.
+		/// </summary>
+		[Test]
+		public void TestReserveAndConnect()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+			var timeOuts = Substitute.For<ITimeOutProvider>();
+
+			var handler = new DisposableDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
+				.Returns(Task.FromResult(new LockInfoTdo.Builder { State = LockitLockingState.Closed }.Build())); // Return lock state indicating success
+
+			locks.TimeOut.Returns(timeOuts);
+
+			viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].OpenAsync()
+				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking call leads to setting of state to booked.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Reserving bike...";
+				connector.Command.DoReserve(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Searching lock...";
+				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
+				bikesViewModel.ActionText = "";
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.DoBook(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be opened
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, null);
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Reserve bike.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestReserveAndConnectReserveFailsBookingDeclinedException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new DisposableDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(true));
+
+			connector.Command.DoReserve(bike).Returns(x => throw new BookingDeclinedException(7)); // Booking must be performed
+
+			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Reserving bike...";
+				connector.Command.DoReserve(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Hint", string.Format("A reservation of bike {0} was rejected because the maximum allowed number of {1} reservations/ rentals had already been made.", 0, 7), "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Reserve bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
+			Assert.IsFalse(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Reserve bike.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestReserveAndConnectReserveFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new DisposableDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(true));
+
+			connector.Command.DoReserve(bike).Returns<Task>(x => throw new WebConnectFailureException("Context info.", new Exception("chub")));
+
+			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Reserving bike...";
+				connector.Command.DoReserve(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Connection error when reserving the bike!", "Context info.\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Reserve bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
+			Assert.IsFalse(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Reserve bike.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestReserveAndConnectReserveFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new DisposableDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(true));
+
+			connector.Command.DoReserve(bike).Returns<Task>(x => throw new Exception("Exception message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Reserving bike...";
+				connector.Command.DoReserve(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error when reserving the bike!", "Exception message.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Reserve bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
+			Assert.IsFalse(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Reserve bike.
+		/// Final state: Reserved unknown.
+		/// </summary>
+		[Test]
+		public void TestReserveAndConnectConnectOutOfReachException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+			var timeOuts = Substitute.For<ITimeOutProvider>();
+
+			var handler = new DisposableDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>()).Returns<LockInfoTdo>(x => throw new OutOfReachException());
+			locks.TimeOut.Returns(timeOuts);
+
+			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requsthandler factory queries lock state to create appropriate request handler object.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Reserving bike...";
+				connector.Command.DoReserve(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Searching lock...";
+				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
+				bikesViewModel.ActionText = "Lock out of reach";
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Reserve bike.
+		/// Final state: Reserved unknown.
+		/// </summary>
+		[Test]
+		public void TestReserveAndConnectConnectException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+			var timeOuts = Substitute.For<ITimeOutProvider>();
+
+			var handler = new DisposableDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>()).Returns<LockInfoTdo>(x => throw new Exception("Exception message."));
+			locks.TimeOut.Returns(timeOuts);
+
+			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requsthandler factory queries lock state to create appropriate request handler object.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Reserving bike...";
+				connector.Command.DoReserve(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Searching lock...";
+				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
+				bikesViewModel.ActionText = "Lock not found";
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Reserve bike.
+		/// Final state: Reserved unknown.
+		/// </summary>
+		[Test]
+		public void TestReserveAndConnectConnectStateUnknown()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+			var timeOuts = Substitute.For<ITimeOutProvider>();
+
+			var handler = new DisposableDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks.TimeOut.Returns(timeOuts);
+
+			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.UnknownFromHardwareError); // Connect did not throw an exception but lock state is still unknown.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Reserving bike...";
+				connector.Command.DoReserve(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Searching lock...";
+				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		[Test]
+		public void TestNotsupported()
+		{
+			var handler = new DisposableDisconnected(
+				Substitute.For<IBikeInfoMutable>(),
+				() => true, // isConnectedDelegate
+				(isConnexted) => Substitute.For<IConnector>(),
+				Substitute.For<IGeolocation>(),
+				Substitute.For<ILocksService>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
+				Substitute.For<ISmartDevice>(),
+				Substitute.For<IViewService>(),
+				Substitute.For<IBikesViewModel>(),
+				Substitute.For<IUser>());
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify state after action
+			Assert.AreEqual("Reserve bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
+			Assert.IsFalse(subsequent.IsLockitButtonVisible);
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableOpen.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableOpen.cs
index 33be306..327735a 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableOpen.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableOpen.cs
@@ -19,423 +19,423 @@ using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
 
 namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    [TestFixture]
-    public class TestDisposableOpen
-    {
+	[TestFixture]
+	public class TestDisposableOpen
+	{
 
-        /// <summary>
-        /// Test construction of object.
-        /// </summary>
-        [Test]
-        public void Testctor()
-        {
-            var handler = new DisposableOpen(
-                Substitute.For<IBikeInfoMutable>(),
-                () => true, // isConnectedDelegate
-                (isConnexted) => Substitute.For<IConnector>(),
-                Substitute.For<IGeolocation>(),
-                Substitute.For<ILocksService>(),
-                () => Substitute.For<IPollingUpdateTaskManager>(),
-                Substitute.For<ISmartDevice>(),
-                Substitute.For<IViewService>(),
-                Substitute.For<IBikesViewModel>(),
-                Substitute.For<IUser>());
+		/// <summary>
+		/// Test construction of object.
+		/// </summary>
+		[Test]
+		public void Testctor()
+		{
+			var handler = new DisposableOpen(
+				Substitute.For<IBikeInfoMutable>(),
+				() => true, // isConnectedDelegate
+				(isConnexted) => Substitute.For<IConnector>(),
+				Substitute.For<IGeolocation>(),
+				Substitute.For<ILocksService>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
+				Substitute.For<ISmartDevice>(),
+				Substitute.For<IViewService>(),
+				Substitute.For<IBikesViewModel>(),
+				Substitute.For<IUser>());
 
-            // Verify prerequisites.
-            Assert.AreEqual("Rent bike or close lock", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual(nameof(DisposableOpen), handler.LockitButtonText);
-            Assert.IsFalse(handler.IsLockitButtonVisible);
-        }
+			// Verify prerequisites.
+			Assert.AreEqual("Rent bike or close lock", handler.ButtonText);
+			Assert.IsTrue(handler.IsButtonVisible);
+			Assert.AreEqual(nameof(DisposableOpen), handler.LockitButtonText);
+			Assert.IsFalse(handler.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Lock bike.
-        /// Final state: Disposable Closed.
-        /// </summary>
-        [Test]
-        public void TestCloseLock()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Lock bike.
+		/// Final state: Disposable Closed.
+		/// </summary>
+		[Test]
+		public void TestCloseLock()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new DisposableOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new DisposableOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(false));
+			viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(false));
 
-            locks[0].CloseAsync().Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed));
+			locks[0].CloseAsync().Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed));
 
-            bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
 
-            var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "Disconnecting lock...";
-                locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks[0].CloseAsync();
+				bikesViewModel.ActionText = "Disconnecting lock...";
+				locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("Reserve bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
+			Assert.IsFalse(subsequent.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Lock bike.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCloseLockCloseFailsOutOfReachExcption()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Lock bike.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestCloseLockCloseFailsOutOfReachExcption()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new DisposableOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new DisposableOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(false));
+			viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(false));
 
-            locks[0].CloseAsync().Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
+			locks[0].CloseAsync().Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
 
-            bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.Open);
+			bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Open);
 
-            var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Lock can not be closed!", "Lock cannot be closed until bike is near.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks[0].CloseAsync();
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Lock can not be closed!", "Lock cannot be closed until bike is near.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual(nameof(DisposableDisconnected), subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("Reserve bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual(nameof(DisposableDisconnected), subsequent.LockitButtonText);
+			Assert.IsFalse(subsequent.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Lock bike.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCloseLockCloseFailsExcption()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Lock bike.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestCloseLockCloseFailsExcption()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new DisposableOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new DisposableOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(false));
+			viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(false));
 
-            locks[0].CloseAsync().Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
+			locks[0].CloseAsync().Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
 
-            bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.Open);
+			bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Open);
 
-            var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Lock can not be closed!", "Exception message.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks[0].CloseAsync();
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Lock can not be closed!", "Exception message.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual(nameof(DisposableDisconnected), subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("Reserve bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual(nameof(DisposableDisconnected), subsequent.LockitButtonText);
+			Assert.IsFalse(subsequent.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Lock bike.
-        /// Final state: Booked Open.
-        /// </summary>
-        [Test]
-        public void TestDoBook()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Lock bike.
+		/// Final state: Booked Open.
+		/// </summary>
+		[Test]
+		public void TestDoBook()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new DisposableOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new DisposableOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            bike.Id.Returns("0");
+			bike.Id.Returns("0");
 
-            viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(true));
+			viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(true));
 
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Open);
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Open);
 
-            var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike);
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.DoBook(bike);
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Lock bike.
-        /// Final state: Disposabled Closed.
-        /// </summary>
-        [Test]
-        public void TestDoBookDoBookFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Lock bike.
+		/// Final state: Disposabled Closed.
+		/// </summary>
+		[Test]
+		public void TestDoBookDoBookFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new DisposableOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new DisposableOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            bike.Id.Returns("0");
+			bike.Id.Returns("0");
 
-            viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(true));
+			viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(true));
 
-            connector.Command.DoBook(bike).Returns(x => throw new WebConnectFailureException("Context info.", new Exception("chub")));
+			connector.Command.DoBook(bike).Returns(x => throw new WebConnectFailureException("Context info.", new Exception("chub")));
 
-            locks[0].CloseAsync().Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed));
+			locks[0].CloseAsync().Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed));
 
-            bike.State.Value.Returns(InUseStateEnum.Disposable);
+			bike.State.Value.Returns(InUseStateEnum.Disposable);
 
-            var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike);
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Connection error when renting the bike!",
-                    string.Format("Attention: Lock is closed!\r\n{0}\r\n{1}", "Context info.", "Is WIFI available/ mobile networt available and mobile data activated / ... ?"),
-                    "OK");
-                bikesViewModel.ActionText = "Verschließe Schloss...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "Disconnecting lock...";
-                locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.DoBook(bike);
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Connection error when renting the bike!",
+					string.Format("Attention: Lock is closed!\r\n{0}\r\n{1}", "Context info.", "Is WIFI available/ mobile networt available and mobile data activated / ... ?"),
+					"OK");
+				bikesViewModel.ActionText = "Verschließe Schloss...";
+				locks[0].CloseAsync();
+				bikesViewModel.ActionText = "Disconnecting lock...";
+				locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("Reserve bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
+			Assert.IsFalse(subsequent.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Lock bike.
-        /// Final state: Disposabled Closed.
-        /// </summary>
-        [Test]
-        public void TestDoBookDoBookFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Lock bike.
+		/// Final state: Disposabled Closed.
+		/// </summary>
+		[Test]
+		public void TestDoBookDoBookFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new DisposableOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new DisposableOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            bike.Id.Returns("0");
+			bike.Id.Returns("0");
 
-            viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(true));
+			viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(true));
 
-            connector.Command.DoBook(bike).Returns(x => throw new Exception("Exception message."));
+			connector.Command.DoBook(bike).Returns(x => throw new Exception("Exception message."));
 
-            locks[0].CloseAsync().Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed));
+			locks[0].CloseAsync().Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed));
 
-            bike.State.Value.Returns(InUseStateEnum.Disposable);
+			bike.State.Value.Returns(InUseStateEnum.Disposable);
 
-            var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike);
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error when renting the bike!", "Attention: Lock is closed!\r\nException message.", "OK");
-                bikesViewModel.ActionText = "Verschließe Schloss...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "Disconnecting lock...";
-                locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.DoBook(bike);
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error when renting the bike!", "Attention: Lock is closed!\r\nException message.", "OK");
+				bikesViewModel.ActionText = "Verschließe Schloss...";
+				locks[0].CloseAsync();
+				bikesViewModel.ActionText = "Disconnecting lock...";
+				locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-    }
+			// Verify state after action
+			Assert.AreEqual("Reserve bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
+			Assert.IsFalse(subsequent.IsLockitButtonVisible);
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedClosed.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedClosed.cs
index 74e579a..554b8dd 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedClosed.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedClosed.cs
@@ -22,182 +22,182 @@ using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
 
 namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    [TestFixture]
-    public class TestReservedClosed
-    {
-        /// <summary>
-        /// Test construction of object.
-        /// </summary>
-        [Test]
-        public void Testctor()
-        {
-            var handler = new ReservedClosed(
-                Substitute.For<IBikeInfoMutable>(),
-                () => true, // isConnectedDelegate
-                (isConnexted) => Substitute.For<IConnector>(),
-                Substitute.For<IGeolocation>(),
-                Substitute.For<ILocksService>(),
-                () => Substitute.For<IPollingUpdateTaskManager>(),
-                Substitute.For<ISmartDevice>(),
-                Substitute.For<IViewService>(),
-                Substitute.For<IBikesViewModel>(),
-                Substitute.For<IUser>());
+	[TestFixture]
+	public class TestReservedClosed
+	{
+		/// <summary>
+		/// Test construction of object.
+		/// </summary>
+		[Test]
+		public void Testctor()
+		{
+			var handler = new ReservedClosed(
+				Substitute.For<IBikeInfoMutable>(),
+				() => true, // isConnectedDelegate
+				(isConnexted) => Substitute.For<IConnector>(),
+				Substitute.For<IGeolocation>(),
+				Substitute.For<ILocksService>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
+				Substitute.For<ISmartDevice>(),
+				Substitute.For<IViewService>(),
+				Substitute.For<IBikesViewModel>(),
+				Substitute.For<IUser>());
 
-            // Verify prerequisites.
-            Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual("Open lock & rent bike", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
+			// Verify prerequisites.
+			Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
+			Assert.IsTrue(handler.IsButtonVisible);
+			Assert.AreEqual("Open lock & rent bike", handler.LockitButtonText);
+			Assert.IsTrue(handler.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Cancel reservation.
-        /// Comment: User deceide to abort cancelling (user is ased whether to really cancel)
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCancelReservationCancel()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Cancel reservation.
+		/// Comment: User deceide to abort cancelling (user is ased whether to really cancel)
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestCancelReservationCancel()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            bike.Id.Returns("0");
+			bike.Id.Returns("0");
 
-            viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(false));
+			viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(false));
 
-            var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No");
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No");
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Cancel reservation.
-        /// Final state: Disposable.
-        /// </summary>
-        [Test]
-        public void TestCancelReservation()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Cancel reservation.
+		/// Final state: Disposable.
+		/// </summary>
+		[Test]
+		public void TestCancelReservation()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            bike.Id.Returns("0");
+			bike.Id.Returns("0");
 
-            viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-            bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requsthandler factory queries lock state to create appropriate request handler object.
+			viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
+			bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requsthandler factory queries lock state to create appropriate request handler object.
 
-            var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Disconnecting lock...";
-                locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Canceling reservation...";
+				connector.Command.DoCancelReservation(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Disconnecting lock...";
+				locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("Reserve bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
+			Assert.IsFalse(subsequent.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Cancel reservation.
-        /// Comment: Exception is thrown.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCancelReservationDoCancelReservationInvalidAuthorizationResponseException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Cancel reservation.
+		/// Comment: Exception is thrown.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestCancelReservationDoCancelReservationInvalidAuthorizationResponseException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            bike.Id.Returns("0");
+			bike.Id.Returns("0");
 
-            viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
+			viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
 
-            var response = JsonConvert.DeserializeObject<AuthorizationResponse>(@"
+			var response = JsonConvert.DeserializeObject<AuthorizationResponse>(@"
             {
                   ""response"" : ""authorization"",
                   ""authcookie"" : ""4da3044c8657a04ba60e2eaa753bc51a"",
@@ -206,982 +206,982 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
                   ""apiserver"" : ""https://tinkwwp.copri-bike.de""
                }");
 
-            connector.Command.DoCancelReservation(bike).Returns(x => throw new InvalidAuthorizationResponseException("mustermann@server.de", response));
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Error when canceling the reservation!",
-                    "Can not login user mustermann@server.de. Mail address unknown or password invalid.",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Cancel reservation.
-        /// Comment: Canceling reservation fails.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCancelReservationDoCancelReservationWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            connector.Command.DoCancelReservation(bike).Returns(x => throw new WebConnectFailureException("Context info.", new Exception("chub")));
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Connection error when canceling the reservation!",
-                    "Context info.\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Cancel reservation.
-        /// Comment: Canceling reservation fails.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCancelReservationDoCancelReservationException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            connector.Command.DoCancelReservation(bike).Returns(x => throw new Exception("Exception message."));
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Error when canceling the reservation!",
-                    "Exception message.",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock and book bike.
-        /// Comment: user cancels operation.
-        /// Final state: Reserved and closed.
-        /// </summary>
-        [Test]
-        public void TestBookAndOpenCancelBook()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(false));
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock and book bike.
-        /// Comment: Bike gets opened.
-        /// Final state: Booked open.
-        /// </summary>
-        [Test]
-        public void TestBookAndOpen()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].OpenAsync()
-                .Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Booking call leads to setting of state to booked.
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be opened
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, null);
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock and book bike.
-        /// Comment: COPRI request to book bike fails (WebConnectFailureException). Lock is opened and closed again.
-        /// Final state: Reserved closed.
-        /// </summary>
-        [Test]
-        public void TestBookAndOpenBookingFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
-
-            connector.Command.DoBook(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("Tst")));
-
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // State remains reserved because booking request failed.
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAdvancedAlert(
-                    "Connection error when renting the bike!",
-                    "Is WIFI available/ mobile networt available and mobile data activated / ... ?",
-                    "Context info",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "reserved closed" after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock and book bike.
-        /// Comment: COPRI request to book bike fails (Exception). Lock is opened and closed again.
-        /// Final state: Reserved closed.
-        /// </summary>
-        [Test]
-        public void TestBookAndOpenBookingFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
-
-            connector.Command.DoBook(bike).Returns(x => throw new Exception("Exception message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // When booking fails state remains reserved.
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAdvancedAlert(
-                    "Error when renting the bike!",
-                    "",
-                    "Exception message.",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "reserved closed" after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock and book bike, 
-        /// Comment: Unlocking bike throws an OutOfReach-Exception.
-        /// Final state: Reserved unknown.
-        /// </summary>
-        [Test]
-        public void TestBookAndOpenOpenFailsExceptionOutOfReachException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].OpenAsync()
-                .Returns<Task<LockitLockingState?>>(x => { throw new OutOfReachException(); });
-
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Booking call leads to setting of state to booked.
-            bike.LockInfo.State.Returns(LockingState.UnknownFromHardwareError);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be opened
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error while opening lock!", "Lock cannot be opened until bike is near.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock and book bike.
-        /// Comment: Unlocking bike throws an exception.
-        /// Final state: Reserved unknown.
-        /// </summary>
-        [Test]
-        public void TestBookAndOpenOpenFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].OpenAsync()
-                .Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message.")); // Return lock state indicating success
-
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Booking call leads to setting of state to booked.
-            bike.LockInfo.State.Returns(LockingState.UnknownFromHardwareError);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be opened
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error while opening lock!", "Exception message.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock and book bike.
-        /// Comment: Unlocking bike does not return state bike opened.
-        /// Final state: Reserved unknown.
-        /// </summary>
-        [Test]
-        public void TestBookAndOpenOpenFailsNotOpen()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].OpenAsync()
-                .Returns(Task.FromResult((LockitLockingState?)null)); // Return lock state indicating success
-
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Booking state does not change.
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be opened
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock and book bike.
-        /// Comment: Bike gets opened.
-        /// Final state: Booked open.
-        /// </summary>
-        [Test]
-        public void TestBookAndOpenBatteryPercentageOutOfReachException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].OpenAsync()
-                .Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Booking call leads to setting of state to booked.
-
-            locks[0].GetBatteryPercentageAsync().Returns<Task<double>>(x => throw new OutOfReachException());
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be opened
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Battery status can only be read when bike is nearby.";
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, null);
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock and book bike.
-        /// Comment: Bike gets opened.
-        /// Final state: Booked open.
-        /// </summary>
-        [Test]
-        public void TestBookAndOpenBatteryPercentageException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].OpenAsync()
-                .Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Booking call leads to setting of state to booked.
-
-            locks[0].GetBatteryPercentageAsync().Returns<Task<double>>(x => throw new Exception());
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be opened
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Battery status cannot be read.";
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, null);
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock and book bike.
-        /// Comment: Bike gets opened.
-        /// Final state: Booked open.
-        /// </summary>
-        [Test]
-        public void TestBookAndOpenUpdateLockingStateFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].OpenAsync()
-                .Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Booking call leads to setting of state to booked.
-
-            connector.Command.UpdateLockingStateAsync(bike, null).Returns(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be opened
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, null);
-                bikesViewModel.ActionText = "No web error on updating locking status.";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock and book bike.
-        /// Comment: Bike gets opened.
-        /// Final state: Booked open.
-        /// </summary>
-        [Test]
-        public void TestBookAndOpenUpdateLockingStateFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].OpenAsync()
-                .Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Booking call leads to setting of state to booked.
-
-            connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new Exception("Exception message."));
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be opened
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "Connection error on updating locking status.";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Open lock and book bike.
-        /// Comment: Bike gets opened.
-        /// Final state: Booked open.
-        /// </summary>
-        [Test]
-        public void TestBookAndOpenUpdateLockingStateFailsResponseException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].OpenAsync()
-                .Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Booking call leads to setting of state to booked.
-
-            connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x =>
-                throw new ReturnBikeException(JsonConvert.DeserializeObject<ReservationCancelReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be opened
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "Status error on updating lock state.";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-    }
+			connector.Command.DoCancelReservation(bike).Returns(x => throw new InvalidAuthorizationResponseException("mustermann@server.de", response));
+			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Canceling reservation...";
+				connector.Command.DoCancelReservation(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Error when canceling the reservation!",
+					"Can not login user mustermann@server.de. Mail address unknown or password invalid.",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Cancel reservation.
+		/// Comment: Canceling reservation fails.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestCancelReservationDoCancelReservationWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
+
+			connector.Command.DoCancelReservation(bike).Returns(x => throw new WebConnectFailureException("Context info.", new Exception("chub")));
+			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Canceling reservation...";
+				connector.Command.DoCancelReservation(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Connection error when canceling the reservation!",
+					"Context info.\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Cancel reservation.
+		/// Comment: Canceling reservation fails.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestCancelReservationDoCancelReservationException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
+
+			connector.Command.DoCancelReservation(bike).Returns(x => throw new Exception("Exception message."));
+			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Canceling reservation...";
+				connector.Command.DoCancelReservation(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Error when canceling the reservation!",
+					"Exception message.",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock and book bike.
+		/// Comment: user cancels operation.
+		/// Final state: Reserved and closed.
+		/// </summary>
+		[Test]
+		public void TestBookAndOpenCancelBook()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(false));
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock and book bike.
+		/// Comment: Bike gets opened.
+		/// Final state: Booked open.
+		/// </summary>
+		[Test]
+		public void TestBookAndOpen()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].OpenAsync()
+				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking call leads to setting of state to booked.
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.DoBook(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be opened
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, null);
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock and book bike.
+		/// Comment: COPRI request to book bike fails (WebConnectFailureException). Lock is opened and closed again.
+		/// Final state: Reserved closed.
+		/// </summary>
+		[Test]
+		public void TestBookAndOpenBookingFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
+
+			bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
+
+			connector.Command.DoBook(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("Tst")));
+
+			bike.State.Value.Returns(InUseStateEnum.Reserved); // State remains reserved because booking request failed.
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.DoBook(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAdvancedAlert(
+					"Connection error when renting the bike!",
+					"Is WIFI available/ mobile networt available and mobile data activated / ... ?",
+					"Context info",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "reserved closed" after action
+			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock and book bike.
+		/// Comment: COPRI request to book bike fails (Exception). Lock is opened and closed again.
+		/// Final state: Reserved closed.
+		/// </summary>
+		[Test]
+		public void TestBookAndOpenBookingFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
+
+			bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
+
+			connector.Command.DoBook(bike).Returns(x => throw new Exception("Exception message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Reserved); // When booking fails state remains reserved.
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.DoBook(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAdvancedAlert(
+					"Error when renting the bike!",
+					"",
+					"Exception message.",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "reserved closed" after action
+			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock and book bike, 
+		/// Comment: Unlocking bike throws an OutOfReach-Exception.
+		/// Final state: Reserved unknown.
+		/// </summary>
+		[Test]
+		public void TestBookAndOpenOpenFailsExceptionOutOfReachException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].OpenAsync()
+				.Returns<Task<LockitLockingState?>>(x => { throw new OutOfReachException(); });
+
+			bike.State.Value.Returns(InUseStateEnum.Reserved); // Booking call leads to setting of state to booked.
+			bike.LockInfo.State.Returns(LockingState.UnknownFromHardwareError);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.DoBook(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be opened
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error while opening lock!", "Lock cannot be opened until bike is near.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock and book bike.
+		/// Comment: Unlocking bike throws an exception.
+		/// Final state: Reserved unknown.
+		/// </summary>
+		[Test]
+		public void TestBookAndOpenOpenFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].OpenAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message.")); // Return lock state indicating success
+
+			bike.State.Value.Returns(InUseStateEnum.Reserved); // Booking call leads to setting of state to booked.
+			bike.LockInfo.State.Returns(LockingState.UnknownFromHardwareError);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.DoBook(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be opened
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error while opening lock!", "Exception message.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock and book bike.
+		/// Comment: Unlocking bike does not return state bike opened.
+		/// Final state: Reserved unknown.
+		/// </summary>
+		[Test]
+		public void TestBookAndOpenOpenFailsNotOpen()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].OpenAsync()
+				.Returns(Task.FromResult((LockitLockingState?)null)); // Return lock state indicating success
+
+			bike.State.Value.Returns(InUseStateEnum.Reserved); // Booking state does not change.
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.DoBook(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be opened
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock and book bike.
+		/// Comment: Bike gets opened.
+		/// Final state: Booked open.
+		/// </summary>
+		[Test]
+		public void TestBookAndOpenBatteryPercentageOutOfReachException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].OpenAsync()
+				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking call leads to setting of state to booked.
+
+			locks[0].GetBatteryPercentageAsync().Returns<Task<double>>(x => throw new OutOfReachException());
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.DoBook(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be opened
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Battery status can only be read when bike is nearby.";
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, null);
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock and book bike.
+		/// Comment: Bike gets opened.
+		/// Final state: Booked open.
+		/// </summary>
+		[Test]
+		public void TestBookAndOpenBatteryPercentageException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].OpenAsync()
+				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking call leads to setting of state to booked.
+
+			locks[0].GetBatteryPercentageAsync().Returns<Task<double>>(x => throw new Exception());
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.DoBook(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be opened
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Battery status cannot be read.";
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, null);
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock and book bike.
+		/// Comment: Bike gets opened.
+		/// Final state: Booked open.
+		/// </summary>
+		[Test]
+		public void TestBookAndOpenUpdateLockingStateFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].OpenAsync()
+				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking call leads to setting of state to booked.
+
+			connector.Command.UpdateLockingStateAsync(bike, null).Returns(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.DoBook(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be opened
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, null);
+				bikesViewModel.ActionText = "No web error on updating locking status.";
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock and book bike.
+		/// Comment: Bike gets opened.
+		/// Final state: Booked open.
+		/// </summary>
+		[Test]
+		public void TestBookAndOpenUpdateLockingStateFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].OpenAsync()
+				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking call leads to setting of state to booked.
+
+			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new Exception("Exception message."));
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.DoBook(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be opened
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "Connection error on updating locking status.";
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Open lock and book bike.
+		/// Comment: Bike gets opened.
+		/// Final state: Booked open.
+		/// </summary>
+		[Test]
+		public void TestBookAndOpenUpdateLockingStateFailsResponseException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].OpenAsync()
+				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking call leads to setting of state to booked.
+
+			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x =>
+				throw new ReturnBikeException(JsonConvert.DeserializeObject<ReservationCancelReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.DoBook(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be opened
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "Status error on updating lock state.";
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedDisconnected.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedDisconnected.cs
index e5b1109..9506da7 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedDisconnected.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedDisconnected.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using NSubstitute;
@@ -21,177 +21,177 @@ using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
 
 namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    public class TestReservedDisconnected
-    {
-        /// <summary>
-        /// Test construction of object.
-        /// </summary>
-        [Test]
-        public void Testctor()
-        {
-            var handler = new ReservedDisconnected(
-                Substitute.For<IBikeInfoMutable>(),
-                () => true, // isConnectedDelegate
-                (isConnexted) => Substitute.For<IConnector>(),
-                Substitute.For<IGeolocation>(),
-                Substitute.For<ILocksService>(),
-                () => Substitute.For<IPollingUpdateTaskManager>(),
-                Substitute.For<ISmartDevice>(),
-                Substitute.For<IViewService>(),
-                Substitute.For<IBikesViewModel>(),
-                Substitute.For<IUser>());
+	public class TestReservedDisconnected
+	{
+		/// <summary>
+		/// Test construction of object.
+		/// </summary>
+		[Test]
+		public void Testctor()
+		{
+			var handler = new ReservedDisconnected(
+				Substitute.For<IBikeInfoMutable>(),
+				() => true, // isConnectedDelegate
+				(isConnexted) => Substitute.For<IConnector>(),
+				Substitute.For<IGeolocation>(),
+				Substitute.For<ILocksService>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
+				Substitute.For<ISmartDevice>(),
+				Substitute.For<IViewService>(),
+				Substitute.For<IBikesViewModel>(),
+				Substitute.For<IUser>());
 
-            // Verify prerequisites.
-            Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
+			// Verify prerequisites.
+			Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
+			Assert.IsTrue(handler.IsButtonVisible);
+			Assert.AreEqual("Search lock", handler.LockitButtonText);
+			Assert.IsTrue(handler.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Cancel reservation.
-        /// Comment: User deceide to abort cancelling (user is ased whether to really cancel)
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCancelReservationCancel()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Cancel reservation.
+		/// Comment: User deceide to abort cancelling (user is ased whether to really cancel)
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestCancelReservationCancel()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new ReservedDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            bike.Id.Returns("0");
+			bike.Id.Returns("0");
 
-            viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(false));
+			viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(false));
 
-            var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No");
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No");
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Cancel reservation.
-        /// Final state: Disposable.
-        /// </summary>
-        [Test]
-        public void TestCancelReservation()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Cancel reservation.
+		/// Final state: Disposable.
+		/// </summary>
+		[Test]
+		public void TestCancelReservation()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new ReservedDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            bike.Id.Returns("0");
+			bike.Id.Returns("0");
 
-            viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-            bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requsthandler factory queries lock state to create appropriate request handler object.
+			viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
+			bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requsthandler factory queries lock state to create appropriate request handler object.
 
-            var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Canceling reservation...";
+				connector.Command.DoCancelReservation(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("Reserve bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
+			Assert.IsFalse(subsequent.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Cancel reservation.
-        /// Comment: Exception is thrown.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCancelReservationDoCancelReservationInvalidAuthorizationResponseException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Cancel reservation.
+		/// Comment: Exception is thrown.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestCancelReservationDoCancelReservationInvalidAuthorizationResponseException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new ReservedDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            bike.Id.Returns("0");
+			bike.Id.Returns("0");
 
-            viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
+			viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
 
-            var l_oResponse = JsonConvert.DeserializeObject<AuthorizationResponse>(@"
+			var l_oResponse = JsonConvert.DeserializeObject<AuthorizationResponse>(@"
                 {
                       ""response"" : ""authorization"",
                       ""authcookie"" : ""4da3044c8657a04ba60e2eaa753bc51a"",
@@ -200,561 +200,561 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
                       ""apiserver"" : ""https://tinkwwp.copri-bike.de""
                    }");
 
-            connector.Command.DoCancelReservation(bike).Returns(x => throw new InvalidAuthorizationResponseException("mustermann@server.de", l_oResponse));
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requsthandler factory queries lock state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Error when canceling the reservation!",
-                    "Can not login user mustermann@server.de. Mail address unknown or password invalid.",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Cancel reservation.
-        /// Comment: Canceling reservation fails.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCancelReservationDoCancelReservationWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            connector.Command.DoCancelReservation(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("chub")));
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requsthandler factory queries lock state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Connection error when canceling the reservation!",
-                    "Context info\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Cancel reservation.
-        /// Comment: Canceling reservation fails.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCancelReservationDoCancelReservationException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            connector.Command.DoCancelReservation(bike).Returns(x => throw new Exception("Exception message."));
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requsthandler factory queries lock state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Error when canceling the reservation!",
-                    "Exception message.",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: reserved closed
-        /// </summary>
-        [Test]
-        public void TestSearch()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
-
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
-                .Returns(Task.FromResult(new LockInfoTdo.Builder { State = LockitLockingState.Closed }.Build()));
-
-            locks.TimeOut.Returns(timeOuts);
-
-            viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].OpenAsync()
-                .Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Booking call leads to setting of state to booked.
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                connector.Command.CalculateAuthKeys(bike);
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "";
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be opened
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, null);
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestSearchCalculateAuthKeysFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            connector.Command.CalculateAuthKeys(bike).Returns(x => throw new WebConnectFailureException("Context info.", new Exception("Tst")));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.UnknownFromHardwareError);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error when connecting to lock!", "Internet must be reachable to connect to lock of reserved bike.\r\nContext info.\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestSearchCalculateAuthKeysFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            connector.Command.CalculateAuthKeys(bike).Returns(x => throw new Exception("Exception message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.UnknownFromHardwareError);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error when connecting to lock!", "Communication error during lock search.\r\nException message.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestSearchConnectFailsOutOfReachException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
-
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
-                .Returns<Task<LockInfoTdo>>(x => { throw new OutOfReachException(); });
-            locks.TimeOut.Returns(timeOuts);
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                connector.Command.CalculateAuthKeys(bike);
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Error when connecting to lock!",
-                    "Lock can only be found when reserved bike is nearby.",
-                    "Retry",
-                    "Cancel");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestSearchConnectFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
-
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
-                .Returns<Task<LockInfoTdo>>(x => throw new Exception("Execption message."));
-            locks.TimeOut.Returns(timeOuts);
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                connector.Command.CalculateAuthKeys(bike);
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAdvancedAlert(
-                    "Error when connecting to lock!",
-                    "Lock of reserved bike can not be found.",
-                    "",
-                    "Retry",
-                    "Cancel");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestSearchConnectNotOpen()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
-
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
-                .Returns(new LockInfoTdo.Builder { State = null }.Build());
-            locks.TimeOut.Returns(timeOuts);
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                connector.Command.CalculateAuthKeys(bike);
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error when connecting to lock!", "Lock status of the reserved bike could not be determined.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
-    }
+			connector.Command.DoCancelReservation(bike).Returns(x => throw new InvalidAuthorizationResponseException("mustermann@server.de", l_oResponse));
+			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requsthandler factory queries lock state to create appropriate request handler object.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Canceling reservation...";
+				connector.Command.DoCancelReservation(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Error when canceling the reservation!",
+					"Can not login user mustermann@server.de. Mail address unknown or password invalid.",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Cancel reservation.
+		/// Comment: Canceling reservation fails.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestCancelReservationDoCancelReservationWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
+
+			connector.Command.DoCancelReservation(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("chub")));
+			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requsthandler factory queries lock state to create appropriate request handler object.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Canceling reservation...";
+				connector.Command.DoCancelReservation(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Connection error when canceling the reservation!",
+					"Context info\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Cancel reservation.
+		/// Comment: Canceling reservation fails.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestCancelReservationDoCancelReservationException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
+
+			connector.Command.DoCancelReservation(bike).Returns(x => throw new Exception("Exception message."));
+			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requsthandler factory queries lock state to create appropriate request handler object.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Canceling reservation...";
+				connector.Command.DoCancelReservation(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Error when canceling the reservation!",
+					"Exception message.",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Search.
+		/// Final state: reserved closed
+		/// </summary>
+		[Test]
+		public void TestSearch()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+			var timeOuts = Substitute.For<ITimeOutProvider>();
+
+			var handler = new ReservedDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
+				.Returns(Task.FromResult(new LockInfoTdo.Builder { State = LockitLockingState.Closed }.Build()));
+
+			locks.TimeOut.Returns(timeOuts);
+
+			viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].OpenAsync()
+				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking call leads to setting of state to booked.
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Request server...";
+				connector.Command.CalculateAuthKeys(bike);
+				bikesViewModel.ActionText = "Searching lock...";
+				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
+				bikesViewModel.ActionText = "";
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.DoBook(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Opening lock...";
+				locks.Received()[0].OpenAsync(); // Lock must be opened
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, null);
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Search.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestSearchCalculateAuthKeysFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			connector.Command.CalculateAuthKeys(bike).Returns(x => throw new WebConnectFailureException("Context info.", new Exception("Tst")));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.UnknownFromHardwareError);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Request server...";
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error when connecting to lock!", "Internet must be reachable to connect to lock of reserved bike.\r\nContext info.\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
+			Assert.IsTrue(handler.IsButtonVisible);
+			Assert.AreEqual("Search lock", handler.LockitButtonText);
+			Assert.IsTrue(handler.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Search.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestSearchCalculateAuthKeysFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			connector.Command.CalculateAuthKeys(bike).Returns(x => throw new Exception("Exception message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.UnknownFromHardwareError);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Request server...";
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error when connecting to lock!", "Communication error during lock search.\r\nException message.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
+			Assert.IsTrue(handler.IsButtonVisible);
+			Assert.AreEqual("Search lock", handler.LockitButtonText);
+			Assert.IsTrue(handler.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Search.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestSearchConnectFailsOutOfReachException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+			var timeOuts = Substitute.For<ITimeOutProvider>();
+
+			var handler = new ReservedDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
+				.Returns<Task<LockInfoTdo>>(x => { throw new OutOfReachException(); });
+			locks.TimeOut.Returns(timeOuts);
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Request server...";
+				connector.Command.CalculateAuthKeys(bike);
+				bikesViewModel.ActionText = "Searching lock...";
+				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Error when connecting to lock!",
+					"Lock can only be found when reserved bike is nearby.",
+					"Retry",
+					"Cancel");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
+			Assert.IsTrue(handler.IsButtonVisible);
+			Assert.AreEqual("Search lock", handler.LockitButtonText);
+			Assert.IsTrue(handler.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Search.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestSearchConnectFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+			var timeOuts = Substitute.For<ITimeOutProvider>();
+
+			var handler = new ReservedDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+
+			locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
+				.Returns<Task<LockInfoTdo>>(x => throw new Exception("Execption message."));
+			locks.TimeOut.Returns(timeOuts);
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Request server...";
+				connector.Command.CalculateAuthKeys(bike);
+				bikesViewModel.ActionText = "Searching lock...";
+				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAdvancedAlert(
+					"Error when connecting to lock!",
+					"Your mobile device does not connect to the bike lock. Please step as close as possible to the bike and try again.",
+					"",
+					"Retry",
+					"Cancel");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
+			Assert.IsTrue(handler.IsButtonVisible);
+			Assert.AreEqual("Search lock", handler.LockitButtonText);
+			Assert.IsTrue(handler.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: Search.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestSearchConnectNotOpen()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+			var timeOuts = Substitute.For<ITimeOutProvider>();
+
+			var handler = new ReservedDisconnected(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
+				.Returns(new LockInfoTdo.Builder { State = null }.Build());
+			locks.TimeOut.Returns(timeOuts);
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Request server...";
+				connector.Command.CalculateAuthKeys(bike);
+				bikesViewModel.ActionText = "Searching lock...";
+				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error when connecting to lock!", "Lock status of the reserved bike could not be determined.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
+			Assert.IsTrue(handler.IsButtonVisible);
+			Assert.AreEqual("Search lock", handler.LockitButtonText);
+			Assert.IsTrue(handler.IsLockitButtonVisible);
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedOpen.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedOpen.cs
index 718d7b0..343c5b0 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedOpen.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedOpen.cs
@@ -21,469 +21,469 @@ using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
 
 namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    [TestFixture]
-    public class TestReservedOpen
-    {
-        /// <summary>
-        /// Test construction of object.
-        /// </summary>
-        [Test]
-        public void Testctor()
-        {
-            var handler = new ReservedOpen(
-                Substitute.For<IBikeInfoMutable>(),
-                () => true, // isConnectedDelegate
-                (isConnexted) => Substitute.For<IConnector>(),
-                Substitute.For<IGeolocation>(),
-                Substitute.For<ILocksService>(),
-                () => Substitute.For<IPollingUpdateTaskManager>(),
-                Substitute.For<ISmartDevice>(),
-                Substitute.For<IViewService>(),
-                Substitute.For<IBikesViewModel>(),
-                Substitute.For<IUser>());
+	[TestFixture]
+	public class TestReservedOpen
+	{
+		/// <summary>
+		/// Test construction of object.
+		/// </summary>
+		[Test]
+		public void Testctor()
+		{
+			var handler = new ReservedOpen(
+				Substitute.For<IBikeInfoMutable>(),
+				() => true, // isConnectedDelegate
+				(isConnexted) => Substitute.For<IConnector>(),
+				Substitute.For<IGeolocation>(),
+				Substitute.For<ILocksService>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
+				Substitute.For<ISmartDevice>(),
+				Substitute.For<IViewService>(),
+				Substitute.For<IBikesViewModel>(),
+				Substitute.For<IUser>());
 
-            // Verify prerequisites.
-            Assert.AreEqual("Rad zurückgeben oder mieten", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual("Alarm/ Sounds verwalten", handler.LockitButtonText);
-            Assert.IsFalse(handler.IsLockitButtonVisible);
-        }
+			// Verify prerequisites.
+			Assert.AreEqual("Rad zurückgeben oder mieten", handler.ButtonText);
+			Assert.IsTrue(handler.IsButtonVisible);
+			Assert.AreEqual("Alarm/ Sounds verwalten", handler.LockitButtonText);
+			Assert.IsFalse(handler.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: User books bike.
-        /// Final state: Booked.
-        /// </summary>
-        [Test]
-        public void TestBook()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: User books bike.
+		/// Final state: Booked.
+		/// </summary>
+		[Test]
+		public void TestBook()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new ReservedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new ReservedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            viewService.DisplayAlert(string.Empty, "Rad Nr. 0  abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(false));
+			viewService.DisplayAlert(string.Empty, "Rad Nr. 0  abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(false));
 
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.Open); // Requsthandler factory queries lock state to create appropriate request handler object.
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Open); // Requsthandler factory queries lock state to create appropriate request handler object.
 
-            var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike);
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.DoBook(bike);
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: User books bike.
-        /// Final state: Reserved closed.
-        /// </summary>
-        [Test]
-        public void TestBookBookFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: User books bike.
+		/// Final state: Reserved closed.
+		/// </summary>
+		[Test]
+		public void TestBookBookFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new ReservedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new ReservedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            viewService.DisplayAlert(string.Empty, "Rad Nr. 0  abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(false));
+			viewService.DisplayAlert(string.Empty, "Rad Nr. 0  abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(false));
 
-            connector.Command.DoBook(bike).Returns(x => throw new WebConnectFailureException("Context info.", new Exception("Tst")));
+			connector.Command.DoBook(bike).Returns(x => throw new WebConnectFailureException("Context info.", new Exception("Tst")));
 
-            locks[0].CloseAsync().Returns(LockitLockingState.Closed);
+			locks[0].CloseAsync().Returns(LockitLockingState.Closed);
 
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
 
-            var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike);
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Connection error when renting the bike!",
-                    string.Format("Attention: Lock is closed!\r\n{0}\r\n{1}", "Context info.", "Is WIFI available/ mobile networt available and mobile data activated / ... ?"),
-                    "OK");
-                bikesViewModel.ActionText = "Wiederverschließe Schloss...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.DoBook(bike);
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Connection error when renting the bike!",
+					string.Format("Attention: Lock is closed!\r\n{0}\r\n{1}", "Context info.", "Is WIFI available/ mobile networt available and mobile data activated / ... ?"),
+					"OK");
+				bikesViewModel.ActionText = "Wiederverschließe Schloss...";
+				locks[0].CloseAsync();
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: User books bike.
-        /// Final state: Reserved closed.
-        /// </summary>
-        [Test]
-        public void TestBookBookFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: User books bike.
+		/// Final state: Reserved closed.
+		/// </summary>
+		[Test]
+		public void TestBookBookFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new ReservedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new ReservedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            viewService.DisplayAlert(string.Empty, "Rad Nr. 0  abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(false));
+			viewService.DisplayAlert(string.Empty, "Rad Nr. 0  abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(false));
 
-            connector.Command.DoBook(bike).Returns(x => throw new Exception("Exception message."));
+			connector.Command.DoBook(bike).Returns(x => throw new Exception("Exception message."));
 
-            locks[0].CloseAsync().Returns(LockitLockingState.Closed);
+			locks[0].CloseAsync().Returns(LockitLockingState.Closed);
 
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
 
-            var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike);
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error when renting the bike!", "Attention: Lock is closed!\r\nException message.", "OK");
-                bikesViewModel.ActionText = "Wiederverschließe Schloss...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Reading charging level...";
+				locks[0].GetBatteryPercentageAsync();
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.DoBook(bike);
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert("Error when renting the bike!", "Attention: Lock is closed!\r\nException message.", "OK");
+				bikesViewModel.ActionText = "Wiederverschließe Schloss...";
+				locks[0].CloseAsync();
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Close lock and cancel reservation.
-        /// Final state: Booked.
-        /// </summary>
-        [Test]
-        public void TestCloseLockAndCancelReservation()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Close lock and cancel reservation.
+		/// Final state: Booked.
+		/// </summary>
+		[Test]
+		public void TestCloseLockAndCancelReservation()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new ReservedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new ReservedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            bike.Id.Returns("0");
+			bike.Id.Returns("0");
 
-            viewService.DisplayAlert(string.Empty, "Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(true));
+			viewService.DisplayAlert(string.Empty, "Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(true));
 
-            locks[0].CloseAsync().Returns(LockitLockingState.Closed);
+			locks[0].CloseAsync().Returns(LockitLockingState.Closed);
 
-            bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
 
-            var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike);
-                bikesViewModel.ActionText = "Disconnecting lock...";
-                locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks[0].CloseAsync();
+				bikesViewModel.ActionText = "Canceling reservation...";
+				connector.Command.DoCancelReservation(bike);
+				bikesViewModel.ActionText = "Disconnecting lock...";
+				locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("Reserve bike", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
+			Assert.IsFalse(subsequent.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Close lock and cancel reservation.
-        /// Final state: Reserved open.
-        /// </summary>
-        [Test]
-        public void TestCloseLockAndCancelReservationCloseFailsOutOfReachException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Close lock and cancel reservation.
+		/// Final state: Reserved open.
+		/// </summary>
+		[Test]
+		public void TestCloseLockAndCancelReservationCloseFailsOutOfReachException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new ReservedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new ReservedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            bike.Id.Returns("0");
+			bike.Id.Returns("0");
 
-            viewService.DisplayAlert(
-                string.Empty,
-                "Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?",
-                "Zurückgeben",
-                "Mieten").Returns(Task.FromResult(true));
+			viewService.DisplayAlert(
+				string.Empty,
+				"Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?",
+				"Zurückgeben",
+				"Mieten").Returns(Task.FromResult(true));
 
-            locks[0].CloseAsync()
-                .Returns<Task<LockitLockingState?>>(x => { throw new OutOfReachException(); });
+			locks[0].CloseAsync()
+				.Returns<Task<LockitLockingState?>>(x => { throw new OutOfReachException(); });
 
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.Open);
+			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Open);
 
-            var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Lock can not be closed!",
-                    "Lock cannot be closed until bike is near.\r\nPlease try again to close bike or report bike to support!",
-                    "OK");
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks[0].CloseAsync();
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Lock can not be closed!",
+					"Lock cannot be closed until bike is near.\r\nPlease try again to close bike or report bike to support!",
+					"OK");
 
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Close lock and cancel reservation.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCloseLockAndCancelReservationCloseFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Close lock and cancel reservation.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestCloseLockAndCancelReservationCloseFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new ReservedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new ReservedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            bike.Id.Returns("0");
+			bike.Id.Returns("0");
 
-            viewService.DisplayAlert(
-                string.Empty,
-                "Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?",
-                "Zurückgeben",
-                "Mieten").Returns(Task.FromResult(true));
+			viewService.DisplayAlert(
+				string.Empty,
+				"Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?",
+				"Zurückgeben",
+				"Mieten").Returns(Task.FromResult(true));
 
-            locks[0].CloseAsync()
-                .Returns<Task<LockitLockingState?>>(x => { throw new Exception("Exception message."); });
+			locks[0].CloseAsync()
+				.Returns<Task<LockitLockingState?>>(x => { throw new Exception("Exception message."); });
 
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.Open);
+			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Open);
 
-            var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Lock can not be closed!",
-                    "Please try to lock again or report bike to support!\r\nException message.",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks[0].CloseAsync();
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Lock can not be closed!",
+					"Please try to lock again or report bike to support!\r\nException message.",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Close lock and cancel reservation.
-        /// Final state: Reserved closed.
-        /// </summary>
-        [Test]
-        public void TestCloseLockAndCancelReservationCancelReservationInvalidAuthorizationResponseException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Close lock and cancel reservation.
+		/// Final state: Reserved closed.
+		/// </summary>
+		[Test]
+		public void TestCloseLockAndCancelReservationCancelReservationInvalidAuthorizationResponseException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new ReservedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new ReservedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            var response = JsonConvert.DeserializeObject<AuthorizationResponse>(@"
+			var response = JsonConvert.DeserializeObject<AuthorizationResponse>(@"
             {
                   ""response"" : ""authorization"",
                   ""authcookie"" : ""4da3044c8657a04ba60e2eaa753bc51a"",
@@ -492,188 +492,188 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
                   ""apiserver"" : ""https://tinkwwp.copri-bike.de""
                }");
 
-            bike.Id.Returns("0");
+			bike.Id.Returns("0");
 
-            viewService.DisplayAlert(string.Empty, "Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(true));
+			viewService.DisplayAlert(string.Empty, "Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(true));
 
-            locks[0].CloseAsync().Returns(LockitLockingState.Closed);
+			locks[0].CloseAsync().Returns(LockitLockingState.Closed);
 
-            connector.Command.DoCancelReservation(bike).Returns(x => throw new InvalidAuthorizationResponseException("mustermann@server.de", response));
+			connector.Command.DoCancelReservation(bike).Returns(x => throw new InvalidAuthorizationResponseException("mustermann@server.de", response));
 
-            bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
 
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-            var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike);
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Error when canceling the reservation!",
-                    "Can not login user mustermann@server.de. Mail address unknown or password invalid.",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks[0].CloseAsync();
+				bikesViewModel.ActionText = "Canceling reservation...";
+				connector.Command.DoCancelReservation(bike);
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Error when canceling the reservation!",
+					"Can not login user mustermann@server.de. Mail address unknown or password invalid.",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("InvalidState", subsequent.ButtonText);
-            Assert.IsFalse(subsequent.IsButtonVisible);
-            Assert.AreEqual("InvalidState", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("InvalidState", subsequent.ButtonText);
+			Assert.IsFalse(subsequent.IsButtonVisible);
+			Assert.AreEqual("InvalidState", subsequent.LockitButtonText);
+			Assert.IsFalse(subsequent.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Close lock and cancel reservation.
-        /// Final state: Reserved closed.
-        /// </summary>
-        [Test]
-        public void TestCloseLockAndCancelReservationCancelReservationWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Close lock and cancel reservation.
+		/// Final state: Reserved closed.
+		/// </summary>
+		[Test]
+		public void TestCloseLockAndCancelReservationCancelReservationWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new ReservedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new ReservedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            bike.Id.Returns("0");
+			bike.Id.Returns("0");
 
-            viewService.DisplayAlert(string.Empty, "Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(true));
+			viewService.DisplayAlert(string.Empty, "Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(true));
 
-            locks[0].CloseAsync().Returns(LockitLockingState.Closed);
+			locks[0].CloseAsync().Returns(LockitLockingState.Closed);
 
-            connector.Command.DoCancelReservation(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("chub")));
+			connector.Command.DoCancelReservation(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("chub")));
 
-            bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
 
-            var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike);
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Connection error when canceling the reservation!",
-                    "Context info\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks[0].CloseAsync();
+				bikesViewModel.ActionText = "Canceling reservation...";
+				connector.Command.DoCancelReservation(bike);
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Connection error when canceling the reservation!",
+					"Context info\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("InvalidState", subsequent.ButtonText);
-            Assert.IsFalse(subsequent.IsButtonVisible);
-            Assert.AreEqual("InvalidState", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
+			// Verify state after action
+			Assert.AreEqual("InvalidState", subsequent.ButtonText);
+			Assert.IsFalse(subsequent.IsButtonVisible);
+			Assert.AreEqual("InvalidState", subsequent.LockitButtonText);
+			Assert.IsFalse(subsequent.IsLockitButtonVisible);
+		}
 
-        /// <summary>
-        /// Use case: Close lock and cancel reservation.
-        /// Final state: Reserved closed.
-        /// </summary>
-        [Test]
-        public void TestCloseLockAndCancelReservationCancelReservationException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Close lock and cancel reservation.
+		/// Final state: Reserved closed.
+		/// </summary>
+		[Test]
+		public void TestCloseLockAndCancelReservationCancelReservationException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new ReservedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new ReservedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            bike.Id.Returns("0");
+			bike.Id.Returns("0");
 
-            viewService.DisplayAlert(string.Empty, "Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(true));
+			viewService.DisplayAlert(string.Empty, "Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(true));
 
-            locks[0].CloseAsync().Returns(LockitLockingState.Closed);
+			locks[0].CloseAsync().Returns(LockitLockingState.Closed);
 
-            connector.Command.DoCancelReservation(bike).Returns(x => throw new Exception("Exception message.", new Exception("chub")));
+			connector.Command.DoCancelReservation(bike).Returns(x => throw new Exception("Exception message.", new Exception("chub")));
 
-            bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
+			bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
 
-            var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike);
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Error when canceling the reservation!",
-                    "Exception message.",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks[0].CloseAsync();
+				bikesViewModel.ActionText = "Canceling reservation...";
+				connector.Command.DoCancelReservation(bike);
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Error when canceling the reservation!",
+					"Exception message.",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.AreEqual("InvalidState", subsequent.ButtonText);
-            Assert.IsFalse(subsequent.IsButtonVisible);
-            Assert.AreEqual("InvalidState", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-    }
+			// Verify state after action
+			Assert.AreEqual("InvalidState", subsequent.ButtonText);
+			Assert.IsFalse(subsequent.IsButtonVisible);
+			Assert.AreEqual("InvalidState", subsequent.LockitButtonText);
+			Assert.IsFalse(subsequent.IsLockitButtonVisible);
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedUnknown.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedUnknown.cs
index 3a6ce0f..a082cf3 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedUnknown.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedUnknown.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using NSubstitute;
@@ -22,955 +22,959 @@ using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
 
 namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-    public class TestReservedUnknown
-    {
-        [TestFixture]
-        public class TestBookedUnknown
-        {
-
-            /// <summary>
-            /// Test construction of object.
-            /// </summary>
-            [Test]
-            public void Testctor()
-            {
-                var handler = new ReservedUnknown(
-                    Substitute.For<IBikeInfoMutable>(),
-                    () => true, // isConnectedDelegate
-                    (isConnexted) => Substitute.For<IConnector>(),
-                    Substitute.For<IGeolocation>(),
-                    Substitute.For<ILocksService>(),
-                    () => Substitute.For<IPollingUpdateTaskManager>(),
-                    Substitute.For<ISmartDevice>(),
-                    Substitute.For<IViewService>(),
-                    Substitute.For<IBikesViewModel>(),
-                    Substitute.For<IUser>());
-
-                // Verify prerequisites.
-                Assert.AreEqual("Open lock & rent bike", handler.ButtonText);
-                Assert.IsFalse(handler.IsButtonVisible);
-                Assert.AreEqual("Close lock", handler.LockitButtonText);
-                Assert.IsTrue(handler.IsLockitButtonVisible);
-            }
-
-            /// <summary>
-            /// Use case: Opens lock
-            /// Final state: Booked opened.
-            /// </summary>
-            [Test]
-            public void TestOpen()
-            {
-                var bike = Substitute.For<IBikeInfoMutable>();
-                var connector = Substitute.For<IConnector>();
-                var command = Substitute.For<ICommand>();
-                var geolocation = Substitute.For<IGeolocation>();
-                var locks = Substitute.For<ILocksService>();
-                var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-                var viewService = Substitute.For<IViewService>();
-                var bikesViewModel = Substitute.For<IBikesViewModel>();
-                var activeUser = Substitute.For<IUser>();
-
-                var handler = new ReservedUnknown(
-                    bike,
-                    () => true, // isConnectedDelegate
-                    (isConnexted) => connector,
-                    geolocation,
-                    locks,
-                    () => pollingManager,
-                    Substitute.For<ISmartDevice>(),
-                    viewService,
-                    bikesViewModel,
-                    activeUser);
-
-                locks[0].OpenAsync()
-                    .Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
-
-                bike.State.Value.Returns(InUseStateEnum.Booked);
-
-                var subsequent = handler.HandleRequestOption1().Result;
-
-                // Verify behaviour
-                Received.InOrder(() =>
-                {
-                    bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                    bikesViewModel.ActionText = "One moment please...";
-                    pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                    bikesViewModel.ActionText = "Opening lock...";
-                    locks.Received()[0].OpenAsync(); // Lock must be closed
-                    bikesViewModel.ActionText = "Reading charging level...";
-                    locks[0].GetBatteryPercentageAsync();
-                    bikesViewModel.ActionText = "Updating lock state...";
-                    connector.Command.UpdateLockingStateAsync(bike, null);
-                    bikesViewModel.ActionText = "Updating...";
-                    pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                    bikesViewModel.ActionText = "";
-                    bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-                });
-
-                // Verify state "Booked Closed" after action
-                Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-                Assert.IsTrue(subsequent.IsButtonVisible);
-                Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-                Assert.IsTrue(subsequent.IsLockitButtonVisible);
-            }
-
-            /// <summary>
-            /// Use case: Open lock
-            /// Final state: Same as initial state.
-            /// </summary>
-            [Test]
-            public void TestOpenOpenFailsOutOfReachException()
-            {
-                var bike = Substitute.For<IBikeInfoMutable>();
-                var connector = Substitute.For<IConnector>();
-                var command = Substitute.For<ICommand>();
-                var geolocation = Substitute.For<IGeolocation>();
-                var locks = Substitute.For<ILocksService>();
-                var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-                var viewService = Substitute.For<IViewService>();
-                var bikesViewModel = Substitute.For<IBikesViewModel>();
-                var activeUser = Substitute.For<IUser>();
-
-                var handler = new ReservedUnknown(
-                    bike,
-                    () => true, // isConnectedDelegate
-                    (isConnexted) => connector,
-                    geolocation,
-                    locks,
-                    () => pollingManager,
-                    Substitute.For<ISmartDevice>(),
-                    viewService,
-                    bikesViewModel,
-                    activeUser);
-
-                locks[0].OpenAsync()
-                    .Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
-
-                bike.State.Value.Returns(InUseStateEnum.Booked);
-                bike.LockInfo.State.Returns(LockingState.Closed);
-
-                var subsequent = handler.HandleRequestOption1().Result;
-
-                // Verify behaviour
-                Received.InOrder(() =>
-                {
-                    bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                    bikesViewModel.ActionText = "One moment please...";
-                    pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                    bikesViewModel.ActionText = "Opening lock...";
-                    locks.Received()[0].OpenAsync(); // Lock must be closed
-                    bikesViewModel.ActionText = "";
-                    viewService.DisplayAlert("Error while opening lock!", "Lock cannot be opened until bike is near.", "OK");
-                    bikesViewModel.ActionText = "Updating...";
-                    pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                    bikesViewModel.ActionText = "";
-                    bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-                });
-
-                // Verify state "Booked Disconnected" after action
-                Assert.AreEqual(nameof(BookedDisconnected), subsequent.ButtonText);
-                Assert.IsFalse(subsequent.IsButtonVisible);
-                Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-                Assert.IsTrue(subsequent.IsLockitButtonVisible);
-            }
-
-            /// <summary>
-            /// Use case: Open lock
-            /// Final state: Same as initial state.
-            /// </summary>
-            [Test]
-            public void TestOpenOpenFailsCouldntOpenBoldBlockedException()
-            {
-                var bike = Substitute.For<IBikeInfoMutable>();
-                var connector = Substitute.For<IConnector>();
-                var command = Substitute.For<ICommand>();
-                var geolocation = Substitute.For<IGeolocation>();
-                var locks = Substitute.For<ILocksService>();
-                var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-                var viewService = Substitute.For<IViewService>();
-                var bikesViewModel = Substitute.For<IBikesViewModel>();
-                var activeUser = Substitute.For<IUser>();
-
-                var handler = new ReservedUnknown(
-                    bike,
-                    () => true, // isConnectedDelegate
-                    (isConnexted) => connector,
-                    geolocation,
-                    locks,
-                    () => pollingManager,
-                    Substitute.For<ISmartDevice>(),
-                    viewService,
-                    bikesViewModel,
-                    activeUser);
-
-                locks[0].OpenAsync()
-                    .Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenBoldIsBlockedException());
-
-                bike.State.Value.Returns(InUseStateEnum.Booked);
-                bike.LockInfo.State.Returns(LockingState.Closed);
-
-                var subsequent = handler.HandleRequestOption1().Result;
-
-                // Verify behaviour
-                Received.InOrder(() =>
-                {
-                    bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                    bikesViewModel.ActionText = "One moment please...";
-                    pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                    bikesViewModel.ActionText = "Opening lock...";
-                    locks.Received()[0].OpenAsync(); // Lock must be closed
-                    bikesViewModel.ActionText = "";
-                    viewService.DisplayAlert("Error while opening lock!", "Lock is blocked. Please ensure that no obstacle prevents lock from opening and try again.", "OK");
-                    bikesViewModel.ActionText = "Updating...";
-                    pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                    bikesViewModel.ActionText = "";
-                    bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-                });
-
-                // Verify state "Booked Unknown" after action
-                Assert.AreEqual("Open lock", subsequent.ButtonText);
-                Assert.IsTrue(subsequent.IsButtonVisible);
-                Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-                Assert.IsTrue(subsequent.IsLockitButtonVisible);
-            }
-
-            /// <summary>
-            /// Use case: Open lock
-            /// Final state: Same as initial state.
-            /// </summary>
-            [Test]
-            public void TestOpenOpenFailsCouldntOpenInconsistentStateExecptionClosed()
-            {
-                var bike = Substitute.For<IBikeInfoMutable>();
-                var connector = Substitute.For<IConnector>();
-                var command = Substitute.For<ICommand>();
-                var geolocation = Substitute.For<IGeolocation>();
-                var locks = Substitute.For<ILocksService>();
-                var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-                var viewService = Substitute.For<IViewService>();
-                var bikesViewModel = Substitute.For<IBikesViewModel>();
-                var activeUser = Substitute.For<IUser>();
-
-                var handler = new ReservedUnknown(
-                    bike,
-                    () => true, // isConnectedDelegate
-                    (isConnexted) => connector,
-                    geolocation,
-                    locks,
-                    () => pollingManager,
-                    Substitute.For<ISmartDevice>(),
-                    viewService,
-                    bikesViewModel,
-                    activeUser);
-
-                locks[0].OpenAsync()
-                    .Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenInconsistentStateExecption(LockingState.Closed));
-
-                bike.State.Value.Returns(InUseStateEnum.Booked);
-                bike.LockInfo.State.Returns(LockingState.Closed);
-
-                var subsequent = handler.HandleRequestOption1().Result;
-
-                // Verify behaviour
-                Received.InOrder(() =>
-                {
-                    bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                    bikesViewModel.ActionText = "One moment please...";
-                    pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                    bikesViewModel.ActionText = "Opening lock...";
-                    locks.Received()[0].OpenAsync(); // Lock must be closed
-                    bikesViewModel.ActionText = "";
-                    viewService.DisplayAlert("Error while opening lock!", "After try to open lock state closed is reported.", "OK");
-                    bikesViewModel.ActionText = "Updating...";
-                    pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                    bikesViewModel.ActionText = "";
-                    bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-                });
-
-                // Verify state "Booked Closed" after action
-                Assert.AreEqual("Return bike", subsequent.ButtonText);
-                Assert.IsTrue(subsequent.IsButtonVisible);
-                Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-                Assert.IsTrue(subsequent.IsLockitButtonVisible);
-            }
-
-            /// <summary>
-            /// Use case: Open lock
-            /// Final state: Same as initial state.
-            /// </summary>
-            [Test]
-            public void TestOpenOpenFailsCouldntOpenInconsistentStateExecption()
-            {
-                var bike = Substitute.For<IBikeInfoMutable>();
-                var connector = Substitute.For<IConnector>();
-                var command = Substitute.For<ICommand>();
-                var geolocation = Substitute.For<IGeolocation>();
-                var locks = Substitute.For<ILocksService>();
-                var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-                var viewService = Substitute.For<IViewService>();
-                var bikesViewModel = Substitute.For<IBikesViewModel>();
-                var activeUser = Substitute.For<IUser>();
-
-                var handler = new ReservedUnknown(
-                    bike,
-                    () => true, // isConnectedDelegate
-                    (isConnexted) => connector,
-                    geolocation,
-                    locks,
-                    () => pollingManager,
-                    Substitute.For<ISmartDevice>(),
-                    viewService,
-                    bikesViewModel,
-                    activeUser);
-
-                locks[0].OpenAsync()
-                    .Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenBoldWasBlockedException());
-
-                bike.State.Value.Returns(InUseStateEnum.Booked);
-                bike.LockInfo.State.Returns(LockingState.Closed);
-
-                var subsequent = handler.HandleRequestOption1().Result;
-
-                // Verify behaviour
-                Received.InOrder(() =>
-                {
-                    bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                    bikesViewModel.ActionText = "One moment please...";
-                    pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                    bikesViewModel.ActionText = "Opening lock...";
-                    locks.Received()[0].OpenAsync(); // Lock must be closed
-                    bikesViewModel.ActionText = "";
-                    viewService.DisplayAlert("Lock can not be opened!", "Lock was blocked and might still be. Please ensure that no obstacle prevents lock from opening and try again.", "OK");
-                    bikesViewModel.ActionText = "Updating...";
-                    pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                    bikesViewModel.ActionText = "";
-                    bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-                });
-
-                // Verify state "Booked Disconnected" after action
-                Assert.AreEqual("Open lock", subsequent.ButtonText);
-                Assert.IsTrue(subsequent.IsButtonVisible);
-                Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-                Assert.IsTrue(subsequent.IsLockitButtonVisible);
-            }
-
-            /// <summary>
-            /// Use case: Open lock
-            /// Final state: Same as initial state.
-            /// </summary>
-            [Test]
-            public void TestOpenOpenFailsException()
-            {
-                var bike = Substitute.For<IBikeInfoMutable>();
-                var connector = Substitute.For<IConnector>();
-                var command = Substitute.For<ICommand>();
-                var geolocation = Substitute.For<IGeolocation>();
-                var locks = Substitute.For<ILocksService>();
-                var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-                var viewService = Substitute.For<IViewService>();
-                var bikesViewModel = Substitute.For<IBikesViewModel>();
-                var activeUser = Substitute.For<IUser>();
-
-                var handler = new ReservedUnknown(
-                    bike,
-                    () => true, // isConnectedDelegate
-                    (isConnexted) => connector,
-                    geolocation,
-                    locks,
-                    () => pollingManager,
-                    Substitute.For<ISmartDevice>(),
-                    viewService,
-                    bikesViewModel,
-                    activeUser);
-
-                locks[0].OpenAsync()
-                    .Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
-
-                bike.State.Value.Returns(InUseStateEnum.Booked);
-                bike.LockInfo.State.Returns(LockingState.Closed);
-
-                var subsequent = handler.HandleRequestOption1().Result;
-
-                // Verify behaviour
-                Received.InOrder(() =>
-                {
-                    bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                    bikesViewModel.ActionText = "One moment please...";
-                    pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                    bikesViewModel.ActionText = "Opening lock...";
-                    locks.Received()[0].OpenAsync(); // Lock must be closed
-                    bikesViewModel.ActionText = "";
-                    viewService.DisplayAlert("Error while opening lock!", "Exception message.", "OK");
-                    bikesViewModel.ActionText = "Updating...";
-                    pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                    bikesViewModel.ActionText = "";
-                    bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-                });
-
-                // Verify state "Booked Disconnected" after action
-                Assert.AreEqual(nameof(BookedDisconnected), subsequent.ButtonText);
-                Assert.IsFalse(subsequent.IsButtonVisible);
-                Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-                Assert.IsTrue(subsequent.IsLockitButtonVisible);
-            }
-
-            /// <summary>
-            /// Use case: Open lock
-            /// Final state: Booked open.
-            /// </summary>
-            [Test]
-            public void TestOpenUpdateLockingStateFailsWebConnectFailureException()
-            {
-                var bike = Substitute.For<IBikeInfoMutable>();
-                var connector = Substitute.For<IConnector>();
-                var command = Substitute.For<ICommand>();
-                var geolocation = Substitute.For<IGeolocation>();
-                var locks = Substitute.For<ILocksService>();
-                var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-                var viewService = Substitute.For<IViewService>();
-                var bikesViewModel = Substitute.For<IBikesViewModel>();
-                var activeUser = Substitute.For<IUser>();
-
-                var handler = new ReservedUnknown(
-                    bike,
-                    () => true, // isConnectedDelegate
-                    (isConnexted) => connector,
-                    geolocation,
-                    locks,
-                    () => pollingManager,
-                    Substitute.For<ISmartDevice>(),
-                    viewService,
-                    bikesViewModel,
-                    activeUser);
-
-                locks[0].OpenAsync()
-                    .Returns(LockitLockingState.Open);
-
-                connector.Command.UpdateLockingStateAsync(bike, null).Returns(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
-
-                bike.State.Value.Returns(InUseStateEnum.Booked);
-                bike.LockInfo.State.Returns(LockingState.Open);
-
-                var subsequent = handler.HandleRequestOption1().Result;
-
-                // Verify behaviour
-                Received.InOrder(() =>
-                {
-                    bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                    bikesViewModel.ActionText = "One moment please...";
-                    pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                    bikesViewModel.ActionText = "Opening lock...";
-                    locks.Received()[0].OpenAsync(); // Lock must be closed
-                    bikesViewModel.ActionText = "Reading charging level...";
-                    locks[0].GetBatteryPercentageAsync();
-                    bikesViewModel.ActionText = "Updating lock state...";
-                    connector.Command.UpdateLockingStateAsync(bike, null);
-                    bikesViewModel.ActionText = "No web error on updating locking status.";
-                    bikesViewModel.ActionText = "Updating...";
-                    pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                    bikesViewModel.ActionText = "";
-                    bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-                });
-
-                // Verify state "Booked Closed" after action
-                Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-                Assert.IsTrue(subsequent.IsButtonVisible);
-                Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-                Assert.IsTrue(subsequent.IsLockitButtonVisible);
-            }
-
-            /// <summary>
-            /// Use case: Open lock
-            /// Final state: Booked open.
-            /// </summary>
-            [Test]
-            public void TestOpenUpdateLockingStateFailsException()
-            {
-                var bike = Substitute.For<IBikeInfoMutable>();
-                var connector = Substitute.For<IConnector>();
-                var command = Substitute.For<ICommand>();
-                var geolocation = Substitute.For<IGeolocation>();
-                var locks = Substitute.For<ILocksService>();
-                var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-                var viewService = Substitute.For<IViewService>();
-                var bikesViewModel = Substitute.For<IBikesViewModel>();
-                var activeUser = Substitute.For<IUser>();
-
-                var handler = new ReservedUnknown(
-                    bike,
-                    () => true, // isConnectedDelegate
-                    (isConnexted) => connector,
-                    geolocation,
-                    locks,
-                    () => pollingManager,
-                    Substitute.For<ISmartDevice>(),
-                    viewService,
-                    bikesViewModel,
-                    activeUser);
-
-                locks[0].OpenAsync()
-                    .Returns(LockitLockingState.Open);
-
-                connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new Exception("Exception message."));
-
-                bike.State.Value.Returns(InUseStateEnum.Booked);
-                bike.LockInfo.State.Returns(LockingState.Open);
-
-                var subsequent = handler.HandleRequestOption1().Result;
-
-                // Verify behaviour
-                Received.InOrder(() =>
-                {
-                    bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                    bikesViewModel.ActionText = "One moment please...";
-                    pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                    bikesViewModel.ActionText = "Opening lock...";
-                    locks.Received()[0].OpenAsync(); // Lock must be closed
-                    bikesViewModel.ActionText = "Reading charging level...";
-                    locks[0].GetBatteryPercentageAsync();
-                    bikesViewModel.ActionText = "Updating lock state...";
-                    connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-                    bikesViewModel.ActionText = "Connection error on updating locking status.";
-                    bikesViewModel.ActionText = "Updating...";
-                    pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                    bikesViewModel.ActionText = "";
-                    bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-                });
-
-                // Verify state "Booked Closed" after action
-                Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-                Assert.IsTrue(subsequent.IsButtonVisible);
-                Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-                Assert.IsTrue(subsequent.IsLockitButtonVisible);
-            }
-
-            /// <summary>
-            /// Use case: Open lock
-            /// Final state: Booked open.
-            /// </summary>
-            [Test]
-            public void TestOpenUpdateLockingStateFailsResponseException()
-            {
-                var bike = Substitute.For<IBikeInfoMutable>();
-                var connector = Substitute.For<IConnector>();
-                var command = Substitute.For<ICommand>();
-                var geolocation = Substitute.For<IGeolocation>();
-                var locks = Substitute.For<ILocksService>();
-                var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-                var viewService = Substitute.For<IViewService>();
-                var bikesViewModel = Substitute.For<IBikesViewModel>();
-                var activeUser = Substitute.For<IUser>();
-
-                var handler = new ReservedUnknown(
-                    bike,
-                    () => true, // isConnectedDelegate
-                    (isConnexted) => connector,
-                    geolocation,
-                    locks,
-                    () => pollingManager,
-                    Substitute.For<ISmartDevice>(),
-                    viewService,
-                    bikesViewModel,
-                    activeUser);
-
-                locks[0].OpenAsync()
-                    .Returns(LockitLockingState.Open);
-
-                connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x =>
-                    throw new ReturnBikeException(JsonConvert.DeserializeObject<ReservationCancelReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
-
-                bike.State.Value.Returns(InUseStateEnum.Booked);
-                bike.LockInfo.State.Returns(LockingState.Open);
-
-                var subsequent = handler.HandleRequestOption1().Result;
-
-                // Verify behaviour
-                Received.InOrder(() =>
-                {
-                    bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                    bikesViewModel.ActionText = "One moment please...";
-                    pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                    bikesViewModel.ActionText = "Opening lock...";
-                    locks.Received()[0].OpenAsync(); // Lock must be closed
-                    bikesViewModel.ActionText = "Reading charging level...";
-                    locks[0].GetBatteryPercentageAsync();
-                    bikesViewModel.ActionText = "Updating lock state...";
-                    connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-                    bikesViewModel.ActionText = "Status error on updating lock state.";
-                    bikesViewModel.ActionText = "Updating...";
-                    pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                    bikesViewModel.ActionText = "";
-                    bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-                });
-
-                // Verify state "Booked Closed" after action
-                Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-                Assert.IsTrue(subsequent.IsButtonVisible);
-                Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-                Assert.IsTrue(subsequent.IsLockitButtonVisible);
-            }
-
-            /// <summary>
-            /// Use case: Close lock
-            /// Final state: Booked closed.
-            /// </summary>
-            [Test]
-            public void TestClose()
-            {
-                var bike = Substitute.For<IBikeInfoMutable>();
-                var connector = Substitute.For<IConnector>();
-                var command = Substitute.For<ICommand>();
-                var geolocation = Substitute.For<IGeolocation>();
-                var locks = Substitute.For<ILocksService>();
-                var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-                var viewService = Substitute.For<IViewService>();
-                var bikesViewModel = Substitute.For<IBikesViewModel>();
-                var activeUser = Substitute.For<IUser>();
-
-                var handler = new ReservedUnknown(
-                    bike,
-                    () => true, // isConnectedDelegate
-                    (isConnexted) => connector,
-                    geolocation,
-                    locks,
-                    () => pollingManager,
-                    Substitute.For<ISmartDevice>(),
-                    viewService,
-                    bikesViewModel,
-                    activeUser);
-
-                locks[0].CloseAsync()
-                    .Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed)); // Return lock state indicating success
-
-                bike.State.Value.Returns(InUseStateEnum.Booked);
-
-                var subsequent = handler.HandleRequestOption2().Result;
-
-                // Verify behaviour
-                Received.InOrder(() =>
-                {
-                    bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                    bikesViewModel.ActionText = "One moment please...";
-                    pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                    bikesViewModel.ActionText = "Closing lock...";
-                    locks.Received()[0].CloseAsync(); // Lock must be closed
-                    bikesViewModel.ActionText = "Updating lock state...";
-                    connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-                    bikesViewModel.ActionText = "Updating...";
-                    pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                    bikesViewModel.ActionText = "";
-                    bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-                });
-
-                // Verify state "Booked Closed" after action
-                Assert.AreEqual("Return bike", subsequent.ButtonText);
-                Assert.IsTrue(subsequent.IsButtonVisible);
-                Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-                Assert.IsTrue(subsequent.IsLockitButtonVisible);
-            }
-
-            [Test]
-            public void TestCloseCloseFailsOutOfReachException()
-            {
-                var bike = Substitute.For<IBikeInfoMutable>();
-                var connector = Substitute.For<IConnector>();
-                var command = Substitute.For<ICommand>();
-                var geolocation = Substitute.For<IGeolocation>();
-                var locks = Substitute.For<ILocksService>();
-                var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-                var viewService = Substitute.For<IViewService>();
-                var bikesViewModel = Substitute.For<IBikesViewModel>();
-                var activeUser = Substitute.For<IUser>();
-
-                var handler = new ReservedUnknown(
-                    bike,
-                    () => true, // isConnectedDelegate
-                    (isConnexted) => connector,
-                    geolocation,
-                    locks,
-                    () => pollingManager,
-                    Substitute.For<ISmartDevice>(),
-                    viewService,
-                    bikesViewModel,
-                    activeUser);
-
-                locks[0].CloseAsync()
-                    .Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
-
-                bike.State.Value.Returns(InUseStateEnum.Booked);
-                bike.LockInfo.State.Returns(LockingState.Open);
-
-                var subsequent = handler.HandleRequestOption2().Result;
-
-                // Verify behaviour
-                Received.InOrder(() =>
-                {
-                    bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                    bikesViewModel.ActionText = "One moment please...";
-                    pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                    bikesViewModel.ActionText = "Closing lock...";
-                    locks.Received()[0].CloseAsync(); // Lock must be closed
-                    bikesViewModel.ActionText = "";
-                    viewService.DisplayAlert("Lock can not be closed!", "Lock cannot be closed until bike is near.", "OK");
-                    bikesViewModel.ActionText = "Updating...";
-                    pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                    bikesViewModel.ActionText = "";
-                    bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-                });
-
-                // Verify state "Booked disconnected" after action
-                Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
-                Assert.IsFalse(subsequent.IsButtonVisible);
-                Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-                Assert.IsTrue(subsequent.IsLockitButtonVisible);
-            }
-
-            /// <summary>
-            /// Use case: Close lock
-            /// Final state: Same as initial state.
-            /// </summary>
-            [Test]
-            public void TestCloseCloseFailsException()
-            {
-                var bike = Substitute.For<IBikeInfoMutable>();
-                var connector = Substitute.For<IConnector>();
-                var command = Substitute.For<ICommand>();
-                var geolocation = Substitute.For<IGeolocation>();
-                var locks = Substitute.For<ILocksService>();
-                var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-                var viewService = Substitute.For<IViewService>();
-                var bikesViewModel = Substitute.For<IBikesViewModel>();
-                var activeUser = Substitute.For<IUser>();
-
-                var handler = new ReservedUnknown(
-                    bike,
-                    () => true, // isConnectedDelegate
-                    (isConnexted) => connector,
-                    geolocation,
-                    locks,
-                    () => pollingManager,
-                    Substitute.For<ISmartDevice>(),
-                    viewService,
-                    bikesViewModel,
-                    activeUser);
-
-                locks[0].CloseAsync()
-                    .Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
-
-                bike.State.Value.Returns(InUseStateEnum.Booked);
-                bike.LockInfo.State.Returns(LockingState.Open);
-
-                var subsequent = handler.HandleRequestOption2().Result;
-
-                // Verify behaviour
-                Received.InOrder(() =>
-                {
-                    bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                    bikesViewModel.ActionText = "One moment please...";
-                    pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                    bikesViewModel.ActionText = "Closing lock...";
-                    locks.Received()[0].CloseAsync(); // Lock must be closed
-                    bikesViewModel.ActionText = "";
-                    viewService.DisplayAlert("Lock can not be closed!", "Exception message.", "OK");
-                    bikesViewModel.ActionText = "Updating...";
-                    pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                    bikesViewModel.ActionText = "";
-                    bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-                });
-
-                // Verify state "Booked Disconnected" after action
-                Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
-                Assert.IsFalse(subsequent.IsButtonVisible);
-                Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-                Assert.IsTrue(subsequent.IsLockitButtonVisible);
-            }
-        }
-
-        /// <summary>
-        /// Use case: Close lock
-        /// Final state: Booked closed.
-        /// </summary>
-        [Test]
-        public void TestCloseUpdateLockingStateFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedUnknown(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].CloseAsync()
-                .Returns(LockitLockingState.Closed); // Return lock state indicating success
-
-            connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "No web error on updating locking status.";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: close lock
-        /// Final state: Booked closed.
-        /// </summary>
-        [Test]
-        public void TestCloseUpdateLockingStateFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedUnknown(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].CloseAsync()
-                .Returns(LockitLockingState.Closed); // Return lock state indicating success
-
-            connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new Exception("Exception message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "Connection error on updating locking status.";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: close lock
-        /// Final state: Booked closed.
-        /// </summary>
-        [Test]
-        public void TestCloseUpdateLockingStateFailsResponseException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedUnknown(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks[0].CloseAsync()
-                .Returns(LockitLockingState.Closed); // Return lock state indicating success
-
-            connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x =>
-                throw new ReturnBikeException(JsonConvert.DeserializeObject<ReservationCancelReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks.Received()[0].CloseAsync(); // Lock must be closed
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-                bikesViewModel.ActionText = "Status error on updating lock state.";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state "Booked Closed" after action
-            Assert.AreEqual("Return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-    }
+	public class TestReservedUnknown
+	{
+		[TestFixture]
+		public class TestBookedUnknown
+		{
+
+			/// <summary>
+			/// Test construction of object.
+			/// </summary>
+			[Test]
+			public void Testctor()
+			{
+				var handler = new ReservedUnknown(
+					Substitute.For<IBikeInfoMutable>(),
+					() => true, // isConnectedDelegate
+					(isConnexted) => Substitute.For<IConnector>(),
+					Substitute.For<IGeolocation>(),
+					Substitute.For<ILocksService>(),
+					() => Substitute.For<IPollingUpdateTaskManager>(),
+					Substitute.For<ISmartDevice>(),
+					Substitute.For<IViewService>(),
+					Substitute.For<IBikesViewModel>(),
+					Substitute.For<IUser>());
+
+				// Verify prerequisites.
+				Assert.AreEqual("Open lock & rent bike", handler.ButtonText);
+				Assert.IsFalse(handler.IsButtonVisible);
+				Assert.AreEqual("Close lock", handler.LockitButtonText);
+				Assert.IsTrue(handler.IsLockitButtonVisible);
+			}
+
+			/// <summary>
+			/// Use case: Opens lock
+			/// Final state: Booked opened.
+			/// </summary>
+			[Test]
+			public void TestOpen()
+			{
+				var bike = Substitute.For<IBikeInfoMutable>();
+				var connector = Substitute.For<IConnector>();
+				var command = Substitute.For<ICommand>();
+				var geolocation = Substitute.For<IGeolocation>();
+				var locks = Substitute.For<ILocksService>();
+				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+				var viewService = Substitute.For<IViewService>();
+				var bikesViewModel = Substitute.For<IBikesViewModel>();
+				var activeUser = Substitute.For<IUser>();
+
+				var handler = new ReservedUnknown(
+					bike,
+					() => true, // isConnectedDelegate
+					(isConnexted) => connector,
+					geolocation,
+					locks,
+					() => pollingManager,
+					Substitute.For<ISmartDevice>(),
+					viewService,
+					bikesViewModel,
+					activeUser);
+
+				locks[0].OpenAsync()
+					.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
+
+				bike.State.Value.Returns(InUseStateEnum.Booked);
+
+				var subsequent = handler.HandleRequestOption1().Result;
+
+				// Verify behaviour
+				Received.InOrder(() =>
+				{
+					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+					bikesViewModel.ActionText = "One moment please...";
+					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+					bikesViewModel.ActionText = "Opening lock...";
+					locks.Received()[0].OpenAsync(); // Lock must be closed
+					bikesViewModel.ActionText = "Reading charging level...";
+					locks[0].GetBatteryPercentageAsync();
+					bikesViewModel.ActionText = "Updating lock state...";
+					connector.Command.UpdateLockingStateAsync(bike, null);
+					bikesViewModel.ActionText = "Updating...";
+					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+					bikesViewModel.ActionText = "";
+					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+				});
+
+				// Verify state "Booked Open" after action
+				Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+				Assert.IsTrue(subsequent.IsButtonVisible);
+				Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+				Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			}
+
+			/// <summary>
+			/// Use case: Open lock
+			/// Final state: Same as initial state.
+			/// </summary>
+			[Test]
+			public void TestOpenOpenFailsOutOfReachException()
+			{
+				var bike = Substitute.For<IBikeInfoMutable>();
+				var connector = Substitute.For<IConnector>();
+				var command = Substitute.For<ICommand>();
+				var geolocation = Substitute.For<IGeolocation>();
+				var locks = Substitute.For<ILocksService>();
+				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+				var viewService = Substitute.For<IViewService>();
+				var bikesViewModel = Substitute.For<IBikesViewModel>();
+				var activeUser = Substitute.For<IUser>();
+
+				var handler = new ReservedUnknown(
+					bike,
+					() => true, // isConnectedDelegate
+					(isConnexted) => connector,
+					geolocation,
+					locks,
+					() => pollingManager,
+					Substitute.For<ISmartDevice>(),
+					viewService,
+					bikesViewModel,
+					activeUser);
+
+				locks[0].OpenAsync()
+					.Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
+
+				bike.State.Value.Returns(InUseStateEnum.Booked);
+				bike.LockInfo.State.Returns(LockingState.Closed);
+
+				var subsequent = handler.HandleRequestOption1().Result;
+
+				// Verify behaviour
+				Received.InOrder(() =>
+				{
+					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+					bikesViewModel.ActionText = "One moment please...";
+					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+					bikesViewModel.ActionText = "Opening lock...";
+					locks.Received()[0].OpenAsync(); // Lock must be closed
+					bikesViewModel.ActionText = "";
+					viewService.DisplayAlert("Error while opening lock!", "Lock cannot be opened until bike is near.", "OK");
+					bikesViewModel.ActionText = "Updating...";
+					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+					bikesViewModel.ActionText = "";
+					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+				});
+
+				// Verify state "Booked Disconnected" after action
+				Assert.AreEqual(nameof(BookedDisconnected), subsequent.ButtonText);
+				Assert.IsFalse(subsequent.IsButtonVisible);
+				Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+				Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			}
+
+			/// <summary>
+			/// Use case: Open lock
+			/// Final state: Same as initial state.
+			/// </summary>
+			[Test]
+			public void TestOpenOpenFailsCouldntOpenBoldBlockedException()
+			{
+				var bike = Substitute.For<IBikeInfoMutable>();
+				var connector = Substitute.For<IConnector>();
+				var command = Substitute.For<ICommand>();
+				var geolocation = Substitute.For<IGeolocation>();
+				var locks = Substitute.For<ILocksService>();
+				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+				var viewService = Substitute.For<IViewService>();
+				var bikesViewModel = Substitute.For<IBikesViewModel>();
+				var activeUser = Substitute.For<IUser>();
+
+				var handler = new ReservedUnknown(
+					bike,
+					() => true, // isConnectedDelegate
+					(isConnexted) => connector,
+					geolocation,
+					locks,
+					() => pollingManager,
+					Substitute.For<ISmartDevice>(),
+					viewService,
+					bikesViewModel,
+					activeUser);
+
+				locks[0].OpenAsync()
+					.Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenBoldIsBlockedException());
+
+				bike.State.Value.Returns(InUseStateEnum.Booked);
+				bike.LockInfo.State.Returns(LockingState.Closed);
+
+				var subsequent = handler.HandleRequestOption1().Result;
+
+				// Verify behaviour
+				Received.InOrder(() =>
+				{
+					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+					bikesViewModel.ActionText = "One moment please...";
+					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+					bikesViewModel.ActionText = "Opening lock...";
+					locks.Received()[0].OpenAsync(); // Lock must be closed
+					bikesViewModel.ActionText = "";
+					viewService.DisplayAlert("Error while opening lock!", "Lock is blocked. Please ensure that no obstacle prevents lock from opening and try again.", "OK");
+					bikesViewModel.ActionText = "Updating...";
+					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+					bikesViewModel.ActionText = "";
+					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+				});
+
+				// Verify state "Booked Unknown" after action
+				Assert.AreEqual("Open lock", subsequent.ButtonText);
+				Assert.IsTrue(subsequent.IsButtonVisible);
+				Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+				Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			}
+
+			/// <summary>
+			/// Use case: Open lock
+			/// Final state: Same as initial state.
+			/// </summary>
+			[Test]
+			public void TestOpenOpenFailsCouldntOpenInconsistentStateExecptionClosed()
+			{
+				var bike = Substitute.For<IBikeInfoMutable>();
+				var connector = Substitute.For<IConnector>();
+				var command = Substitute.For<ICommand>();
+				var geolocation = Substitute.For<IGeolocation>();
+				var locks = Substitute.For<ILocksService>();
+				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+				var viewService = Substitute.For<IViewService>();
+				var bikesViewModel = Substitute.For<IBikesViewModel>();
+				var activeUser = Substitute.For<IUser>();
+
+				var handler = new ReservedUnknown(
+					bike,
+					() => true, // isConnectedDelegate
+					(isConnexted) => connector,
+					geolocation,
+					locks,
+					() => pollingManager,
+					Substitute.For<ISmartDevice>(),
+					viewService,
+					bikesViewModel,
+					activeUser);
+
+				locks[0].OpenAsync()
+					.Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenInconsistentStateExecption(LockingState.Closed));
+
+				bike.State.Value.Returns(InUseStateEnum.Booked);
+				bike.LockInfo.State.Returns(LockingState.Closed);
+
+				var subsequent = handler.HandleRequestOption1().Result;
+
+				// Verify behaviour
+				Received.InOrder(() =>
+				{
+					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+					bikesViewModel.ActionText = "One moment please...";
+					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+					bikesViewModel.ActionText = "Opening lock...";
+					locks.Received()[0].OpenAsync(); // Lock must be closed
+					bikesViewModel.ActionText = "";
+					viewService.DisplayAlert("Error while opening lock!", "After try to open lock state closed is reported.", "OK");
+					bikesViewModel.ActionText = "Updating...";
+					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+					bikesViewModel.ActionText = "";
+					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+				});
+
+				// Verify state "Booked Closed" after action
+				//Assert.AreEqual("Return bike", subsequent.ButtonText);
+				//Assert.IsTrue(subsequent.IsButtonVisible);
+				Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+				Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			}
+
+			/// <summary>
+			/// Use case: Open lock
+			/// Final state: Same as initial state.
+			/// </summary>
+			[Test]
+			public void TestOpenOpenFailsCouldntOpenInconsistentStateExecption()
+			{
+				var bike = Substitute.For<IBikeInfoMutable>();
+				var connector = Substitute.For<IConnector>();
+				var command = Substitute.For<ICommand>();
+				var geolocation = Substitute.For<IGeolocation>();
+				var locks = Substitute.For<ILocksService>();
+				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+				var viewService = Substitute.For<IViewService>();
+				var bikesViewModel = Substitute.For<IBikesViewModel>();
+				var activeUser = Substitute.For<IUser>();
+
+				var handler = new ReservedUnknown(
+					bike,
+					() => true, // isConnectedDelegate
+					(isConnexted) => connector,
+					geolocation,
+					locks,
+					() => pollingManager,
+					Substitute.For<ISmartDevice>(),
+					viewService,
+					bikesViewModel,
+					activeUser);
+
+				locks[0].OpenAsync()
+					.Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenBoldWasBlockedException());
+
+				bike.State.Value.Returns(InUseStateEnum.Booked);
+				bike.LockInfo.State.Returns(LockingState.Closed);
+
+				var subsequent = handler.HandleRequestOption1().Result;
+
+				// Verify behaviour
+				Received.InOrder(() =>
+				{
+					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+					bikesViewModel.ActionText = "One moment please...";
+					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+					bikesViewModel.ActionText = "Opening lock...";
+					locks.Received()[0].OpenAsync(); // Lock must be closed
+					bikesViewModel.ActionText = "";
+					viewService.DisplayAlert("Lock can not be opened!", "Lock was blocked and might still be. Please ensure that no obstacle prevents lock from opening and try again.", "OK");
+					bikesViewModel.ActionText = "Updating...";
+					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+					bikesViewModel.ActionText = "";
+					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+				});
+
+				// Verify state "Booked Disconnected" after action
+				Assert.AreEqual("Open lock", subsequent.ButtonText);
+				Assert.IsTrue(subsequent.IsButtonVisible);
+				Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+				Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			}
+
+			/// <summary>
+			/// Use case: Open lock
+			/// Final state: Same as initial state.
+			/// </summary>
+			[Test]
+			public void TestOpenOpenFailsException()
+			{
+				var bike = Substitute.For<IBikeInfoMutable>();
+				var connector = Substitute.For<IConnector>();
+				var command = Substitute.For<ICommand>();
+				var geolocation = Substitute.For<IGeolocation>();
+				var locks = Substitute.For<ILocksService>();
+				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+				var viewService = Substitute.For<IViewService>();
+				var bikesViewModel = Substitute.For<IBikesViewModel>();
+				var activeUser = Substitute.For<IUser>();
+
+				var handler = new ReservedUnknown(
+					bike,
+					() => true, // isConnectedDelegate
+					(isConnexted) => connector,
+					geolocation,
+					locks,
+					() => pollingManager,
+					Substitute.For<ISmartDevice>(),
+					viewService,
+					bikesViewModel,
+					activeUser);
+
+				locks[0].OpenAsync()
+					.Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
+
+				bike.State.Value.Returns(InUseStateEnum.Booked);
+				bike.LockInfo.State.Returns(LockingState.Closed);
+
+				var subsequent = handler.HandleRequestOption1().Result;
+
+				// Verify behaviour
+				Received.InOrder(() =>
+				{
+					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+					bikesViewModel.ActionText = "One moment please...";
+					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+					bikesViewModel.ActionText = "Opening lock...";
+					locks.Received()[0].OpenAsync(); // Lock must be closed
+					bikesViewModel.ActionText = "";
+					viewService.DisplayAlert("Error while opening lock!", "Exception message.", "OK");
+					bikesViewModel.ActionText = "Updating...";
+					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+					bikesViewModel.ActionText = "";
+					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+				});
+
+				// Verify state "Booked Disconnected" after action
+				Assert.AreEqual(nameof(BookedDisconnected), subsequent.ButtonText);
+				Assert.IsFalse(subsequent.IsButtonVisible);
+				Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+				Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			}
+
+			/// <summary>
+			/// Use case: Open lock
+			/// Final state: Booked open.
+			/// </summary>
+			[Test]
+			public void TestOpenUpdateLockingStateFailsWebConnectFailureException()
+			{
+				var bike = Substitute.For<IBikeInfoMutable>();
+				var connector = Substitute.For<IConnector>();
+				var command = Substitute.For<ICommand>();
+				var geolocation = Substitute.For<IGeolocation>();
+				var locks = Substitute.For<ILocksService>();
+				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+				var viewService = Substitute.For<IViewService>();
+				var bikesViewModel = Substitute.For<IBikesViewModel>();
+				var activeUser = Substitute.For<IUser>();
+
+				var handler = new ReservedUnknown(
+					bike,
+					() => true, // isConnectedDelegate
+					(isConnexted) => connector,
+					geolocation,
+					locks,
+					() => pollingManager,
+					Substitute.For<ISmartDevice>(),
+					viewService,
+					bikesViewModel,
+					activeUser);
+
+				locks[0].OpenAsync()
+					.Returns(LockitLockingState.Open);
+
+				connector.Command.UpdateLockingStateAsync(bike, null).Returns(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
+
+				bike.State.Value.Returns(InUseStateEnum.Booked);
+				bike.LockInfo.State.Returns(LockingState.Open);
+
+				var subsequent = handler.HandleRequestOption1().Result;
+
+				// Verify behaviour
+				Received.InOrder(() =>
+				{
+					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+					bikesViewModel.ActionText = "One moment please...";
+					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+					bikesViewModel.ActionText = "Opening lock...";
+					locks.Received()[0].OpenAsync(); // Lock must be closed
+					bikesViewModel.ActionText = "Reading charging level...";
+					locks[0].GetBatteryPercentageAsync();
+					bikesViewModel.ActionText = "Updating lock state...";
+					connector.Command.UpdateLockingStateAsync(bike, null);
+					bikesViewModel.ActionText = "No web error on updating locking status.";
+					bikesViewModel.ActionText = "Updating...";
+					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+					bikesViewModel.ActionText = "";
+					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+				});
+
+				// Verify state "Booked Open" after action
+				Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+				Assert.IsTrue(subsequent.IsButtonVisible);
+				Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+				Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			}
+
+			/// <summary>
+			/// Use case: Open lock
+			/// Final state: Booked open.
+			/// </summary>
+			[Test]
+			public void TestOpenUpdateLockingStateFailsException()
+			{
+				var bike = Substitute.For<IBikeInfoMutable>();
+				var connector = Substitute.For<IConnector>();
+				var command = Substitute.For<ICommand>();
+				var geolocation = Substitute.For<IGeolocation>();
+				var locks = Substitute.For<ILocksService>();
+				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+				var viewService = Substitute.For<IViewService>();
+				var bikesViewModel = Substitute.For<IBikesViewModel>();
+				var activeUser = Substitute.For<IUser>();
+
+				var handler = new ReservedUnknown(
+					bike,
+					() => true, // isConnectedDelegate
+					(isConnexted) => connector,
+					geolocation,
+					locks,
+					() => pollingManager,
+					Substitute.For<ISmartDevice>(),
+					viewService,
+					bikesViewModel,
+					activeUser);
+
+				locks[0].OpenAsync()
+					.Returns(LockitLockingState.Open);
+
+				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new Exception("Exception message."));
+
+				bike.State.Value.Returns(InUseStateEnum.Booked);
+				bike.LockInfo.State.Returns(LockingState.Open);
+
+				var subsequent = handler.HandleRequestOption1().Result;
+
+				// Verify behaviour
+				Received.InOrder(() =>
+				{
+					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+					bikesViewModel.ActionText = "One moment please...";
+					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+					bikesViewModel.ActionText = "Opening lock...";
+					locks.Received()[0].OpenAsync(); // Lock must be closed
+					bikesViewModel.ActionText = "Reading charging level...";
+					locks[0].GetBatteryPercentageAsync();
+					bikesViewModel.ActionText = "Updating lock state...";
+					connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+					bikesViewModel.ActionText = "Connection error on updating locking status.";
+					bikesViewModel.ActionText = "Updating...";
+					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+					bikesViewModel.ActionText = "";
+					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+				});
+
+				// Verify state "Booked Open" after action
+				Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+				Assert.IsTrue(subsequent.IsButtonVisible);
+				Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+				Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			}
+
+			/// <summary>
+			/// Use case: Open lock
+			/// Final state: Booked open.
+			/// </summary>
+			[Test]
+			public void TestOpenUpdateLockingStateFailsResponseException()
+			{
+				var bike = Substitute.For<IBikeInfoMutable>();
+				var connector = Substitute.For<IConnector>();
+				var command = Substitute.For<ICommand>();
+				var geolocation = Substitute.For<IGeolocation>();
+				var locks = Substitute.For<ILocksService>();
+				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+				var viewService = Substitute.For<IViewService>();
+				var bikesViewModel = Substitute.For<IBikesViewModel>();
+				var activeUser = Substitute.For<IUser>();
+
+				var handler = new ReservedUnknown(
+					bike,
+					() => true, // isConnectedDelegate
+					(isConnexted) => connector,
+					geolocation,
+					locks,
+					() => pollingManager,
+					Substitute.For<ISmartDevice>(),
+					viewService,
+					bikesViewModel,
+					activeUser);
+
+				locks[0].OpenAsync()
+					.Returns(LockitLockingState.Open);
+
+				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x =>
+					throw new ReturnBikeException(JsonConvert.DeserializeObject<ReservationCancelReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
+
+				bike.State.Value.Returns(InUseStateEnum.Booked);
+				bike.LockInfo.State.Returns(LockingState.Open);
+
+				var subsequent = handler.HandleRequestOption1().Result;
+
+				// Verify behaviour
+				Received.InOrder(() =>
+				{
+					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+					bikesViewModel.ActionText = "One moment please...";
+					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+					bikesViewModel.ActionText = "Opening lock...";
+					locks.Received()[0].OpenAsync(); // Lock must be closed
+					bikesViewModel.ActionText = "Reading charging level...";
+					locks[0].GetBatteryPercentageAsync();
+					bikesViewModel.ActionText = "Updating lock state...";
+					connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+					bikesViewModel.ActionText = "Status error on updating lock state.";
+					bikesViewModel.ActionText = "Updating...";
+					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+					bikesViewModel.ActionText = "";
+					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+				});
+
+				// Verify state "Booked Open" after action
+				Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
+				Assert.IsTrue(subsequent.IsButtonVisible);
+				Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+				Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			}
+
+			/// <summary>
+			/// Use case: Close lock
+			/// Final state: Booked closed.
+			/// </summary>
+			[Test]
+			public void TestClose()
+			{
+				var bike = Substitute.For<IBikeInfoMutable>();
+				var connector = Substitute.For<IConnector>();
+				var command = Substitute.For<ICommand>();
+				var geolocation = Substitute.For<IGeolocation>();
+				var locks = Substitute.For<ILocksService>();
+				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+				var viewService = Substitute.For<IViewService>();
+				var bikesViewModel = Substitute.For<IBikesViewModel>();
+				var activeUser = Substitute.For<IUser>();
+
+				var handler = new ReservedUnknown(
+					bike,
+					() => true, // isConnectedDelegate
+					(isConnexted) => connector,
+					geolocation,
+					locks,
+					() => pollingManager,
+					Substitute.For<ISmartDevice>(),
+					viewService,
+					bikesViewModel,
+					activeUser);
+
+				locks[0].CloseAsync()
+					.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed)); // Return lock state indicating success
+
+				bike.State.Value.Returns(InUseStateEnum.Booked);
+
+				var subsequent = handler.HandleRequestOption2().Result;
+
+				// Verify behaviour
+				Received.InOrder(() =>
+				{
+					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+					bikesViewModel.ActionText = "One moment please...";
+					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+					bikesViewModel.ActionText = "Closing lock...";
+					locks.Received()[0].CloseAsync(); // Lock must be closed
+					bikesViewModel.ActionText = "Updating lock state...";
+					connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+					bikesViewModel.ActionText = "Updating...";
+					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+					bikesViewModel.ActionText = "";
+					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+				});
+
+				// Verify state "Booked Closed" after action
+				// Following two assertions are deactivated temporarily in context of issue https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/440/.
+				//Assert.AreEqual("Return bike", subsequent.ButtonText);
+				//Assert.IsTrue(subsequent.IsButtonVisible);
+				Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+				Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			}
+
+			[Test]
+			public void TestCloseCloseFailsOutOfReachException()
+			{
+				var bike = Substitute.For<IBikeInfoMutable>();
+				var connector = Substitute.For<IConnector>();
+				var command = Substitute.For<ICommand>();
+				var geolocation = Substitute.For<IGeolocation>();
+				var locks = Substitute.For<ILocksService>();
+				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+				var viewService = Substitute.For<IViewService>();
+				var bikesViewModel = Substitute.For<IBikesViewModel>();
+				var activeUser = Substitute.For<IUser>();
+
+				var handler = new ReservedUnknown(
+					bike,
+					() => true, // isConnectedDelegate
+					(isConnexted) => connector,
+					geolocation,
+					locks,
+					() => pollingManager,
+					Substitute.For<ISmartDevice>(),
+					viewService,
+					bikesViewModel,
+					activeUser);
+
+				locks[0].CloseAsync()
+					.Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
+
+				bike.State.Value.Returns(InUseStateEnum.Booked);
+				bike.LockInfo.State.Returns(LockingState.Open);
+
+				var subsequent = handler.HandleRequestOption2().Result;
+
+				// Verify behaviour
+				Received.InOrder(() =>
+				{
+					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+					bikesViewModel.ActionText = "One moment please...";
+					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+					bikesViewModel.ActionText = "Closing lock...";
+					locks.Received()[0].CloseAsync(); // Lock must be closed
+					bikesViewModel.ActionText = "";
+					viewService.DisplayAlert("Lock can not be closed!", "Lock cannot be closed until bike is near.", "OK");
+					bikesViewModel.ActionText = "Updating...";
+					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+					bikesViewModel.ActionText = "";
+					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+				});
+
+				// Verify state "Booked disconnected" after action
+				Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
+				Assert.IsFalse(subsequent.IsButtonVisible);
+				Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+				Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			}
+
+			/// <summary>
+			/// Use case: Close lock
+			/// Final state: Same as initial state.
+			/// </summary>
+			[Test]
+			public void TestCloseCloseFailsException()
+			{
+				var bike = Substitute.For<IBikeInfoMutable>();
+				var connector = Substitute.For<IConnector>();
+				var command = Substitute.For<ICommand>();
+				var geolocation = Substitute.For<IGeolocation>();
+				var locks = Substitute.For<ILocksService>();
+				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+				var viewService = Substitute.For<IViewService>();
+				var bikesViewModel = Substitute.For<IBikesViewModel>();
+				var activeUser = Substitute.For<IUser>();
+
+				var handler = new ReservedUnknown(
+					bike,
+					() => true, // isConnectedDelegate
+					(isConnexted) => connector,
+					geolocation,
+					locks,
+					() => pollingManager,
+					Substitute.For<ISmartDevice>(),
+					viewService,
+					bikesViewModel,
+					activeUser);
+
+				locks[0].CloseAsync()
+					.Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
+
+				bike.State.Value.Returns(InUseStateEnum.Booked);
+				bike.LockInfo.State.Returns(LockingState.Open);
+
+				var subsequent = handler.HandleRequestOption2().Result;
+
+				// Verify behaviour
+				Received.InOrder(() =>
+				{
+					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+					bikesViewModel.ActionText = "One moment please...";
+					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+					bikesViewModel.ActionText = "Closing lock...";
+					locks.Received()[0].CloseAsync(); // Lock must be closed
+					bikesViewModel.ActionText = "";
+					viewService.DisplayAlert("Lock can not be closed!", "Exception message.", "OK");
+					bikesViewModel.ActionText = "Updating...";
+					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+					bikesViewModel.ActionText = "";
+					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+				});
+
+				// Verify state "Booked Disconnected" after action
+				Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
+				Assert.IsFalse(subsequent.IsButtonVisible);
+				Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+				Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			}
+		}
+
+		/// <summary>
+		/// Use case: Close lock
+		/// Final state: Booked closed.
+		/// </summary>
+		[Test]
+		public void TestCloseUpdateLockingStateFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].CloseAsync()
+				.Returns(LockitLockingState.Closed); // Return lock state indicating success
+
+			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "No web error on updating locking status.";
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Closed" after action
+			// Following two assertions are deactivated temporarily in context of issue https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/440/.
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: close lock
+		/// Final state: Booked closed.
+		/// </summary>
+		[Test]
+		public void TestCloseUpdateLockingStateFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].CloseAsync()
+				.Returns(LockitLockingState.Closed); // Return lock state indicating success
+
+			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new Exception("Exception message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "Connection error on updating locking status.";
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Closed" after action
+			// Following two assertions are deactivated temporarily in context of issue https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/440/.
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
+		/// <summary>
+		/// Use case: close lock
+		/// Final state: Booked closed.
+		/// </summary>
+		[Test]
+		public void TestCloseUpdateLockingStateFailsResponseException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocation>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			locks[0].CloseAsync()
+				.Returns(LockitLockingState.Closed); // Return lock state indicating success
+
+			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x =>
+				throw new ReturnBikeException(JsonConvert.DeserializeObject<ReservationCancelReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Closing lock...";
+				locks.Received()[0].CloseAsync(); // Lock must be closed
+				bikesViewModel.ActionText = "Updating lock state...";
+				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = "Status error on updating lock state.";
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Closed" after action
+			// Following two assertions are deactivated temporarily in context of issue https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/440/.
+			//Assert.AreEqual("Return bike", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedClosed.cs b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedClosed.cs
index d5b963e..9718ef0 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedClosed.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedClosed.cs
@@ -13,208 +13,208 @@ using TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler;
 
 namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 {
-    [TestFixture]
-    public class TestBookedClosed
-    {
-        /// <summary>
-        /// Use case: Try to open lock.
-        /// Final state: Bike remains locked and stays booked.
-        /// </summary>
-        [Test]
-        public void TestOpenLockOpenLockAsyncFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+	[TestFixture]
+	public class TestBookedClosed
+	{
+		/// <summary>
+		/// Use case: Try to open lock.
+		/// Final state: Bike remains locked and stays booked.
+		/// </summary>
+		[Test]
+		public void TestOpenLockOpenLockAsyncFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            bike.Id.Returns("0");
+			bike.Id.Returns("0");
 
-            bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
 
-            connector.Command.OpenLockAsync(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("Tst")));
+			connector.Command.OpenLockAsync(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("Tst")));
 
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Booked); // State remains booked because opening failed.
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Booked); // State remains booked because opening failed.
 
-            var subsequent = handler.HandleRequestOption2().Result;
+			var subsequent = handler.HandleRequestOption2().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                connector.Command.OpenLockAsync(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAdvancedAlert(
-                    "Connection error when opening the lock!",
-                    "Is WIFI available/ mobile networt available and mobile data activated / ... ?",
-                    "Context info",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				connector.Command.OpenLockAsync(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAdvancedAlert(
+					"Connection error when opening the lock!",
+					"Is WIFI available/ mobile networt available and mobile data activated / ... ?",
+					"Context info",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("BookedClosed"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.False);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Open lock"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
+			// Verify state after action
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("BookedClosed"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.False);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Open lock"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
 
-        /// <summary>
-        /// Use case: Try to open lock.
-        /// Final state: Bike remains locked and stays booked.
-        /// </summary>
-        [Test]
-        public void TestOpenLockOpenLockAsyncFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Try to open lock.
+		/// Final state: Bike remains locked and stays booked.
+		/// </summary>
+		[Test]
+		public void TestOpenLockOpenLockAsyncFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            bike.Id.Returns("0");
+			bike.Id.Returns("0");
 
-            bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
 
-            connector.Command.OpenLockAsync(bike).Returns(x => throw new Exception("Some error", new Exception("Inner exception")));
+			connector.Command.OpenLockAsync(bike).Returns(x => throw new Exception("Some error", new Exception("Inner exception")));
 
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Booked); // State remains booked because opening failed.
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Booked); // State remains booked because opening failed.
 
-            var subsequent = handler.HandleRequestOption2().Result;
+			var subsequent = handler.HandleRequestOption2().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                connector.Command.OpenLockAsync(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Error while opening lock!",
-                    "Some error",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				connector.Command.OpenLockAsync(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Error while opening lock!",
+					"Some error",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("BookedClosed"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.False);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Open lock"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
+			// Verify state after action
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("BookedClosed"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.False);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Open lock"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
 
-        /// <summary>
-        /// Use case: Open lock.
-        /// Final state: Lock is opened and bike remains booked.
-        /// </summary>
-        [Test]
-        public void TestOpenLock()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Open lock.
+		/// Final state: Lock is opened and bike remains booked.
+		/// </summary>
+		[Test]
+		public void TestOpenLock()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new BookedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new BookedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            bike.Id.Returns("0");
+			bike.Id.Returns("0");
 
-            bike.LockInfo.State.Returns(LockingState.Open); // After opening, lock state is open.
+			bike.LockInfo.State.Returns(LockingState.Open); // After opening, lock state is open.
 
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Booked); // After Booking and opening, state is booked.
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Booked); // After Booking and opening, state is booked.
 
-            var subsequent = handler.HandleRequestOption2().Result;
+			var subsequent = handler.HandleRequestOption2().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                connector.Command.OpenLockAsync(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				connector.Command.OpenLockAsync(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state 
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("BookedOpen"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.False);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Open lock"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
-    }
+			// Verify state 
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("BookedOpen"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.False);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Open lock"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedOpen.cs b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedOpen.cs
index 635e83f..318ae44 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedOpen.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedOpen.cs
@@ -13,209 +13,209 @@ using TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler;
 
 namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 {
-    [TestFixture]
-    public class TestBookedOpen
-    {
-        /// <summary>
-        /// Use case: Try to open lock.
-        /// Final state: Bike remains locked and stays booked.
-        /// </summary>
-        [Test]
-        public void TestOpenLockOpenLockAsyncFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+	[TestFixture]
+	public class TestBookedOpen
+	{
+		/// <summary>
+		/// Use case: Try to open lock.
+		/// Final state: Bike remains locked and stays booked.
+		/// </summary>
+		[Test]
+		public void TestOpenLockOpenLockAsyncFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            bike.Id.Returns("0");
+			bike.Id.Returns("0");
 
-            bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
 
-            connector.Command.OpenLockAsync(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("Tst")));
+			connector.Command.OpenLockAsync(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("Tst")));
 
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Booked); // State remains booked because opening failed.
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Booked); // State remains booked because opening failed.
 
-            var subsequent = handler.HandleRequestOption2().Result;
+			var subsequent = handler.HandleRequestOption2().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                connector.Command.OpenLockAsync(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAdvancedAlert(
-                    "Connection error when opening the lock!",
-                    "Is WIFI available/ mobile networt available and mobile data activated / ... ?",
-                    "Context info",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				connector.Command.OpenLockAsync(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAdvancedAlert(
+					"Connection error when opening the lock!",
+					"Is WIFI available/ mobile networt available and mobile data activated / ... ?",
+					"Context info",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("BookedClosed"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.False);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Open lock"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
+			// Verify state after action
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("BookedClosed"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.False);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Open lock"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
 
-        /// <summary>
-        /// Use case: Try to open lock.
-        /// Final state: Bike remains locked and stays booked.
-        /// </summary>
-        [Test]
-        public void TestOpenLockOpenLockAsyncFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Try to open lock.
+		/// Final state: Bike remains locked and stays booked.
+		/// </summary>
+		[Test]
+		public void TestOpenLockOpenLockAsyncFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            bike.Id.Returns("0");
+			bike.Id.Returns("0");
 
-            bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
 
-            connector.Command.OpenLockAsync(bike).Returns(x => throw new Exception("Some error", new Exception("Inner exception")));
+			connector.Command.OpenLockAsync(bike).Returns(x => throw new Exception("Some error", new Exception("Inner exception")));
 
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Booked); // State remains booked because opening failed.
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Booked); // State remains booked because opening failed.
 
-            var subsequent = handler.HandleRequestOption2().Result;
+			var subsequent = handler.HandleRequestOption2().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                connector.Command.OpenLockAsync(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Error while opening lock!",
-                    "Some error",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				connector.Command.OpenLockAsync(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Error while opening lock!",
+					"Some error",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("BookedClosed"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.False);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Open lock"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
+			// Verify state after action
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("BookedClosed"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.False);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Open lock"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
 
-        /// <summary>
-        /// Use case: Open lock.
-        /// Final state: Lock is opened and bike remains booked.
-        /// </summary>
-        [Test]
-        public void TestOpenLock()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Open lock.
+		/// Final state: Lock is opened and bike remains booked.
+		/// </summary>
+		[Test]
+		public void TestOpenLock()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new BookedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            bike.Id.Returns("0");
+			bike.Id.Returns("0");
 
-            bike.LockInfo.State.Returns(LockingState.Open); // After opening, lock state is open.
+			bike.LockInfo.State.Returns(LockingState.Open); // After opening, lock state is open.
 
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Booked); // After Booking and opening, state is booked.
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Booked); // After Booking and opening, state is booked.
 
-            var subsequent = handler.HandleRequestOption2().Result;
+			var subsequent = handler.HandleRequestOption2().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Opening lock...";
-                connector.Command.OpenLockAsync(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Opening lock...";
+				connector.Command.OpenLockAsync(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state 
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("BookedOpen"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.False);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Open lock"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
+			// Verify state 
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("BookedOpen"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.False);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Open lock"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
 
-    }
+	}
 }
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestDisposableClosed.cs b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestDisposableClosed.cs
index f370127..1f04ee9 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestDisposableClosed.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestDisposableClosed.cs
@@ -14,643 +14,643 @@ using TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler;
 
 namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 {
-    public class TestDisposableClosed
-    {
-        /// <summary>
-        /// Use case: Start booking and cancel.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestBookAndReleaseCancel()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(
-                string.Empty,
-                "Rent bike Nr. 0 and open lock?",
-                "Yes",
-                "No").Returns(Task.FromResult(false)); // User chooes "No"
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                viewService.DisplayAlert(
-                    string.Empty,
-                    "Rent bike Nr. 0 and open lock?",
-                    "Yes",
-                    "No");
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("Open lock & rent bike"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.True);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Reserve bike"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
-
-        /// <summary>
-        /// Use case: Try book bike and release from station.
-        /// Final state: Bike is disposable.
-        /// </summary>
-        [Test]
-        public void TestBookAndReleaseBookAndOpenAyncFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(
-                string.Empty,
-                string.Format("Rent bike {0} and open lock?", "Nr. 0"),
-                "Yes",
-                "No").Returns(Task.FromResult(true));
-
-            bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
-
-            connector.Command.BookAndOpenAync(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("Tst")));
-
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Disposable); // State remains available because booking request failed.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.BookAndOpenAync(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAdvancedAlert(
-                    "Connection error when renting the bike!",
-                    "Is WIFI available/ mobile networt available and mobile data activated / ... ?",
-                    "Context info",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("Open lock & rent bike"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.True);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Reserve bike"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
-
-        /// <summary>
-        /// Use case: Try book bike and release from station.
-        /// Final state: Bike is disposable.
-        /// </summary>
-        [Test]
-        public void TestBookAndReleaseBookAndOpenAyncFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(
-                string.Empty,
-                string.Format("Rent bike {0} and open lock?", "Nr. 0"),
-                "Yes",
-                "No").Returns(Task.FromResult(true));
-
-            bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
-
-            connector.Command.BookAndOpenAync(bike).Returns(x => throw new Exception("Some error", new Exception("Inner exception")));
-
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Disposable); // State remains available because booking request failed.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.BookAndOpenAync(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Error when renting the bike!",
-                    "Some error",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("Open lock & rent bike"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.True);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Reserve bike"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
-
-        /// <summary>
-        /// Use case: Book bike and release from station.
-        /// Final state: Bike is booked and released from station.
-        /// </summary>
-        [Test]
-        public void TestBookAndRelease()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(
-                string.Empty,
-                string.Format("Rent bike {0} and open lock?", "Nr. 0"),
-                "Yes",
-                "No").Returns(Task.FromResult(true));
-
-            bike.LockInfo.State.Returns(LockingState.Open); // After Booking and opening, lock state is open.
-
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Booked); // After Booking and opening, state is booked.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.BookAndOpenAync(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state 
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("BookedOpen"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.False);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Open lock"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
-
-        /// <summary>
-        /// Use case: Cancel reserving.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestReserveCancel()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(
-                string.Empty,
-                "Reserve bike Nr. 0 free of charge for 15 min?",
-                "Yes",
-                "No").Returns(Task.FromResult(false)); // User chooes "No"
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                viewService.DisplayAlert(
-                    string.Empty,
-                    "Reserve bike Nr. 0 free of charge for 15 min?",
-                    "Yes",
-                    "No");
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("Open lock & rent bike"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.True);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Reserve bike"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
-
-        /// <summary>
-        /// Use case: Try book reserve bike.
-        /// Final state: Bike is disposable.
-        /// </summary>
-        [Test]
-        public void TestReserveDoReserveFailsBookingDeclinedException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(
-                string.Empty,
-                "Reserve bike Nr. 0 free of charge for 15 min?",
-                "Yes",
-                "No").Returns(Task.FromResult(true));
-
-            bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
-
-            connector.Command.DoReserve(bike).Returns(x => throw new BookingDeclinedException(4));
-
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Disposable); // State remains available because booking request failed.
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reserving bike...";
-                connector.Command.DoReserve(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Hint",
-                    "A reservation of bike Nr. 0 was rejected because the maximum allowed number of 4 reservations/ rentals had already been made.",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("Open lock & rent bike"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.True);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Reserve bike"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
-
-        /// <summary>
-        /// Use case: Try book reserve bike.
-        /// Final state: Bike is disposable.
-        /// </summary>
-        [Test]
-        public void TestReserveDoReserveFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(
-                string.Empty,
-                "Reserve bike Nr. 0 free of charge for 15 min?",
-                "Yes",
-                "No").Returns(Task.FromResult(true));
-
-            bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
-
-            connector.Command.DoReserve(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("Tst")));
-
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Disposable); // State remains available because booking request failed.
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reserving bike...";
-                connector.Command.DoReserve(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAdvancedAlert(
-                    "Connection error when reserving the bike!",
-                    "Is WIFI available/ mobile networt available and mobile data activated / ... ?",
-                    "Context info",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("Open lock & rent bike"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.True);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Reserve bike"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
-
-        /// <summary>
-        /// Use case: Try book reserve bike.
-        /// Final state: Bike is disposable.
-        /// </summary>
-        [Test]
-        public void TestReserveDoReserveFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(
-                string.Empty,
-                "Reserve bike Nr. 0 free of charge for 15 min?",
-                "Yes",
-                "No").Returns(Task.FromResult(true));
-
-            bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
-
-            connector.Command.DoReserve(bike).Returns(x => throw new Exception("Some error", new Exception("Inner exception")));
-
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Disposable); // State remains available because booking request failed.
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reserving bike...";
-                connector.Command.DoReserve(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Error when reserving the bike!",
-                    "Some error",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("Open lock & rent bike"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.True);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Reserve bike"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
-
-        /// <summary>
-        /// Use case: Reserve bike.
-        /// Final state: Bike is booked and released from station.
-        /// </summary>
-        [Test]
-        public void TestReserve()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(
-                string.Empty,
-                "Reserve bike Nr. 0 free of charge for 15 min?",
-                "Yes",
-                "No").Returns(Task.FromResult(true));
-
-            bike.LockInfo.State.Returns(LockingState.Open); // After Booking and opening, lock state is open.
-
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Booked); // After Booking and opening, lock state is open.
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reserving bike...";
-                connector.Command.DoReserve(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state 
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("BookedOpen"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.False);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Open lock"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
-    }
+	public class TestDisposableClosed
+	{
+		/// <summary>
+		/// Use case: Start booking and cancel.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestBookAndReleaseCancel()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new DisposableClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(
+				string.Empty,
+				"Rent bike Nr. 0 and open lock?",
+				"Yes",
+				"No").Returns(Task.FromResult(false)); // User chooes "No"
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				viewService.DisplayAlert(
+					string.Empty,
+					"Rent bike Nr. 0 and open lock?",
+					"Yes",
+					"No");
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("Open lock & rent bike"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.True);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Reserve bike"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
+
+		/// <summary>
+		/// Use case: Try book bike and release from station.
+		/// Final state: Bike is disposable.
+		/// </summary>
+		[Test]
+		public void TestBookAndReleaseBookAndOpenAyncFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new DisposableClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(
+				string.Empty,
+				string.Format("Rent bike {0} and open lock?", "Nr. 0"),
+				"Yes",
+				"No").Returns(Task.FromResult(true));
+
+			bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
+
+			connector.Command.BookAndOpenAync(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("Tst")));
+
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Disposable); // State remains available because booking request failed.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.BookAndOpenAync(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAdvancedAlert(
+					"Connection error when renting the bike!",
+					"Is WIFI available/ mobile networt available and mobile data activated / ... ?",
+					"Context info",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("Open lock & rent bike"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.True);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Reserve bike"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
+
+		/// <summary>
+		/// Use case: Try book bike and release from station.
+		/// Final state: Bike is disposable.
+		/// </summary>
+		[Test]
+		public void TestBookAndReleaseBookAndOpenAyncFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new DisposableClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(
+				string.Empty,
+				string.Format("Rent bike {0} and open lock?", "Nr. 0"),
+				"Yes",
+				"No").Returns(Task.FromResult(true));
+
+			bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
+
+			connector.Command.BookAndOpenAync(bike).Returns(x => throw new Exception("Some error", new Exception("Inner exception")));
+
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Disposable); // State remains available because booking request failed.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.BookAndOpenAync(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Error when renting the bike!",
+					"Some error",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("Open lock & rent bike"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.True);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Reserve bike"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
+
+		/// <summary>
+		/// Use case: Book bike and release from station.
+		/// Final state: Bike is booked and released from station.
+		/// </summary>
+		[Test]
+		public void TestBookAndRelease()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new DisposableClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(
+				string.Empty,
+				string.Format("Rent bike {0} and open lock?", "Nr. 0"),
+				"Yes",
+				"No").Returns(Task.FromResult(true));
+
+			bike.LockInfo.State.Returns(LockingState.Open); // After Booking and opening, lock state is open.
+
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Booked); // After Booking and opening, state is booked.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.BookAndOpenAync(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state 
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("BookedOpen"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.False);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Open lock"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
+
+		/// <summary>
+		/// Use case: Cancel reserving.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestReserveCancel()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new DisposableClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(
+				string.Empty,
+				"Reserve bike Nr. 0 free of charge for 15 min?",
+				"Yes",
+				"No").Returns(Task.FromResult(false)); // User chooes "No"
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				viewService.DisplayAlert(
+					string.Empty,
+					"Reserve bike Nr. 0 free of charge for 15 min?",
+					"Yes",
+					"No");
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("Open lock & rent bike"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.True);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Reserve bike"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
+
+		/// <summary>
+		/// Use case: Try book reserve bike.
+		/// Final state: Bike is disposable.
+		/// </summary>
+		[Test]
+		public void TestReserveDoReserveFailsBookingDeclinedException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new DisposableClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(
+				string.Empty,
+				"Reserve bike Nr. 0 free of charge for 15 min?",
+				"Yes",
+				"No").Returns(Task.FromResult(true));
+
+			bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
+
+			connector.Command.DoReserve(bike).Returns(x => throw new BookingDeclinedException(4));
+
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Disposable); // State remains available because booking request failed.
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Reserving bike...";
+				connector.Command.DoReserve(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Hint",
+					"A reservation of bike Nr. 0 was rejected because the maximum allowed number of 4 reservations/ rentals had already been made.",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("Open lock & rent bike"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.True);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Reserve bike"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
+
+		/// <summary>
+		/// Use case: Try book reserve bike.
+		/// Final state: Bike is disposable.
+		/// </summary>
+		[Test]
+		public void TestReserveDoReserveFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new DisposableClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(
+				string.Empty,
+				"Reserve bike Nr. 0 free of charge for 15 min?",
+				"Yes",
+				"No").Returns(Task.FromResult(true));
+
+			bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
+
+			connector.Command.DoReserve(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("Tst")));
+
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Disposable); // State remains available because booking request failed.
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Reserving bike...";
+				connector.Command.DoReserve(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAdvancedAlert(
+					"Connection error when reserving the bike!",
+					"Is WIFI available/ mobile networt available and mobile data activated / ... ?",
+					"Context info",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("Open lock & rent bike"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.True);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Reserve bike"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
+
+		/// <summary>
+		/// Use case: Try book reserve bike.
+		/// Final state: Bike is disposable.
+		/// </summary>
+		[Test]
+		public void TestReserveDoReserveFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new DisposableClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(
+				string.Empty,
+				"Reserve bike Nr. 0 free of charge for 15 min?",
+				"Yes",
+				"No").Returns(Task.FromResult(true));
+
+			bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
+
+			connector.Command.DoReserve(bike).Returns(x => throw new Exception("Some error", new Exception("Inner exception")));
+
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Disposable); // State remains available because booking request failed.
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Reserving bike...";
+				connector.Command.DoReserve(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Error when reserving the bike!",
+					"Some error",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("Open lock & rent bike"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.True);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Reserve bike"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
+
+		/// <summary>
+		/// Use case: Reserve bike.
+		/// Final state: Bike is booked and released from station.
+		/// </summary>
+		[Test]
+		public void TestReserve()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new DisposableClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(
+				string.Empty,
+				"Reserve bike Nr. 0 free of charge for 15 min?",
+				"Yes",
+				"No").Returns(Task.FromResult(true));
+
+			bike.LockInfo.State.Returns(LockingState.Open); // After Booking and opening, lock state is open.
+
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Booked); // After Booking and opening, lock state is open.
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Reserving bike...";
+				connector.Command.DoReserve(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state 
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("BookedOpen"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.False);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Open lock"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestFeedbackPending.cs b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestFeedbackPending.cs
index 85032b6..07d6c0b 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestFeedbackPending.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestFeedbackPending.cs
@@ -14,191 +14,191 @@ using TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler;
 
 namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 {
-    [TestFixture]
-    public class TestFeedbackPending
-    {
-        /// <summary>
-        /// Use case: Give feedback but submission fails.
-        /// Final state: Feedback is pending.
-        /// </summary>
-        [Test]
-        public void TestGiveFeedbackDoSubmitFeedbackFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+	[TestFixture]
+	public class TestFeedbackPending
+	{
+		/// <summary>
+		/// Use case: Give feedback but submission fails.
+		/// Final state: Feedback is pending.
+		/// </summary>
+		[Test]
+		public void TestGiveFeedbackDoSubmitFeedbackFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new FeedbackPending(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new FeedbackPending(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            connector.Command.DoSubmitFeedback(
-                Arg.Any<TINK.Model.Connector.IUserFeedback>(),
-                Arg.Any<Uri>()).Returns(x => throw new Exception("Context info", new Exception("Tst")));
+			connector.Command.DoSubmitFeedback(
+				Arg.Any<TINK.Model.Connector.IUserFeedback>(),
+				Arg.Any<Uri>()).Returns(x => throw new Exception("Context info", new Exception("Tst")));
 
 
-            var subsequent = handler.HandleRequestOption2().Result;
+			var subsequent = handler.HandleRequestOption2().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                viewService.DisplayUserFeedbackPopup(Arg.Any<IBattery>(), Arg.Any<string>());
-                bikesViewModel.ActionText = "Submitting feedback...";
-                connector.Command.DoSubmitFeedback(Arg.Any<TINK.Model.Connector.IUserFeedback>(), Arg.Any<Uri>()); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Submitting feedback failed!",
-                    "Your feedback could not be send to server successfully.",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				viewService.DisplayUserFeedbackPopup(Arg.Any<IBattery>(), Arg.Any<string>());
+				bikesViewModel.ActionText = "Submitting feedback...";
+				connector.Command.DoSubmitFeedback(Arg.Any<TINK.Model.Connector.IUserFeedback>(), Arg.Any<Uri>()); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Submitting feedback failed!",
+					"Your feedback could not be send to server successfully.",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("FeedbackPending"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.False);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Give Feedback"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
+			// Verify state after action
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("FeedbackPending"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.False);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Give Feedback"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
 
-        /// <summary>
-        /// Use case: Give feedback.
-        /// Final state: Feedback is pending.
-        /// </summary>
-        [Test]
-        public void TestGiveFeedback()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Give feedback.
+		/// Final state: Feedback is pending.
+		/// </summary>
+		[Test]
+		public void TestGiveFeedback()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new FeedbackPending(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new FeedbackPending(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            var subsequent = handler.HandleRequestOption2().Result;
+			var subsequent = handler.HandleRequestOption2().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                viewService.DisplayUserFeedbackPopup(Arg.Any<IBattery>(), Arg.Any<string>());
-                bikesViewModel.ActionText = "Submitting feedback...";
-                connector.Command.DoSubmitFeedback(Arg.Any<TINK.Model.Connector.IUserFeedback>(), Arg.Any<Uri>()); // Booking must be performed
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				viewService.DisplayUserFeedbackPopup(Arg.Any<IBattery>(), Arg.Any<string>());
+				bikesViewModel.ActionText = "Submitting feedback...";
+				connector.Command.DoSubmitFeedback(Arg.Any<TINK.Model.Connector.IUserFeedback>(), Arg.Any<Uri>()); // Booking must be performed
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("FeedbackPending"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.False);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Give Feedback"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
+			// Verify state after action
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("FeedbackPending"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.False);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Give Feedback"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
 
-        /// <summary>
-        /// Use case: Give feedback.
-        /// Final state: Feedback is pending.
-        /// </summary>
-        [Test]
-        public void TestGiveFeedbackAndQuerry()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Give feedback.
+		/// Final state: Feedback is pending.
+		/// </summary>
+		[Test]
+		public void TestGiveFeedbackAndQuerry()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            var handler = new FeedbackPending(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var handler = new FeedbackPending(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            bike.BookingFinishedModel.MiniSurvey.Questions.Count.Returns(1);
+			bike.BookingFinishedModel.MiniSurvey.Questions.Count.Returns(1);
 
-            var subsequent = handler.HandleRequestOption2().Result;
+			var subsequent = handler.HandleRequestOption2().Result;
 
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                viewService.DisplayUserFeedbackPopup(Arg.Any<IBattery>(), Arg.Any<string>());
-                bikesViewModel.ActionText = "Submitting feedback...";
-                connector.Command.DoSubmitFeedback(Arg.Any<TINK.Model.Connector.IUserFeedback>(), Arg.Any<Uri>()); // Booking must be performed
-                viewService.PushModalAsync(ViewTypes.MiniSurvey);
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				viewService.DisplayUserFeedbackPopup(Arg.Any<IBattery>(), Arg.Any<string>());
+				bikesViewModel.ActionText = "Submitting feedback...";
+				connector.Command.DoSubmitFeedback(Arg.Any<TINK.Model.Connector.IUserFeedback>(), Arg.Any<Uri>()); // Booking must be performed
+				viewService.PushModalAsync(ViewTypes.MiniSurvey);
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-            // Verify state after action
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("FeedbackPending"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.False);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Give Feedback"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
-    }
+			// Verify state after action
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("FeedbackPending"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.False);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Give Feedback"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestReservedClosed.cs b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestReservedClosed.cs
index 3822fa2..c0d20f3 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestReservedClosed.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestReservedClosed.cs
@@ -16,626 +16,626 @@ using TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler;
 
 namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 {
-    [TestFixture]
-    public class TestReservedClosed
-    {
-        /// <summary>
-        /// Use case: Cancel reservation.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCancelReservationCancel()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(
-                string.Empty,
-                "Cancel reservation for bike Nr. 0?",
-                "Yes",
-                "No").Returns(Task.FromResult(false)); // User chooes "No"
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                viewService.DisplayAlert(
-                    string.Empty,
-                    "Cancel reservation for bike Nr. 0?",
-                    "Yes",
-                    "No");
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("Cancel bike reservation"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.True);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Open lock & rent bike"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
-
-        [Test]
-        public void TestCancelReservationDoCancelReservationInvalidAuthorizationResponseException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(
-                string.Empty,
-                "Cancel reservation for bike Nr. 0?",
-                "Yes",
-                "No").Returns(Task.FromResult(true));
-
-            connector.Command.DoCancelReservation(bike).Returns(x => throw new InvalidAuthorizationResponseException(
-                "otto@mustermann.de", JsonConvert.DeserializeObject<ResponseBase>(@"{}")));
-
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Reserved); // Locking state does not change.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Error when canceling the reservation!",
-                    "Can not login user otto@mustermann.de. Mail address unknown or password invalid.",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.That(
-              subsequent.ButtonText,
-              Is.EqualTo("Cancel bike reservation"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.True);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Open lock & rent bike"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
-
-        [Test]
-        public void TestCancelReservationDoCancelReservationFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(
-                string.Empty,
-                "Cancel reservation for bike Nr. 0?",
-                "Yes",
-                "No").Returns(Task.FromResult(true));
-
-            connector.Command.DoCancelReservation(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("Tst")));
-
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Reserved); // Locking state does not change.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAdvancedAlert(
-                    "Connection error when canceling the reservation!",
-                    "Is WIFI available/ mobile networt available and mobile data activated / ... ?",
-                    "Context info",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("Cancel bike reservation"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.True);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Open lock & rent bike"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
-
-        /// <summary>
-        /// Use case: Try cancel reservation.
-        /// Final state: Bike remains reserved.
-        /// </summary>
-        [Test]
-        public void TestCancelReservationDoCancelReservationFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(
-                string.Empty,
-                "Cancel reservation for bike Nr. 0?",
-                "Yes",
-                "No").Returns(Task.FromResult(true));
-
-            connector.Command.DoCancelReservation(bike).Returns(x => throw new Exception("Some error", new Exception("Inner exception")));
-
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Reserved); // Locking state does not change.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike); // Cancel reservation must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Error when canceling the reservation!",
-                    "Some error",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("Cancel bike reservation"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.True);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Open lock & rent bike"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
-
-        /// <summary>
-        /// Use case: Cancel reservation.
-        /// Final state: Bike is available again.
-        /// </summary>
-        [Test]
-        public void TestCancelReservation()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(
-                string.Empty,
-                "Cancel reservation for bike Nr. 0?",
-                "Yes",
-                "No").Returns(Task.FromResult(true));
-
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Disposable); // Reservation gets canceled.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike); // Cancel reservation must be performed
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state 
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("Open lock & rent bike"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.True);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Reserve bike"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
-
-        /// <summary>
-        /// Use case: Cancel booking.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestBookAndReleaseCancel()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(
-                string.Empty,
-                "Rent bike Nr. 0 and open lock?",
-                "Yes",
-                "No").Returns(Task.FromResult(false)); // User chooes "No"
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                viewService.DisplayAlert(
-                    string.Empty,
-                    "Rent bike Nr. 0 and open lock?",
-                    "Yes",
-                    "No");
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.That(
-                  subsequent.ButtonText,
-                  Is.EqualTo("Cancel bike reservation"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.True);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Open lock & rent bike"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
-
-        /// <summary>
-        /// Use case: Try book bike and release from station.
-        /// Final state: Bike is disposable.
-        /// </summary>
-        [Test]
-        public void TestBookAndReleaseBookAndOpenAyncFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(
-                string.Empty,
-                string.Format("Rent bike {0} and open lock?", "Nr. 0"),
-                "Yes",
-                "No").Returns(Task.FromResult(true));
-
-            connector.Command.BookAndOpenAync(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("Tst")));
-
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Reserved); // State remains reserved because booking request failed.
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.BookAndOpenAync(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAdvancedAlert(
-                    "Connection error when renting the bike!",
-                    "Is WIFI available/ mobile networt available and mobile data activated / ... ?",
-                    "Context info",
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.That(
-                  subsequent.ButtonText,
-                  Is.EqualTo("Cancel bike reservation"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.True);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Open lock & rent bike"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
-
-        /// <summary>
-        /// Use case: Try book bike and release from station.
-        /// Final state: Bike is disposable.
-        /// </summary>
-        [Test]
-        public void TestBookAndReleaseBookAndOpenAyncFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(
-                string.Empty,
-                string.Format("Rent bike {0} and open lock?", "Nr. 0"),
-                "Yes",
-                "No").Returns(Task.FromResult(true));
-
-            connector.Command.BookAndOpenAync(bike).Returns(x => throw new Exception("Some error", new Exception("Inner exception")));
-
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Reserved); // State remains reserved because booking request failed.
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.BookAndOpenAync(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAdvancedAlert(
-                    "Error when renting the bike!",
-                    "Some error",
-                    String.Empty,
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("Cancel bike reservation"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.True);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Open lock & rent bike"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
-
-        /// <summary>
-        /// Use case: Book bike and release from station.
-        /// Final state: Bike is booked and released from station.
-        /// </summary>
-        [Test]
-        public void TestBookAndRelease()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedClosed(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(
-                string.Empty,
-                string.Format("Rent bike {0} and open lock?", "Nr. 0"),
-                "Yes",
-                "No").Returns(Task.FromResult(true));
-
-            bike.LockInfo.State.Returns(LockingState.Open); // After Booking and opening, lock state is open.
-
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Booked); // After Booking and opening, state is booked.
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.BookAndOpenAync(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state 
-            Assert.That(
-                subsequent.ButtonText,
-                Is.EqualTo("BookedOpen"));
-            Assert.That(
-                subsequent.IsButtonVisible,
-                Is.False);
-            Assert.That(
-                subsequent.LockitButtonText,
-                Is.EqualTo("Open lock"));
-            Assert.That(
-                subsequent.IsLockitButtonVisible,
-                Is.True);
-        }
-    }
+	[TestFixture]
+	public class TestReservedClosed
+	{
+		/// <summary>
+		/// Use case: Cancel reservation.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestCancelReservationCancel()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(
+				string.Empty,
+				"Cancel reservation for bike Nr. 0?",
+				"Yes",
+				"No").Returns(Task.FromResult(false)); // User chooes "No"
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				viewService.DisplayAlert(
+					string.Empty,
+					"Cancel reservation for bike Nr. 0?",
+					"Yes",
+					"No");
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("Cancel bike reservation"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.True);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Open lock & rent bike"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
+
+		[Test]
+		public void TestCancelReservationDoCancelReservationInvalidAuthorizationResponseException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(
+				string.Empty,
+				"Cancel reservation for bike Nr. 0?",
+				"Yes",
+				"No").Returns(Task.FromResult(true));
+
+			connector.Command.DoCancelReservation(bike).Returns(x => throw new InvalidAuthorizationResponseException(
+				"otto@mustermann.de", JsonConvert.DeserializeObject<ResponseBase>(@"{}")));
+
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Reserved); // Locking state does not change.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Canceling reservation...";
+				connector.Command.DoCancelReservation(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Error when canceling the reservation!",
+					"Can not login user otto@mustermann.de. Mail address unknown or password invalid.",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.That(
+			  subsequent.ButtonText,
+			  Is.EqualTo("Cancel bike reservation"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.True);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Open lock & rent bike"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
+
+		[Test]
+		public void TestCancelReservationDoCancelReservationFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(
+				string.Empty,
+				"Cancel reservation for bike Nr. 0?",
+				"Yes",
+				"No").Returns(Task.FromResult(true));
+
+			connector.Command.DoCancelReservation(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("Tst")));
+
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Reserved); // Locking state does not change.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Canceling reservation...";
+				connector.Command.DoCancelReservation(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAdvancedAlert(
+					"Connection error when canceling the reservation!",
+					"Is WIFI available/ mobile networt available and mobile data activated / ... ?",
+					"Context info",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("Cancel bike reservation"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.True);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Open lock & rent bike"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
+
+		/// <summary>
+		/// Use case: Try cancel reservation.
+		/// Final state: Bike remains reserved.
+		/// </summary>
+		[Test]
+		public void TestCancelReservationDoCancelReservationFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(
+				string.Empty,
+				"Cancel reservation for bike Nr. 0?",
+				"Yes",
+				"No").Returns(Task.FromResult(true));
+
+			connector.Command.DoCancelReservation(bike).Returns(x => throw new Exception("Some error", new Exception("Inner exception")));
+
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Reserved); // Locking state does not change.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Canceling reservation...";
+				connector.Command.DoCancelReservation(bike); // Cancel reservation must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAlert(
+					"Error when canceling the reservation!",
+					"Some error",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("Cancel bike reservation"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.True);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Open lock & rent bike"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
+
+		/// <summary>
+		/// Use case: Cancel reservation.
+		/// Final state: Bike is available again.
+		/// </summary>
+		[Test]
+		public void TestCancelReservation()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(
+				string.Empty,
+				"Cancel reservation for bike Nr. 0?",
+				"Yes",
+				"No").Returns(Task.FromResult(true));
+
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Disposable); // Reservation gets canceled.
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Canceling reservation...";
+				connector.Command.DoCancelReservation(bike); // Cancel reservation must be performed
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state 
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("Open lock & rent bike"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.True);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Reserve bike"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
+
+		/// <summary>
+		/// Use case: Cancel booking.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestBookAndReleaseCancel()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(
+				string.Empty,
+				"Rent bike Nr. 0 and open lock?",
+				"Yes",
+				"No").Returns(Task.FromResult(false)); // User chooes "No"
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				viewService.DisplayAlert(
+					string.Empty,
+					"Rent bike Nr. 0 and open lock?",
+					"Yes",
+					"No");
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.That(
+				  subsequent.ButtonText,
+				  Is.EqualTo("Cancel bike reservation"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.True);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Open lock & rent bike"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
+
+		/// <summary>
+		/// Use case: Try book bike and release from station.
+		/// Final state: Bike is disposable.
+		/// </summary>
+		[Test]
+		public void TestBookAndReleaseBookAndOpenAyncFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(
+				string.Empty,
+				string.Format("Rent bike {0} and open lock?", "Nr. 0"),
+				"Yes",
+				"No").Returns(Task.FromResult(true));
+
+			connector.Command.BookAndOpenAync(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("Tst")));
+
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Reserved); // State remains reserved because booking request failed.
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.BookAndOpenAync(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAdvancedAlert(
+					"Connection error when renting the bike!",
+					"Is WIFI available/ mobile networt available and mobile data activated / ... ?",
+					"Context info",
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.That(
+				  subsequent.ButtonText,
+				  Is.EqualTo("Cancel bike reservation"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.True);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Open lock & rent bike"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
+
+		/// <summary>
+		/// Use case: Try book bike and release from station.
+		/// Final state: Bike is disposable.
+		/// </summary>
+		[Test]
+		public void TestBookAndReleaseBookAndOpenAyncFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(
+				string.Empty,
+				string.Format("Rent bike {0} and open lock?", "Nr. 0"),
+				"Yes",
+				"No").Returns(Task.FromResult(true));
+
+			connector.Command.BookAndOpenAync(bike).Returns(x => throw new Exception("Some error", new Exception("Inner exception")));
+
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Reserved); // State remains reserved because booking request failed.
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.BookAndOpenAync(bike); // Booking must be performed
+				bikesViewModel.ActionText = "";
+				viewService.DisplayAdvancedAlert(
+					"Error when renting the bike!",
+					"Some error",
+					String.Empty,
+					"OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("Cancel bike reservation"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.True);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Open lock & rent bike"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
+
+		/// <summary>
+		/// Use case: Book bike and release from station.
+		/// Final state: Bike is booked and released from station.
+		/// </summary>
+		[Test]
+		public void TestBookAndRelease()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedClosed(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(
+				string.Empty,
+				string.Format("Rent bike {0} and open lock?", "Nr. 0"),
+				"Yes",
+				"No").Returns(Task.FromResult(true));
+
+			bike.LockInfo.State.Returns(LockingState.Open); // After Booking and opening, lock state is open.
+
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Booked); // After Booking and opening, state is booked.
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Renting bike...";
+				connector.Command.BookAndOpenAync(bike); // Booking must be performed
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "";
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state 
+			Assert.That(
+				subsequent.ButtonText,
+				Is.EqualTo("BookedOpen"));
+			Assert.That(
+				subsequent.IsButtonVisible,
+				Is.False);
+			Assert.That(
+				subsequent.LockitButtonText,
+				Is.EqualTo("Open lock"));
+			Assert.That(
+				subsequent.IsLockitButtonVisible,
+				Is.True);
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/TestReqeustHandlerFactory.cs b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/TestReqeustHandlerFactory.cs
index 2d93f99..c7017f2 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/TestReqeustHandlerFactory.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/TestReqeustHandlerFactory.cs
@@ -13,135 +13,135 @@ using TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler;
 
 namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock
 {
-    [TestFixture]
-    public class TestReqeustHandlerFactory
-    {
-        [Test]
-        public void TestCreateDisposable()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var smartDevice = Substitute.For<ISmartDevice>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+	[TestFixture]
+	public class TestReqeustHandlerFactory
+	{
+		[Test]
+		public void TestCreateDisposable()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var smartDevice = Substitute.For<ISmartDevice>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Disposable);
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Disposable);
 
-            var requestHandler = RequestHandlerFactory.Create(
-                bike,
-                () => true /*isConnectedDelegate*/,
-                (isconnected) => connector,
-                () => pollingManager,
-                smartDevice,
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var requestHandler = RequestHandlerFactory.Create(
+				bike,
+				() => true /*isConnectedDelegate*/,
+				(isconnected) => connector,
+				() => pollingManager,
+				smartDevice,
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            Assert.That(
-                requestHandler.GetType(),
-                Is.EqualTo(typeof(DisposableClosed)));
-        }
+			Assert.That(
+				requestHandler.GetType(),
+				Is.EqualTo(typeof(DisposableClosed)));
+		}
 
-        [Test]
-        public void TestCreateReserved()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var smartDevice = Substitute.For<ISmartDevice>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		[Test]
+		public void TestCreateReserved()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var smartDevice = Substitute.For<ISmartDevice>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Reserved);
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Reserved);
 
-            var requestHandler = RequestHandlerFactory.Create(
-                bike,
-                () => true /*isConnectedDelegate*/,
-                (isconnected) => connector,
-                () => pollingManager,
-                smartDevice,
-                viewService,
-                bikesViewModel,
-                activeUser);
+			var requestHandler = RequestHandlerFactory.Create(
+				bike,
+				() => true /*isConnectedDelegate*/,
+				(isconnected) => connector,
+				() => pollingManager,
+				smartDevice,
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-            Assert.That(
-                requestHandler.GetType(),
-                Is.EqualTo(typeof(ReservedClosed)));
-        }
+			Assert.That(
+				requestHandler.GetType(),
+				Is.EqualTo(typeof(ReservedClosed)));
+		}
 
-        [Test]
-        public void TestCreateBooked()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var smartDevice = Substitute.For<ISmartDevice>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		[Test]
+		public void TestCreateBooked()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var smartDevice = Substitute.For<ISmartDevice>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Booked);
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.Booked);
 
-            foreach (LockingState state in Enum.GetValues(typeof(LockingState)))
-            {
-                bike.LockInfo.State.Returns(state);
+			foreach (LockingState state in Enum.GetValues(typeof(LockingState)))
+			{
+				bike.LockInfo.State.Returns(state);
 
-                var requestHandler = RequestHandlerFactory.Create(
-                    bike,
-                    () => true /*isConnectedDelegate*/,
-                    (isconnected) => connector,
-                    () => pollingManager,
-                    smartDevice,
-                    viewService,
-                    bikesViewModel,
-                    activeUser);
+				var requestHandler = RequestHandlerFactory.Create(
+					bike,
+					() => true /*isConnectedDelegate*/,
+					(isconnected) => connector,
+					() => pollingManager,
+					smartDevice,
+					viewService,
+					bikesViewModel,
+					activeUser);
 
-                Assert.That(
-                    requestHandler.GetType(),
-                    Is.EqualTo(state == LockingState.Closed
-                    ? typeof(BookedClosed)
-                    : typeof(BookedOpen)));
-            }
-        }
+				Assert.That(
+					requestHandler.GetType(),
+					Is.EqualTo(state == LockingState.Closed
+					? typeof(BookedClosed)
+					: typeof(BookedOpen)));
+			}
+		}
 
-        [Test]
-        public void TestCreateFeedbackPending()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var smartDevice = Substitute.For<ISmartDevice>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
+		[Test]
+		public void TestCreateFeedbackPending()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var smartDevice = Substitute.For<ISmartDevice>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-            bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.FeedbackPending);
+			bike.State.Value.Returns(TINK.Model.State.InUseStateEnum.FeedbackPending);
 
-            foreach (LockingState state in Enum.GetValues(typeof(LockingState)))
-            {
-                bike.LockInfo.State.Returns(state);
+			foreach (LockingState state in Enum.GetValues(typeof(LockingState)))
+			{
+				bike.LockInfo.State.Returns(state);
 
-                var requestHandler = RequestHandlerFactory.Create(
-                    bike,
-                    () => true /*isConnectedDelegate*/,
-                    (isconnected) => connector,
-                    () => pollingManager,
-                    smartDevice,
-                    viewService,
-                    bikesViewModel,
-                    activeUser);
+				var requestHandler = RequestHandlerFactory.Create(
+					bike,
+					() => true /*isConnectedDelegate*/,
+					(isconnected) => connector,
+					() => pollingManager,
+					smartDevice,
+					viewService,
+					bikesViewModel,
+					activeUser);
 
-                Assert.That(
-                    requestHandler.GetType(),
-                    Is.EqualTo(typeof(FeedbackPending)));
-            }
-        }
-    }
+				Assert.That(
+					requestHandler.GetType(),
+					Is.EqualTo(typeof(FeedbackPending)));
+			}
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/TestBikeViewModelBase.cs b/TestShareeLib/ViewModel/Bikes/Bike/TestBikeViewModelBase.cs
index 9053f60..88e9387 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/TestBikeViewModelBase.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/TestBikeViewModelBase.cs
@@ -3,31 +3,31 @@ using TINK.ViewModel.Bikes.Bike;
 
 namespace TestShareeLib.ViewModel.Bikes.Bike
 {
-    [TestFixture]
-    public class TestBikeViewModelBase
-    {
-        [Test]
-        public void TestGetUrl()
-        {
-            Assert.That(
-                BikeViewModelBase.GetUrlFirstOrDefault(@"Mit der Mietrad Anmietung wird folgender Betreiber <a href='https://shareeapp-fr01.copri.eu/site/agb.html' target='_blank'>AGB</a> zugestimmt (als Demo sharee AGB)."),
-                Is.EqualTo(@"https://shareeapp-fr01.copri.eu/site/agb.html"));
-        }
+	[TestFixture]
+	public class TestBikeViewModelBase
+	{
+		[Test]
+		public void TestGetUrl()
+		{
+			Assert.That(
+				BikeViewModelBase.GetUrlFirstOrDefault(@"Mit der Mietrad Anmietung wird folgender Betreiber <a href='https://shareeapp-fr01.copri.eu/site/agb.html' target='_blank'>AGB</a> zugestimmt (als Demo sharee AGB)."),
+				Is.EqualTo(@"https://shareeapp-fr01.copri.eu/site/agb.html"));
+		}
 
-        [Test]
-        public void TestGetUrlNoProtocol()
-        {
-            Assert.That(
-                BikeViewModelBase.GetUrlFirstOrDefault(@"Mit der Mietrad Anmietung wird folgender Betreiber <a href='shareeapp-fr01.copri.eu/site/agb.html' target='_blank'>AGB</a> zugestimmt (als Demo sharee AGB)."),
-                Is.EqualTo(""));
-        }
+		[Test]
+		public void TestGetUrlNoProtocol()
+		{
+			Assert.That(
+				BikeViewModelBase.GetUrlFirstOrDefault(@"Mit der Mietrad Anmietung wird folgender Betreiber <a href='shareeapp-fr01.copri.eu/site/agb.html' target='_blank'>AGB</a> zugestimmt (als Demo sharee AGB)."),
+				Is.EqualTo(""));
+		}
 
-        [Test]
-        public void TestGetUrlNull()
-        {
-            Assert.That(
-                BikeViewModelBase.GetUrlFirstOrDefault(null),
-                Is.EqualTo(""));
-        }
-    }
+		[Test]
+		public void TestGetUrlNull()
+		{
+			Assert.That(
+				BikeViewModelBase.GetUrlFirstOrDefault(null),
+				Is.EqualTo(""));
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/TestTariffDescriptionViewModel.cs b/TestShareeLib/ViewModel/Bikes/Bike/TestTariffDescriptionViewModel.cs
index 5b7195f..e7a52e0 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/TestTariffDescriptionViewModel.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/TestTariffDescriptionViewModel.cs
@@ -4,77 +4,77 @@ using TINK.ViewModel.Bikes.Bike;
 
 namespace TestShareeLib.ViewModel.Bikes.Bike
 {
-    [TestFixture]
-    public class TestTariffDescriptionViewModel
-    {
-        [Test]
-        public void TestCtor()
-        {
-            var model = new RentalDescription
-            {
-                Name = "Fancy Tarif",
-                Id = 47,
-                TariffEntries = new System.Collections.Generic.Dictionary<string, RentalDescription.TariffElement>
-                {
-                    { "23", new RentalDescription.TariffElement { Value = "Max Gebühr", Description = "9.00 € / Tag"} },
-                    { "24", new RentalDescription.TariffElement { Value = "Gratis Mietzeit", Description = "30 Min  / Tag"} },
-                },
-                InfoEntries = new System.Collections.Generic.Dictionary<string, RentalDescription.InfoElement>
-                {
-                    { "15", new RentalDescription.InfoElement { Key = "Tracking", Value = "Ich stimme der Speicherung (Tracking) meiner Fahrstrecke zwecks wissenschaftlicher Auswertung und Berechnung der CO2-Einsparung zu!" } },
-                    { "22", new RentalDescription.InfoElement { Key = "AGB", Value ="Mit der Mietrad Anmietung wird folgender Betreiber <a href='$varenv->{wwwhost}/site/agb.html' target='_blank'>AGB</a> zugestimmt"} }
-                }
-            };
+	[TestFixture]
+	public class TestTariffDescriptionViewModel
+	{
+		[Test]
+		public void TestCtor()
+		{
+			var model = new RentalDescription
+			{
+				Name = "Fancy Tarif",
+				Id = 47,
+				TariffEntries = new System.Collections.Generic.Dictionary<string, RentalDescription.TariffElement>
+				{
+					{ "23", new RentalDescription.TariffElement { Value = "Max Gebühr", Description = "9.00 € / Tag"} },
+					{ "24", new RentalDescription.TariffElement { Value = "Gratis Mietzeit", Description = "30 Min  / Tag"} },
+				},
+				InfoEntries = new System.Collections.Generic.Dictionary<string, RentalDescription.InfoElement>
+				{
+					{ "15", new RentalDescription.InfoElement { Key = "Tracking", Value = "Ich stimme der Speicherung (Tracking) meiner Fahrstrecke zwecks wissenschaftlicher Auswertung und Berechnung der CO2-Einsparung zu!" } },
+					{ "22", new RentalDescription.InfoElement { Key = "AGB", Value ="Mit der Mietrad Anmietung wird folgender Betreiber <a href='$varenv->{wwwhost}/site/agb.html' target='_blank'>AGB</a> zugestimmt"} }
+				}
+			};
 
-            var viewModel = new TariffDescriptionViewModel(model);
+			var viewModel = new TariffDescriptionViewModel(model);
 
-            Assert.That(
-                viewModel.Name,
-                Is.EqualTo("Fancy Tarif"));
+			Assert.That(
+				viewModel.Name,
+				Is.EqualTo("Fancy Tarif"));
 
-            Assert.That(
-                viewModel.TariffEntries.Count,
-                Is.EqualTo(2));
+			Assert.That(
+				viewModel.TariffEntries.Count,
+				Is.EqualTo(2));
 
-            Assert.That(
-                viewModel.InfoEntries.Count,
-                Is.EqualTo(1));
+			Assert.That(
+				viewModel.InfoEntries.Count,
+				Is.EqualTo(1));
 
-            Assert.That(
-                viewModel.OperatorAgb,
-                Is.EqualTo("Mit der Mietrad Anmietung wird folgender Betreiber <a href='$varenv->{wwwhost}/site/agb.html' target='_blank'>AGB</a> zugestimmt"));
+			Assert.That(
+				viewModel.OperatorAgb,
+				Is.EqualTo("Mit der Mietrad Anmietung wird folgender Betreiber <a href='$varenv->{wwwhost}/site/agb.html' target='_blank'>AGB</a> zugestimmt"));
 
-            Assert.That(
-                viewModel.TarifEntry1.Value,
-                Is.EqualTo("Max Gebühr"));
+			Assert.That(
+				viewModel.TarifEntry1.Value,
+				Is.EqualTo("Max Gebühr"));
 
-            Assert.That(
-                viewModel.TarifEntry1.Description,
-                Is.EqualTo("9.00 € / Tag"));
+			Assert.That(
+				viewModel.TarifEntry1.Description,
+				Is.EqualTo("9.00 € / Tag"));
 
-            Assert.That(
-                viewModel.TarifEntry2.Value,
-                Is.EqualTo("Gratis Mietzeit"));
+			Assert.That(
+				viewModel.TarifEntry2.Value,
+				Is.EqualTo("Gratis Mietzeit"));
 
-            Assert.That(
-                viewModel.TarifEntry2.Description,
-                Is.EqualTo("30 Min  / Tag"));
+			Assert.That(
+				viewModel.TarifEntry2.Description,
+				Is.EqualTo("30 Min  / Tag"));
 
-            Assert.That(
-                viewModel.TarifEntry3.Value,
-                Is.Empty);
+			Assert.That(
+				viewModel.TarifEntry3.Value,
+				Is.Empty);
 
-            Assert.That(
-                viewModel.TarifEntry3.Description,
-                Is.Empty);
+			Assert.That(
+				viewModel.TarifEntry3.Description,
+				Is.Empty);
 
-            Assert.That(
-                viewModel.InfoEntry1,
-                Is.EqualTo("Ich stimme der Speicherung (Tracking) meiner Fahrstrecke zwecks wissenschaftlicher Auswertung und Berechnung der CO2-Einsparung zu!"));
+			Assert.That(
+				viewModel.InfoEntry1,
+				Is.EqualTo("Ich stimme der Speicherung (Tracking) meiner Fahrstrecke zwecks wissenschaftlicher Auswertung und Berechnung der CO2-Einsparung zu!"));
 
-            Assert.That(
-                viewModel.InfoEntry2,
-                Is.Empty);
-        }
-    }
+			Assert.That(
+				viewModel.InfoEntry2,
+				Is.Empty);
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/BikesAtStation/TestBikesAtStationPageViewModel.cs b/TestShareeLib/ViewModel/BikesAtStation/TestBikesAtStationPageViewModel.cs
index 6e33dfe..6e48cc1 100644
--- a/TestShareeLib/ViewModel/BikesAtStation/TestBikesAtStationPageViewModel.cs
+++ b/TestShareeLib/ViewModel/BikesAtStation/TestBikesAtStationPageViewModel.cs
@@ -31,1267 +31,1267 @@ using static TINK.Repository.CopriCallsMemory;
 
 namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 {
-    [TestFixture]
-    public class TestBikesAtStationPageViewModel
-    {
-        [Test]
-        public async Task TestConstruct_Droid_NotLoggedIn()
-        {
-            var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(new TINK.Model.User.Account.Account("", null, false, null, new List<string>())),
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
-                merchantId: "MyMerchId",
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: null,
-                locationServicesContainer: geolocation,
-                locksService: locksService, // Cipher
-                device: new DeviceMock(), // Permissions
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var bikesAtStation = new BikesAtStationPageViewModel(
-                tinkApp.ActiveUser,
-                permissions,
-                bluetooth,
-                Device.Android,
-                new TINK.Model.Station.Station("FR103", new List<string>(), null), // Was station id 103 before switching from data provider CopriCallsMemory(SampleSets.ShareeFr01_Set1, 1, ...) 
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                geolocation.Active, // geolocation
-                locksService,
-                tinkApp.Polling,
-                (url) => { },
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService);
-
-            await bikesAtStation.OnAppearing();
-
-            Assert.IsEmpty(bikesAtStation.StatusInfoText);
-
-            // Verify list of bikes
-            Assert.AreEqual(2, bikesAtStation.Count);
-            Assert.IsTrue(bikesAtStation.IsIdle);
-            Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            var bikeFR9999 = bikesAtStation.FirstOrDefault(x => x.Id == "FR9999") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel; // Was id 1315
-            var bikeFR9998 = bikesAtStation.FirstOrDefault(x => x.Id == "FR9998") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel; // Was id 1543
-
-            Assert.That(
-                bikeFR9999,
-                Is.Not.Null);
-
-            Assert.That(
-                bikeFR9998,
-                Is.Not.Null);
-
-            Assert.AreEqual("Available.", bikeFR9999.StateText);
-            Assert.AreEqual("Available.", bikeFR9998.StateText);
-            Assert.AreEqual("NotLoggedIn", bikeFR9999.LockitButtonText);
-            Assert.AreEqual("NotLoggedIn", bikeFR9998.LockitButtonText);
-
-            // Login hint/ no bikes frame
-            Assert.IsTrue(bikesAtStation.IsLoginRequiredHintVisible);
-            Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
-            Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
-        }
-
-        [Test]
-        public async Task TestConstruct_Droid_NoBikes()
-        {
-            var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            const string MERCH_ID = "MyMerchId";
-
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
-                merchantId: "MyMerchId",
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: null,
-                locationServicesContainer: geolocation,
-                locksService: locksService, // Cipher
-                device: new DeviceMock(), // Permissions,
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var bikesAtStation = new BikesAtStationPageViewModel(
-                tinkApp.ActiveUser,
-                permissions,
-                bluetooth,
-                Device.Android,
-                new TINK.Model.Station.Station("102", new List<string>(), null), // Station 102
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                geolocation.Active, // geolocation
-                locksService,
-                tinkApp.Polling,
-                (url) => { },
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService);
-
-            await bikesAtStation.OnAppearing();
-
-            Assert.IsEmpty(bikesAtStation.StatusInfoText);
-
-            // Verify list of bikes
-            Assert.AreEqual(0, bikesAtStation.Count);
-            Assert.IsTrue(bikesAtStation.IsIdle);
-            Assert.IsFalse(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            // Login hint/ no bikes frame
-            Assert.IsFalse(bikesAtStation.IsLoginRequiredHintVisible);
-            Assert.IsTrue(bikesAtStation.IsNoBikesAtStationVisible);
-            Assert.AreEqual("Momentan sind keine Fahrräder an dieser Station verfügbar.", bikesAtStation.NoBikesAtStationText);
-        }
-
-        [Test]
-        public async Task TestConstruct_Droid()
-        {
-            var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            // Fake location permissions to be set
-            permissions.CheckStatusAsync().Returns(Task.FromResult(Status.Granted));
-            geolocation.Active.IsGeolcationEnabled.Returns(true); // Fake gps to be on
-            bluetooth.State.Returns(BluetoothState.On); // Fake bluetooth to be on
-
-            // Fake bluetooth answer for locks with id 2200545 and 2200537.
-            locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(
-                new List<LockInfoTdo> {
-                    { new LockInfoTdo.Builder { Id = 2200545, State = LockitLockingState.Open }.Build() },
-                    { new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
-                    }
-                );
-
-            const string MERCH_ID = "MyMerchId";
-
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
-                merchantId: MERCH_ID, // Instance geolocation mocks both parts
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: null,
-                locationServicesContainer: geolocation,
-                locksService: locksService, // Cipher
-                device: new DeviceMock(), // Permissions,
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var bikesAtStation = new BikesAtStationPageViewModel(
-                tinkApp.ActiveUser,
-                permissions,
-                bluetooth,
-                Device.Android,
-                new TINK.Model.Station.Station("103", new List<string>(), null), // Station 103
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                geolocation.Active, // geolocation
-                locksService,
-                tinkApp.Polling,
-                (url) => { },
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService);
-
-            await bikesAtStation.OnAppearing();
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                permissions.CheckStatusAsync();
-                var glDummy = geolocation.Active.Received().IsGeolcationEnabled;
-                var btDummy = bluetooth.Received().State;
-                locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>());
-            });
-
-            Assert.IsEmpty(bikesAtStation.StatusInfoText);
-
-            // Verify list of bikes
-            Assert.AreEqual(4, bikesAtStation.Count);
-            Assert.IsTrue(bikesAtStation.IsIdle);
-            Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            var bike1545 = bikesAtStation.FirstOrDefault(x => x.Id == "1545") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            var bike1537 = bikesAtStation.FirstOrDefault(x => x.Id == "1537") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            var bike1315 = bikesAtStation.FirstOrDefault(x => x.Id == "1315") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            var bike1543 = bikesAtStation.FirstOrDefault(x => x.Id == "1543") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-
-            Assert.That(
-                bike1545,
-                Is.Not.Null);
-
-            Assert.That(
-                bike1537,
-                Is.Not.Null);
-
-            Assert.That(
-                bike1315,
-                Is.Not.Null);
-
-            Assert.That(
-                bike1543,
-                Is.Not.Null);
-
-            Assert.AreEqual($"Rented since {DateTime.Parse("2020-11-06 17:53:22.784681+01"):dd. MMMM HH:mm}.", bike1545.StateText);
-            Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
-            Assert.AreEqual("Available.", bike1315.StateText);
-            Assert.AreEqual("Available.", bike1543.StateText);
-            Assert.AreEqual("Close lock", bike1545.LockitButtonText);
-            Assert.AreEqual("Open lock", bike1537.LockitButtonText);
-            Assert.AreEqual("DisposableDisconnected", bike1315.LockitButtonText);
-            Assert.AreEqual("DisposableDisconnected", bike1543.LockitButtonText);
-
-            // Login hint/ no bikes frame
-            Assert.IsFalse(bikesAtStation.IsLoginRequiredHintVisible);
-            Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
-            Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
-        }
-
-        [Test]
-        public async Task TestConstruct_Droid_NoPermissions_OpenSettings()
-        {
-            var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            // Fake location permissions not to be set
-            permissions.CheckStatusAsync().Returns(Task.FromResult(Status.Denied));
-
-            // Fake anwser on question whether to open permissions dialog
-            viewService.DisplayAlert(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>()).Returns(true);
-
-            // Fake bluetooth answer for locks with id 2200545 and 2200537.
-            locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(
-                new List<LockInfoTdo> {
-                    { new LockInfoTdo.Builder { Id = 2200545, State = LockitLockingState.Open }.Build() },
-                    { new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
-                    }
-                );
-
-            bluetooth.State.Returns(BluetoothState.On);
-
-            const string MERCH_ID = "MyMerchId";
-
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
-                merchantId: MERCH_ID,
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: null,
-                locationServicesContainer: geolocation,
-                locksService: locksService, // Cipher
-                device: new DeviceMock(), // Permissions,
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var bikesAtStation = new BikesAtStationPageViewModel(
-                tinkApp.ActiveUser,
-                permissions,
-                bluetooth,
-                Device.Android,
-                new TINK.Model.Station.Station("103", new List<string>(), null), // Station 103
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                geolocation.Active, // geolocation
-                locksService,
-                tinkApp.Polling,
-                (url) => { },
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService);
-
-            await bikesAtStation.OnAppearing();
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                permissions.CheckStatusAsync();
-                var glDummy = geolocation.Active.Received().IsGeolcationEnabled;
-                permissions.RequestAsync(); // Ask user from permissions.
-                viewService.DisplayAlert(
-                    "Hint",
-                    "Please allow location sharing so that bike lock/locks can be managed.\r\nOpen sharing dialog?",
-                    "Yes",
-                    "No");
-                permissions.OpenAppSettings();
-            });
-
-            Assert.IsEmpty(bikesAtStation.StatusInfoText);
-
-            // Verify list of bikes
-            Assert.AreEqual(4, bikesAtStation.Count);
-            Assert.IsTrue(bikesAtStation.IsIdle);
-            Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            var bike1545 = bikesAtStation.FirstOrDefault(x => x.Id == "1545") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            var bike1537 = bikesAtStation.FirstOrDefault(x => x.Id == "1537") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            var bike1315 = bikesAtStation.FirstOrDefault(x => x.Id == "1315") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            var bike1543 = bikesAtStation.FirstOrDefault(x => x.Id == "1543") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-
-            Assert.That(
-                bike1545,
-                Is.Not.Null);
-
-            Assert.That(
-                bike1537,
-                Is.Not.Null);
-
-            Assert.That(
-                bike1315,
-                Is.Not.Null);
-
-            Assert.That(
-                bike1543,
-                Is.Not.Null);
-
-            Assert.AreEqual($"Rented since {DateTime.Parse("2020-11-06 17:53:22.784681+01"):dd. MMMM HH:mm}.", bike1545.StateText);
-            Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
-            Assert.AreEqual("Available.", bike1315.StateText);
-            Assert.AreEqual("Available.", bike1543.StateText);
-            Assert.AreEqual("Search lock", bike1545.LockitButtonText);
-            Assert.AreEqual("Search lock", bike1537.LockitButtonText);
-            Assert.AreEqual("DisposableDisconnected", bike1315.LockitButtonText);
-            Assert.AreEqual("DisposableDisconnected", bike1543.LockitButtonText);
-
-            // Login hint/ no bikes frame
-            Assert.IsFalse(bikesAtStation.IsLoginRequiredHintVisible);
-            Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
-            Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
-        }
-
-        [Test]
-        public async Task TestConstruct_Droid_NoPermissions()
-        {
-            var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            // Fake location permissions not to be set
-            permissions.CheckStatusAsync().Returns(Task.FromResult(Status.Denied));
-            permissions.OpenAppSettings().Throws<Exception>(); // Ensures that method is not called and fixture succeeds.
-
-            // Fake anwser on question whether to open permissions dialog
-            viewService.DisplayAlert(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>()).Returns(false);
-
-            // Fake bluetooth answer for locks with id 2200545 and 2200537.
-            locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(
-                new List<LockInfoTdo> {
-                    { new LockInfoTdo.Builder { Id = 2200545, State = LockitLockingState.Open }.Build() },
-                    { new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
-                    }
-                );
-            const string MERCH_ID = "MyMerchId";
-
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
-                merchantId: MERCH_ID,
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: null,
-                locationServicesContainer: geolocation,
-                locksService: locksService, // Cipher
-                device: new DeviceMock(), // Permissions,
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var bikesAtStation = new BikesAtStationPageViewModel(
-                tinkApp.ActiveUser,
-                permissions,
-                bluetooth,
-                Device.Android,
-                new TINK.Model.Station.Station("103", new List<string>(), null), // Station 103
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                geolocation.Active, // geolocation
-                locksService,
-                tinkApp.Polling,
-                (url) => { },
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService);
-
-            await bikesAtStation.OnAppearing();
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                permissions.CheckStatusAsync();
-                var glDummy = geolocation.Active.Received().IsGeolcationEnabled;
-                permissions.RequestAsync(); // Ask user from permissions.
-                viewService.DisplayAlert(
-                    "Hint",
-                    "Please allow location sharing so that bike lock/locks can be managed.\r\nOpen sharing dialog?",
-                    "Yes",
-                    "No");
-            });
-
-            Assert.IsEmpty(bikesAtStation.StatusInfoText);
-
-            // Verify list of bikes
-            Assert.AreEqual(4, bikesAtStation.Count);
-            Assert.IsTrue(bikesAtStation.IsIdle);
-            Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            var bike1545 = bikesAtStation.FirstOrDefault(x => x.Id == "1545") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            var bike1537 = bikesAtStation.FirstOrDefault(x => x.Id == "1537") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            var bike1315 = bikesAtStation.FirstOrDefault(x => x.Id == "1315") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            var bike1543 = bikesAtStation.FirstOrDefault(x => x.Id == "1543") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-
-            Assert.That(
-                bike1545,
-                Is.Not.Null);
-
-            Assert.That(
-                bike1537,
-                Is.Not.Null);
-
-            Assert.That(
-                bike1315,
-                Is.Not.Null);
-
-            Assert.That(
-                bike1543,
-                Is.Not.Null);
-
-            Assert.AreEqual($"Rented since {DateTime.Parse("2020-11-06 17:53:22.784681+01"):dd. MMMM HH:mm}.", bike1545.StateText);
-            Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
-            Assert.AreEqual("Available.", bike1315.StateText);
-            Assert.AreEqual("Available.", bike1543.StateText);
-            Assert.AreEqual("Search lock", bike1545.LockitButtonText);
-            Assert.AreEqual("Search lock", bike1537.LockitButtonText);
-            Assert.AreEqual("DisposableDisconnected", bike1315.LockitButtonText);
-            Assert.AreEqual("DisposableDisconnected", bike1543.LockitButtonText);
-
-            // Login hint/ no bikes frame
-            Assert.IsFalse(bikesAtStation.IsLoginRequiredHintVisible);
-            Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
-            Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
-        }
-
-        [Test]
-        public async Task TestConstruct_Droid_GeolocationOff()
-        {
-            var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            // Fake location permissions to be set
-            permissions.CheckStatusAsync().Returns(Task.FromResult(Status.Granted));
-            geolocation.Active.IsGeolcationEnabled.Returns(false); // Fake gps to be off
-            bluetooth.State.Returns(BluetoothState.On); // Fake bluetooth to be on
-
-            // Fake bluetooth answer for locks with id 2200545 and 2200537.
-            locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(
-                new List<LockInfoTdo> {
-                    { new LockInfoTdo.Builder { Id = 2200545, State = LockitLockingState.Open }.Build() },
-                    { new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
-                    }
-                );
-            const string MERCH_ID = "MyMerchId";
-
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
-                merchantId: MERCH_ID,
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: null,
-                locationServicesContainer: geolocation,
-                locksService: locksService, // Cipher
-                device: new DeviceMock(), // Permissions,
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var bikesAtStation = new BikesAtStationPageViewModel(
-                tinkApp.ActiveUser,
-                permissions,
-                bluetooth,
-                Device.Android,
-                new TINK.Model.Station.Station("103", new List<string>(), null), // Station 103
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                geolocation.Active, // geolocation
-                locksService,
-                tinkApp.Polling,
-                (url) => { },
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService);
-
-            await bikesAtStation.OnAppearing();
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                permissions.CheckStatusAsync();
-                var glDummy = geolocation.Active.Received().IsGeolcationEnabled;
-                viewService.DisplayAlert(
-                        "Hint",
-                        "Please activate location so that bike lock can be found!",
-                        "OK");
-            });
-
-            Assert.IsEmpty(bikesAtStation.StatusInfoText);
-
-            // Verify list of bikes
-            Assert.AreEqual(4, bikesAtStation.Count);
-            Assert.IsTrue(bikesAtStation.IsIdle);
-            Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            var bike1545 = bikesAtStation.FirstOrDefault(x => x.Id == "1545") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            var bike1537 = bikesAtStation.FirstOrDefault(x => x.Id == "1537") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            var bike1315 = bikesAtStation.FirstOrDefault(x => x.Id == "1315") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            var bike1543 = bikesAtStation.FirstOrDefault(x => x.Id == "1543") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-
-            Assert.That(
-                bike1545,
-                Is.Not.Null);
-
-            Assert.That(
-                bike1537,
-                Is.Not.Null);
-
-            Assert.That(
-                bike1315,
-                Is.Not.Null);
-
-            Assert.That(
-                bike1543,
-                Is.Not.Null);
-
-            Assert.AreEqual($"Rented since {DateTime.Parse("2020-11-06 17:53:22.784681+01"):dd. MMMM HH:mm}.", bike1545.StateText);
-            Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
-            Assert.AreEqual("Available.", bike1315.StateText);
-            Assert.AreEqual("Available.", bike1543.StateText);
-            Assert.AreEqual("Search lock", bike1545.LockitButtonText);
-            Assert.AreEqual("Search lock", bike1537.LockitButtonText);
-            Assert.AreEqual("DisposableDisconnected", bike1315.LockitButtonText);
-            Assert.AreEqual("DisposableDisconnected", bike1543.LockitButtonText);
-
-            // Login hint/ no bikes frame
-            Assert.IsFalse(bikesAtStation.IsLoginRequiredHintVisible);
-            Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
-            Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
-        }
-
-        [Test]
-        public async Task TestConstruct_Droid_BluetoothOff()
-        {
-            var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            // Fake location permissions to be set
-            permissions.CheckStatusAsync().Returns(Task.FromResult(Status.Granted));
-            geolocation.Active.IsGeolcationEnabled.Returns(true); // Fake gps to be on
-            bluetooth.State.Returns(BluetoothState.Off); //  // Fake bluetooth to be off
-
-            // Fake bluetooth answer for locks with id 2200545 and 2200537.
-            locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(
-                new List<LockInfoTdo> {
-                    { new LockInfoTdo.Builder { Id = 2200545, State = LockitLockingState.Open }.Build() },
-                    { new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
-                    }
-                );
-            const string MERCH_ID = "MyMerchId";
-
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
-                merchantId: MERCH_ID,
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: null,
-                locationServicesContainer: geolocation,
-                locksService: locksService, // Cipher
-                device: new DeviceMock(), // Permissions,
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var bikesAtStation = new BikesAtStationPageViewModel(
-                tinkApp.ActiveUser,
-                permissions,
-                bluetooth,
-                Device.Android,
-                new TINK.Model.Station.Station("103", new List<string>(), null), // Station 103
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                geolocation.Active, // geolocation
-                locksService,
-                tinkApp.Polling,
-                (url) => { },
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService);
-
-            await bikesAtStation.OnAppearing();
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                permissions.CheckStatusAsync();
-                var glDummy = geolocation.Active.Received().IsGeolcationEnabled;
-                var btDummy = bluetooth.Received().State;
-                viewService.DisplayAlert(
-                        "Hint",
-                        "Please enable Bluetooth to manage bike lock/locks.",
-                        "OK");
-            });
-
-            Assert.IsEmpty(bikesAtStation.StatusInfoText);
-
-            // Verify list of bikes
-            Assert.AreEqual(4, bikesAtStation.Count);
-            Assert.IsTrue(bikesAtStation.IsIdle);
-            Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            var bike1545 = bikesAtStation.FirstOrDefault(x => x.Id == "1545") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            var bike1537 = bikesAtStation.FirstOrDefault(x => x.Id == "1537") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            var bike1315 = bikesAtStation.FirstOrDefault(x => x.Id == "1315") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            var bike1543 = bikesAtStation.FirstOrDefault(x => x.Id == "1543") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-
-            Assert.That(
-                bike1545,
-                Is.Not.Null);
-
-            Assert.That(
-                bike1537,
-                Is.Not.Null);
-
-            Assert.That(
-                bike1315,
-                Is.Not.Null);
-
-            Assert.That(
-                bike1543,
-                Is.Not.Null);
-
-            Assert.AreEqual($"Rented since {DateTime.Parse("2020-11-06 17:53:22.784681+01"):dd. MMMM HH:mm}.", bike1545.StateText);
-            Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
-            Assert.AreEqual("Available.", bike1315.StateText);
-            Assert.AreEqual("Available.", bike1543.StateText);
-            Assert.AreEqual("Search lock", bike1545.LockitButtonText);
-            Assert.AreEqual("Search lock", bike1537.LockitButtonText);
-            Assert.AreEqual("DisposableDisconnected", bike1315.LockitButtonText);
-            Assert.AreEqual("DisposableDisconnected", bike1543.LockitButtonText);
-
-            // Login hint/ no bikes frame
-            Assert.IsFalse(bikesAtStation.IsLoginRequiredHintVisible);
-            Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
-            Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
-        }
-
-        [Test]
-        public async Task TestConstructKonrad()
-        {
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            bluetooth.State.Returns(BluetoothState.On);
-
-            locksService.TimeOut.Returns(timeOut);
-            timeOut.MultiConnect.Returns(new TimeSpan(0));
-
-            const string MERCH_ID = "MyMerchId";
-
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(),
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
-                merchantId: MERCH_ID,
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: locksService, // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var bikesAtStation = new BikesAtStationPageViewModel(
-                tinkApp.ActiveUser,
-                permissions,
-                bluetooth,
-                Device.iOS,
-                new TINK.Model.Station.Station("FR101", new List<string>(), null), // Was 31 before switching CopriCallsMemory(SampleSets.Set2, 1, ...)
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                new GeolocationMock(),
-                locksService,
-                tinkApp.Polling,
-                (url) => { },
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService);
-
-            await bikesAtStation.OnAppearing();
-
-            Assert.IsTrue(new List<string> { "Updating...", string.Empty }.Contains(bikesAtStation.StatusInfoText));
-
-            // Verify list of bikes
-            Assert.AreEqual(3, bikesAtStation.Count); // Was 1 before switch.
-            Assert.IsTrue(bikesAtStation.IsIdle);
-            Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR1003").StateText); // Was 52 before switch.
-            Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR1002").StateText);
-            Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR1001").StateText);
-
-            // Login hint/ no bikes frame
-            Assert.IsTrue(bikesAtStation.IsLoginRequiredHintVisible);
-            Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
-            Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
-        }
-
-
-        [Test]
-        public async Task TestConstructKonrad_NoBikes()
-        {
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            bluetooth.State.Returns(BluetoothState.On);
-
-            locksService.TimeOut.Returns(timeOut);
-            timeOut.MultiConnect.Returns(new TimeSpan(0));
-
-            const string MERCH_ID = "MyMerchId";
-
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(),
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.Set2, 1, sessionCookie)),
-                merchantId: "MyMerchId",
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: locksService, // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var bikesAtStation = new BikesAtStationPageViewModel(
-                tinkApp.ActiveUser,
-                permissions,
-                bluetooth,
-                Device.iOS,
-                new TINK.Model.Station.Station("4", new List<string>(), null),
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                new GeolocationMock(),
-                locksService,
-                tinkApp.Polling,
-                (url) => { },
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService);
-
-            await bikesAtStation.OnAppearing();
-
-            Assert.IsTrue(new List<string> { "Updating...", string.Empty }.Contains(bikesAtStation.StatusInfoText));
-
-            // Verify list of bikes
-            Assert.AreEqual(0, bikesAtStation.Count);
-            Assert.IsTrue(bikesAtStation.IsIdle);
-            Assert.IsFalse(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            // Login hint/ no bikes frame
-            Assert.IsFalse(bikesAtStation.IsLoginRequiredHintVisible);
-            Assert.IsTrue(bikesAtStation.IsNoBikesAtStationVisible);
-            Assert.AreEqual("Momentan sind keine Fahrräder an dieser Station verfügbar.", bikesAtStation.NoBikesAtStationText);
-        }
-
-        [Test]
-        public async Task TestConstruct_LoggedIn()
-        {
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            bluetooth.State.Returns(BluetoothState.On);
-
-            locksService.TimeOut.Returns(timeOut);
-            timeOut.MultiConnect.Returns(new TimeSpan(0));
-
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: locksService.GetType().FullName),
-                    new StoreMock(new TINK.Model.User.Account.Account(
-                    LoginSessionCopriInfo.JavaministerHardwareNr1.Mail,
-                    LoginSessionCopriInfo.JavaministerHardwareNr1.Pwd,
-                    false,
-                    "6103_112e96b36ba33de245943c5ffaf369cd_", // Was 4da3044c8657a04ba60e2eaa753bc51a before switching from data provider CopriCallsMemory(SampleSets.Set2, 1, ...) 
-                    new List<string> { FilterHelper.CARGOBIKE })),
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
-                merchantId: "MyMerchId",
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: locksService, // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var bikesAtStation = new BikesAtStationPageViewModel(
-                tinkApp.ActiveUser,
-                permissions,
-                bluetooth,
-                Device.iOS,
-                new TINK.Model.Station.Station("FR103", new List<string>(), null), // Was station id 4 before switching from data provider CopriCallsMemory(SampleSets.Set2, 1, ...) 
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                new GeolocationMock(),
-                locksService,
-                tinkApp.Polling,
-                (url) => { },
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService);
-
-            await bikesAtStation.OnAppearing();
-
-            Assert.IsTrue(new List<string> { "Updating...", string.Empty }.Contains(bikesAtStation.StatusInfoText));
-
-            // Verify list of bikes
-            Assert.AreEqual(4, bikesAtStation.Count); // Count of bikes was 4 before switching from data provider CopriCallsMemory(SampleSets.Set2, 1, ...)
-            Assert.IsTrue(bikesAtStation.IsIdle);
-            Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR9999").StateText);
-            Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR9999").StateText);
-            Assert.AreEqual("Max. reservation time of 15 min. expired.", bikesAtStation.FirstOrDefault(x => x.Id == "FR1004").StateText);
-            Assert.AreEqual($"Rented since {DateTime.Parse("2021-11-06 18:57:25.445447+01"):dd. MMMM HH:mm}.", bikesAtStation.FirstOrDefault(x => x.Id == "FR1544").StateText); // Was 7
-
-            // Login hint/ no bikes frame
-            Assert.IsFalse(bikesAtStation.IsLoginRequiredHintVisible);
-            Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
-            Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
-        }
-
-        [Test]
-        public async Task TestConstruct_Offline()
-        {
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            bluetooth.State.Returns(BluetoothState.On);
-
-            locksService.TimeOut.Returns(timeOut);
-            timeOut.MultiConnect.Returns(new TimeSpan(0));
-
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(),
-                                                isConnectedFunc: () => false,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
-                merchantId: "MyMerchId",
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: locksService, // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null, // Not connected.
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var bikesAtStation = new BikesAtStationPageViewModel(
-                tinkApp.ActiveUser,
-                permissions,
-                bluetooth,
-                Device.iOS,
-                new TINK.Model.Station.Station("FR103", new List<string>(), null), // Was station id 4 before switching from data provider CopriCallsMemory(SampleSets.Set2, 1
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                new GeolocationMock(),
-                locksService,
-                tinkApp.Polling,
-                (url) => { },
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService);
-
-            await bikesAtStation.OnAppearing();
-
-            Assert.AreEqual("Offline.", bikesAtStation.StatusInfoText);
-
-            // Verify list of bikes
-            Assert.AreEqual(2, bikesAtStation.Count); // Count of bikes was 3. There is no more bike with id 26.
-            Assert.IsTrue(bikesAtStation.IsIdle);
-            Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR9999").StateText); // Was id 5
-            Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR9998").StateText); // Was is 14
-
-            // Login hint/ no bikes frame
-            Assert.IsTrue(bikesAtStation.IsLoginRequiredHintVisible);
-            Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
-            Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
-        }
-
-        [Test]
-        public async Task TestConstruct_WebConnectCommunicationError()
-        {
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            bluetooth.State.Returns(BluetoothState.On);
-
-            locksService.TimeOut.Returns(timeOut);
-            timeOut.MultiConnect.Returns(new TimeSpan(0));
-
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(),
-                                                isConnectedFunc: () => false,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new TINK.Model.Connector.Connector(
-                        uri,
-                        new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                        null /*UI language */,
-                        sessionCookie,
-                        mail,
-                        server: new CopriProviderHttps(
-                            uri,
-                            TinkApp.MerchantId,
-                            new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                            null /*UI language */,
-                            sessionCookie: sessionCookie,
-                            cacheServer: new CopriCallsCacheMemory001(sessionCookie: sessionCookie),
-                            httpsServer: new ExceptionServer((msg) => new WebConnectFailureException(msg, new Exception("Source expection."))))),
-                merchantId: "MyMerchId",
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: locksService, // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null, // Not connected.
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var bikesAtStation = new BikesAtStationPageViewModel(
-                tinkApp.ActiveUser,
-                permissions,
-                bluetooth,
-                Device.iOS,
-                new TINK.Model.Station.Station("FR103", new List<string>(), null), // Was station id 4 before switching from data provider CopriCallsCacheMemory()
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                new GeolocationMock(),
-                locksService,
-                tinkApp.Polling,
-                (url) => { },
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService)
-            {
-                IsReportLevelVerbose = true
-            };
-
-            await bikesAtStation.OnAppearing();
-
-            Assert.AreEqual("Connection interrupted, server unreachable.", bikesAtStation.StatusInfoText);
-
-            // Verify list of bikes
-            Assert.AreEqual(2, bikesAtStation.Count); // Count of bikes was 3. There is no more bike with id 26.
-            Assert.IsTrue(bikesAtStation.IsIdle);
-            Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR9999").StateText); // Was id 5
-            Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR9998").StateText); // Was is 14
-
-            // Login hint/ no bikes frame
-            Assert.IsTrue(bikesAtStation.IsLoginRequiredHintVisible);
-            Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
-            Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
-        }
-
-        [Test]
-        public async Task TestTinkApp_GeneralPurposeError()
-        {
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            bluetooth.State.Returns(BluetoothState.On);
-
-            locksService.TimeOut.Returns(timeOut);
-            timeOut.MultiConnect.Returns(new TimeSpan(0));
-
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000),
-                    true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(),
-                isConnectedFunc: () => false,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new TINK.Model.Connector.Connector(
-                    uri,
-                    new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                    null /*UI language */,
-                    sessionCookie,
-                    mail,
-                    server: new CopriProviderHttps(
-                        uri,
-                        TinkApp.MerchantId,
-                        new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                        null /*UI language */,
-                        sessionCookie: sessionCookie,
-                        cacheServer: new CopriCallsCacheMemory001(sessionCookie: sessionCookie),
-                        httpsServer: new ExceptionServer((msg) => new Exception(msg)))),
-                merchantId: "MyMerchId",
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: locksService, // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null, // Not connected.
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var bikesAtStation = new BikesAtStationPageViewModel(
-                tinkApp.ActiveUser,
-                permissions,
-                bluetooth,
-                Device.iOS,
-                new TINK.Model.Station.Station("FR103", new List<string>(), null), // Was station id 4 before switching from data provider CopriCallsCacheMemory()
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                new GeolocationMock(),
-                locksService,
-                tinkApp.Polling,
-                (url) => { },
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService)
-            {
-                IsReportLevelVerbose = true
-            };
-
-            await bikesAtStation.OnAppearing();
-
-            Assert.AreEqual("Connection interrupted.", bikesAtStation.StatusInfoText);
-
-            // Verify list of bikes
-            Assert.AreEqual(2, bikesAtStation.Count); // Count of bikes was 3. There is no more bike with id 26.
-            Assert.IsTrue(bikesAtStation.IsIdle);
-            Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR9999").StateText);  // Was id 5
-            Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR9998").StateText);  // Was id 14.
-
-            // Login hint/ no bikes frame
-            Assert.IsTrue(bikesAtStation.IsLoginRequiredHintVisible);
-            Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
-            Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
-        }
-    }
+	[TestFixture]
+	public class TestBikesAtStationPageViewModel
+	{
+		[Test]
+		public async Task TestConstruct_Droid_NotLoggedIn()
+		{
+			var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(new TINK.Model.User.Account.Account("", null, false, null, new List<string>())),
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
+				merchantId: "MyMerchId",
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: null,
+				locationServicesContainer: geolocation,
+				locksService: locksService, // Cipher
+				device: new DeviceMock(), // Permissions
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var bikesAtStation = new BikesAtStationPageViewModel(
+				tinkApp.ActiveUser,
+				permissions,
+				bluetooth,
+				Device.Android,
+				new TINK.Model.Station.Station("FR103", new List<string>(), null), // Was station id 103 before switching from data provider CopriCallsMemory(SampleSets.ShareeFr01_Set1, 1, ...) 
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				geolocation.Active, // geolocation
+				locksService,
+				tinkApp.Polling,
+				(url) => { },
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService);
+
+			await bikesAtStation.OnAppearing();
+
+			Assert.IsEmpty(bikesAtStation.StatusInfoText);
+
+			// Verify list of bikes
+			Assert.AreEqual(2, bikesAtStation.Count);
+			Assert.IsTrue(bikesAtStation.IsIdle);
+			Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			var bikeFR9999 = bikesAtStation.FirstOrDefault(x => x.Id == "FR9999") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel; // Was id 1315
+			var bikeFR9998 = bikesAtStation.FirstOrDefault(x => x.Id == "FR9998") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel; // Was id 1543
+
+			Assert.That(
+				bikeFR9999,
+				Is.Not.Null);
+
+			Assert.That(
+				bikeFR9998,
+				Is.Not.Null);
+
+			Assert.AreEqual("Available.", bikeFR9999.StateText);
+			Assert.AreEqual("Available.", bikeFR9998.StateText);
+			Assert.AreEqual("NotLoggedIn", bikeFR9999.LockitButtonText);
+			Assert.AreEqual("NotLoggedIn", bikeFR9998.LockitButtonText);
+
+			// Login hint/ no bikes frame
+			Assert.IsTrue(bikesAtStation.IsLoginRequiredHintVisible);
+			Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
+			Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
+		}
+
+		[Test]
+		public async Task TestConstruct_Droid_NoBikes()
+		{
+			var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			const string MERCH_ID = "MyMerchId";
+
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
+				merchantId: "MyMerchId",
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: null,
+				locationServicesContainer: geolocation,
+				locksService: locksService, // Cipher
+				device: new DeviceMock(), // Permissions,
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var bikesAtStation = new BikesAtStationPageViewModel(
+				tinkApp.ActiveUser,
+				permissions,
+				bluetooth,
+				Device.Android,
+				new TINK.Model.Station.Station("102", new List<string>(), null), // Station 102
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				geolocation.Active, // geolocation
+				locksService,
+				tinkApp.Polling,
+				(url) => { },
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService);
+
+			await bikesAtStation.OnAppearing();
+
+			Assert.IsEmpty(bikesAtStation.StatusInfoText);
+
+			// Verify list of bikes
+			Assert.AreEqual(0, bikesAtStation.Count);
+			Assert.IsTrue(bikesAtStation.IsIdle);
+			Assert.IsFalse(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			// Login hint/ no bikes frame
+			Assert.IsFalse(bikesAtStation.IsLoginRequiredHintVisible);
+			Assert.IsTrue(bikesAtStation.IsNoBikesAtStationVisible);
+			Assert.AreEqual("Momentan sind keine Fahrräder an dieser Station verfügbar.", bikesAtStation.NoBikesAtStationText);
+		}
+
+		[Test]
+		public async Task TestConstruct_Droid()
+		{
+			var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			// Fake location permissions to be set
+			permissions.CheckStatusAsync().Returns(Task.FromResult(Status.Granted));
+			geolocation.Active.IsGeolcationEnabled.Returns(true); // Fake gps to be on
+			bluetooth.State.Returns(BluetoothState.On); // Fake bluetooth to be on
+
+			// Fake bluetooth answer for locks with id 2200545 and 2200537.
+			locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(
+				new List<LockInfoTdo> {
+					{ new LockInfoTdo.Builder { Id = 2200545, State = LockitLockingState.Open }.Build() },
+					{ new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
+					}
+				);
+
+			const string MERCH_ID = "MyMerchId";
+
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
+				merchantId: MERCH_ID, // Instance geolocation mocks both parts
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: null,
+				locationServicesContainer: geolocation,
+				locksService: locksService, // Cipher
+				device: new DeviceMock(), // Permissions,
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var bikesAtStation = new BikesAtStationPageViewModel(
+				tinkApp.ActiveUser,
+				permissions,
+				bluetooth,
+				Device.Android,
+				new TINK.Model.Station.Station("103", new List<string>(), null), // Station 103
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				geolocation.Active, // geolocation
+				locksService,
+				tinkApp.Polling,
+				(url) => { },
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService);
+
+			await bikesAtStation.OnAppearing();
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				permissions.CheckStatusAsync();
+				var glDummy = geolocation.Active.Received().IsGeolcationEnabled;
+				var btDummy = bluetooth.Received().State;
+				locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>());
+			});
+
+			Assert.IsEmpty(bikesAtStation.StatusInfoText);
+
+			// Verify list of bikes
+			Assert.AreEqual(4, bikesAtStation.Count);
+			Assert.IsTrue(bikesAtStation.IsIdle);
+			Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			var bike1545 = bikesAtStation.FirstOrDefault(x => x.Id == "1545") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			var bike1537 = bikesAtStation.FirstOrDefault(x => x.Id == "1537") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			var bike1315 = bikesAtStation.FirstOrDefault(x => x.Id == "1315") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			var bike1543 = bikesAtStation.FirstOrDefault(x => x.Id == "1543") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+
+			Assert.That(
+				bike1545,
+				Is.Not.Null);
+
+			Assert.That(
+				bike1537,
+				Is.Not.Null);
+
+			Assert.That(
+				bike1315,
+				Is.Not.Null);
+
+			Assert.That(
+				bike1543,
+				Is.Not.Null);
+
+			Assert.AreEqual($"Rented since {DateTime.Parse("2020-11-06 17:53:22.784681+01"):dd. MMMM HH:mm}.", bike1545.StateText);
+			Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
+			Assert.AreEqual("Available.", bike1315.StateText);
+			Assert.AreEqual("Available.", bike1543.StateText);
+			Assert.AreEqual("Close lock", bike1545.LockitButtonText);
+			Assert.AreEqual("Open lock", bike1537.LockitButtonText);
+			Assert.AreEqual("DisposableDisconnected", bike1315.LockitButtonText);
+			Assert.AreEqual("DisposableDisconnected", bike1543.LockitButtonText);
+
+			// Login hint/ no bikes frame
+			Assert.IsFalse(bikesAtStation.IsLoginRequiredHintVisible);
+			Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
+			Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
+		}
+
+		[Test]
+		public async Task TestConstruct_Droid_NoPermissions_OpenSettings()
+		{
+			var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			// Fake location permissions not to be set
+			permissions.CheckStatusAsync().Returns(Task.FromResult(Status.Denied));
+
+			// Fake anwser on question whether to open permissions dialog
+			viewService.DisplayAlert(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>()).Returns(true);
+
+			// Fake bluetooth answer for locks with id 2200545 and 2200537.
+			locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(
+				new List<LockInfoTdo> {
+					{ new LockInfoTdo.Builder { Id = 2200545, State = LockitLockingState.Open }.Build() },
+					{ new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
+					}
+				);
+
+			bluetooth.State.Returns(BluetoothState.On);
+
+			const string MERCH_ID = "MyMerchId";
+
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
+				merchantId: MERCH_ID,
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: null,
+				locationServicesContainer: geolocation,
+				locksService: locksService, // Cipher
+				device: new DeviceMock(), // Permissions,
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var bikesAtStation = new BikesAtStationPageViewModel(
+				tinkApp.ActiveUser,
+				permissions,
+				bluetooth,
+				Device.Android,
+				new TINK.Model.Station.Station("103", new List<string>(), null), // Station 103
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				geolocation.Active, // geolocation
+				locksService,
+				tinkApp.Polling,
+				(url) => { },
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService);
+
+			await bikesAtStation.OnAppearing();
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				permissions.CheckStatusAsync();
+				var glDummy = geolocation.Active.Received().IsGeolcationEnabled;
+				permissions.RequestAsync(); // Ask user from permissions.
+				viewService.DisplayAlert(
+					"Hint",
+					"Please allow location sharing so that bike lock/locks can be managed.\r\nOpen sharing dialog?",
+					"Yes",
+					"No");
+				permissions.OpenAppSettings();
+			});
+
+			Assert.IsEmpty(bikesAtStation.StatusInfoText);
+
+			// Verify list of bikes
+			Assert.AreEqual(4, bikesAtStation.Count);
+			Assert.IsTrue(bikesAtStation.IsIdle);
+			Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			var bike1545 = bikesAtStation.FirstOrDefault(x => x.Id == "1545") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			var bike1537 = bikesAtStation.FirstOrDefault(x => x.Id == "1537") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			var bike1315 = bikesAtStation.FirstOrDefault(x => x.Id == "1315") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			var bike1543 = bikesAtStation.FirstOrDefault(x => x.Id == "1543") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+
+			Assert.That(
+				bike1545,
+				Is.Not.Null);
+
+			Assert.That(
+				bike1537,
+				Is.Not.Null);
+
+			Assert.That(
+				bike1315,
+				Is.Not.Null);
+
+			Assert.That(
+				bike1543,
+				Is.Not.Null);
+
+			Assert.AreEqual($"Rented since {DateTime.Parse("2020-11-06 17:53:22.784681+01"):dd. MMMM HH:mm}.", bike1545.StateText);
+			Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
+			Assert.AreEqual("Available.", bike1315.StateText);
+			Assert.AreEqual("Available.", bike1543.StateText);
+			Assert.AreEqual("Search lock", bike1545.LockitButtonText);
+			Assert.AreEqual("Search lock", bike1537.LockitButtonText);
+			Assert.AreEqual("DisposableDisconnected", bike1315.LockitButtonText);
+			Assert.AreEqual("DisposableDisconnected", bike1543.LockitButtonText);
+
+			// Login hint/ no bikes frame
+			Assert.IsFalse(bikesAtStation.IsLoginRequiredHintVisible);
+			Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
+			Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
+		}
+
+		[Test]
+		public async Task TestConstruct_Droid_NoPermissions()
+		{
+			var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			// Fake location permissions not to be set
+			permissions.CheckStatusAsync().Returns(Task.FromResult(Status.Denied));
+			permissions.OpenAppSettings().Throws<Exception>(); // Ensures that method is not called and fixture succeeds.
+
+			// Fake anwser on question whether to open permissions dialog
+			viewService.DisplayAlert(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>()).Returns(false);
+
+			// Fake bluetooth answer for locks with id 2200545 and 2200537.
+			locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(
+				new List<LockInfoTdo> {
+					{ new LockInfoTdo.Builder { Id = 2200545, State = LockitLockingState.Open }.Build() },
+					{ new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
+					}
+				);
+			const string MERCH_ID = "MyMerchId";
+
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
+				merchantId: MERCH_ID,
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: null,
+				locationServicesContainer: geolocation,
+				locksService: locksService, // Cipher
+				device: new DeviceMock(), // Permissions,
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var bikesAtStation = new BikesAtStationPageViewModel(
+				tinkApp.ActiveUser,
+				permissions,
+				bluetooth,
+				Device.Android,
+				new TINK.Model.Station.Station("103", new List<string>(), null), // Station 103
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				geolocation.Active, // geolocation
+				locksService,
+				tinkApp.Polling,
+				(url) => { },
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService);
+
+			await bikesAtStation.OnAppearing();
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				permissions.CheckStatusAsync();
+				var glDummy = geolocation.Active.Received().IsGeolcationEnabled;
+				permissions.RequestAsync(); // Ask user from permissions.
+				viewService.DisplayAlert(
+					"Hint",
+					"Please allow location sharing so that bike lock/locks can be managed.\r\nOpen sharing dialog?",
+					"Yes",
+					"No");
+			});
+
+			Assert.IsEmpty(bikesAtStation.StatusInfoText);
+
+			// Verify list of bikes
+			Assert.AreEqual(4, bikesAtStation.Count);
+			Assert.IsTrue(bikesAtStation.IsIdle);
+			Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			var bike1545 = bikesAtStation.FirstOrDefault(x => x.Id == "1545") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			var bike1537 = bikesAtStation.FirstOrDefault(x => x.Id == "1537") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			var bike1315 = bikesAtStation.FirstOrDefault(x => x.Id == "1315") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			var bike1543 = bikesAtStation.FirstOrDefault(x => x.Id == "1543") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+
+			Assert.That(
+				bike1545,
+				Is.Not.Null);
+
+			Assert.That(
+				bike1537,
+				Is.Not.Null);
+
+			Assert.That(
+				bike1315,
+				Is.Not.Null);
+
+			Assert.That(
+				bike1543,
+				Is.Not.Null);
+
+			Assert.AreEqual($"Rented since {DateTime.Parse("2020-11-06 17:53:22.784681+01"):dd. MMMM HH:mm}.", bike1545.StateText);
+			Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
+			Assert.AreEqual("Available.", bike1315.StateText);
+			Assert.AreEqual("Available.", bike1543.StateText);
+			Assert.AreEqual("Search lock", bike1545.LockitButtonText);
+			Assert.AreEqual("Search lock", bike1537.LockitButtonText);
+			Assert.AreEqual("DisposableDisconnected", bike1315.LockitButtonText);
+			Assert.AreEqual("DisposableDisconnected", bike1543.LockitButtonText);
+
+			// Login hint/ no bikes frame
+			Assert.IsFalse(bikesAtStation.IsLoginRequiredHintVisible);
+			Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
+			Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
+		}
+
+		[Test]
+		public async Task TestConstruct_Droid_GeolocationOff()
+		{
+			var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			// Fake location permissions to be set
+			permissions.CheckStatusAsync().Returns(Task.FromResult(Status.Granted));
+			geolocation.Active.IsGeolcationEnabled.Returns(false); // Fake gps to be off
+			bluetooth.State.Returns(BluetoothState.On); // Fake bluetooth to be on
+
+			// Fake bluetooth answer for locks with id 2200545 and 2200537.
+			locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(
+				new List<LockInfoTdo> {
+					{ new LockInfoTdo.Builder { Id = 2200545, State = LockitLockingState.Open }.Build() },
+					{ new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
+					}
+				);
+			const string MERCH_ID = "MyMerchId";
+
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
+				merchantId: MERCH_ID,
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: null,
+				locationServicesContainer: geolocation,
+				locksService: locksService, // Cipher
+				device: new DeviceMock(), // Permissions,
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var bikesAtStation = new BikesAtStationPageViewModel(
+				tinkApp.ActiveUser,
+				permissions,
+				bluetooth,
+				Device.Android,
+				new TINK.Model.Station.Station("103", new List<string>(), null), // Station 103
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				geolocation.Active, // geolocation
+				locksService,
+				tinkApp.Polling,
+				(url) => { },
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService);
+
+			await bikesAtStation.OnAppearing();
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				permissions.CheckStatusAsync();
+				var glDummy = geolocation.Active.Received().IsGeolcationEnabled;
+				viewService.DisplayAlert(
+						"Hint",
+						"Please activate location so that bike lock can be found!",
+						"OK");
+			});
+
+			Assert.IsEmpty(bikesAtStation.StatusInfoText);
+
+			// Verify list of bikes
+			Assert.AreEqual(4, bikesAtStation.Count);
+			Assert.IsTrue(bikesAtStation.IsIdle);
+			Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			var bike1545 = bikesAtStation.FirstOrDefault(x => x.Id == "1545") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			var bike1537 = bikesAtStation.FirstOrDefault(x => x.Id == "1537") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			var bike1315 = bikesAtStation.FirstOrDefault(x => x.Id == "1315") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			var bike1543 = bikesAtStation.FirstOrDefault(x => x.Id == "1543") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+
+			Assert.That(
+				bike1545,
+				Is.Not.Null);
+
+			Assert.That(
+				bike1537,
+				Is.Not.Null);
+
+			Assert.That(
+				bike1315,
+				Is.Not.Null);
+
+			Assert.That(
+				bike1543,
+				Is.Not.Null);
+
+			Assert.AreEqual($"Rented since {DateTime.Parse("2020-11-06 17:53:22.784681+01"):dd. MMMM HH:mm}.", bike1545.StateText);
+			Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
+			Assert.AreEqual("Available.", bike1315.StateText);
+			Assert.AreEqual("Available.", bike1543.StateText);
+			Assert.AreEqual("Search lock", bike1545.LockitButtonText);
+			Assert.AreEqual("Search lock", bike1537.LockitButtonText);
+			Assert.AreEqual("DisposableDisconnected", bike1315.LockitButtonText);
+			Assert.AreEqual("DisposableDisconnected", bike1543.LockitButtonText);
+
+			// Login hint/ no bikes frame
+			Assert.IsFalse(bikesAtStation.IsLoginRequiredHintVisible);
+			Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
+			Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
+		}
+
+		[Test]
+		public async Task TestConstruct_Droid_BluetoothOff()
+		{
+			var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			// Fake location permissions to be set
+			permissions.CheckStatusAsync().Returns(Task.FromResult(Status.Granted));
+			geolocation.Active.IsGeolcationEnabled.Returns(true); // Fake gps to be on
+			bluetooth.State.Returns(BluetoothState.Off); //  // Fake bluetooth to be off
+
+			// Fake bluetooth answer for locks with id 2200545 and 2200537.
+			locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(
+				new List<LockInfoTdo> {
+					{ new LockInfoTdo.Builder { Id = 2200545, State = LockitLockingState.Open }.Build() },
+					{ new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
+					}
+				);
+			const string MERCH_ID = "MyMerchId";
+
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
+				merchantId: MERCH_ID,
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: null,
+				locationServicesContainer: geolocation,
+				locksService: locksService, // Cipher
+				device: new DeviceMock(), // Permissions,
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var bikesAtStation = new BikesAtStationPageViewModel(
+				tinkApp.ActiveUser,
+				permissions,
+				bluetooth,
+				Device.Android,
+				new TINK.Model.Station.Station("103", new List<string>(), null), // Station 103
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				geolocation.Active, // geolocation
+				locksService,
+				tinkApp.Polling,
+				(url) => { },
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService);
+
+			await bikesAtStation.OnAppearing();
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				permissions.CheckStatusAsync();
+				var glDummy = geolocation.Active.Received().IsGeolcationEnabled;
+				var btDummy = bluetooth.Received().State;
+				viewService.DisplayAlert(
+						"Hint",
+						"Please enable Bluetooth to manage bike lock/locks.",
+						"OK");
+			});
+
+			Assert.IsEmpty(bikesAtStation.StatusInfoText);
+
+			// Verify list of bikes
+			Assert.AreEqual(4, bikesAtStation.Count);
+			Assert.IsTrue(bikesAtStation.IsIdle);
+			Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			var bike1545 = bikesAtStation.FirstOrDefault(x => x.Id == "1545") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			var bike1537 = bikesAtStation.FirstOrDefault(x => x.Id == "1537") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			var bike1315 = bikesAtStation.FirstOrDefault(x => x.Id == "1315") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			var bike1543 = bikesAtStation.FirstOrDefault(x => x.Id == "1543") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+
+			Assert.That(
+				bike1545,
+				Is.Not.Null);
+
+			Assert.That(
+				bike1537,
+				Is.Not.Null);
+
+			Assert.That(
+				bike1315,
+				Is.Not.Null);
+
+			Assert.That(
+				bike1543,
+				Is.Not.Null);
+
+			Assert.AreEqual($"Rented since {DateTime.Parse("2020-11-06 17:53:22.784681+01"):dd. MMMM HH:mm}.", bike1545.StateText);
+			Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
+			Assert.AreEqual("Available.", bike1315.StateText);
+			Assert.AreEqual("Available.", bike1543.StateText);
+			Assert.AreEqual("Search lock", bike1545.LockitButtonText);
+			Assert.AreEqual("Search lock", bike1537.LockitButtonText);
+			Assert.AreEqual("DisposableDisconnected", bike1315.LockitButtonText);
+			Assert.AreEqual("DisposableDisconnected", bike1543.LockitButtonText);
+
+			// Login hint/ no bikes frame
+			Assert.IsFalse(bikesAtStation.IsLoginRequiredHintVisible);
+			Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
+			Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
+		}
+
+		[Test]
+		public async Task TestConstructKonrad()
+		{
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			bluetooth.State.Returns(BluetoothState.On);
+
+			locksService.TimeOut.Returns(timeOut);
+			timeOut.MultiConnect.Returns(new TimeSpan(0));
+
+			const string MERCH_ID = "MyMerchId";
+
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(),
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
+				merchantId: MERCH_ID,
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: locksService, // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var bikesAtStation = new BikesAtStationPageViewModel(
+				tinkApp.ActiveUser,
+				permissions,
+				bluetooth,
+				Device.iOS,
+				new TINK.Model.Station.Station("FR101", new List<string>(), null), // Was 31 before switching CopriCallsMemory(SampleSets.Set2, 1, ...)
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				new GeolocationMock(),
+				locksService,
+				tinkApp.Polling,
+				(url) => { },
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService);
+
+			await bikesAtStation.OnAppearing();
+
+			Assert.IsTrue(new List<string> { "Updating...", string.Empty }.Contains(bikesAtStation.StatusInfoText));
+
+			// Verify list of bikes
+			Assert.AreEqual(3, bikesAtStation.Count); // Was 1 before switch.
+			Assert.IsTrue(bikesAtStation.IsIdle);
+			Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR1003").StateText); // Was 52 before switch.
+			Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR1002").StateText);
+			Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR1001").StateText);
+
+			// Login hint/ no bikes frame
+			Assert.IsTrue(bikesAtStation.IsLoginRequiredHintVisible);
+			Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
+			Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
+		}
+
+
+		[Test]
+		public async Task TestConstructKonrad_NoBikes()
+		{
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			bluetooth.State.Returns(BluetoothState.On);
+
+			locksService.TimeOut.Returns(timeOut);
+			timeOut.MultiConnect.Returns(new TimeSpan(0));
+
+			const string MERCH_ID = "MyMerchId";
+
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(),
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.Set2, 1, sessionCookie)),
+				merchantId: "MyMerchId",
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: locksService, // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var bikesAtStation = new BikesAtStationPageViewModel(
+				tinkApp.ActiveUser,
+				permissions,
+				bluetooth,
+				Device.iOS,
+				new TINK.Model.Station.Station("4", new List<string>(), null),
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				new GeolocationMock(),
+				locksService,
+				tinkApp.Polling,
+				(url) => { },
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService);
+
+			await bikesAtStation.OnAppearing();
+
+			Assert.IsTrue(new List<string> { "Updating...", string.Empty }.Contains(bikesAtStation.StatusInfoText));
+
+			// Verify list of bikes
+			Assert.AreEqual(0, bikesAtStation.Count);
+			Assert.IsTrue(bikesAtStation.IsIdle);
+			Assert.IsFalse(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			// Login hint/ no bikes frame
+			Assert.IsFalse(bikesAtStation.IsLoginRequiredHintVisible);
+			Assert.IsTrue(bikesAtStation.IsNoBikesAtStationVisible);
+			Assert.AreEqual("Momentan sind keine Fahrräder an dieser Station verfügbar.", bikesAtStation.NoBikesAtStationText);
+		}
+
+		[Test]
+		public async Task TestConstruct_LoggedIn()
+		{
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			bluetooth.State.Returns(BluetoothState.On);
+
+			locksService.TimeOut.Returns(timeOut);
+			timeOut.MultiConnect.Returns(new TimeSpan(0));
+
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: locksService.GetType().FullName),
+					new StoreMock(new TINK.Model.User.Account.Account(
+					LoginSessionCopriInfo.JavaministerHardwareNr1.Mail,
+					LoginSessionCopriInfo.JavaministerHardwareNr1.Pwd,
+					false,
+					"6103_112e96b36ba33de245943c5ffaf369cd_", // Was 4da3044c8657a04ba60e2eaa753bc51a before switching from data provider CopriCallsMemory(SampleSets.Set2, 1, ...) 
+					new List<string> { FilterHelper.CARGOBIKE })),
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
+				merchantId: "MyMerchId",
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: locksService, // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var bikesAtStation = new BikesAtStationPageViewModel(
+				tinkApp.ActiveUser,
+				permissions,
+				bluetooth,
+				Device.iOS,
+				new TINK.Model.Station.Station("FR103", new List<string>(), null), // Was station id 4 before switching from data provider CopriCallsMemory(SampleSets.Set2, 1, ...) 
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				new GeolocationMock(),
+				locksService,
+				tinkApp.Polling,
+				(url) => { },
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService);
+
+			await bikesAtStation.OnAppearing();
+
+			Assert.IsTrue(new List<string> { "Updating...", string.Empty }.Contains(bikesAtStation.StatusInfoText));
+
+			// Verify list of bikes
+			Assert.AreEqual(4, bikesAtStation.Count); // Count of bikes was 4 before switching from data provider CopriCallsMemory(SampleSets.Set2, 1, ...)
+			Assert.IsTrue(bikesAtStation.IsIdle);
+			Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR9999").StateText);
+			Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR9999").StateText);
+			Assert.AreEqual("Max. reservation time of 15 min. expired.", bikesAtStation.FirstOrDefault(x => x.Id == "FR1004").StateText);
+			Assert.AreEqual($"Rented since {DateTime.Parse("2021-11-06 18:57:25.445447+01"):dd. MMMM HH:mm}.", bikesAtStation.FirstOrDefault(x => x.Id == "FR1544").StateText); // Was 7
+
+			// Login hint/ no bikes frame
+			Assert.IsFalse(bikesAtStation.IsLoginRequiredHintVisible);
+			Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
+			Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
+		}
+
+		[Test]
+		public async Task TestConstruct_Offline()
+		{
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			bluetooth.State.Returns(BluetoothState.On);
+
+			locksService.TimeOut.Returns(timeOut);
+			timeOut.MultiConnect.Returns(new TimeSpan(0));
+
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(),
+												isConnectedFunc: () => false,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
+				merchantId: "MyMerchId",
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: locksService, // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null, // Not connected.
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var bikesAtStation = new BikesAtStationPageViewModel(
+				tinkApp.ActiveUser,
+				permissions,
+				bluetooth,
+				Device.iOS,
+				new TINK.Model.Station.Station("FR103", new List<string>(), null), // Was station id 4 before switching from data provider CopriCallsMemory(SampleSets.Set2, 1
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				new GeolocationMock(),
+				locksService,
+				tinkApp.Polling,
+				(url) => { },
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService);
+
+			await bikesAtStation.OnAppearing();
+
+			Assert.AreEqual("Offline.", bikesAtStation.StatusInfoText);
+
+			// Verify list of bikes
+			Assert.AreEqual(2, bikesAtStation.Count); // Count of bikes was 3. There is no more bike with id 26.
+			Assert.IsTrue(bikesAtStation.IsIdle);
+			Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR9999").StateText); // Was id 5
+			Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR9998").StateText); // Was is 14
+
+			// Login hint/ no bikes frame
+			Assert.IsTrue(bikesAtStation.IsLoginRequiredHintVisible);
+			Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
+			Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
+		}
+
+		[Test]
+		public async Task TestConstruct_WebConnectCommunicationError()
+		{
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			bluetooth.State.Returns(BluetoothState.On);
+
+			locksService.TimeOut.Returns(timeOut);
+			timeOut.MultiConnect.Returns(new TimeSpan(0));
+
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(),
+												isConnectedFunc: () => false,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new TINK.Model.Connector.Connector(
+						uri,
+						new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+						null /*UI language */,
+						sessionCookie,
+						mail,
+						server: new CopriProviderHttps(
+							uri,
+							TinkApp.MerchantId,
+							new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+							null /*UI language */,
+							sessionCookie: sessionCookie,
+							cacheServer: new CopriCallsCacheMemory001(sessionCookie: sessionCookie),
+							httpsServer: new ExceptionServer((msg) => new WebConnectFailureException(msg, new Exception("Source expection."))))),
+				merchantId: "MyMerchId",
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: locksService, // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null, // Not connected.
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var bikesAtStation = new BikesAtStationPageViewModel(
+				tinkApp.ActiveUser,
+				permissions,
+				bluetooth,
+				Device.iOS,
+				new TINK.Model.Station.Station("FR103", new List<string>(), null), // Was station id 4 before switching from data provider CopriCallsCacheMemory()
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				new GeolocationMock(),
+				locksService,
+				tinkApp.Polling,
+				(url) => { },
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService)
+			{
+				IsReportLevelVerbose = true
+			};
+
+			await bikesAtStation.OnAppearing();
+
+			Assert.AreEqual("Connection interrupted, server unreachable.", bikesAtStation.StatusInfoText);
+
+			// Verify list of bikes
+			Assert.AreEqual(2, bikesAtStation.Count); // Count of bikes was 3. There is no more bike with id 26.
+			Assert.IsTrue(bikesAtStation.IsIdle);
+			Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR9999").StateText); // Was id 5
+			Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR9998").StateText); // Was is 14
+
+			// Login hint/ no bikes frame
+			Assert.IsTrue(bikesAtStation.IsLoginRequiredHintVisible);
+			Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
+			Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
+		}
+
+		[Test]
+		public async Task TestTinkApp_GeneralPurposeError()
+		{
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			bluetooth.State.Returns(BluetoothState.On);
+
+			locksService.TimeOut.Returns(timeOut);
+			timeOut.MultiConnect.Returns(new TimeSpan(0));
+
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000),
+					true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(),
+				isConnectedFunc: () => false,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new TINK.Model.Connector.Connector(
+					uri,
+					new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+					null /*UI language */,
+					sessionCookie,
+					mail,
+					server: new CopriProviderHttps(
+						uri,
+						TinkApp.MerchantId,
+						new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+						null /*UI language */,
+						sessionCookie: sessionCookie,
+						cacheServer: new CopriCallsCacheMemory001(sessionCookie: sessionCookie),
+						httpsServer: new ExceptionServer((msg) => new Exception(msg)))),
+				merchantId: "MyMerchId",
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: locksService, // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null, // Not connected.
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var bikesAtStation = new BikesAtStationPageViewModel(
+				tinkApp.ActiveUser,
+				permissions,
+				bluetooth,
+				Device.iOS,
+				new TINK.Model.Station.Station("FR103", new List<string>(), null), // Was station id 4 before switching from data provider CopriCallsCacheMemory()
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				new GeolocationMock(),
+				locksService,
+				tinkApp.Polling,
+				(url) => { },
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService)
+			{
+				IsReportLevelVerbose = true
+			};
+
+			await bikesAtStation.OnAppearing();
+
+			Assert.AreEqual("Connection interrupted.", bikesAtStation.StatusInfoText);
+
+			// Verify list of bikes
+			Assert.AreEqual(2, bikesAtStation.Count); // Count of bikes was 3. There is no more bike with id 26.
+			Assert.IsTrue(bikesAtStation.IsIdle);
+			Assert.IsTrue(bikesAtStation.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR9999").StateText);  // Was id 5
+			Assert.AreEqual("Available.", bikesAtStation.FirstOrDefault(x => x.Id == "FR9998").StateText);  // Was id 14.
+
+			// Login hint/ no bikes frame
+			Assert.IsTrue(bikesAtStation.IsLoginRequiredHintVisible);
+			Assert.IsFalse(bikesAtStation.IsNoBikesAtStationVisible);
+			Assert.AreEqual(string.Empty, bikesAtStation.NoBikesAtStationText);
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/CopriWebView/TestManageAccountViewModel.cs b/TestShareeLib/ViewModel/CopriWebView/TestManageAccountViewModel.cs
index 5ad0197..cc7d737 100644
--- a/TestShareeLib/ViewModel/CopriWebView/TestManageAccountViewModel.cs
+++ b/TestShareeLib/ViewModel/CopriWebView/TestManageAccountViewModel.cs
@@ -3,14 +3,14 @@ using TINK.ViewModel.Login;
 
 namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.CopriWebView
 {
-    [TestFixture]
-    public class TestManageAccountViewModel
-    {
-        [Test]
-        public void TestUrl()
-        {
-            var viewModel = new ManageAccountViewModel("Keks", "Merchant", "de", "Hosti");
-            Assert.AreEqual("https://Hosti?sessionid=KeksMerchant&lang=de", viewModel.Uri);
-        }
-    }
+	[TestFixture]
+	public class TestManageAccountViewModel
+	{
+		[Test]
+		public void TestUrl()
+		{
+			var viewModel = new ManageAccountViewModel("Keks", "Merchant", "de", "Hosti");
+			Assert.AreEqual("https://Hosti?sessionid=KeksMerchant&lang=de", viewModel.Uri);
+		}
+	}
 }
\ No newline at end of file
diff --git a/TestShareeLib/ViewModel/CopriWebView/TestPasswordForgottonViewModel.cs b/TestShareeLib/ViewModel/CopriWebView/TestPasswordForgottonViewModel.cs
index 97a41f4..bd91aa6 100644
--- a/TestShareeLib/ViewModel/CopriWebView/TestPasswordForgottonViewModel.cs
+++ b/TestShareeLib/ViewModel/CopriWebView/TestPasswordForgottonViewModel.cs
@@ -3,34 +3,34 @@ using TINK.ViewModel.CopriWebView;
 
 namespace TestShareeLib.ViewModel.CopriWebView
 {
-    [TestFixture]
-    public class TestPasswordForgottonViewModel
-    {
-        [Test]
-        public void TestUri()
-            => Assert.That(
-              new PasswordForgottonViewModel("merch", "de", "host").Uri,
-              Is.EqualTo("https://host/app/Account?sessionid=merch&lang=de"));
+	[TestFixture]
+	public class TestPasswordForgottonViewModel
+	{
+		[Test]
+		public void TestUri()
+			=> Assert.That(
+			  new PasswordForgottonViewModel("merch", "de", "host").Uri,
+			  Is.EqualTo("https://host/app/Account?sessionid=merch&lang=de"));
 
-        [Test]
-        public void TestUrl()
-        {
-            var viewModel = new PasswordForgottonViewModel("Merchant", null /* lang */, "Hosti");
-            Assert.AreEqual("https://Hosti/app/Account?sessionid=Merchant", viewModel.Uri);
-        }
+		[Test]
+		public void TestUrl()
+		{
+			var viewModel = new PasswordForgottonViewModel("Merchant", null /* lang */, "Hosti");
+			Assert.AreEqual("https://Hosti/app/Account?sessionid=Merchant", viewModel.Uri);
+		}
 
-        [Test]
-        public void TestUrl_TINKLive()
-        {
-            var viewModel = new PasswordForgottonViewModel("Merchant", "us", "app.tink-konstanz.de");
-            Assert.AreEqual("https://app.tink-konstanz.de/app/Account?sessionid=Merchant&lang=us", viewModel.Uri);
-        }
+		[Test]
+		public void TestUrl_TINKLive()
+		{
+			var viewModel = new PasswordForgottonViewModel("Merchant", "us", "app.tink-konstanz.de");
+			Assert.AreEqual("https://app.tink-konstanz.de/app/Account?sessionid=Merchant&lang=us", viewModel.Uri);
+		}
 
-        [Test]
-        public void TestUrl_TINK()
-        {
-            var viewModel = new PasswordForgottonViewModel("Merchant", "de", "tinkwwp.copri-bike.de");
-            Assert.AreEqual("https://tinkwwp.copri-bike.de/app/Account?sessionid=Merchant&lang=de", viewModel.Uri);
-        }
-    }
+		[Test]
+		public void TestUrl_TINK()
+		{
+			var viewModel = new PasswordForgottonViewModel("Merchant", "de", "tinkwwp.copri-bike.de");
+			Assert.AreEqual("https://tinkwwp.copri-bike.de/app/Account?sessionid=Merchant&lang=de", viewModel.Uri);
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/CopriWebView/TestRegisterPageViewModel.cs b/TestShareeLib/ViewModel/CopriWebView/TestRegisterPageViewModel.cs
index 6ebaa7e..62470cb 100644
--- a/TestShareeLib/ViewModel/CopriWebView/TestRegisterPageViewModel.cs
+++ b/TestShareeLib/ViewModel/CopriWebView/TestRegisterPageViewModel.cs
@@ -3,13 +3,13 @@ using TINK.ViewModel.CopriWebView;
 
 namespace TestShareeLib.ViewModel.CopriWebView
 {
-    [TestFixture]
-    public class TestRegisterPageViewModel
-    {
-        [Test]
-        public void TestUri()
-            => Assert.That(
-              new RegisterPageViewModel("merch", "us", "host").Uri,
-              Is.EqualTo("https://host/app/Account/1.%20Kundendaten?sessionid=merch&lang=us"));
-    }
+	[TestFixture]
+	public class TestRegisterPageViewModel
+	{
+		[Test]
+		public void TestUri()
+			=> Assert.That(
+			  new RegisterPageViewModel("merch", "us", "host").Uri,
+			  Is.EqualTo("https://host/app/Account/1.%20Kundendaten?sessionid=merch&lang=us"));
+	}
 }
diff --git a/TestShareeLib/ViewModel/Login/TestManageAccountViewModel.cs b/TestShareeLib/ViewModel/Login/TestManageAccountViewModel.cs
index ae202b0..36f6f3f 100644
--- a/TestShareeLib/ViewModel/Login/TestManageAccountViewModel.cs
+++ b/TestShareeLib/ViewModel/Login/TestManageAccountViewModel.cs
@@ -3,13 +3,13 @@ using TINK.ViewModel.Login;
 
 namespace TestShareeLib.ViewModel.Login
 {
-    [TestFixture]
-    public class TestManageAccountViewModel
-    {
-        [Test]
-        public void TestUri()
-            => Assert.That(
-                new ManageAccountViewModel("keks", "merch", "de", "host").Uri,
-                Is.EqualTo("https://host?sessionid=keksmerch&lang=de"));
-    }
+	[TestFixture]
+	public class TestManageAccountViewModel
+	{
+		[Test]
+		public void TestUri()
+			=> Assert.That(
+				new ManageAccountViewModel("keks", "merch", "de", "host").Uri,
+				Is.EqualTo("https://host?sessionid=keksmerch&lang=de"));
+	}
 }
diff --git a/TestShareeLib/ViewModel/MiniSurvey/Question/TestCheckOneViewModel.cs b/TestShareeLib/ViewModel/MiniSurvey/Question/TestCheckOneViewModel.cs
index 1e64ecc..207b23b 100644
--- a/TestShareeLib/ViewModel/MiniSurvey/Question/TestCheckOneViewModel.cs
+++ b/TestShareeLib/ViewModel/MiniSurvey/Question/TestCheckOneViewModel.cs
@@ -4,54 +4,54 @@ using TINK.ViewModel.MiniSurvey.Question;
 
 namespace TestShareeLib.ViewModel.MiniSurvey.Question
 {
-    [TestFixture]
-    public class TestCheckOneViewModel
-    {
-        [Test]
-        public void TestCtor()
-        {
-            var vm = new CheckOneViewModel(
-                new KeyValuePair<string, string>("q5", "wie ist das Wetter heute"),
-                new Dictionary<string, string> { { "opt1", "regnerisch" }, { "opt2", "bewölkt" }, { "opt3", "sonnig" } });
+	[TestFixture]
+	public class TestCheckOneViewModel
+	{
+		[Test]
+		public void TestCtor()
+		{
+			var vm = new CheckOneViewModel(
+				new KeyValuePair<string, string>("q5", "wie ist das Wetter heute"),
+				new Dictionary<string, string> { { "opt1", "regnerisch" }, { "opt2", "bewölkt" }, { "opt3", "sonnig" } });
 
-            Assert.That(
-                vm.Question.Key,
-                Is.EqualTo("q5"),
-                "Key is essential for COPRI request.");
+			Assert.That(
+				vm.Question.Key,
+				Is.EqualTo("q5"),
+				"Key is essential for COPRI request.");
 
-            Assert.That(
-                vm.QuestionText,
-                Is.EqualTo("wie ist das Wetter heute"),
-                "Question shown to user.");
+			Assert.That(
+				vm.QuestionText,
+				Is.EqualTo("wie ist das Wetter heute"),
+				"Question shown to user.");
 
-            Assert.That(
-                string.Join(',', vm.AnswersText),
-                Is.EqualTo("regnerisch,bewölkt,sonnig"),
-                "Gui must show three options.");
+			Assert.That(
+				string.Join(',', vm.AnswersText),
+				Is.EqualTo("regnerisch,bewölkt,sonnig"),
+				"Gui must show three options.");
 
-            Assert.That(
-                vm.AnswerText,
-                Is.EqualTo(null),
-                "GUI should not show selected entry.");
+			Assert.That(
+				vm.AnswerText,
+				Is.EqualTo(null),
+				"GUI should not show selected entry.");
 
-            Assert.That(
-                vm.Answer.Key,
-                Is.EqualTo(null),
-                "View model shold not hold any selected endtry.");
-        }
+			Assert.That(
+				vm.Answer.Key,
+				Is.EqualTo(null),
+				"View model shold not hold any selected endtry.");
+		}
 
-        [Test]
-        public void TestSelected()
-        {
-            var vm = new CheckOneViewModel(
-                new KeyValuePair<string, string>("q5", "wie ist das Wetter heute"),
-                new Dictionary<string, string> { { "opt1", "regnerisch" }, { "opt2", "bewölkt" }, { "opt3", "sonnig" } });
+		[Test]
+		public void TestSelected()
+		{
+			var vm = new CheckOneViewModel(
+				new KeyValuePair<string, string>("q5", "wie ist das Wetter heute"),
+				new Dictionary<string, string> { { "opt1", "regnerisch" }, { "opt2", "bewölkt" }, { "opt3", "sonnig" } });
 
-            vm.AnswerText = "sonnig"; // Member is called if user selects an entry.
-            Assert.That(
-                vm.Answer.Key,
-                Is.EqualTo("opt3"),
-                "Key matching to selected item must be set as answer.");
-        }
-    }
+			vm.AnswerText = "sonnig"; // Member is called if user selects an entry.
+			Assert.That(
+				vm.Answer.Key,
+				Is.EqualTo("opt3"),
+				"Key matching to selected item must be set as answer.");
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/MiniSurvey/Question/TestFreeTextViewModel.cs b/TestShareeLib/ViewModel/MiniSurvey/Question/TestFreeTextViewModel.cs
index 75bd0cd..d07f202 100644
--- a/TestShareeLib/ViewModel/MiniSurvey/Question/TestFreeTextViewModel.cs
+++ b/TestShareeLib/ViewModel/MiniSurvey/Question/TestFreeTextViewModel.cs
@@ -4,49 +4,49 @@ using TINK.ViewModel.MiniSurvey.Question;
 
 namespace TestShareeLib.ViewModel.MiniSurvey.Question
 {
-    [TestFixture]
-    class TestFreeTextViewModel
-    {
-        [Test]
-        public void TestCtor()
-        {
-            var vm = new FreeTextViewModel(
-                new KeyValuePair<string, string>("q9", "War das essen heute gut?"));
+	[TestFixture]
+	class TestFreeTextViewModel
+	{
+		[Test]
+		public void TestCtor()
+		{
+			var vm = new FreeTextViewModel(
+				new KeyValuePair<string, string>("q9", "War das essen heute gut?"));
 
-            Assert.That(
-                vm.Question.Key,
-                Is.EqualTo("q9"),
-                "Key is essential for COPRI request.");
+			Assert.That(
+				vm.Question.Key,
+				Is.EqualTo("q9"),
+				"Key is essential for COPRI request.");
 
-            Assert.That(
-                vm.QuestionText,
-                Is.EqualTo("War das essen heute gut?"),
-                "Question shown to user.");
+			Assert.That(
+				vm.QuestionText,
+				Is.EqualTo("War das essen heute gut?"),
+				"Question shown to user.");
 
-            Assert.That(
-                vm.AnswerText,
-                Is.EqualTo(null),
-                "GUI should not show selected entry.");
+			Assert.That(
+				vm.AnswerText,
+				Is.EqualTo(null),
+				"GUI should not show selected entry.");
 
-            Assert.That(
-                vm.Answer.Key,
-                Is.EqualTo(null),
-                "View model shold not hold any selected endtry.");
-        }
+			Assert.That(
+				vm.Answer.Key,
+				Is.EqualTo(null),
+				"View model shold not hold any selected endtry.");
+		}
 
-        [Test]
-        public void TestSelected()
-        {
-            var vm = new FreeTextViewModel(
-                new KeyValuePair<string, string>("q9", "War das essen heute gut?"));
+		[Test]
+		public void TestSelected()
+		{
+			var vm = new FreeTextViewModel(
+				new KeyValuePair<string, string>("q9", "War das essen heute gut?"));
 
-            vm.AnswerText = "Sehr wohlschmeckend!"; // Member is called if user enters text.
+			vm.AnswerText = "Sehr wohlschmeckend!"; // Member is called if user enters text.
 
-            Assert.That(
-                vm.Answer.Key,
-                Is.EqualTo("Sehr wohlschmeckend!"),
-                "Key is the answer for COPRI.");
-        }
+			Assert.That(
+				vm.Answer.Key,
+				Is.EqualTo("Sehr wohlschmeckend!"),
+				"Key is the answer for COPRI.");
+		}
 
-    }
+	}
 }
diff --git a/TestShareeLib/ViewModel/Settings/TestServicesViewModel.cs b/TestShareeLib/ViewModel/Settings/TestServicesViewModel.cs
index 0f0119f..3f7379b 100644
--- a/TestShareeLib/ViewModel/Settings/TestServicesViewModel.cs
+++ b/TestShareeLib/ViewModel/Settings/TestServicesViewModel.cs
@@ -4,118 +4,118 @@ using NUnit.Framework;
 
 namespace TINK.ViewModel.Settings
 {
-    [TestFixture]
-    public class TestServicesViewModel
-    {
-        [Test]
-        public void TestCtor()
-        {
-            var servicesViewModel = new ServicesViewModel(
-                new List<string> {
-                    "ServiceA",
-                    "ServiceB",
-                    "ServiceB", // Dupes are removed
+	[TestFixture]
+	public class TestServicesViewModel
+	{
+		[Test]
+		public void TestCtor()
+		{
+			var servicesViewModel = new ServicesViewModel(
+				new List<string> {
+					"ServiceA",
+					"ServiceB",
+					"ServiceB", // Dupes are removed
                     "ServiceC" },
-                new Dictionary<string, string> {
-                    { "ServiceA", "Top service of type A" },
-                    { "ServiceB", "Supertop service of type B" },
-                    { "OldsService", "This entry is discarded" }},
-                "ServiceB");
+				new Dictionary<string, string> {
+					{ "ServiceA", "Top service of type A" },
+					{ "ServiceB", "Supertop service of type B" },
+					{ "OldsService", "This entry is discarded" }},
+				"ServiceB");
 
-            Assert.That(
-                servicesViewModel.ServicesTextList,
-                Is.EqualTo(new List<string> {
-                    "ServiceC",
-                    "Supertop service of type B",
-                    "Top service of type A" }).AsCollection);
+			Assert.That(
+				servicesViewModel.ServicesTextList,
+				Is.EqualTo(new List<string> {
+					"ServiceC",
+					"Supertop service of type B",
+					"Top service of type A" }).AsCollection);
 
-            Assert.That(
-                servicesViewModel.Active,
-                Is.EqualTo("ServiceB"));
-        }
+			Assert.That(
+				servicesViewModel.Active,
+				Is.EqualTo("ServiceB"));
+		}
 
-        [Test]
-        public void TestCtorInvalidActive()
-        {
-            Assert.That(
-                () => new ServicesViewModel(
-                new List<string> { "ServiceA", "ServiceB", "ServiceB", "ServiceC" },
-                new Dictionary<string, string> { { "ServiceA", "Top service of type A" }, { "ServiceB", "Supertop service of type B" } },
-                "ServiceX"),
-                Throws.TypeOf<ArgumentException>());
-        }
+		[Test]
+		public void TestCtorInvalidActive()
+		{
+			Assert.That(
+				() => new ServicesViewModel(
+				new List<string> { "ServiceA", "ServiceB", "ServiceB", "ServiceC" },
+				new Dictionary<string, string> { { "ServiceA", "Top service of type A" }, { "ServiceB", "Supertop service of type B" } },
+				"ServiceX"),
+				Throws.TypeOf<ArgumentException>());
+		}
 
-        [Test]
-        public void TestCtorInvalidServiceNames()
-        {
-            Assert.That(
-                () => new ServicesViewModel(
-                new List<string> { "ServiceA", "ServiceB", "ServiceC" },
-                new Dictionary<string, string> { { "ServiceA", "Top fast" }, { "ServiceB", "Top fast" } },
-                "ServiceB"),
-                Throws.TypeOf<ArgumentException>());
-        }
+		[Test]
+		public void TestCtorInvalidServiceNames()
+		{
+			Assert.That(
+				() => new ServicesViewModel(
+				new List<string> { "ServiceA", "ServiceB", "ServiceC" },
+				new Dictionary<string, string> { { "ServiceA", "Top fast" }, { "ServiceB", "Top fast" } },
+				"ServiceB"),
+				Throws.TypeOf<ArgumentException>());
+		}
 
-        [Test]
-        public void TestGetActiveTextDisplayTextAvailable()
-        {
-            var servicesViewModel = new ServicesViewModel(
-                new List<string> {
-                    "ServiceB"},
-                new Dictionary<string, string> {
-                    { "ServiceB", "Supertop service of type B" }},
-                "ServiceB");
+		[Test]
+		public void TestGetActiveTextDisplayTextAvailable()
+		{
+			var servicesViewModel = new ServicesViewModel(
+				new List<string> {
+					"ServiceB"},
+				new Dictionary<string, string> {
+					{ "ServiceB", "Supertop service of type B" }},
+				"ServiceB");
 
-            Assert.That(
-                servicesViewModel.ActiveText,
-                Is.EqualTo("Supertop service of type B"));
-        }
+			Assert.That(
+				servicesViewModel.ActiveText,
+				Is.EqualTo("Supertop service of type B"));
+		}
 
-        [Test]
-        public void TestGetActiveTextNoDisplayText()
-        {
-            var servicesViewModel = new ServicesViewModel(
-                new List<string> {
-                    "ServiceB"},
-                new Dictionary<string, string>(),
-                "ServiceB");
+		[Test]
+		public void TestGetActiveTextNoDisplayText()
+		{
+			var servicesViewModel = new ServicesViewModel(
+				new List<string> {
+					"ServiceB"},
+				new Dictionary<string, string>(),
+				"ServiceB");
 
-            Assert.That(
-                servicesViewModel.ActiveText,
-                Is.EqualTo("ServiceB"));
-        }
+			Assert.That(
+				servicesViewModel.ActiveText,
+				Is.EqualTo("ServiceB"));
+		}
 
-        [Test]
-        public void TestSetActiveText()
-        {
-            var servicesViewModel = new ServicesViewModel(
-                new List<string> {
-                    "ServiceA",
-                    "ServiceB" },
-                new Dictionary<string, string>(),
-                "ServiceB")
-            {
-                ActiveText = "ServiceA"
-            };
+		[Test]
+		public void TestSetActiveText()
+		{
+			var servicesViewModel = new ServicesViewModel(
+				new List<string> {
+					"ServiceA",
+					"ServiceB" },
+				new Dictionary<string, string>(),
+				"ServiceB")
+			{
+				ActiveText = "ServiceA"
+			};
 
-            Assert.That(
-                servicesViewModel.ActiveText,
-                Is.EqualTo("ServiceA"));
-        }
+			Assert.That(
+				servicesViewModel.ActiveText,
+				Is.EqualTo("ServiceA"));
+		}
 
-        [Test]
-        public void TestSetActiveTextInvalid()
-        {
-            var servicesViewModel = new ServicesViewModel(
-                new List<string> {
-                    "ServiceA",
-                    "ServiceB" },
-                new Dictionary<string, string>(),
-                "ServiceB");
+		[Test]
+		public void TestSetActiveTextInvalid()
+		{
+			var servicesViewModel = new ServicesViewModel(
+				new List<string> {
+					"ServiceA",
+					"ServiceB" },
+				new Dictionary<string, string>(),
+				"ServiceB");
 
-            Assert.That(
-                () => servicesViewModel.ActiveText = "ServiceX",
-                Throws.InstanceOf<ArgumentException>());
-        }
-    }
+			Assert.That(
+				() => servicesViewModel.ActiveText = "ServiceX",
+				Throws.InstanceOf<ArgumentException>());
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/TestPollingTaskManager.cs b/TestShareeLib/ViewModel/TestPollingTaskManager.cs
index cac2a79..ff8f494 100644
--- a/TestShareeLib/ViewModel/TestPollingTaskManager.cs
+++ b/TestShareeLib/ViewModel/TestPollingTaskManager.cs
@@ -5,42 +5,42 @@ using TINK.ViewModel;
 
 namespace UITest.Fixtures.ObjectTests
 {
-    [TestFixture]
-    public class TestPollingTaskManager
-    {
-        [Test]
-        public async Task TestStopUpdatePeriodiallyRepeated()
-        {
-            var l_oManger = new PollingUpdateTaskManager(() => Task.Delay(1000));
+	[TestFixture]
+	public class TestPollingTaskManager
+	{
+		[Test]
+		public async Task TestStopUpdatePeriodiallyRepeated()
+		{
+			var l_oManger = new PollingUpdateTaskManager(() => Task.Delay(1000));
 
-            await l_oManger.StartUpdateAyncPeridically(new PollingParameters(new System.TimeSpan(0, 0, 2), true));
+			await l_oManger.StartUpdateAyncPeridically(new PollingParameters(new System.TimeSpan(0, 0, 2), true));
 
-            l_oManger.StopUpdatePeridically().Wait();
+			l_oManger.StopUpdatePeridically().Wait();
 
-            // Should not lead to dead lock.
-            l_oManger.StopUpdatePeridically().Wait();
-        }
+			// Should not lead to dead lock.
+			l_oManger.StopUpdatePeridically().Wait();
+		}
 
-        [Test]
-        public async Task TestStartUpdatePeriodiallyRepeated()
-        {
-            var l_oManger = new PollingUpdateTaskManager(() => Task.Delay(1000));
+		[Test]
+		public async Task TestStartUpdatePeriodiallyRepeated()
+		{
+			var l_oManger = new PollingUpdateTaskManager(() => Task.Delay(1000));
 
-            await l_oManger.StartUpdateAyncPeridically(new PollingParameters(new System.TimeSpan(0, 0, 2), true));
+			await l_oManger.StartUpdateAyncPeridically(new PollingParameters(new System.TimeSpan(0, 0, 2), true));
 
-            // Should not lead to dead lock.
-            await l_oManger.StartUpdateAyncPeridically(new PollingParameters(new System.TimeSpan(0, 0, 2), true));
+			// Should not lead to dead lock.
+			await l_oManger.StartUpdateAyncPeridically(new PollingParameters(new System.TimeSpan(0, 0, 2), true));
 
-            l_oManger.StopUpdatePeridically().Wait();
-        }
+			l_oManger.StopUpdatePeridically().Wait();
+		}
 
-        [Test]
-        public async Task TestStopUpdatePeriodiallyNoStart()
-        {
-            var l_oManger = new PollingUpdateTaskManager(() => Task.Delay(1000));
+		[Test]
+		public async Task TestStopUpdatePeriodiallyNoStart()
+		{
+			var l_oManger = new PollingUpdateTaskManager(() => Task.Delay(1000));
 
-            // Should not lead to dead lock.
-            await l_oManger.StartUpdateAyncPeridically(new PollingParameters(new System.TimeSpan(0, 0, 2), true));
-        }
-    }
+			// Should not lead to dead lock.
+			await l_oManger.StartUpdateAyncPeridically(new PollingParameters(new System.TimeSpan(0, 0, 2), true));
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/TestPollingUpdateTask.cs b/TestShareeLib/ViewModel/TestPollingUpdateTask.cs
index ddd1c6e..8ca2c50 100644
--- a/TestShareeLib/ViewModel/TestPollingUpdateTask.cs
+++ b/TestShareeLib/ViewModel/TestPollingUpdateTask.cs
@@ -4,42 +4,42 @@ using TINK.ViewModel;
 
 namespace TestTINKLib.Fixtures.ObjectTests
 {
-    [TestFixture]
-    public class TestPollingUpdateTask
-    {
-        /// <summary>
-        /// Verify that no exception is thrown when invoking Terminate.
-        /// </summary>
-        [Test]
-        public async Task TestCtorPollingOff()
-        {
-            var task = new PollingUpdateTask(() => throw new System.Exception("This must not be called."), null);
+	[TestFixture]
+	public class TestPollingUpdateTask
+	{
+		/// <summary>
+		/// Verify that no exception is thrown when invoking Terminate.
+		/// </summary>
+		[Test]
+		public async Task TestCtorPollingOff()
+		{
+			var task = new PollingUpdateTask(() => throw new System.Exception("This must not be called."), null);
 
-            await task.Terminate();
-        }
+			await task.Terminate();
+		}
 
-        [Test]
-        public async Task TestCtorPollingOn()
-        {
-            int index = 0;
-            var task = new PollingUpdateTask(() => index++, new System.TimeSpan(10));
+		[Test]
+		public async Task TestCtorPollingOn()
+		{
+			int index = 0;
+			var task = new PollingUpdateTask(() => index++, new System.TimeSpan(10));
 
-            System.Threading.SpinWait.SpinUntil(() => index > 2);
+			System.Threading.SpinWait.SpinUntil(() => index > 2);
 
-            await task.Terminate();
+			await task.Terminate();
 
-            Assert.That(index, Is.AtLeast(3), "Delegate which increments index must be called.");
-        }
+			Assert.That(index, Is.AtLeast(3), "Delegate which increments index must be called.");
+		}
 
-        [Test]
-        public void TestTerminateRepeated()
-        {
-            var tasks = new PollingUpdateTask(async () => await Task.Delay(1000), new System.TimeSpan(0, 0, 2));
+		[Test]
+		public void TestTerminateRepeated()
+		{
+			var tasks = new PollingUpdateTask(async () => await Task.Delay(1000), new System.TimeSpan(0, 0, 2));
 
-            tasks.Terminate().Wait();
+			tasks.Terminate().Wait();
 
-            // Verify that calling terminate twice does not lead to hang of call.
-            tasks.Terminate().Wait();
-        }
-    }
+			// Verify that calling terminate twice does not lead to hang of call.
+			tasks.Terminate().Wait();
+		}
+	}
 }
diff --git a/TestShareeLib/ViewModel/TestViewModelHelper.cs b/TestShareeLib/ViewModel/TestViewModelHelper.cs
index b99e277..7271793 100644
--- a/TestShareeLib/ViewModel/TestViewModelHelper.cs
+++ b/TestShareeLib/ViewModel/TestViewModelHelper.cs
@@ -6,123 +6,123 @@ using TINK.ViewModel;
 
 namespace TestShareeLib.ViewModel
 {
-    [TestFixture]
-    public class TestViewModelHelper
-    {
-        [Test]
-        public void TestGetFullDisplayName()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            bike.Description.Returns("MyStation");
-            bike.Id.Returns("MyId");
+	[TestFixture]
+	public class TestViewModelHelper
+	{
+		[Test]
+		public void TestGetFullDisplayName()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			bike.Description.Returns("MyStation");
+			bike.Id.Returns("MyId");
 
-            Assert.That(
-                bike.GetFullDisplayName(),
-                Is.EqualTo("MyStation, Nr. MyId"));
-        }
+			Assert.That(
+				bike.GetFullDisplayName(),
+				Is.EqualTo("MyStation, Nr. MyId"));
+		}
 
-        [Test]
-        public void TestGetFullDisplayNameIdEmpty()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            bike.Description.Returns("MyStation");
-            bike.Id.Returns("");
+		[Test]
+		public void TestGetFullDisplayNameIdEmpty()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			bike.Description.Returns("MyStation");
+			bike.Id.Returns("");
 
-            Assert.That(
-                bike.GetFullDisplayName(),
-                Is.EqualTo("MyStation, Nr. "));
-        }
+			Assert.That(
+				bike.GetFullDisplayName(),
+				Is.EqualTo("MyStation, Nr. "));
+		}
 
-        [Test]
-        public void TestGetFullDisplayNameEmpty()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            bike.Description.Returns("");
-            bike.Id.Returns("Id33");
+		[Test]
+		public void TestGetFullDisplayNameEmpty()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			bike.Description.Returns("");
+			bike.Id.Returns("Id33");
 
-            Assert.That(
-                bike.GetDisplayName(),
-                Is.EqualTo("Id33"));
-        }
+			Assert.That(
+				bike.GetDisplayName(),
+				Is.EqualTo("Id33"));
+		}
 
-        [Test]
-        public void TestGetDisplayName()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            bike.Description.Returns("MyStation");
-            bike.Id.Returns("Id33");
+		[Test]
+		public void TestGetDisplayName()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			bike.Description.Returns("MyStation");
+			bike.Id.Returns("Id33");
 
-            Assert.That(
-                bike.GetDisplayName(),
-                Is.EqualTo("MyStation"));
-        }
+			Assert.That(
+				bike.GetDisplayName(),
+				Is.EqualTo("MyStation"));
+		}
 
-        [Test]
-        public void TestGetDisplayNameEmpty()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            bike.Description.Returns("");
-            bike.Id.Returns("Id33");
+		[Test]
+		public void TestGetDisplayNameEmpty()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			bike.Description.Returns("");
+			bike.Id.Returns("Id33");
 
-            Assert.That(
-                bike.GetDisplayName(),
-                Is.EqualTo("Id33"));
-        }
+			Assert.That(
+				bike.GetDisplayName(),
+				Is.EqualTo("Id33"));
+		}
 
-        [Test]
-        public void TestGetDisplayId()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            bike.Description.Returns("ValidName");
-            bike.Id.Returns("Id33");
+		[Test]
+		public void TestGetDisplayId()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			bike.Description.Returns("ValidName");
+			bike.Id.Returns("Id33");
 
-            Assert.That(
-                bike.GetDisplayId(),
-                Is.EqualTo("Id33"));
-        }
+			Assert.That(
+				bike.GetDisplayId(),
+				Is.EqualTo("Id33"));
+		}
 
-        [Test]
-        public void TestGetDisplayIdNameEmpty()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            bike.Description.Returns("");
-            bike.Id.Returns("Id33");
+		[Test]
+		public void TestGetDisplayIdNameEmpty()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			bike.Description.Returns("");
+			bike.Id.Returns("Id33");
 
-            Assert.That(
-                bike.GetDisplayId(),
-                Is.EqualTo(""));
-        }
+			Assert.That(
+				bike.GetDisplayId(),
+				Is.EqualTo(""));
+		}
 
-        [Test]
-        public void TestGetErrorMessage_Null()
-        {
-            Assert.That(
-                ViewModelHelper.GetErrorMessage(null),
-                Is.Empty);
-        }
+		[Test]
+		public void TestGetErrorMessage_Null()
+		{
+			Assert.That(
+				ViewModelHelper.GetErrorMessage(null),
+				Is.Empty);
+		}
 
-        [Test]
-        public void TestGetErrorMessage_Ex()
-        {
-            Assert.That(
-                new Exception("Ja toll").GetErrorMessage(),
-                Is.EqualTo("Ja toll"));
-        }
+		[Test]
+		public void TestGetErrorMessage_Ex()
+		{
+			Assert.That(
+				new Exception("Ja toll").GetErrorMessage(),
+				Is.EqualTo("Ja toll"));
+		}
 
-        [Test]
-        public void TestGetErrorMessage_Aggregate_One()
-        {
-            Assert.That(
-                new AggregateException(new Exception("Oh yes")).GetErrorMessage(),
-                Is.EqualTo("Oh yes"));
-        }
+		[Test]
+		public void TestGetErrorMessage_Aggregate_One()
+		{
+			Assert.That(
+				new AggregateException(new Exception("Oh yes")).GetErrorMessage(),
+				Is.EqualTo("Oh yes"));
+		}
 
-        [Test]
-        public void TestGetErrorMessage_Aggregate_Two()
-        {
-            Assert.That(
-                new AggregateException(new Exception("Oh yes"), new Exception("Oh no")).GetErrorMessage(),
-                Is.EqualTo("One or more errors occurred.\r\nOh yes\r\nOh no"));
-        }
-    }
+		[Test]
+		public void TestGetErrorMessage_Aggregate_Two()
+		{
+			Assert.That(
+				new AggregateException(new Exception("Oh yes"), new Exception("Oh no")).GetErrorMessage(),
+				Is.EqualTo("One or more errors occurred.\r\nOh yes\r\nOh no"));
+		}
+	}
 }
diff --git a/TestShareeSharedGuiLib/TestShareeSharedGuiLib.csproj b/TestShareeSharedGuiLib/TestShareeSharedGuiLib.csproj
index 3872ca6..df9c2cd 100644
--- a/TestShareeSharedGuiLib/TestShareeSharedGuiLib.csproj
+++ b/TestShareeSharedGuiLib/TestShareeSharedGuiLib.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
     <PackageReference Include="NUnit.Analyzers" Version="3.3.0" />
diff --git a/TestShareeSharedGuiLib/ViewModel/TestBarLevelViewModel.cs b/TestShareeSharedGuiLib/ViewModel/TestBarLevelViewModel.cs
index 9cead4c..73470bb 100644
--- a/TestShareeSharedGuiLib/ViewModel/TestBarLevelViewModel.cs
+++ b/TestShareeSharedGuiLib/ViewModel/TestBarLevelViewModel.cs
@@ -2,74 +2,74 @@
 
 namespace TestShareeSharedGuiLib.ViewModel
 {
-    [TestFixture]
-    public class TestBarLevelViewModel
-    {
-        [Test]
-        public void TestIsBatteryChargeLevelImageVisibleNull()
-            => Assert.That(
-                new BarLevelViewModel().IsBatteryChargeLevelImageVisible,
-                Is.False);
+	[TestFixture]
+	public class TestBarLevelViewModel
+	{
+		[Test]
+		public void TestIsBatteryChargeLevelImageVisibleNull()
+			=> Assert.That(
+				new BarLevelViewModel().IsBatteryChargeLevelImageVisible,
+				Is.False);
 
-        [Test]
-        public void TestIsBatteryChargeLevelImageVisibleNot5()
-        => Assert.That(
-            new BarLevelViewModel { Maximum = 6 }.IsBatteryChargeLevelImageVisible,
-            Is.False);
+		[Test]
+		public void TestIsBatteryChargeLevelImageVisibleNot5()
+		=> Assert.That(
+			new BarLevelViewModel { Maximum = 6 }.IsBatteryChargeLevelImageVisible,
+			Is.False);
 
-        [Test]
-        public void TestIsBatteryChargeLevelImageVisible5()
-        => Assert.That(
-            new BarLevelViewModel { Maximum = 5 }.IsBatteryChargeLevelImageVisible,
-            Is.True);
+		[Test]
+		public void TestIsBatteryChargeLevelImageVisible5()
+		=> Assert.That(
+			new BarLevelViewModel { Maximum = 5 }.IsBatteryChargeLevelImageVisible,
+			Is.True);
 
-        [Test]
-        public void TestBatteryChargeLevelImageSourceStringNull()
-        => Assert.That(
-            new BarLevelViewModel().BatteryChargeLevelImageSourceString,
-            Is.EqualTo("battery_undefined.png"));
+		[Test]
+		public void TestBatteryChargeLevelImageSourceStringNull()
+		=> Assert.That(
+			new BarLevelViewModel().BatteryChargeLevelImageSourceString,
+			Is.EqualTo("battery_undefined.png"));
 
-        [Test]
-        public void TestBatteryChargeLevelImageSourceStringNot5CurrentNull()
-        => Assert.That(
-            new BarLevelViewModel { Maximum = 6 }.BatteryChargeLevelImageSourceString,
-            Is.EqualTo("battery_undefined.png"));
+		[Test]
+		public void TestBatteryChargeLevelImageSourceStringNot5CurrentNull()
+		=> Assert.That(
+			new BarLevelViewModel { Maximum = 6 }.BatteryChargeLevelImageSourceString,
+			Is.EqualTo("battery_undefined.png"));
 
-        [Test]
-        public void TestBatteryChargeLevelImageSourceStringNot5()
-        => Assert.That(
-            new BarLevelViewModel { Maximum = 6, Current = 3 }.BatteryChargeLevelImageSourceString,
-            Is.EqualTo("battery_undefined.png"));
+		[Test]
+		public void TestBatteryChargeLevelImageSourceStringNot5()
+		=> Assert.That(
+			new BarLevelViewModel { Maximum = 6, Current = 3 }.BatteryChargeLevelImageSourceString,
+			Is.EqualTo("battery_undefined.png"));
 
-        [Test]
-        public void TestBatteryChargeLevelImageSourceStringMax5CurrentNull()
-        => Assert.That(
-            new BarLevelViewModel { Maximum = 5 }.BatteryChargeLevelImageSourceString,
-            Is.EqualTo("battery_undefined.png"));
+		[Test]
+		public void TestBatteryChargeLevelImageSourceStringMax5CurrentNull()
+		=> Assert.That(
+			new BarLevelViewModel { Maximum = 5 }.BatteryChargeLevelImageSourceString,
+			Is.EqualTo("battery_undefined.png"));
 
-        [Test]
-        public void TestBatteryChargeLevelImageSourceStringMax5Current3()
-        => Assert.That(
-            new BarLevelViewModel { Maximum = 5, Current = 3 }.BatteryChargeLevelImageSourceString,
-            Is.EqualTo("battery_3_5.png"));
+		[Test]
+		public void TestBatteryChargeLevelImageSourceStringMax5Current3()
+		=> Assert.That(
+			new BarLevelViewModel { Maximum = 5, Current = 3 }.BatteryChargeLevelImageSourceString,
+			Is.EqualTo("battery_3_5.png"));
 
-        [Test]
-        public void TestIsBatteryChargeLevelLabelVisibleNull()
-        => Assert.That(
-            new BarLevelViewModel().IsBatteryChargeLevelLabelVisible,
-            Is.False);
+		[Test]
+		public void TestIsBatteryChargeLevelLabelVisibleNull()
+		=> Assert.That(
+			new BarLevelViewModel().IsBatteryChargeLevelLabelVisible,
+			Is.False);
 
-        [Test]
-        public void TestIsBatteryChargeLevelLabelVisibleNot5()
-        => Assert.That(
-            new BarLevelViewModel { Maximum = 5 }.IsBatteryChargeLevelLabelVisible,
-            Is.False);
+		[Test]
+		public void TestIsBatteryChargeLevelLabelVisibleNot5()
+		=> Assert.That(
+			new BarLevelViewModel { Maximum = 5 }.IsBatteryChargeLevelLabelVisible,
+			Is.False);
 
-        [Test]
-        public void TestIsBatteryChargeLevelLabelVisible5()
-        => Assert.That(
-            new BarLevelViewModel { Maximum = 6 }.IsBatteryChargeLevelLabelVisible,
-            Is.True);
+		[Test]
+		public void TestIsBatteryChargeLevelLabelVisible5()
+		=> Assert.That(
+			new BarLevelViewModel { Maximum = 6 }.IsBatteryChargeLevelLabelVisible,
+			Is.True);
 
-    }
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Bike/BC/TestBikeInfoMutable.cs b/TestTINKLib/Fixtures/ObjectTests/Bike/BC/TestBikeInfoMutable.cs
index ee22cee..e81962a 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Bike/BC/TestBikeInfoMutable.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Bike/BC/TestBikeInfoMutable.cs
@@ -9,144 +9,144 @@ using IBikeInfo = TINK.Model.Bikes.BikeInfoNS.BC.IBikeInfo;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Bike
 {
-    [TestFixture]
-    public class TestBikeInfoMutable
-    {
-        private class BikeInfoMutable : TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable
-        {
-            public BikeInfoMutable(
-                string id,
-                LockModel lockModel,
-                bool isDemo = false,
-                IEnumerable<string> group = null,
-                WheelType? wheelType = null,
-                TypeOfBike? typeOfBike = null,
-                string description = null,
-                string stationId = null,
-                string stationName = null,
-                Uri operatorUri = null,
-                RentalDescription tariffDescription = null,
-                Func<DateTime> dateTimeProvider = null,
-                IStateInfo stateInfo = null) : base(
-                    new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike(id, lockModel, wheelType, typeOfBike, description),
-                    new TINK.Model.Bikes.BikeInfoNS.DriveNS.Drive(),
-                    isDemo,
-                    group,
-                    stationId,
-                    stationName,
-                    operatorUri,
-                    tariffDescription,
-                    dateTimeProvider,
-                    stateInfo)
-            {
-            }
-        }
+	[TestFixture]
+	public class TestBikeInfoMutable
+	{
+		private class BikeInfoMutable : TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable
+		{
+			public BikeInfoMutable(
+				string id,
+				LockModel lockModel,
+				bool isDemo = false,
+				IEnumerable<string> group = null,
+				WheelType? wheelType = null,
+				TypeOfBike? typeOfBike = null,
+				string description = null,
+				string stationId = null,
+				string stationName = null,
+				Uri operatorUri = null,
+				RentalDescription tariffDescription = null,
+				Func<DateTime> dateTimeProvider = null,
+				IStateInfo stateInfo = null) : base(
+					new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike(id, lockModel, wheelType, typeOfBike, description),
+					new TINK.Model.Bikes.BikeInfoNS.DriveNS.Drive(),
+					isDemo,
+					group,
+					stationId,
+					stationName,
+					operatorUri,
+					tariffDescription,
+					dateTimeProvider,
+					stateInfo)
+			{
+			}
+		}
 
-        [Test]
-        public void TestConstruct()
-        {
-            var l_oBikeInfo = new BikeInfoMutable("17", LockModel.ILockIt);
-            Assert.AreEqual("17", l_oBikeInfo.Id);
-            Assert.IsNull(l_oBikeInfo.StationId);
-            Assert.AreEqual(InUseStateEnum.Disposable, l_oBikeInfo.State.Value);
-            Assert.AreEqual(null, l_oBikeInfo.WheelType);
-            Assert.AreEqual(null, l_oBikeInfo.TypeOfBike);
+		[Test]
+		public void TestConstruct()
+		{
+			var l_oBikeInfo = new BikeInfoMutable("17", LockModel.ILockIt);
+			Assert.AreEqual("17", l_oBikeInfo.Id);
+			Assert.IsNull(l_oBikeInfo.StationId);
+			Assert.AreEqual(InUseStateEnum.Disposable, l_oBikeInfo.State.Value);
+			Assert.AreEqual(null, l_oBikeInfo.WheelType);
+			Assert.AreEqual(null, l_oBikeInfo.TypeOfBike);
 
-            l_oBikeInfo = new BikeInfoMutable("22", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Trike, TypeOfBike.Cargo, "Test description", "23");
-            Assert.AreEqual("22", l_oBikeInfo.Id);
-            Assert.IsFalse(l_oBikeInfo.IsDemo);
-            Assert.AreEqual("23", l_oBikeInfo.StationId);
-            Assert.AreEqual(InUseStateEnum.Disposable, l_oBikeInfo.State.Value);
-            Assert.AreEqual(WheelType.Trike, l_oBikeInfo.WheelType);
-            Assert.AreEqual(TypeOfBike.Cargo, l_oBikeInfo.TypeOfBike);
-        }
+			l_oBikeInfo = new BikeInfoMutable("22", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Trike, TypeOfBike.Cargo, "Test description", "23");
+			Assert.AreEqual("22", l_oBikeInfo.Id);
+			Assert.IsFalse(l_oBikeInfo.IsDemo);
+			Assert.AreEqual("23", l_oBikeInfo.StationId);
+			Assert.AreEqual(InUseStateEnum.Disposable, l_oBikeInfo.State.Value);
+			Assert.AreEqual(WheelType.Trike, l_oBikeInfo.WheelType);
+			Assert.AreEqual(TypeOfBike.Cargo, l_oBikeInfo.TypeOfBike);
+		}
 
 
-        [Test]
-        public void TestConstructCopyBooked()
-        {
-            // State Booked
-            var bikeInfoSource = Substitute.For<IBikeInfo>();
-            var stateSource = Substitute.For<IStateInfo>();
+		[Test]
+		public void TestConstructCopyBooked()
+		{
+			// State Booked
+			var bikeInfoSource = Substitute.For<IBikeInfo>();
+			var stateSource = Substitute.For<IStateInfo>();
 
-            bikeInfoSource.Bike.Returns(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.BordComputer, WheelType.Trike, TypeOfBike.Cargo));
-            bikeInfoSource.StationId.Returns("23");
-            bikeInfoSource.State.Returns(stateSource);
-            stateSource.Value.Returns(InUseStateEnum.Booked);
-            stateSource.From.Returns(new System.DateTime(2018, 01, 03));
-            stateSource.MailAddress.Returns("a@b");
-            stateSource.Code.Returns("234");
+			bikeInfoSource.Bike.Returns(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.BordComputer, WheelType.Trike, TypeOfBike.Cargo));
+			bikeInfoSource.StationId.Returns("23");
+			bikeInfoSource.State.Returns(stateSource);
+			stateSource.Value.Returns(InUseStateEnum.Booked);
+			stateSource.From.Returns(new System.DateTime(2018, 01, 03));
+			stateSource.MailAddress.Returns("a@b");
+			stateSource.Code.Returns("234");
 
-            var bikeInfoTarget = new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable(bikeInfoSource, "My Station Name");
+			var bikeInfoTarget = new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable(bikeInfoSource, "My Station Name");
 
-            Assert.AreEqual(InUseStateEnum.Booked, bikeInfoTarget.State.Value);
-            Assert.AreEqual("22", bikeInfoTarget.Id);
-            Assert.AreEqual("23", bikeInfoTarget.StationId);
-            Assert.AreEqual("My Station Name", bikeInfoTarget.StationName);
-            Assert.AreEqual(WheelType.Trike, bikeInfoTarget.WheelType);
-            Assert.AreEqual(TypeOfBike.Cargo, bikeInfoTarget.TypeOfBike);
-            Assert.AreEqual(InUseStateEnum.Booked, bikeInfoTarget.State.Value);
-            Assert.AreEqual(new System.DateTime(2018, 01, 03), bikeInfoTarget.State.From);
-            Assert.AreEqual("a@b", bikeInfoTarget.State.MailAddress);
-        }
+			Assert.AreEqual(InUseStateEnum.Booked, bikeInfoTarget.State.Value);
+			Assert.AreEqual("22", bikeInfoTarget.Id);
+			Assert.AreEqual("23", bikeInfoTarget.StationId);
+			Assert.AreEqual("My Station Name", bikeInfoTarget.StationName);
+			Assert.AreEqual(WheelType.Trike, bikeInfoTarget.WheelType);
+			Assert.AreEqual(TypeOfBike.Cargo, bikeInfoTarget.TypeOfBike);
+			Assert.AreEqual(InUseStateEnum.Booked, bikeInfoTarget.State.Value);
+			Assert.AreEqual(new System.DateTime(2018, 01, 03), bikeInfoTarget.State.From);
+			Assert.AreEqual("a@b", bikeInfoTarget.State.MailAddress);
+		}
 
-        [Test]
-        public void TestConstructCopyReserved()
-        {
-            // State Reserved
-            var bikeInfoSource = Substitute.For<IBikeInfo>();
-            var stateSource = Substitute.For<IStateInfo>();
+		[Test]
+		public void TestConstructCopyReserved()
+		{
+			// State Reserved
+			var bikeInfoSource = Substitute.For<IBikeInfo>();
+			var stateSource = Substitute.For<IStateInfo>();
 
-            bikeInfoSource.Bike.Returns(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.BordComputer, WheelType.Trike, TypeOfBike.Cargo));
-            bikeInfoSource.StationId.Returns("23");
-            bikeInfoSource.State.Returns(stateSource);
-            stateSource.Value.Returns(InUseStateEnum.Reserved);
-            stateSource.From.Returns(new System.DateTime(2018, 01, 03));
-            stateSource.MailAddress.Returns("a@b");
-            stateSource.Code.Returns("234");
+			bikeInfoSource.Bike.Returns(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.BordComputer, WheelType.Trike, TypeOfBike.Cargo));
+			bikeInfoSource.StationId.Returns("23");
+			bikeInfoSource.State.Returns(stateSource);
+			stateSource.Value.Returns(InUseStateEnum.Reserved);
+			stateSource.From.Returns(new System.DateTime(2018, 01, 03));
+			stateSource.MailAddress.Returns("a@b");
+			stateSource.Code.Returns("234");
 
-            var bikeInfoTarget = new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable(bikeInfoSource, "My Station Name");
+			var bikeInfoTarget = new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable(bikeInfoSource, "My Station Name");
 
-            Assert.AreEqual(InUseStateEnum.Reserved, bikeInfoTarget.State.Value);
-            Assert.AreEqual("22", bikeInfoTarget.Id);
-            Assert.AreEqual("23", bikeInfoTarget.StationId);
-            Assert.AreEqual(WheelType.Trike, bikeInfoTarget.WheelType);
-            Assert.AreEqual(TypeOfBike.Cargo, bikeInfoTarget.TypeOfBike);
-            Assert.AreEqual(InUseStateEnum.Reserved, bikeInfoTarget.State.Value);
-            Assert.AreEqual(new System.DateTime(2018, 01, 03), bikeInfoTarget.State.From);
-            Assert.AreEqual("a@b", bikeInfoTarget.State.MailAddress);
+			Assert.AreEqual(InUseStateEnum.Reserved, bikeInfoTarget.State.Value);
+			Assert.AreEqual("22", bikeInfoTarget.Id);
+			Assert.AreEqual("23", bikeInfoTarget.StationId);
+			Assert.AreEqual(WheelType.Trike, bikeInfoTarget.WheelType);
+			Assert.AreEqual(TypeOfBike.Cargo, bikeInfoTarget.TypeOfBike);
+			Assert.AreEqual(InUseStateEnum.Reserved, bikeInfoTarget.State.Value);
+			Assert.AreEqual(new System.DateTime(2018, 01, 03), bikeInfoTarget.State.From);
+			Assert.AreEqual("a@b", bikeInfoTarget.State.MailAddress);
 
-        }
+		}
 
-        [Test]
-        public void TestConstructCopyAvailable()
-        {
-            // State Disposable
-            var bikeInfoSource = Substitute.For<IBikeInfo>();
-            var stateSource = Substitute.For<IStateInfo>();
+		[Test]
+		public void TestConstructCopyAvailable()
+		{
+			// State Disposable
+			var bikeInfoSource = Substitute.For<IBikeInfo>();
+			var stateSource = Substitute.For<IStateInfo>();
 
-            bikeInfoSource.Bike.Returns(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.BordComputer, WheelType.Trike, TypeOfBike.Cargo));
-            bikeInfoSource.StationId.Returns("23");
-            bikeInfoSource.State.Returns(stateSource);
-            stateSource.Value.Returns(InUseStateEnum.Disposable);
+			bikeInfoSource.Bike.Returns(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.BordComputer, WheelType.Trike, TypeOfBike.Cargo));
+			bikeInfoSource.StationId.Returns("23");
+			bikeInfoSource.State.Returns(stateSource);
+			stateSource.Value.Returns(InUseStateEnum.Disposable);
 
-            var bikeInfoTarget = new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable(bikeInfoSource, "My Station Name");
+			var bikeInfoTarget = new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable(bikeInfoSource, "My Station Name");
 
-            Assert.AreEqual(InUseStateEnum.Disposable, bikeInfoTarget.State.Value);
-            Assert.AreEqual("22", bikeInfoTarget.Id);
-            Assert.AreEqual("23", bikeInfoTarget.StationId);
-            Assert.AreEqual(WheelType.Trike, bikeInfoTarget.WheelType);
-            Assert.AreEqual(TypeOfBike.Cargo, bikeInfoTarget.TypeOfBike);
-            Assert.AreEqual(InUseStateEnum.Disposable, bikeInfoTarget.State.Value);
-            Assert.IsNull(bikeInfoTarget.State.From);
-        }
+			Assert.AreEqual(InUseStateEnum.Disposable, bikeInfoTarget.State.Value);
+			Assert.AreEqual("22", bikeInfoTarget.Id);
+			Assert.AreEqual("23", bikeInfoTarget.StationId);
+			Assert.AreEqual(WheelType.Trike, bikeInfoTarget.WheelType);
+			Assert.AreEqual(TypeOfBike.Cargo, bikeInfoTarget.TypeOfBike);
+			Assert.AreEqual(InUseStateEnum.Disposable, bikeInfoTarget.State.Value);
+			Assert.IsNull(bikeInfoTarget.State.From);
+		}
 
-        [Test]
-        public void TestConstructBikeNull()
-        {
-            Assert.That(
-                () => new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable(null, "My Station Name"),
-                Throws.ArgumentNullException);
-        }
-    }
+		[Test]
+		public void TestConstructBikeNull()
+		{
+			Assert.That(
+				() => new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable(null, "My Station Name"),
+				Throws.ArgumentNullException);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/CopriCallsHttpReference.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/CopriCallsHttpReference.cs
index 0b786bc..d6a2f1f 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/CopriCallsHttpReference.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/CopriCallsHttpReference.cs
@@ -10,281 +10,281 @@ using TINK.Repository.Response;
 
 namespace UITest.Fixtures.Connector
 {
-    /// <summary>
-    /// Object which manages calls to copri.
-    /// </summary>
-    public class CopriCallsHttpsReference
-    {
-        /// <summary> Logs user in. </summary>
-        /// <param name="copriHost">Host to connect to. </param>
-        /// <param name="merchantId">Id of the merchant.</param>
-        /// <param name="mailAddress">Mailaddress of user to log in.</param>
-        /// <param name="password">Password to log in.</param>
-        /// <param name="deviceId">Id specifying user and hardware.</param>
-        /// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
-        public static AuthorizationResponse DoAuthorizeCall(
-            string copriHost,
-            string merchantId,
-            string mailAddress,
-            string password,
-            string deviceId)
-        {
+	/// <summary>
+	/// Object which manages calls to copri.
+	/// </summary>
+	public class CopriCallsHttpsReference
+	{
+		/// <summary> Logs user in. </summary>
+		/// <param name="copriHost">Host to connect to. </param>
+		/// <param name="merchantId">Id of the merchant.</param>
+		/// <param name="mailAddress">Mailaddress of user to log in.</param>
+		/// <param name="password">Password to log in.</param>
+		/// <param name="deviceId">Id specifying user and hardware.</param>
+		/// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
+		public static AuthorizationResponse DoAuthorizeCall(
+			string copriHost,
+			string merchantId,
+			string mailAddress,
+			string password,
+			string deviceId)
+		{
 #if !WINDOWS_UWP
 
-            var l_oCommand = string.Format(
-                "request=authorization&merchant_id={0}&user_id={1}&user_pw={2}&hw_id={3}",
-                merchantId,
-                mailAddress,
-                password,
-                deviceId);
+			var l_oCommand = string.Format(
+				"request=authorization&merchant_id={0}&user_id={1}&user_pw={2}&hw_id={3}",
+				merchantId,
+				mailAddress,
+				password,
+				deviceId);
 
-            /// Extract session cookie from response.
+			/// Extract session cookie from response.
 
-            string response = string.Empty;
+			string response = string.Empty;
 
-            response = Post(l_oCommand, copriHost);
+			response = Post(l_oCommand, copriHost);
 
-            return JsonConvert.DeserializeObject<ResponseContainer<AuthorizationResponse>>(response)?.shareejson;
+			return JsonConvert.DeserializeObject<ResponseContainer<AuthorizationResponse>>(response)?.shareejson;
 #else
             return null;
 #endif
-        }
+		}
 
-        /// <summary> Logs user out. </summary>
-        /// <param name="copriHost">Host to connect to. </param>
-        /// <param name="merchantId">Id of the merchant.</param>
-        /// <param name="sessionCookie"> Cookie which identifies user.</param>
-        public static AuthorizationoutResponse DoAuthoutCall(
-            string copriHost,
-            string merchantId,
-            string sessionCookie)
-        {
+		/// <summary> Logs user out. </summary>
+		/// <param name="copriHost">Host to connect to. </param>
+		/// <param name="merchantId">Id of the merchant.</param>
+		/// <param name="sessionCookie"> Cookie which identifies user.</param>
+		public static AuthorizationoutResponse DoAuthoutCall(
+			string copriHost,
+			string merchantId,
+			string sessionCookie)
+		{
 #if !WINDOWS_UWP
 
-            var l_oCommand = string.Format(
-                "request=authout&authcookie={0}{1}",
-                sessionCookie,
-                merchantId);
+			var l_oCommand = string.Format(
+				"request=authout&authcookie={0}{1}",
+				sessionCookie,
+				merchantId);
 
-            string l_oLogoutResponse;
+			string l_oLogoutResponse;
 
-            l_oLogoutResponse = Post(l_oCommand, copriHost);
+			l_oLogoutResponse = Post(l_oCommand, copriHost);
 
-            /// Extract session cookie from response.
-            return JsonConvert.DeserializeObject<ResponseContainer<AuthorizationoutResponse>>(l_oLogoutResponse)?.shareejson;
+			/// Extract session cookie from response.
+			return JsonConvert.DeserializeObject<ResponseContainer<AuthorizationoutResponse>>(l_oLogoutResponse)?.shareejson;
 #else
             return null;
 #endif
-        }
+		}
 
-        /// <summary>
-        /// Get list of stations from file.
-        /// </summary>
-        /// <param name="p_strCopriHost">URL of the copri host to connect to.</param>
-        /// <param name="p_strMerchantId">Id of the merchant.</param>
-        /// <param name="p_strCookie">Auto cookie of user if user is logged in.</param>
-        /// <returns>List of files.</returns>
-        public static StationsAvailableResponse GetStationsAllCall(
-            string p_strCopriHost,
-            string p_strMerchantId,
-            string p_strCookie = null)
-        {
-            var l_oCommand = string.Format(
-                "request=stations_all&authcookie={0}{1}",
-                p_strCookie,
-                p_strMerchantId);
+		/// <summary>
+		/// Get list of stations from file.
+		/// </summary>
+		/// <param name="p_strCopriHost">URL of the copri host to connect to.</param>
+		/// <param name="p_strMerchantId">Id of the merchant.</param>
+		/// <param name="p_strCookie">Auto cookie of user if user is logged in.</param>
+		/// <returns>List of files.</returns>
+		public static StationsAvailableResponse GetStationsAllCall(
+			string p_strCopriHost,
+			string p_strMerchantId,
+			string p_strCookie = null)
+		{
+			var l_oCommand = string.Format(
+				"request=stations_all&authcookie={0}{1}",
+				p_strCookie,
+				p_strMerchantId);
 
 #if !WINDOWS_UWP
-            string l_oStationsAllResponse;
+			string l_oStationsAllResponse;
 
-            l_oStationsAllResponse = Post(l_oCommand, p_strCopriHost);
+			l_oStationsAllResponse = Post(l_oCommand, p_strCopriHost);
 
-            // Extract bikes from response.
-            return JsonConvert.DeserializeObject<ResponseContainer<StationsAvailableResponse>>(l_oStationsAllResponse)?.shareejson;
+			// Extract bikes from response.
+			return JsonConvert.DeserializeObject<ResponseContainer<StationsAvailableResponse>>(l_oStationsAllResponse)?.shareejson;
 #else
             return null;
 #endif
-        }
+		}
 
-        /// <summary>
-        /// Gets a list of bikes from Copri.
-        /// </summary>
-        /// <param name="copriHost">URL of the copri host to connect to.</param>
-        /// <param name="p_strMerchantId">Id of the merchant.</param>
-        /// <param name="p_strSessionCookie">Cookie to authenticate user.</param>
-        /// <returns>Response holding list of bikes.</returns>
-        public static BikesAvailableResponse GetBikesAvailableCall(
-            string copriHost,
-            string merchantId,
-            string sessionCookie = null)
-        {
+		/// <summary>
+		/// Gets a list of bikes from Copri.
+		/// </summary>
+		/// <param name="copriHost">URL of the copri host to connect to.</param>
+		/// <param name="p_strMerchantId">Id of the merchant.</param>
+		/// <param name="p_strSessionCookie">Cookie to authenticate user.</param>
+		/// <returns>Response holding list of bikes.</returns>
+		public static BikesAvailableResponse GetBikesAvailableCall(
+			string copriHost,
+			string merchantId,
+			string sessionCookie = null)
+		{
 #if !WINDOWS_UWP
-            string l_oCommand =
-                $"request=bikes_available&system=all&authcookie={sessionCookie ?? string.Empty}{merchantId}";
+			string l_oCommand =
+				$"request=bikes_available&system=all&authcookie={sessionCookie ?? string.Empty}{merchantId}";
 
-            string response;
+			string response;
 
-            response = Post(l_oCommand, copriHost);
+			response = Post(l_oCommand, copriHost);
 
-            // Extract bikes from response.
-            return CopriCallsStatic.DeserializeResponse<BikesAvailableResponse>(response);
+			// Extract bikes from response.
+			return CopriCallsStatic.DeserializeResponse<BikesAvailableResponse>(response);
 #else
             return null;
 #endif
-        }
+		}
 
-        /// <summary>
-        /// Gets a list of bikes reserved/ booked by acctive user from Copri.
-        /// </summary>
-        /// <param name="p_strMerchantId">Id of the merchant.</param>
-        /// <param name="p_strSessionCookie">Cookie to authenticate user.</param>
-        /// <returns>Response holding list of bikes.</returns>
-        public static BikesReservedOccupiedResponse GetBikesOccupiedCall(
-            string copriHost,
-            string merchantId,
-            string sessionCookie)
-        {
+		/// <summary>
+		/// Gets a list of bikes reserved/ booked by acctive user from Copri.
+		/// </summary>
+		/// <param name="p_strMerchantId">Id of the merchant.</param>
+		/// <param name="p_strSessionCookie">Cookie to authenticate user.</param>
+		/// <returns>Response holding list of bikes.</returns>
+		public static BikesReservedOccupiedResponse GetBikesOccupiedCall(
+			string copriHost,
+			string merchantId,
+			string sessionCookie)
+		{
 #if !WINDOWS_UWP
-            string l_oCommand = !string.IsNullOrEmpty(sessionCookie)
-                ? $"request=user_bikes_occupied&system=all&authcookie={sessionCookie}{merchantId}"
-                : "request=bikes_available";
+			string l_oCommand = !string.IsNullOrEmpty(sessionCookie)
+				? $"request=user_bikes_occupied&system=all&authcookie={sessionCookie}{merchantId}"
+				: "request=bikes_available";
 
-            string l_oBikesOccupiedResponse;
+			string l_oBikesOccupiedResponse;
 
-            l_oBikesOccupiedResponse = Post(l_oCommand, copriHost);
+			l_oBikesOccupiedResponse = Post(l_oCommand, copriHost);
 
-            // Extract bikes from response.
-            return CopriCallsStatic.DeserializeResponse<BikesReservedOccupiedResponse>(l_oBikesOccupiedResponse);
+			// Extract bikes from response.
+			return CopriCallsStatic.DeserializeResponse<BikesReservedOccupiedResponse>(l_oBikesOccupiedResponse);
 #else
             return null;
 #endif
-        }
+		}
 
-        /// <summary>
-        /// Gets booking request response.
-        /// </summary>
-        /// <param name="p_strMerchantId">Id of the merchant.</param>
-        /// <param name="p_iBikeId">Id of the bike to book.</param>
-        /// <param name="p_strSessionCookie">Cookie identifying the user.</param>
-        /// <returns>Response on booking request.</returns>
-        public static ReservationBookingResponse DoReserveCall(
-            string copriHost,
-            string p_strMerchantId,
-            string p_iBikeId,
-            string p_strSessionCookie)
-        {
+		/// <summary>
+		/// Gets booking request response.
+		/// </summary>
+		/// <param name="p_strMerchantId">Id of the merchant.</param>
+		/// <param name="p_iBikeId">Id of the bike to book.</param>
+		/// <param name="p_strSessionCookie">Cookie identifying the user.</param>
+		/// <returns>Response on booking request.</returns>
+		public static ReservationBookingResponse DoReserveCall(
+			string copriHost,
+			string p_strMerchantId,
+			string p_iBikeId,
+			string p_strSessionCookie)
+		{
 #if !WINDOWS_UWP
-            string l_oCommand = string.Format(
-                "request=booking_request&bike={0}&authcookie={1}{2}",
-                p_iBikeId,
-                p_strSessionCookie,
-                p_strMerchantId);
+			string l_oCommand = string.Format(
+				"request=booking_request&bike={0}&authcookie={1}{2}",
+				p_iBikeId,
+				p_strSessionCookie,
+				p_strMerchantId);
 
-            string l_oBikesAvaialbeResponse = Post(l_oCommand, copriHost);
+			string l_oBikesAvaialbeResponse = Post(l_oCommand, copriHost);
 
-            // Extract bikes from response.
-            return JsonConvert.DeserializeObject<ResponseContainer<ReservationBookingResponse>>(l_oBikesAvaialbeResponse)?.shareejson;
+			// Extract bikes from response.
+			return JsonConvert.DeserializeObject<ResponseContainer<ReservationBookingResponse>>(l_oBikesAvaialbeResponse)?.shareejson;
 #else
             return null;
 #endif
-        }
+		}
 
-        /// <summary>
-        /// Gets canel booking request response.
-        /// </summary>
-        /// <param name="p_strMerchantId">Id of the merchant.</param>
-        /// <param name="p_iBikeId">Id of the bike to book.</param>
-        /// <param name="p_strSessionCookie">Cookie of the logged in user.</param>
-        /// <returns>Response on cancel booking request.</returns>
-        public static ReservationCancelReturnResponse DoCancelReservationCall(
-            string copriHost,
-            string p_strMerchantId,
-            string p_iBikeId,
-            string p_strSessionCookie)
-        {
+		/// <summary>
+		/// Gets canel booking request response.
+		/// </summary>
+		/// <param name="p_strMerchantId">Id of the merchant.</param>
+		/// <param name="p_iBikeId">Id of the bike to book.</param>
+		/// <param name="p_strSessionCookie">Cookie of the logged in user.</param>
+		/// <returns>Response on cancel booking request.</returns>
+		public static ReservationCancelReturnResponse DoCancelReservationCall(
+			string copriHost,
+			string p_strMerchantId,
+			string p_iBikeId,
+			string p_strSessionCookie)
+		{
 #if !WINDOWS_UWP
-            string l_oCommand = string.Format(
-                "request=booking_cancel&bike={0}&authcookie={1}{2}",
-                p_iBikeId,
-                p_strSessionCookie,
-                p_strMerchantId);
-            string l_oBikesAvaialbeResponse;
+			string l_oCommand = string.Format(
+				"request=booking_cancel&bike={0}&authcookie={1}{2}",
+				p_iBikeId,
+				p_strSessionCookie,
+				p_strMerchantId);
+			string l_oBikesAvaialbeResponse;
 
-            l_oBikesAvaialbeResponse = Post(l_oCommand, copriHost);
+			l_oBikesAvaialbeResponse = Post(l_oCommand, copriHost);
 
-            // Extract bikes from response.
-            return JsonConvert.DeserializeObject<ResponseContainer<ReservationCancelReturnResponse>>(l_oBikesAvaialbeResponse)?.shareejson;
+			// Extract bikes from response.
+			return JsonConvert.DeserializeObject<ResponseContainer<ReservationCancelReturnResponse>>(l_oBikesAvaialbeResponse)?.shareejson;
 #else
             return null;
 #endif
-        }
+		}
 
-        /// <summary>
-        /// Gets a list of bikes from Copri.
-        /// </summary>
-        /// <param name="p_strSessionCookie">Cookie to authenticate user.</param>
-        /// <returns></returns>
-        private static string Post(
-            string p_strCommand,
-            string p_strURL)
-        {
+		/// <summary>
+		/// Gets a list of bikes from Copri.
+		/// </summary>
+		/// <param name="p_strSessionCookie">Cookie to authenticate user.</param>
+		/// <returns></returns>
+		private static string Post(
+			string p_strCommand,
+			string p_strURL)
+		{
 #if !WINDOWS_UWP
-            var l_strHost = p_strURL;
+			var l_strHost = p_strURL;
 
-            // Returns a http request.
-            var l_oRequest = WebRequest.Create(l_strHost);
+			// Returns a http request.
+			var l_oRequest = WebRequest.Create(l_strHost);
 
-            l_oRequest.Method = "POST";
-            l_oRequest.ContentType = "application/x-www-form-urlencoded";
+			l_oRequest.Method = "POST";
+			l_oRequest.ContentType = "application/x-www-form-urlencoded";
 
-            byte[] l_oPostData = Encoding.UTF8.GetBytes(p_strCommand);
+			byte[] l_oPostData = Encoding.UTF8.GetBytes(p_strCommand);
 
-            l_oRequest.ContentLength = l_oPostData.Length;
+			l_oRequest.ContentLength = l_oPostData.Length;
 
-            // Get the request stream.
-            using (Stream l_oDataStream = l_oRequest.GetRequestStream())
-            {
-                // Write the data to the request stream.
-                l_oDataStream.Write(l_oPostData, 0, l_oPostData.Length);
-            }
+			// Get the request stream.
+			using (Stream l_oDataStream = l_oRequest.GetRequestStream())
+			{
+				// Write the data to the request stream.
+				l_oDataStream.Write(l_oPostData, 0, l_oPostData.Length);
+			}
 
-            // Get the response.
-            var l_oResponse = l_oRequest.GetResponse() as HttpWebResponse;
+			// Get the response.
+			var l_oResponse = l_oRequest.GetResponse() as HttpWebResponse;
 
-            if (l_oResponse == null)
-            {
-                throw new Exception(string.Format("Reserve request failed. Response form from server was not of expected type."));
-            }
+			if (l_oResponse == null)
+			{
+				throw new Exception(string.Format("Reserve request failed. Response form from server was not of expected type."));
+			}
 
-            if (l_oResponse.StatusCode != HttpStatusCode.OK)
-            {
-                throw new CommunicationException(string.Format(
-                    "Posting request {0} failed. Expected status code is {1} but was {2}.",
-                    p_strCommand,
-                    HttpStatusCode.OK,
-                    l_oResponse.StatusCode));
-            }
+			if (l_oResponse.StatusCode != HttpStatusCode.OK)
+			{
+				throw new CommunicationException(string.Format(
+					"Posting request {0} failed. Expected status code is {1} but was {2}.",
+					p_strCommand,
+					HttpStatusCode.OK,
+					l_oResponse.StatusCode));
+			}
 
-            string responseFromServer = string.Empty;
+			string responseFromServer = string.Empty;
 
-            // Get the request stream.
-            using (Stream l_oDataStream = l_oResponse.GetResponseStream())
-            using (StreamReader l_oReader = new StreamReader(l_oDataStream))
-            {
-                // Read the content.
-                responseFromServer = l_oReader.ReadToEnd();
+			// Get the request stream.
+			using (Stream l_oDataStream = l_oResponse.GetResponseStream())
+			using (StreamReader l_oReader = new StreamReader(l_oDataStream))
+			{
+				// Read the content.
+				responseFromServer = l_oReader.ReadToEnd();
 
-                // Display the content.
-                Console.WriteLine(responseFromServer);
+				// Display the content.
+				Console.WriteLine(responseFromServer);
 
-                // Clean up the streams.
-                l_oResponse.Close();
-            }
+				// Clean up the streams.
+				l_oResponse.Close();
+			}
 
-            return responseFromServer;
+			return responseFromServer;
 #else
             return null;
 #endif
-        }
-    }
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/Exception/TestAuthcookieNotDefinedException.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/Exception/TestAuthcookieNotDefinedException.cs
index 2df5c89..07c9279 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/Exception/TestAuthcookieNotDefinedException.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/Exception/TestAuthcookieNotDefinedException.cs
@@ -5,45 +5,45 @@ using TINK.Repository.Response;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Connector.Exception
 {
-    [TestFixture]
-    public class TestAuthcookieNotDefinedException
-    {
-        [Test]
-        public void TestConstruct()
-        {
-            Assert.AreEqual(
-                "Can not test.\r\nDie Sitzung ist abgelaufen. Bitte neu anmelden.",
-                (new AuthcookieNotDefinedException(
-                    "Can not test.",
-                    JsonConvert.DeserializeObject<ResponseBase>(@"{ ""response_state"" : ""Some inner error description""}"))).Message);
-        }
+	[TestFixture]
+	public class TestAuthcookieNotDefinedException
+	{
+		[Test]
+		public void TestConstruct()
+		{
+			Assert.AreEqual(
+				"Can not test.\r\nDie Sitzung ist abgelaufen. Bitte neu anmelden.",
+				(new AuthcookieNotDefinedException(
+					"Can not test.",
+					JsonConvert.DeserializeObject<ResponseBase>(@"{ ""response_state"" : ""Some inner error description""}"))).Message);
+		}
 
-        [Test]
-        public void TestTestIsAuthcookieNotDefined_False()
-        {
-            var response = JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(@"{ ""response_state"" : ""OK"" }");
-            Assert.That(AuthcookieNotDefinedException.IsAuthcookieNotDefined(response, "Test context", out AuthcookieNotDefinedException exception),
-                Is.EqualTo(false));
-        }
+		[Test]
+		public void TestTestIsAuthcookieNotDefined_False()
+		{
+			var response = JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(@"{ ""response_state"" : ""OK"" }");
+			Assert.That(AuthcookieNotDefinedException.IsAuthcookieNotDefined(response, "Test context", out AuthcookieNotDefinedException exception),
+				Is.EqualTo(false));
+		}
 
-        [Test]
-        public void TestIsAuthcookieNotDefined_TrueLegacy()
-        {
-            var response = JsonConvert.DeserializeObject<ResponseBase>($"{{ \"response_state\" : \"Failure 1003: authcookie not defined\" }}");
-            Assert.That(AuthcookieNotDefinedException.IsAuthcookieNotDefined(response, "Test context", out AuthcookieNotDefinedException exception),
-                Is.EqualTo(true));
+		[Test]
+		public void TestIsAuthcookieNotDefined_TrueLegacy()
+		{
+			var response = JsonConvert.DeserializeObject<ResponseBase>($"{{ \"response_state\" : \"Failure 1003: authcookie not defined\" }}");
+			Assert.That(AuthcookieNotDefinedException.IsAuthcookieNotDefined(response, "Test context", out AuthcookieNotDefinedException exception),
+				Is.EqualTo(true));
 
-            Assert.That(exception, !Is.Null);
-        }
+			Assert.That(exception, !Is.Null);
+		}
 
-        [Test]
-        public void TestIsAuthcookieNotDefined_False()
-        {
-            var response = JsonConvert.DeserializeObject<ResponseBase>($"{{ \"response_state\" : \"Failure 1001: authcookie not defined\" }}");
-            Assert.That(AuthcookieNotDefinedException.IsAuthcookieNotDefined(response, "Test context", out AuthcookieNotDefinedException exception),
-                Is.EqualTo(true));
+		[Test]
+		public void TestIsAuthcookieNotDefined_False()
+		{
+			var response = JsonConvert.DeserializeObject<ResponseBase>($"{{ \"response_state\" : \"Failure 1001: authcookie not defined\" }}");
+			Assert.That(AuthcookieNotDefinedException.IsAuthcookieNotDefined(response, "Test context", out AuthcookieNotDefinedException exception),
+				Is.EqualTo(true));
 
-            Assert.That(exception, !Is.Null);
-        }
-    }
+			Assert.That(exception, !Is.Null);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/Filter/TestIntersectFilter.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/Filter/TestIntersectFilter.cs
index 7ad6c46..4472bac 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/Filter/TestIntersectFilter.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/Filter/TestIntersectFilter.cs
@@ -5,36 +5,36 @@ using TINK.Model.Connector.Filter;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Connector.Filter
 {
-    [TestFixture]
-    public class TestIntersectFilter
-    {
-        [Test]
-        public void TestDoFilter_Null()
-        {
-            var filter = new IntersectGroupFilter(new List<string> { "Tonk" });
+	[TestFixture]
+	public class TestIntersectFilter
+	{
+		[Test]
+		public void TestDoFilter_Null()
+		{
+			var filter = new IntersectGroupFilter(new List<string> { "Tonk" });
 
-            Assert.AreEqual(1, filter.DoFilter(null).Count());
-            Assert.AreEqual(
-                "Tonk",
-                filter.DoFilter(null).ToArray()[0],
-                "Do not apply filtering when null is passed as argement (null-filter).");
-        }
+			Assert.AreEqual(1, filter.DoFilter(null).Count());
+			Assert.AreEqual(
+				"Tonk",
+				filter.DoFilter(null).ToArray()[0],
+				"Do not apply filtering when null is passed as argement (null-filter).");
+		}
 
-        [Test]
-        public void TestDoFilter_Empty()
-        {
-            var filter = new IntersectGroupFilter(new List<string> { "Tonk" });
+		[Test]
+		public void TestDoFilter_Empty()
+		{
+			var filter = new IntersectGroupFilter(new List<string> { "Tonk" });
 
-            Assert.AreEqual(0, filter.DoFilter(new List<string>()).Count());
-        }
+			Assert.AreEqual(0, filter.DoFilter(new List<string>()).Count());
+		}
 
-        [Test]
-        public void TestDoFilter()
-        {
-            var filter = new IntersectGroupFilter(new List<string> { "FR_001", "FR_009" });
+		[Test]
+		public void TestDoFilter()
+		{
+			var filter = new IntersectGroupFilter(new List<string> { "FR_001", "FR_009" });
 
-            Assert.AreEqual(1, filter.DoFilter(new List<string> { "FR_001", "FR_007" }).Count());
-            Assert.AreEqual("FR_001", filter.DoFilter(new List<string> { "FR_001", "FR_007" }).ToArray()[0]);
-        }
-    }
+			Assert.AreEqual(1, filter.DoFilter(new List<string> { "FR_001", "FR_007" }).Count());
+			Assert.AreEqual("FR_001", filter.DoFilter(new List<string> { "FR_001", "FR_007" }).ToArray()[0]);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/Filter/TestNullFilter.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/Filter/TestNullFilter.cs
index b44b6e9..9e75972 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/Filter/TestNullFilter.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/Filter/TestNullFilter.cs
@@ -5,16 +5,16 @@ using TINK.Model.Connector.Filter;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Connector.Filter
 {
-    [TestFixture]
-    public class TestNullFilter
-    {
-        [Test]
-        public void TestDoFilter()
-        {
-            var filter = new NullGroupFilter();
-            Assert.IsNull(filter.DoFilter(null));
-            Assert.AreEqual(0, filter.DoFilter(new List<string>()).Count());
-            Assert.AreEqual(1, filter.DoFilter(new List<string> { "Hello" }).Count());
-        }
-    }
+	[TestFixture]
+	public class TestNullFilter
+	{
+		[Test]
+		public void TestDoFilter()
+		{
+			var filter = new NullGroupFilter();
+			Assert.IsNull(filter.DoFilter(null));
+			Assert.AreEqual(0, filter.DoFilter(new List<string>()).Count());
+			Assert.AreEqual(1, filter.DoFilter(new List<string> { "Hello" }).Count());
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/Query/TestCachedQuery.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/Query/TestCachedQuery.cs
index 76682d6..5df88fa 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/Query/TestCachedQuery.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/Query/TestCachedQuery.cs
@@ -10,10 +10,10 @@ using TINK.Services.CopriApi;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Connector.Query
 {
-    [TestFixture]
-    public class TestCachedQuery
-    {
-        private const string BIKESAVAILABLE = @"{
+	[TestFixture]
+	public class TestCachedQuery
+	{
+		private const string BIKESAVAILABLE = @"{
               ""copri_version"" : ""4.1.0.0"",
               ""bikes"" : {},
               ""response_state"" : ""OK"",
@@ -31,7 +31,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Query
             }
         }";
 
-        private const string STATIONSALL = @"{
+		private const string STATIONSALL = @"{
               ""copri_version"" : ""4.1.0.0"",
               ""stations"" : {
                  ""5"" : {
@@ -71,7 +71,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Query
               ""apiserver"" : ""https://tinkwwp.copri-bike.de""
         }";
 
-        private const string STATIONSALLEMPTY = @"{
+		private const string STATIONSALLEMPTY = @"{
               ""copri_version"" : ""4.1.0.0"",
               ""stations"" : {
         },
@@ -84,115 +84,115 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Query
               ""apiserver"" : ""https://tinkwwp.copri-bike.de""
         }";
 
-        [Test]
-        public async Task TestGetStations_StationsFromCache()
-        {
-            var server = MockRepository.GenerateMock<ICachedCopriServer>();
+		[Test]
+		public async Task TestGetStations_StationsFromCache()
+		{
+			var server = MockRepository.GenerateMock<ICachedCopriServer>();
 
-            server.Stub(x => x.GetStations(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<StationsAvailableResponse>(
-                typeof(CopriCallsMonkeyStore),
-                JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL),
-                new GeneralData(),
-                new System.Exception("Bang when getting stations..."))));
+			server.Stub(x => x.GetStations(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<StationsAvailableResponse>(
+				typeof(CopriCallsMonkeyStore),
+				JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL),
+				new GeneralData(),
+				new System.Exception("Bang when getting stations..."))));
 
-            server.Stub(x => x.GetBikesAvailable(Arg<bool>.Matches(fromCache => fromCache == true))).Return(Task.Run(() => new Result<BikesAvailableResponse>(
-                typeof(CopriCallsMonkeyStore),
-                JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
-                new GeneralData())));
+			server.Stub(x => x.GetBikesAvailable(Arg<bool>.Matches(fromCache => fromCache == true))).Return(Task.Run(() => new Result<BikesAvailableResponse>(
+				typeof(CopriCallsMonkeyStore),
+				JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
+				new GeneralData())));
 
-            var result = await new CachedQuery(server).GetBikesAndStationsAsync();
+			var result = await new CachedQuery(server).GetBikesAndStationsAsync();
 
-            Assert.AreEqual(3, result.Response.StationsAll.Count);
-            Assert.AreEqual(1, result.Response.Bikes.Count);
-            Assert.AreEqual(typeof(CopriCallsMonkeyStore), result.Source);
-            Assert.AreEqual("Bang when getting stations...", result.Exception.Message);
-        }
+			Assert.AreEqual(3, result.Response.StationsAll.Count);
+			Assert.AreEqual(1, result.Response.Bikes.Count);
+			Assert.AreEqual(typeof(CopriCallsMonkeyStore), result.Source);
+			Assert.AreEqual("Bang when getting stations...", result.Exception.Message);
+		}
 
-        [Test]
-        public async Task TestGetStations_BikesAvailableFromCache()
-        {
-            var server = MockRepository.GenerateMock<ICachedCopriServer>();
+		[Test]
+		public async Task TestGetStations_BikesAvailableFromCache()
+		{
+			var server = MockRepository.GenerateMock<ICachedCopriServer>();
 
-            server.Stub(x => x.GetStations(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<StationsAvailableResponse>(
-                typeof(CopriCallsHttps),
-                JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALLEMPTY),
-                new GeneralData())));
+			server.Stub(x => x.GetStations(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<StationsAvailableResponse>(
+				typeof(CopriCallsHttps),
+				JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALLEMPTY),
+				new GeneralData())));
 
-            server.Stub(x => x.GetBikesAvailable(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<BikesAvailableResponse>(
-                typeof(CopriCallsMonkeyStore),
-                JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
-                new GeneralData(),
-                new System.Exception("Bang when getting bikes..."))));
+			server.Stub(x => x.GetBikesAvailable(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<BikesAvailableResponse>(
+				typeof(CopriCallsMonkeyStore),
+				JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
+				new GeneralData(),
+				new System.Exception("Bang when getting bikes..."))));
 
-            server.Stub(x => x.GetStations(Arg<bool>.Matches(fromCache => fromCache == true))).Return(Task.Run(() => new Result<StationsAvailableResponse>(
-                typeof(CopriCallsMonkeyStore),
-                JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL),
-                new GeneralData())));
+			server.Stub(x => x.GetStations(Arg<bool>.Matches(fromCache => fromCache == true))).Return(Task.Run(() => new Result<StationsAvailableResponse>(
+				typeof(CopriCallsMonkeyStore),
+				JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL),
+				new GeneralData())));
 
-            var result = await new CachedQuery(server).GetBikesAndStationsAsync();
+			var result = await new CachedQuery(server).GetBikesAndStationsAsync();
 
-            Assert.AreEqual(3, result.Response.StationsAll.Count);
-            Assert.AreEqual(1, result.Response.Bikes.Count);
-            Assert.AreEqual(typeof(CopriCallsMonkeyStore), result.Source);
-            Assert.AreEqual("Bang when getting bikes...", result.Exception.Message);
-        }
+			Assert.AreEqual(3, result.Response.StationsAll.Count);
+			Assert.AreEqual(1, result.Response.Bikes.Count);
+			Assert.AreEqual(typeof(CopriCallsMonkeyStore), result.Source);
+			Assert.AreEqual("Bang when getting bikes...", result.Exception.Message);
+		}
 
 
-        [Test]
-        public async Task TestGetStations()
-        {
-            var server = MockRepository.GenerateMock<ICachedCopriServer>();
+		[Test]
+		public async Task TestGetStations()
+		{
+			var server = MockRepository.GenerateMock<ICachedCopriServer>();
 
-            server.Stub(x => x.GetStations(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<StationsAvailableResponse>(
-                typeof(CopriCallsHttps),
-                JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL),
-                new GeneralData())));
+			server.Stub(x => x.GetStations(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<StationsAvailableResponse>(
+				typeof(CopriCallsHttps),
+				JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL),
+				new GeneralData())));
 
-            server.Stub(x => x.GetBikesAvailable(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<BikesAvailableResponse>(
-                typeof(CopriCallsHttps),
-                JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
-                new GeneralData())));
+			server.Stub(x => x.GetBikesAvailable(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<BikesAvailableResponse>(
+				typeof(CopriCallsHttps),
+				JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
+				new GeneralData())));
 
-            server.Stub(x => x.AddToCache(Arg<Result<StationsAvailableResponse>>.Is.Anything));
-            server.Stub(x => x.AddToCache(Arg<Result<BikesAvailableResponse>>.Is.Anything));
+			server.Stub(x => x.AddToCache(Arg<Result<StationsAvailableResponse>>.Is.Anything));
+			server.Stub(x => x.AddToCache(Arg<Result<BikesAvailableResponse>>.Is.Anything));
 
-            var result = await new CachedQuery(server).GetBikesAndStationsAsync();
+			var result = await new CachedQuery(server).GetBikesAndStationsAsync();
 
-            Assert.AreEqual(3, result.Response.StationsAll.Count);
-            Assert.AreEqual(1, result.Response.Bikes.Count);
-            Assert.AreEqual(typeof(CopriCallsHttps), result.Source);
-            Assert.IsNull(result.Exception);
-        }
+			Assert.AreEqual(3, result.Response.StationsAll.Count);
+			Assert.AreEqual(1, result.Response.Bikes.Count);
+			Assert.AreEqual(typeof(CopriCallsHttps), result.Source);
+			Assert.IsNull(result.Exception);
+		}
 
-        [Test]
-        public async Task TestGetBikes()
-        {
-            var server = MockRepository.GenerateMock<ICachedCopriServer>();
+		[Test]
+		public async Task TestGetBikes()
+		{
+			var server = MockRepository.GenerateMock<ICachedCopriServer>();
 
-            server.Stub(x => x.GetBikesAvailable()).Return(Task.Run(() => new Result<BikesAvailableResponse>(
-                typeof(CopriCallsHttps),
-                JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
-                new GeneralData())));
+			server.Stub(x => x.GetBikesAvailable()).Return(Task.Run(() => new Result<BikesAvailableResponse>(
+				typeof(CopriCallsHttps),
+				JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
+				new GeneralData())));
 
-            server.Stub(x => x.AddToCache(Arg<Result<BikesAvailableResponse>>.Is.Anything));
+			server.Stub(x => x.AddToCache(Arg<Result<BikesAvailableResponse>>.Is.Anything));
 
-            var result = await new CachedQuery(server).GetBikesAsync();
+			var result = await new CachedQuery(server).GetBikesAsync();
 
-            Assert.AreEqual(1, result.Response.Count);
-            Assert.AreEqual(typeof(CopriCallsHttps), result.Source);
-            Assert.IsNull(result.Exception);
-        }
+			Assert.AreEqual(1, result.Response.Count);
+			Assert.AreEqual(typeof(CopriCallsHttps), result.Source);
+			Assert.IsNull(result.Exception);
+		}
 
-        [Test]
-        public async Task TestGetBikesOccupied()
-        {
-            var server = MockRepository.GenerateMock<ICachedCopriServer>();
+		[Test]
+		public async Task TestGetBikesOccupied()
+		{
+			var server = MockRepository.GenerateMock<ICachedCopriServer>();
 
-            var result = await new CachedQuery(server).GetBikesOccupiedAsync();
+			var result = await new CachedQuery(server).GetBikesOccupiedAsync();
 
-            Assert.AreEqual(0, result.Response.Count);
-            Assert.AreEqual(typeof(CopriCallsMonkeyStore), result.Source);
-            Assert.AreEqual(result.Exception.Message, "Abfrage der reservierten/ gebuchten Räder nicht möglich. Kein Benutzer angemeldet.");
-        }
-    }
+			Assert.AreEqual(0, result.Response.Count);
+			Assert.AreEqual(typeof(CopriCallsMonkeyStore), result.Source);
+			Assert.AreEqual(result.Exception.Message, "Abfrage der reservierten/ gebuchten Räder nicht möglich. Kein Benutzer angemeldet.");
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/Query/TestCachedQueryLoggedIn.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/Query/TestCachedQueryLoggedIn.cs
index fd6b302..434b1d0 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/Query/TestCachedQueryLoggedIn.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/Query/TestCachedQueryLoggedIn.cs
@@ -13,10 +13,10 @@ using TINK.Services.CopriApi;
 namespace TestTINKLib.Fixtures.ObjectTests.Connector.Query
 {
 
-    [TestFixture]
-    public class TestCachedQueryLoggedIn
-    {
-        private const string BIKESAVAILABLE = @"{
+	[TestFixture]
+	public class TestCachedQueryLoggedIn
+	{
+		private const string BIKESAVAILABLE = @"{
               ""copri_version"" : ""4.1.0.0"",
               ""bikes"" : {},
               ""response_state"" : ""OK"",
@@ -34,7 +34,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Query
             }
         }";
 
-        private const string BIKESAVAILABLEEMPTY = @"{
+		private const string BIKESAVAILABLEEMPTY = @"{
               ""copri_version"" : ""4.1.0.0"",
               ""bikes"" : {},
               ""response_state"" : ""OK"",
@@ -45,7 +45,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Query
             }
         }";
 
-        private const string BIKESOCCUPIED = @"{
+		private const string BIKESOCCUPIED = @"{
           ""authcookie"" : ""6103_f782a208d9399291ba8d086b5dcc2509_12345678"",
           ""debuglevel"" : ""2"",
           ""user_group"" : [ ""TINK"" ],
@@ -78,7 +78,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Query
             }
         }";
 
-        private const string STATIONSALL = @"{
+		private const string STATIONSALL = @"{
               ""copri_version"" : ""4.1.0.0"",
               ""stations"" : {
                  ""5"" : {
@@ -118,7 +118,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Query
               ""apiserver"" : ""https://tinkwwp.copri-bike.de""
         }";
 
-        private const string STATIONSALLEMPTY = @"{
+		private const string STATIONSALLEMPTY = @"{
               ""copri_version"" : ""4.1.0.0"",
               ""stations"" : {
         },
@@ -131,233 +131,233 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Query
               ""apiserver"" : ""https://tinkwwp.copri-bike.de""
         }";
 
-        [Test]
-        public async Task TestGetStations_StationsFromCache()
-        {
-            var server = MockRepository.GenerateMock<ICachedCopriServer>();
+		[Test]
+		public async Task TestGetStations_StationsFromCache()
+		{
+			var server = MockRepository.GenerateMock<ICachedCopriServer>();
 
-            server.Stub(x => x.GetStations(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<StationsAvailableResponse>(
-                typeof(CopriCallsMonkeyStore),
-                JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL),
-                new GeneralData(),
-                new System.Exception("Bang when getting stations..."))));
+			server.Stub(x => x.GetStations(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<StationsAvailableResponse>(
+				typeof(CopriCallsMonkeyStore),
+				JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL),
+				new GeneralData(),
+				new System.Exception("Bang when getting stations..."))));
 
-            server.Stub(x => x.GetBikesAvailable(Arg<bool>.Matches(fromCache => fromCache == true))).Return(Task.Run(() => new Result<BikesAvailableResponse>(
-                typeof(CopriCallsMonkeyStore),
-                JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
-                new GeneralData())));
+			server.Stub(x => x.GetBikesAvailable(Arg<bool>.Matches(fromCache => fromCache == true))).Return(Task.Run(() => new Result<BikesAvailableResponse>(
+				typeof(CopriCallsMonkeyStore),
+				JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
+				new GeneralData())));
 
-            server.Stub(x => x.GetBikesOccupied(Arg<bool>.Matches(fromCache => fromCache == true))).Return(Task.Run(() => new Result<BikesReservedOccupiedResponse>(
-                typeof(CopriCallsMonkeyStore),
-                JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED),
-                new GeneralData())));
+			server.Stub(x => x.GetBikesOccupied(Arg<bool>.Matches(fromCache => fromCache == true))).Return(Task.Run(() => new Result<BikesReservedOccupiedResponse>(
+				typeof(CopriCallsMonkeyStore),
+				JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED),
+				new GeneralData())));
 
-            var result = await new CachedQueryLoggedIn(server, "123", "a@b", () => DateTime.Now).GetBikesAndStationsAsync();
+			var result = await new CachedQueryLoggedIn(server, "123", "a@b", () => DateTime.Now).GetBikesAndStationsAsync();
 
-            Assert.AreEqual(3, result.Response.StationsAll.Count);
-            Assert.AreEqual(2, result.Response.Bikes.Count);
-            Assert.AreEqual(typeof(CopriCallsMonkeyStore), result.Source);
-            Assert.AreEqual("Bang when getting stations...", result.Exception.Message);
-        }
+			Assert.AreEqual(3, result.Response.StationsAll.Count);
+			Assert.AreEqual(2, result.Response.Bikes.Count);
+			Assert.AreEqual(typeof(CopriCallsMonkeyStore), result.Source);
+			Assert.AreEqual("Bang when getting stations...", result.Exception.Message);
+		}
 
-        [Test]
-        public async Task TestGetStations_BikesAvailableFromCache()
-        {
-            var server = MockRepository.GenerateMock<ICachedCopriServer>();
+		[Test]
+		public async Task TestGetStations_BikesAvailableFromCache()
+		{
+			var server = MockRepository.GenerateMock<ICachedCopriServer>();
 
-            server.Stub(x => x.GetStations(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<StationsAvailableResponse>(
-                typeof(CopriCallsHttps),
-                JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALLEMPTY),
-                new GeneralData())));
+			server.Stub(x => x.GetStations(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<StationsAvailableResponse>(
+				typeof(CopriCallsHttps),
+				JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALLEMPTY),
+				new GeneralData())));
 
-            server.Stub(x => x.GetBikesAvailable(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<BikesAvailableResponse>(
-                typeof(CopriCallsMonkeyStore),
-                JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
-                new GeneralData(),
-                new System.Exception("Bang when getting bikes..."))));
+			server.Stub(x => x.GetBikesAvailable(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<BikesAvailableResponse>(
+				typeof(CopriCallsMonkeyStore),
+				JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
+				new GeneralData(),
+				new System.Exception("Bang when getting bikes..."))));
 
-            server.Stub(x => x.GetBikesOccupied(Arg<bool>.Matches(fromCache => fromCache == true))).Return(Task.Run(() => new Result<BikesReservedOccupiedResponse>(
-                typeof(CopriCallsMonkeyStore),
-                JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED),
-                new GeneralData())));
+			server.Stub(x => x.GetBikesOccupied(Arg<bool>.Matches(fromCache => fromCache == true))).Return(Task.Run(() => new Result<BikesReservedOccupiedResponse>(
+				typeof(CopriCallsMonkeyStore),
+				JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED),
+				new GeneralData())));
 
-            server.Stub(x => x.GetStations(Arg<bool>.Matches(fromCache => fromCache == true))).Return(Task.Run(() => new Result<StationsAvailableResponse>(
-                typeof(CopriCallsMonkeyStore),
-                JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL),
-                new GeneralData())));
+			server.Stub(x => x.GetStations(Arg<bool>.Matches(fromCache => fromCache == true))).Return(Task.Run(() => new Result<StationsAvailableResponse>(
+				typeof(CopriCallsMonkeyStore),
+				JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL),
+				new GeneralData())));
 
-            var result = await new CachedQueryLoggedIn(server, "123", "a@b", () => DateTime.Now).GetBikesAndStationsAsync();
+			var result = await new CachedQueryLoggedIn(server, "123", "a@b", () => DateTime.Now).GetBikesAndStationsAsync();
 
-            Assert.AreEqual(3, result.Response.StationsAll.Count);
-            Assert.AreEqual(2, result.Response.Bikes.Count);
-            Assert.AreEqual(typeof(CopriCallsMonkeyStore), result.Source);
-            Assert.AreEqual("Bang when getting bikes...", result.Exception.Message);
-        }
+			Assert.AreEqual(3, result.Response.StationsAll.Count);
+			Assert.AreEqual(2, result.Response.Bikes.Count);
+			Assert.AreEqual(typeof(CopriCallsMonkeyStore), result.Source);
+			Assert.AreEqual("Bang when getting bikes...", result.Exception.Message);
+		}
 
-        [Test]
-        public async Task TestGetStations_BikesOccupiedFromCache()
-        {
-            var server = MockRepository.GenerateMock<ICachedCopriServer>();
+		[Test]
+		public async Task TestGetStations_BikesOccupiedFromCache()
+		{
+			var server = MockRepository.GenerateMock<ICachedCopriServer>();
 
-            server.Stub(x => x.GetStations(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<StationsAvailableResponse>(
-                typeof(CopriCallsHttps),
-                JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALLEMPTY),
-                new GeneralData())));
+			server.Stub(x => x.GetStations(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<StationsAvailableResponse>(
+				typeof(CopriCallsHttps),
+				JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALLEMPTY),
+				new GeneralData())));
 
-            server.Stub(x => x.GetBikesAvailable(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<BikesAvailableResponse>(
-                typeof(CopriCallsHttps),
-                JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLEEMPTY),
-                new GeneralData())));
+			server.Stub(x => x.GetBikesAvailable(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<BikesAvailableResponse>(
+				typeof(CopriCallsHttps),
+				JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLEEMPTY),
+				new GeneralData())));
 
-            server.Stub(x => x.GetBikesOccupied(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<BikesReservedOccupiedResponse>(
-                typeof(CopriCallsMonkeyStore),
-                JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED),
-                new GeneralData(),
-                new System.Exception("Bang when getting bikes occupied..."))));
+			server.Stub(x => x.GetBikesOccupied(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<BikesReservedOccupiedResponse>(
+				typeof(CopriCallsMonkeyStore),
+				JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED),
+				new GeneralData(),
+				new System.Exception("Bang when getting bikes occupied..."))));
 
-            server.Stub(x => x.GetBikesAvailable(Arg<bool>.Matches(fromCache => fromCache == true))).Return(Task.Run(() => new Result<BikesAvailableResponse>(
-                typeof(CopriCallsMonkeyStore),
-                JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
-                new GeneralData())));
+			server.Stub(x => x.GetBikesAvailable(Arg<bool>.Matches(fromCache => fromCache == true))).Return(Task.Run(() => new Result<BikesAvailableResponse>(
+				typeof(CopriCallsMonkeyStore),
+				JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
+				new GeneralData())));
 
-            server.Stub(x => x.GetStations(Arg<bool>.Matches(fromCache => fromCache == true))).Return(Task.Run(() => new Result<StationsAvailableResponse>(
-                typeof(CopriCallsMonkeyStore),
-                JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL),
-                new GeneralData())));
+			server.Stub(x => x.GetStations(Arg<bool>.Matches(fromCache => fromCache == true))).Return(Task.Run(() => new Result<StationsAvailableResponse>(
+				typeof(CopriCallsMonkeyStore),
+				JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL),
+				new GeneralData())));
 
-            var result = await new CachedQueryLoggedIn(server, "123", "a@b", () => DateTime.Now).GetBikesAndStationsAsync();
+			var result = await new CachedQueryLoggedIn(server, "123", "a@b", () => DateTime.Now).GetBikesAndStationsAsync();
 
-            Assert.AreEqual(3, result.Response.StationsAll.Count);
-            Assert.AreEqual(2, result.Response.Bikes.Count);
-            Assert.AreEqual(typeof(CopriCallsMonkeyStore), result.Source);
-            Assert.AreEqual("Bang when getting bikes occupied...", result.Exception.Message);
-        }
+			Assert.AreEqual(3, result.Response.StationsAll.Count);
+			Assert.AreEqual(2, result.Response.Bikes.Count);
+			Assert.AreEqual(typeof(CopriCallsMonkeyStore), result.Source);
+			Assert.AreEqual("Bang when getting bikes occupied...", result.Exception.Message);
+		}
 
-        [Test]
-        public async Task TestGetStations()
-        {
-            var server = MockRepository.GenerateMock<ICachedCopriServer>();
+		[Test]
+		public async Task TestGetStations()
+		{
+			var server = MockRepository.GenerateMock<ICachedCopriServer>();
 
-            server.Stub(x => x.GetStations(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<StationsAvailableResponse>(
-                typeof(CopriCallsHttps),
-                JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL),
-                new GeneralData())));
+			server.Stub(x => x.GetStations(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<StationsAvailableResponse>(
+				typeof(CopriCallsHttps),
+				JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL),
+				new GeneralData())));
 
-            server.Stub(x => x.GetBikesAvailable(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<BikesAvailableResponse>(
-                typeof(CopriCallsHttps),
-                JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
-                new GeneralData())));
+			server.Stub(x => x.GetBikesAvailable(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<BikesAvailableResponse>(
+				typeof(CopriCallsHttps),
+				JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
+				new GeneralData())));
 
-            server.Stub(x => x.GetBikesOccupied(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<BikesReservedOccupiedResponse>(
-                typeof(CopriCallsHttps),
-                JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED),
-                new GeneralData())));
+			server.Stub(x => x.GetBikesOccupied(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<BikesReservedOccupiedResponse>(
+				typeof(CopriCallsHttps),
+				JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED),
+				new GeneralData())));
 
-            server.Stub(x => x.AddToCache(Arg<Result<StationsAvailableResponse>>.Is.Anything));
-            server.Stub(x => x.AddToCache(Arg<Result<BikesAvailableResponse>>.Is.Anything));
-            server.Stub(x => x.AddToCache(Arg<Result<BikesReservedOccupiedResponse>>.Is.Anything));
+			server.Stub(x => x.AddToCache(Arg<Result<StationsAvailableResponse>>.Is.Anything));
+			server.Stub(x => x.AddToCache(Arg<Result<BikesAvailableResponse>>.Is.Anything));
+			server.Stub(x => x.AddToCache(Arg<Result<BikesReservedOccupiedResponse>>.Is.Anything));
 
-            var result = await new CachedQueryLoggedIn(server, "123", "a@b", () => DateTime.Now).GetBikesAndStationsAsync();
+			var result = await new CachedQueryLoggedIn(server, "123", "a@b", () => DateTime.Now).GetBikesAndStationsAsync();
 
-            Assert.AreEqual(3, result.Response.StationsAll.Count);
-            Assert.AreEqual(2, result.Response.Bikes.Count);
-            Assert.AreEqual(typeof(CopriCallsHttps), result.Source);
-            Assert.IsNull(result.Exception);
-        }
+			Assert.AreEqual(3, result.Response.StationsAll.Count);
+			Assert.AreEqual(2, result.Response.Bikes.Count);
+			Assert.AreEqual(typeof(CopriCallsHttps), result.Source);
+			Assert.IsNull(result.Exception);
+		}
 
-        [Test]
-        public async Task TestGetBikes_BikesAvailableFromCache()
-        {
-            var server = MockRepository.GenerateMock<ICachedCopriServer>();
+		[Test]
+		public async Task TestGetBikes_BikesAvailableFromCache()
+		{
+			var server = MockRepository.GenerateMock<ICachedCopriServer>();
 
-            server.Stub(x => x.GetBikesAvailable()).Return(Task.Run(() => new Result<BikesAvailableResponse>(
-                typeof(CopriCallsMonkeyStore),
-                JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
-                new GeneralData(),
-                new System.Exception("Bang, bikes avail..."))));
+			server.Stub(x => x.GetBikesAvailable()).Return(Task.Run(() => new Result<BikesAvailableResponse>(
+				typeof(CopriCallsMonkeyStore),
+				JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
+				new GeneralData(),
+				new System.Exception("Bang, bikes avail..."))));
 
-            server.Stub(x => x.GetBikesOccupied(Arg<bool>.Matches(fromCache => fromCache == true))).Return(Task.Run(() => new Result<BikesReservedOccupiedResponse>(
-                typeof(CopriCallsHttps),
-                JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED),
-                new GeneralData())));
+			server.Stub(x => x.GetBikesOccupied(Arg<bool>.Matches(fromCache => fromCache == true))).Return(Task.Run(() => new Result<BikesReservedOccupiedResponse>(
+				typeof(CopriCallsHttps),
+				JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED),
+				new GeneralData())));
 
-            var result = await new CachedQueryLoggedIn(server, "123", "a@b", () => DateTime.Now).GetBikesAsync();
+			var result = await new CachedQueryLoggedIn(server, "123", "a@b", () => DateTime.Now).GetBikesAsync();
 
-            Assert.AreEqual(2, result.Response.Count);
-            Assert.AreEqual(typeof(CopriCallsMonkeyStore), result.Source);
-            Assert.AreEqual("Bang, bikes avail...", result.Exception.Message);
-        }
+			Assert.AreEqual(2, result.Response.Count);
+			Assert.AreEqual(typeof(CopriCallsMonkeyStore), result.Source);
+			Assert.AreEqual("Bang, bikes avail...", result.Exception.Message);
+		}
 
-        [Test]
-        public async Task TestGetBikes_BikesOccupiedFromCache()
-        {
-            var server = MockRepository.GenerateMock<ICachedCopriServer>();
+		[Test]
+		public async Task TestGetBikes_BikesOccupiedFromCache()
+		{
+			var server = MockRepository.GenerateMock<ICachedCopriServer>();
 
-            server.Stub(x => x.GetBikesAvailable(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<BikesAvailableResponse>(
-                typeof(CopriCallsHttps),
-                JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLEEMPTY),
-                new GeneralData())));
+			server.Stub(x => x.GetBikesAvailable(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<BikesAvailableResponse>(
+				typeof(CopriCallsHttps),
+				JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLEEMPTY),
+				new GeneralData())));
 
-            server.Stub(x => x.GetBikesOccupied(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<BikesReservedOccupiedResponse>(
-                typeof(CopriCallsMonkeyStore),
-                JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED),
-                new GeneralData(),
-                new System.Exception("Bang, error bikes occupied"))));
+			server.Stub(x => x.GetBikesOccupied(Arg<bool>.Matches(fromCache => fromCache == false))).Return(Task.Run(() => new Result<BikesReservedOccupiedResponse>(
+				typeof(CopriCallsMonkeyStore),
+				JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED),
+				new GeneralData(),
+				new System.Exception("Bang, error bikes occupied"))));
 
-            server.Stub(x => x.GetBikesAvailable(Arg<bool>.Matches(fromCache => fromCache == true))).Return(Task.Run(() => new Result<BikesAvailableResponse>(
-                typeof(CopriCallsMonkeyStore),
-                JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
-                new GeneralData())));
+			server.Stub(x => x.GetBikesAvailable(Arg<bool>.Matches(fromCache => fromCache == true))).Return(Task.Run(() => new Result<BikesAvailableResponse>(
+				typeof(CopriCallsMonkeyStore),
+				JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
+				new GeneralData())));
 
-            var result = await new CachedQueryLoggedIn(server, "123", "a@b", () => DateTime.Now).GetBikesAsync();
+			var result = await new CachedQueryLoggedIn(server, "123", "a@b", () => DateTime.Now).GetBikesAsync();
 
-            Assert.AreEqual(2, result.Response.Count);
-            Assert.AreEqual(typeof(CopriCallsMonkeyStore), result.Source);
-            Assert.AreEqual("Bang, error bikes occupied", result.Exception.Message);
-        }
+			Assert.AreEqual(2, result.Response.Count);
+			Assert.AreEqual(typeof(CopriCallsMonkeyStore), result.Source);
+			Assert.AreEqual("Bang, error bikes occupied", result.Exception.Message);
+		}
 
-        [Test]
-        public async Task TestGetBikes()
-        {
-            var server = Substitute.For<ICachedCopriServer>();
+		[Test]
+		public async Task TestGetBikes()
+		{
+			var server = Substitute.For<ICachedCopriServer>();
 
-            server.GetBikesAvailable().Returns(Task.Run(() => new Result<BikesAvailableResponse>(
-                typeof(CopriCallsHttps),
-                JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
-                new GeneralData())));
+			server.GetBikesAvailable().Returns(Task.Run(() => new Result<BikesAvailableResponse>(
+				typeof(CopriCallsHttps),
+				JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
+				new GeneralData())));
 
-            server.GetBikesOccupied().Returns(Task.Run(() => new Result<BikesReservedOccupiedResponse>(
-                typeof(CopriCallsHttps),
-                JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED),
-                new GeneralData())));
+			server.GetBikesOccupied().Returns(Task.Run(() => new Result<BikesReservedOccupiedResponse>(
+				typeof(CopriCallsHttps),
+				JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED),
+				new GeneralData())));
 
-            var result = await new CachedQueryLoggedIn(server, "123", "a@b", () => DateTime.Now).GetBikesAsync();
+			var result = await new CachedQueryLoggedIn(server, "123", "a@b", () => DateTime.Now).GetBikesAsync();
 
-            Assert.AreEqual(2, result.Response.Count);
-            Assert.AreEqual(typeof(CopriCallsHttps), result.Source);
-            Assert.IsNull(result.Exception);
-        }
+			Assert.AreEqual(2, result.Response.Count);
+			Assert.AreEqual(typeof(CopriCallsHttps), result.Source);
+			Assert.IsNull(result.Exception);
+		}
 
-        [Test]
-        public async Task TestGetBikesOccupied()
-        {
-            var server = Substitute.For<ICachedCopriServer>();
+		[Test]
+		public async Task TestGetBikesOccupied()
+		{
+			var server = Substitute.For<ICachedCopriServer>();
 
-            server.GetBikesAvailable().Returns(Task.Run(() => new Result<BikesAvailableResponse>(
-                typeof(CopriCallsHttps),
-                JsonConvert.DeserializeObject<BikesAvailableResponse>("{}"),
-                new GeneralData())));
+			server.GetBikesAvailable().Returns(Task.Run(() => new Result<BikesAvailableResponse>(
+				typeof(CopriCallsHttps),
+				JsonConvert.DeserializeObject<BikesAvailableResponse>("{}"),
+				new GeneralData())));
 
-            server.GetBikesOccupied().Returns(Task.Run(() => new Result<BikesReservedOccupiedResponse>(
-                typeof(CopriCallsHttps),
-                JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED),
-                new GeneralData())));
+			server.GetBikesOccupied().Returns(Task.Run(() => new Result<BikesReservedOccupiedResponse>(
+				typeof(CopriCallsHttps),
+				JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED),
+				new GeneralData())));
 
-            var result = await new CachedQueryLoggedIn(server, "123", "a@b", () => DateTime.Now).GetBikesOccupiedAsync();
+			var result = await new CachedQueryLoggedIn(server, "123", "a@b", () => DateTime.Now).GetBikesOccupiedAsync();
 
-            Assert.AreEqual(1, result.Response.Count);
-            Assert.AreEqual(typeof(CopriCallsHttps), result.Source);
-            Assert.IsNull(result.Exception);
-        }
-    }
+			Assert.AreEqual(1, result.Response.Count);
+			Assert.AreEqual(typeof(CopriCallsHttps), result.Source);
+			Assert.IsNull(result.Exception);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestBikesAvailableResponse.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestBikesAvailableResponse.cs
index ce86206..342b55a 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestBikesAvailableResponse.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestBikesAvailableResponse.cs
@@ -6,23 +6,23 @@ using static TINK.Repository.CopriCallsMemory;
 namespace TestTINKLib.Fixtures.Connector
 {
 
-    [TestFixture]
-    public class TestBikesAvailableResponse
-    {
-        [Test]
-        public void TestDeserialize_StateAvailable()
-        {
-            // Deserialize object and verify.
-            var l_oContainer = GetBikesAvailable(TinkApp.MerchantId, sampleSet: SampleSets.Set2, stageIndex: 1);
-            Assert.AreEqual(12, l_oContainer.bikes.Count);
+	[TestFixture]
+	public class TestBikesAvailableResponse
+	{
+		[Test]
+		public void TestDeserialize_StateAvailable()
+		{
+			// Deserialize object and verify.
+			var l_oContainer = GetBikesAvailable(TinkApp.MerchantId, sampleSet: SampleSets.Set2, stageIndex: 1);
+			Assert.AreEqual(12, l_oContainer.bikes.Count);
 
-            // Check first entry.
-            Assert.AreEqual("Cargo Trike", l_oContainer.bikes["3399"].description);
-            Assert.AreEqual("26", l_oContainer.bikes["3399"].bike);
-            Assert.AreEqual("available", l_oContainer.bikes["3399"].state);
-            Assert.AreEqual("47.6586936667", l_oContainer.bikes["3399"].gps.latitude);
-            Assert.AreEqual("9.16863116667", l_oContainer.bikes["3399"].gps.longitude);
-            Assert.AreEqual("4", l_oContainer.bikes["3399"].station);
-        }
-    }
+			// Check first entry.
+			Assert.AreEqual("Cargo Trike", l_oContainer.bikes["3399"].description);
+			Assert.AreEqual("26", l_oContainer.bikes["3399"].bike);
+			Assert.AreEqual("available", l_oContainer.bikes["3399"].state);
+			Assert.AreEqual("47.6586936667", l_oContainer.bikes["3399"].gps.latitude);
+			Assert.AreEqual("9.16863116667", l_oContainer.bikes["3399"].gps.longitude);
+			Assert.AreEqual("4", l_oContainer.bikes["3399"].station);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestBikesOccupiedResponse.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestBikesOccupiedResponse.cs
index 9e4996e..a7f03de 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestBikesOccupiedResponse.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestBikesOccupiedResponse.cs
@@ -6,46 +6,46 @@ using static TINK.Repository.CopriCallsMemory;
 namespace TestTINKLib.Fixtures.Connector.Response
 {
 
-    [TestFixture]
-    public class TestBikesOccupiedResponse
-    {
-        [Test]
-        public void TestDeserialize()
-        {
-            // Deserialize object and verify.
-            var l_oContainer = GetBikesOccupied("4da3044c8657a04ba60e2eaa753bc51a", SampleSets.Set2, 1);
+	[TestFixture]
+	public class TestBikesOccupiedResponse
+	{
+		[Test]
+		public void TestDeserialize()
+		{
+			// Deserialize object and verify.
+			var l_oContainer = GetBikesOccupied("4da3044c8657a04ba60e2eaa753bc51a", SampleSets.Set2, 1);
 
-            Assert.AreEqual(2, l_oContainer.bikes_occupied.Count);
+			Assert.AreEqual(2, l_oContainer.bikes_occupied.Count);
 
-            // Check first entry.
-            Assert.AreEqual("3630", l_oContainer.bikes_occupied["87781"].timeCode);
-            Assert.AreEqual("occupied", l_oContainer.bikes_occupied["87781"].state);
-            Assert.AreEqual("5", l_oContainer.bikes_occupied["87781"].station);
-            Assert.AreEqual("Cargo Long", l_oContainer.bikes_occupied["87781"].description);
-            Assert.AreEqual("2017-11-28 11:01:51.637747+01", l_oContainer.bikes_occupied["87781"].start_time);
-            Assert.AreEqual("8", l_oContainer.bikes_occupied["87781"].bike);
+			// Check first entry.
+			Assert.AreEqual("3630", l_oContainer.bikes_occupied["87781"].timeCode);
+			Assert.AreEqual("occupied", l_oContainer.bikes_occupied["87781"].state);
+			Assert.AreEqual("5", l_oContainer.bikes_occupied["87781"].station);
+			Assert.AreEqual("Cargo Long", l_oContainer.bikes_occupied["87781"].description);
+			Assert.AreEqual("2017-11-28 11:01:51.637747+01", l_oContainer.bikes_occupied["87781"].start_time);
+			Assert.AreEqual("8", l_oContainer.bikes_occupied["87781"].bike);
 
-            // Check first entry.
-            Assert.AreEqual("2931", l_oContainer.bikes_occupied["87782"].timeCode);
-            Assert.AreEqual("occupied", l_oContainer.bikes_occupied["87782"].state);
-            Assert.AreEqual("4", l_oContainer.bikes_occupied["87782"].station);
-            Assert.AreEqual("Cargo Long", l_oContainer.bikes_occupied["87782"].description);
-            Assert.AreEqual("2017-11-28 13:06:55.147368+01", l_oContainer.bikes_occupied["87782"].start_time);
-            Assert.AreEqual("7", l_oContainer.bikes_occupied["87782"].bike);
-        }
+			// Check first entry.
+			Assert.AreEqual("2931", l_oContainer.bikes_occupied["87782"].timeCode);
+			Assert.AreEqual("occupied", l_oContainer.bikes_occupied["87782"].state);
+			Assert.AreEqual("4", l_oContainer.bikes_occupied["87782"].station);
+			Assert.AreEqual("Cargo Long", l_oContainer.bikes_occupied["87782"].description);
+			Assert.AreEqual("2017-11-28 13:06:55.147368+01", l_oContainer.bikes_occupied["87782"].start_time);
+			Assert.AreEqual("7", l_oContainer.bikes_occupied["87782"].bike);
+		}
 
-        [Test]
-        public void TestDeserialize_StateReserved()
-        {
-            // Deserialize object and verify.
-            var l_oContainer = CopriCallsMemory.GetBikesOccupied("4da3044c8657a04ba60e2eaa753bc51a", SampleSets.Set2, 2);
-            Assert.AreEqual(3, l_oContainer.bikes_occupied.Count);
+		[Test]
+		public void TestDeserialize_StateReserved()
+		{
+			// Deserialize object and verify.
+			var l_oContainer = CopriCallsMemory.GetBikesOccupied("4da3044c8657a04ba60e2eaa753bc51a", SampleSets.Set2, 2);
+			Assert.AreEqual(3, l_oContainer.bikes_occupied.Count);
 
-            // Check first entry.
-            Assert.AreEqual("Cargo Long", l_oContainer.bikes_occupied["2360"].description);
-            Assert.AreEqual("5", l_oContainer.bikes_occupied["2360"].bike);
-            Assert.AreEqual("reserved", l_oContainer.bikes_occupied["2360"].state);
-            Assert.AreEqual("4", l_oContainer.bikes_occupied["2360"].station);
-        }
-    }
+			// Check first entry.
+			Assert.AreEqual("Cargo Long", l_oContainer.bikes_occupied["2360"].description);
+			Assert.AreEqual("5", l_oContainer.bikes_occupied["2360"].bike);
+			Assert.AreEqual("reserved", l_oContainer.bikes_occupied["2360"].state);
+			Assert.AreEqual("4", l_oContainer.bikes_occupied["2360"].station);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestBookingResponse.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestBookingResponse.cs
index 81032a5..6d11722 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestBookingResponse.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestBookingResponse.cs
@@ -6,49 +6,49 @@ using static TINK.Repository.CopriCallsMemory;
 namespace TestTINKLib.Fixtures.Connector.Response
 {
 
-    [TestFixture]
-    public class TestBookingResponse
-    {
-        [Test]
-        public void TestDeserialize()
-        {
-            // Deserialize object and verify.
-            var l_oContainer = CopriCallsMemory.DoReserve("8", "b76b97e43a2d76b8499f32e6dd597af8", SampleSets.Set2, 1);
+	[TestFixture]
+	public class TestBookingResponse
+	{
+		[Test]
+		public void TestDeserialize()
+		{
+			// Deserialize object and verify.
+			var l_oContainer = CopriCallsMemory.DoReserve("8", "b76b97e43a2d76b8499f32e6dd597af8", SampleSets.Set2, 1);
 
-            Assert.AreEqual(2, l_oContainer.bikes_occupied.Count);
-            Assert.AreEqual("3630", l_oContainer.timeCode);
-            Assert.AreEqual("OK: requested bike 8", l_oContainer.response_state);
+			Assert.AreEqual(2, l_oContainer.bikes_occupied.Count);
+			Assert.AreEqual("3630", l_oContainer.timeCode);
+			Assert.AreEqual("OK: requested bike 8", l_oContainer.response_state);
 
-            // Check first entry which is bike #8
-            Assert.AreEqual("3630", l_oContainer.bikes_occupied["87781"].timeCode);
-            Assert.AreEqual("occupied", l_oContainer.bikes_occupied["87781"].state);
-            Assert.AreEqual("5", l_oContainer.bikes_occupied["87781"].station);
-            Assert.AreEqual("Cargo Long", l_oContainer.bikes_occupied["87781"].description);
-            Assert.AreEqual("2017-11-28 11:01:51.637747+01", l_oContainer.bikes_occupied["87781"].start_time);
-            Assert.AreEqual("8", l_oContainer.bikes_occupied["87781"].bike);
-        }
+			// Check first entry which is bike #8
+			Assert.AreEqual("3630", l_oContainer.bikes_occupied["87781"].timeCode);
+			Assert.AreEqual("occupied", l_oContainer.bikes_occupied["87781"].state);
+			Assert.AreEqual("5", l_oContainer.bikes_occupied["87781"].station);
+			Assert.AreEqual("Cargo Long", l_oContainer.bikes_occupied["87781"].description);
+			Assert.AreEqual("2017-11-28 11:01:51.637747+01", l_oContainer.bikes_occupied["87781"].start_time);
+			Assert.AreEqual("8", l_oContainer.bikes_occupied["87781"].bike);
+		}
 
-        [Test]
-        public void TestGetIsBookingResponseSucceeded()
-        {
-            // Create response to check
-            var l_oResponse = DoReserve(
-                "8",
-                "4da3044c8657a04ba60e2eaa753bc51a",
-                SampleSets.Set2,
-                1);
+		[Test]
+		public void TestGetIsBookingResponseSucceeded()
+		{
+			// Create response to check
+			var l_oResponse = DoReserve(
+				"8",
+				"4da3044c8657a04ba60e2eaa753bc51a",
+				SampleSets.Set2,
+				1);
 
-            Assert.AreEqual(
-                "4da3044c8657a04ba60e2eaa753bc51aoiF2kahH",
-                l_oResponse.authcookie);
+			Assert.AreEqual(
+				"4da3044c8657a04ba60e2eaa753bc51aoiF2kahH",
+				l_oResponse.authcookie);
 
-            Assert.AreEqual(
-                "OK: requested bike 8",
-                l_oResponse.response_state);
+			Assert.AreEqual(
+				"OK: requested bike 8",
+				l_oResponse.response_state);
 
-            Assert.NotNull(
-                l_oResponse.GetIsReserveResponseOk("8"),
-                "Booking did succeed, response must not be null.");
-        }
-    }
+			Assert.NotNull(
+				l_oResponse.GetIsReserveResponseOk("8"),
+				"Booking did succeed, response must not be null.");
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestResponseBase.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestResponseBase.cs
index 550c4a9..beefbff 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestResponseBase.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestResponseBase.cs
@@ -5,25 +5,25 @@ using NUnit.Framework;
 namespace TINK.Repository.Response
 {
 
-    [TestFixture]
-    public class TestResponseBase
-    {
-        [Test]
-        public void TestDeserialize()
-        {
-            // Deserialize object and verify.
-            var l_oContainer = CopriCallsMemory.DoAuthorize("javaminister@gmail.com", "javaminister", "HwId1000000000000");
+	[TestFixture]
+	public class TestResponseBase
+	{
+		[Test]
+		public void TestDeserialize()
+		{
+			// Deserialize object and verify.
+			var l_oContainer = CopriCallsMemory.DoAuthorize("javaminister@gmail.com", "javaminister", "HwId1000000000000");
 
-            // Check first entry.
-            Assert.AreEqual("authorization", l_oContainer.response);
-            Assert.AreEqual("4da3044c8657a04ba60e2eaa753bc51a", l_oContainer.authcookie);
-            Assert.AreEqual("OK", l_oContainer.response_state);
-        }
+			// Check first entry.
+			Assert.AreEqual("authorization", l_oContainer.response);
+			Assert.AreEqual("4da3044c8657a04ba60e2eaa753bc51a", l_oContainer.authcookie);
+			Assert.AreEqual("OK", l_oContainer.response_state);
+		}
 
-        [Test]
-        public void TestToString()
-        {
-            var l_oResponse = JsonConvert.DeserializeObject<ResponseBase>(@"
+		[Test]
+		public void TestToString()
+		{
+			var l_oResponse = JsonConvert.DeserializeObject<ResponseBase>(@"
             {
                 ""response_state"": ""OhMyState"",
                 ""response"": ""HabGsagt"",
@@ -32,12 +32,12 @@ namespace TINK.Repository.Response
                 ""copri_version"":""123""
             }");
 
-            Assert.AreEqual(
-                "Response state is \"OhMyState\", " +
-                $"auth cookie is \"lecker1\" and response is \"die Antwort\", " +
-                $"code \"HabGsagt\"" +
-                $"response text \"die Antwort\".",
-                l_oResponse.ToString());
-        }
-    }
+			Assert.AreEqual(
+				"Response state is \"OhMyState\", " +
+				$"auth cookie is \"lecker1\" and response is \"die Antwort\", " +
+				$"code \"HabGsagt\"" +
+				$"response text \"die Antwort\".",
+				l_oResponse.ToString());
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestResponseHelper.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestResponseHelper.cs
index fcc566a..2ace4dc 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestResponseHelper.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestResponseHelper.cs
@@ -6,81 +6,81 @@ using TINK.Repository.Response;
 namespace TestTINKLib.Fixtures.ObjectTests.Connector.Response
 {
 
-    [TestFixture]
-    public class TestResponseHelper
-    {
-        [Test]
-        public void TestGetIsResponseOk_BikesOccupied_Ok()
-        {
-            var l_oResponse = JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(@"{ ""response_state"" : ""OK"" }");
-            Assert.NotNull(l_oResponse.GetIsResponseOk(ResponseHelper.BIKES_OCCUPIED_ACTIONTEXT));
-        }
+	[TestFixture]
+	public class TestResponseHelper
+	{
+		[Test]
+		public void TestGetIsResponseOk_BikesOccupied_Ok()
+		{
+			var l_oResponse = JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(@"{ ""response_state"" : ""OK"" }");
+			Assert.NotNull(l_oResponse.GetIsResponseOk(ResponseHelper.BIKES_OCCUPIED_ACTIONTEXT));
+		}
 
-        [Test]
-        public void TestGetIsResponseOk_BikesOccupied_AuthcookieNotDefined()
-        {
-            var l_oResponseBase = JsonConvert.DeserializeObject<ResponseBase>($"{{ \"response_state\" : \"Failure 1003: authcookie not defined\" }}");
-            Assert.Throws<AuthcookieNotDefinedException>(() => l_oResponseBase.GetIsResponseOk("Get not succeed"));
-        }
+		[Test]
+		public void TestGetIsResponseOk_BikesOccupied_AuthcookieNotDefined()
+		{
+			var l_oResponseBase = JsonConvert.DeserializeObject<ResponseBase>($"{{ \"response_state\" : \"Failure 1003: authcookie not defined\" }}");
+			Assert.Throws<AuthcookieNotDefinedException>(() => l_oResponseBase.GetIsResponseOk("Get not succeed"));
+		}
 
 
-        [Test]
-        public void TestGetIsResponseOk_NoBikes()
-        {
-            var l_oResponse = JsonConvert.DeserializeObject<ReservationBookingResponse>(
-                @"{ ""response_state"" : ""OK"", " +
-                @"""authcookie"" : ""KeksoiF2kahH"" }");
+		[Test]
+		public void TestGetIsResponseOk_NoBikes()
+		{
+			var l_oResponse = JsonConvert.DeserializeObject<ReservationBookingResponse>(
+				@"{ ""response_state"" : ""OK"", " +
+				@"""authcookie"" : ""KeksoiF2kahH"" }");
 
-            Assert.That(() => l_oResponse.GetIsReserveResponseOk("8"), Throws.Exception.TypeOf<System.Exception>());
-        }
+			Assert.That(() => l_oResponse.GetIsReserveResponseOk("8"), Throws.Exception.TypeOf<System.Exception>());
+		}
 
-        [Test]
-        public void TestGetIsResposeOk_Booking_Declined()
-        {
-            var l_oResponse = JsonConvert.DeserializeObject<ReservationBookingResponse>(@"{ ""response_state"" : ""OK: booking_request declined. max count of 8 occupied bikes has been reached"", ""authcookie"" : ""KeksoiF2kahH"" }");
-            Assert.AreEqual(
-                8,
-                Assert.Throws<BookingDeclinedException>(() => l_oResponse.GetIsReserveResponseOk("8")).MaxBikesCount);
-        }
+		[Test]
+		public void TestGetIsResposeOk_Booking_Declined()
+		{
+			var l_oResponse = JsonConvert.DeserializeObject<ReservationBookingResponse>(@"{ ""response_state"" : ""OK: booking_request declined. max count of 8 occupied bikes has been reached"", ""authcookie"" : ""KeksoiF2kahH"" }");
+			Assert.AreEqual(
+				8,
+				Assert.Throws<BookingDeclinedException>(() => l_oResponse.GetIsReserveResponseOk("8")).MaxBikesCount);
+		}
 
-        [Test]
-        public void TestGetIsResposeOk_Logout_AutcookieUnknown()
-        {
-            var l_oResponse = JsonConvert.DeserializeObject<AuthorizationoutResponse>($"{{ \"response_state\" : \"Failure 1004: authcookie not defined\"}}");
+		[Test]
+		public void TestGetIsResposeOk_Logout_AutcookieUnknown()
+		{
+			var l_oResponse = JsonConvert.DeserializeObject<AuthorizationoutResponse>($"{{ \"response_state\" : \"Failure 1004: authcookie not defined\"}}");
 
-            Assert.Throws<AuthcookieNotDefinedException>(() => l_oResponse.GetIsResponseOk());
-        }
+			Assert.Throws<AuthcookieNotDefinedException>(() => l_oResponse.GetIsResponseOk());
+		}
 
-        [Test]
-        public void TestGetIsReturnBikeResponseOk_Error()
-        {
-            var l_oResponse = JsonConvert.DeserializeObject<DoReturnResponse>(
-                @"{ ""response_state"" : ""Failure 1234"", " +
-                @"""authcookie"" : ""KeksoiF2kahH"" }");
+		[Test]
+		public void TestGetIsReturnBikeResponseOk_Error()
+		{
+			var l_oResponse = JsonConvert.DeserializeObject<DoReturnResponse>(
+				@"{ ""response_state"" : ""Failure 1234"", " +
+				@"""authcookie"" : ""KeksoiF2kahH"" }");
 
-            Assert.That(
-                () => l_oResponse.GetIsReturnBikeResponseOk("8"),
-                Throws.Exception.TypeOf<InvalidResponseException<ResponseBase>>());
-        }
+			Assert.That(
+				() => l_oResponse.GetIsReturnBikeResponseOk("8"),
+				Throws.Exception.TypeOf<InvalidResponseException<ResponseBase>>());
+		}
 
-        [Test]
-        public void TestGetIsReturnBikeResponseOk_ErrorNotAtStation()
-        {
-            var l_oResponse = JsonConvert.DeserializeObject<DoReturnResponse>(
-                @"{ ""response_state"" : ""Failure 2178: bike 1545 out of GEO fencing. 15986 meter distance to next station 66. OK: bike 1545 locked confirmed"", " +
-                @"""authcookie"" : ""KeksoiF2kahH"" }");
+		[Test]
+		public void TestGetIsReturnBikeResponseOk_ErrorNotAtStation()
+		{
+			var l_oResponse = JsonConvert.DeserializeObject<DoReturnResponse>(
+				@"{ ""response_state"" : ""Failure 2178: bike 1545 out of GEO fencing. 15986 meter distance to next station 66. OK: bike 1545 locked confirmed"", " +
+				@"""authcookie"" : ""KeksoiF2kahH"" }");
 
-            Assert.That(() => l_oResponse.GetIsReturnBikeResponseOk("8"), Throws.Exception.TypeOf<NotAtStationException>());
-        }
+			Assert.That(() => l_oResponse.GetIsReturnBikeResponseOk("8"), Throws.Exception.TypeOf<NotAtStationException>());
+		}
 
-        [Test]
-        public void TestGetIsReturnBikeResponseOk_ErrorNoGPSData()
-        {
-            var l_oResponse = JsonConvert.DeserializeObject<DoReturnResponse>(
-                @"{ ""response_state"" : ""Failure 2245: No GPS data, state change forbidden."", " +
-                @"""authcookie"" : ""KeksoiF2kahH"" }");
+		[Test]
+		public void TestGetIsReturnBikeResponseOk_ErrorNoGPSData()
+		{
+			var l_oResponse = JsonConvert.DeserializeObject<DoReturnResponse>(
+				@"{ ""response_state"" : ""Failure 2245: No GPS data, state change forbidden."", " +
+				@"""authcookie"" : ""KeksoiF2kahH"" }");
 
-            Assert.That(() => l_oResponse.GetIsReturnBikeResponseOk("8"), Throws.Exception.TypeOf<NoGPSDataException>());
-        }
-    }
+			Assert.That(() => l_oResponse.GetIsReturnBikeResponseOk("8"), Throws.Exception.TypeOf<NoGPSDataException>());
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestStationsAllResponse.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestStationsAllResponse.cs
index 7c2bba9..157683f 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestStationsAllResponse.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestStationsAllResponse.cs
@@ -6,36 +6,36 @@ using static TINK.Repository.CopriCallsMemory;
 namespace TestTINKLib.Fixtures.Connector
 {
 
-    [TestFixture]
-    public class TestStationsAllResponse
-    {
-        [Test]
-        public void TestDeserialize()
-        {
-            // Deserialize object and verify.
-            var l_oContainer = GetStationsAll(TinkApp.MerchantId, p_eSampleSet: SampleSets.Set2, p_lStageIndex: 1);
-            Assert.AreEqual(9, l_oContainer.stations.Count);
+	[TestFixture]
+	public class TestStationsAllResponse
+	{
+		[Test]
+		public void TestDeserialize()
+		{
+			// Deserialize object and verify.
+			var l_oContainer = GetStationsAll(TinkApp.MerchantId, p_eSampleSet: SampleSets.Set2, p_lStageIndex: 1);
+			Assert.AreEqual(9, l_oContainer.stations.Count);
 
-            // Check first entry (type TINK).
-            Assert.AreEqual("4", l_oContainer.stations["5786"].station);
-            Assert.AreEqual("TINK", string.Join(",", l_oContainer.stations["5786"].station_group));
-            Assert.IsNull(l_oContainer.stations["5786"].description);
-            Assert.AreEqual("47.6586936667", l_oContainer.stations["5786"].gps.latitude);
-            Assert.AreEqual("9.16863116667", l_oContainer.stations["5786"].gps.longitude);
+			// Check first entry (type TINK).
+			Assert.AreEqual("4", l_oContainer.stations["5786"].station);
+			Assert.AreEqual("TINK", string.Join(",", l_oContainer.stations["5786"].station_group));
+			Assert.IsNull(l_oContainer.stations["5786"].description);
+			Assert.AreEqual("47.6586936667", l_oContainer.stations["5786"].gps.latitude);
+			Assert.AreEqual("9.16863116667", l_oContainer.stations["5786"].gps.longitude);
 
-            // Check Konrad entry.
-            Assert.AreEqual("14", l_oContainer.stations["14"].station);
-            Assert.AreEqual("Konrad", string.Join(",", l_oContainer.stations["14"].station_group));
-            Assert.AreEqual(string.Empty, l_oContainer.stations["14"].description);
-            Assert.AreEqual("47.66698054007847", l_oContainer.stations["14"].gps.latitude);
-            Assert.AreEqual("9.169303178787231", l_oContainer.stations["14"].gps.longitude);
+			// Check Konrad entry.
+			Assert.AreEqual("14", l_oContainer.stations["14"].station);
+			Assert.AreEqual("Konrad", string.Join(",", l_oContainer.stations["14"].station_group));
+			Assert.AreEqual(string.Empty, l_oContainer.stations["14"].description);
+			Assert.AreEqual("47.66698054007847", l_oContainer.stations["14"].gps.latitude);
+			Assert.AreEqual("9.169303178787231", l_oContainer.stations["14"].gps.longitude);
 
-            // Check TINK/ Konrad entry.
-            Assert.AreEqual("31", l_oContainer.stations["31"].station);
-            Assert.AreEqual("TINK,Konrad", string.Join(",", l_oContainer.stations["31"].station_group));
-            Assert.AreEqual("Südstadt Station", l_oContainer.stations["31"].description);
-            Assert.AreEqual("47.69489", l_oContainer.stations["31"].gps.latitude);
-            Assert.AreEqual("9.19", l_oContainer.stations["31"].gps.longitude);
-        }
-    }
+			// Check TINK/ Konrad entry.
+			Assert.AreEqual("31", l_oContainer.stations["31"].station);
+			Assert.AreEqual("TINK,Konrad", string.Join(",", l_oContainer.stations["31"].station_group));
+			Assert.AreEqual("Südstadt Station", l_oContainer.stations["31"].description);
+			Assert.AreEqual("47.69489", l_oContainer.stations["31"].gps.latitude);
+			Assert.AreEqual("9.19", l_oContainer.stations["31"].gps.longitude);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/TestCommandLoggedIn.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/TestCommandLoggedIn.cs
index c8e8e2b..94c9b57 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/TestCommandLoggedIn.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/TestCommandLoggedIn.cs
@@ -10,64 +10,64 @@ using TINK.Repository.Response;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Connector
 {
-    [TestFixture]
-    public class TestCommandLoggedIn
-    {
-        /// <summary> Verifies, that logout leads to expected call on copri server. </summary>
-        [Test]
-        public void TestDoLogout()
-        {
-            var l_oServer = MockRepository.GenerateStub<ICopriServer>();
+	[TestFixture]
+	public class TestCommandLoggedIn
+	{
+		/// <summary> Verifies, that logout leads to expected call on copri server. </summary>
+		[Test]
+		public void TestDoLogout()
+		{
+			var l_oServer = MockRepository.GenerateStub<ICopriServer>();
 
-            l_oServer.Stub(x => x.DoAuthoutAsync()).Return(Task.Run(() => JsonConvert.DeserializeObject<AuthorizationoutResponse>("{ \"response_state\" : \"OK\", \"authcookie\" : \"1\"}")));
+			l_oServer.Stub(x => x.DoAuthoutAsync()).Return(Task.Run(() => JsonConvert.DeserializeObject<AuthorizationoutResponse>("{ \"response_state\" : \"OK\", \"authcookie\" : \"1\"}")));
 
-            var l_oCmd = new CommandLoggedIn(l_oServer, "MeinKeks", "EMehl", () => DateTime.Now);
+			var l_oCmd = new CommandLoggedIn(l_oServer, "MeinKeks", "EMehl", () => DateTime.Now);
 
-            LoginStateChangedEventArgs l_oEventArgs = null;
-            l_oCmd.LoginStateChanged += (sender, eventargs) => l_oEventArgs = eventargs;
+			LoginStateChangedEventArgs l_oEventArgs = null;
+			l_oCmd.LoginStateChanged += (sender, eventargs) => l_oEventArgs = eventargs;
 
-            l_oCmd.DoLogout().Wait();
+			l_oCmd.DoLogout().Wait();
 
-            l_oServer.AssertWasCalled(x => x.DoAuthoutAsync());
-            Assert.IsNotNull(l_oEventArgs);
-        }
+			l_oServer.AssertWasCalled(x => x.DoAuthoutAsync());
+			Assert.IsNotNull(l_oEventArgs);
+		}
 
-        /// <summary> Verifies, that logout leads to expected call on copri server. </summary>
-        [Test]
-        public void TestDoLogout_AuthcookieNotDefined()
-        {
-            var l_oServer = MockRepository.GenerateStub<ICopriServer>();
+		/// <summary> Verifies, that logout leads to expected call on copri server. </summary>
+		[Test]
+		public void TestDoLogout_AuthcookieNotDefined()
+		{
+			var l_oServer = MockRepository.GenerateStub<ICopriServer>();
 
-            l_oServer.Stub(x => x.DoAuthoutAsync()).Throw(new AuthcookieNotDefinedException("Testing action", JsonConvert.DeserializeObject<ResponseBase>(@"{ ""response_state"" : ""Some inner error description""}")));
+			l_oServer.Stub(x => x.DoAuthoutAsync()).Throw(new AuthcookieNotDefinedException("Testing action", JsonConvert.DeserializeObject<ResponseBase>(@"{ ""response_state"" : ""Some inner error description""}")));
 
-            var l_oCmd = new CommandLoggedIn(l_oServer, "MeinKeks", "EMehl", () => DateTime.Now);
+			var l_oCmd = new CommandLoggedIn(l_oServer, "MeinKeks", "EMehl", () => DateTime.Now);
 
-            LoginStateChangedEventArgs l_oEventArgs = null;
-            l_oCmd.LoginStateChanged += (sender, eventargs) => l_oEventArgs = eventargs;
+			LoginStateChangedEventArgs l_oEventArgs = null;
+			l_oCmd.LoginStateChanged += (sender, eventargs) => l_oEventArgs = eventargs;
 
-            l_oCmd.DoLogout().Wait();
+			l_oCmd.DoLogout().Wait();
 
-            l_oServer.AssertWasCalled(x => x.DoAuthoutAsync());
-            Assert.IsNotNull(l_oEventArgs);
-        }
+			l_oServer.AssertWasCalled(x => x.DoAuthoutAsync());
+			Assert.IsNotNull(l_oEventArgs);
+		}
 
-        /// <summary> Verifies, that logout leads to expected call on copri server. </summary>
-        [Test]
-        public void TestDoLogout_Exception()
-        {
-            var l_oServer = MockRepository.GenerateStub<ICopriServer>();
+		/// <summary> Verifies, that logout leads to expected call on copri server. </summary>
+		[Test]
+		public void TestDoLogout_Exception()
+		{
+			var l_oServer = MockRepository.GenerateStub<ICopriServer>();
 
-            l_oServer.Stub(x => x.DoAuthoutAsync()).Throw(new System.Exception("Sometheing went wrong."));
+			l_oServer.Stub(x => x.DoAuthoutAsync()).Throw(new System.Exception("Sometheing went wrong."));
 
-            var l_oCmd = new CommandLoggedIn(l_oServer, "MeinKeks", "EMehl", () => DateTime.Now);
+			var l_oCmd = new CommandLoggedIn(l_oServer, "MeinKeks", "EMehl", () => DateTime.Now);
 
-            LoginStateChangedEventArgs l_oEventArgs = null;
-            l_oCmd.LoginStateChanged += (sender, eventargs) => l_oEventArgs = eventargs;
+			LoginStateChangedEventArgs l_oEventArgs = null;
+			l_oCmd.LoginStateChanged += (sender, eventargs) => l_oEventArgs = eventargs;
 
-            Assert.Throws<AggregateException>(() => l_oCmd.DoLogout().Wait());
+			Assert.Throws<AggregateException>(() => l_oCmd.DoLogout().Wait());
 
-            l_oServer.AssertWasCalled(x => x.DoAuthoutAsync());
-            Assert.IsNull(l_oEventArgs);
-        }
-    }
+			l_oServer.AssertWasCalled(x => x.DoAuthoutAsync());
+			Assert.IsNull(l_oEventArgs);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/TestConnector.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/TestConnector.cs
index 625b74d..dd697bf 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/TestConnector.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/TestConnector.cs
@@ -7,84 +7,84 @@ using TINK.Repository;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Connector
 {
-    [TestFixture]
-    public class TestConnector
-    {
-        /// <summary>
-        /// Verifies that factory method returns correcty type depending on session cookie.
-        /// </summary>
-        [Test]
-        public void TestCommandFactory()
-        {
-            var l_oCopri = MockRepository.GenerateStub<ICachedCopriServer>();
+	[TestFixture]
+	public class TestConnector
+	{
+		/// <summary>
+		/// Verifies that factory method returns correcty type depending on session cookie.
+		/// </summary>
+		[Test]
+		public void TestCommandFactory()
+		{
+			var l_oCopri = MockRepository.GenerateStub<ICachedCopriServer>();
 
-            // Construct not logged in version of connector.
-            var l_oCommand = new TINK.Model.Connector.Connector(
-                new System.Uri("http://1.2.3.4"),
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                null /*UI language */,
-                "",      // Not logged in
-                "",
-                server: l_oCopri).Command;
+			// Construct not logged in version of connector.
+			var l_oCommand = new TINK.Model.Connector.Connector(
+				new System.Uri("http://1.2.3.4"),
+				new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+				null /*UI language */,
+				"",      // Not logged in
+				"",
+				server: l_oCopri).Command;
 
-            Assert.AreEqual(typeof(Command), l_oCommand.GetType());
-        }
+			Assert.AreEqual(typeof(Command), l_oCommand.GetType());
+		}
 
-        /// <summary>
-        /// Verifies that factory method returns correcty type depending on session cookie.
-        /// </summary>
-        [Test]
-        public void TestCommandFactory_LoggedIn()
-        {
-            var l_oCopri = MockRepository.GenerateStub<ICachedCopriServer>();
+		/// <summary>
+		/// Verifies that factory method returns correcty type depending on session cookie.
+		/// </summary>
+		[Test]
+		public void TestCommandFactory_LoggedIn()
+		{
+			var l_oCopri = MockRepository.GenerateStub<ICachedCopriServer>();
 
-            var l_oCommand = new TINK.Model.Connector.Connector(
-                new System.Uri("http://1.2.3.4"),
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                null /*UI language */,
-                "123",      // Logged in
-                "a@b",
-                server: l_oCopri).Command;
+			var l_oCommand = new TINK.Model.Connector.Connector(
+				new System.Uri("http://1.2.3.4"),
+				new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+				null /*UI language */,
+				"123",      // Logged in
+				"a@b",
+				server: l_oCopri).Command;
 
-            Assert.AreEqual(typeof(CommandLoggedIn), l_oCommand.GetType());
-        }
+			Assert.AreEqual(typeof(CommandLoggedIn), l_oCommand.GetType());
+		}
 
-        /// <summary>
-        /// Verifies that factory method returns correcty type depending on session cookie.
-        /// </summary>
-        [Test]
-        public void TestQueryFactory_CachedServer()
-        {
-            var l_oCopri = MockRepository.GenerateStub<ICachedCopriServer>();
+		/// <summary>
+		/// Verifies that factory method returns correcty type depending on session cookie.
+		/// </summary>
+		[Test]
+		public void TestQueryFactory_CachedServer()
+		{
+			var l_oCopri = MockRepository.GenerateStub<ICachedCopriServer>();
 
-            var l_oQuery = new TINK.Model.Connector.Connector(
-                new Uri("http://1.2.3.4"),
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                null /*UI language */,
-                "",
-                "",
-                server: l_oCopri).Query;
+			var l_oQuery = new TINK.Model.Connector.Connector(
+				new Uri("http://1.2.3.4"),
+				new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+				null /*UI language */,
+				"",
+				"",
+				server: l_oCopri).Query;
 
-            Assert.AreEqual(typeof(CachedQuery), l_oQuery.GetType());
-        }
+			Assert.AreEqual(typeof(CachedQuery), l_oQuery.GetType());
+		}
 
-        /// <summary>
-        /// Verifies that factory method returns correcty type depending on session cookie.
-        /// </summary>
-        [Test]
-        public void TestQueryFactory_LoggedIn()
-        {
-            var l_oCopri = MockRepository.GenerateStub<ICachedCopriServer>();
+		/// <summary>
+		/// Verifies that factory method returns correcty type depending on session cookie.
+		/// </summary>
+		[Test]
+		public void TestQueryFactory_LoggedIn()
+		{
+			var l_oCopri = MockRepository.GenerateStub<ICachedCopriServer>();
 
-            var l_oQuery = new TINK.Model.Connector.Connector(
-                new System.Uri("http://1.2.3.4"),
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                null /*UI language */,
-                "123",
-                "a@b",
-                server: l_oCopri).Query;
+			var l_oQuery = new TINK.Model.Connector.Connector(
+				new System.Uri("http://1.2.3.4"),
+				new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+				null /*UI language */,
+				"123",
+				"a@b",
+				server: l_oCopri).Query;
 
-            Assert.AreEqual(typeof(CachedQueryLoggedIn), l_oQuery.GetType());
-        }
-    }
+			Assert.AreEqual(typeof(CachedQueryLoggedIn), l_oQuery.GetType());
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/TestConnectorCache.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/TestConnectorCache.cs
index 0e86aef..0f28bca 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/TestConnectorCache.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/TestConnectorCache.cs
@@ -6,80 +6,80 @@ using TINK.Repository;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Connector
 {
-    [TestFixture]
-    public class TestConnectorCache
-    {
-        /// <summary>
-        /// Verifies that factory method returns correcty type depending on session cookie.
-        /// </summary>
-        [Test]
-        public void TestCommandFactory()
-        {
-            var l_oCopri = MockRepository.GenerateStub<ICopriServer>();
+	[TestFixture]
+	public class TestConnectorCache
+	{
+		/// <summary>
+		/// Verifies that factory method returns correcty type depending on session cookie.
+		/// </summary>
+		[Test]
+		public void TestCommandFactory()
+		{
+			var l_oCopri = MockRepository.GenerateStub<ICopriServer>();
 
-            // Construct not logged in version of connector.
-            var l_oCommand = new ConnectorCache(
-                new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
-                null /*UI language */,
-                "", // Not logged in
-                "",
-                l_oCopri).Command;
+			// Construct not logged in version of connector.
+			var l_oCommand = new ConnectorCache(
+				new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
+				null /*UI language */,
+				"", // Not logged in
+				"",
+				l_oCopri).Command;
 
-            Assert.AreEqual(typeof(Command), l_oCommand.GetType());
-        }
+			Assert.AreEqual(typeof(Command), l_oCommand.GetType());
+		}
 
-        /// <summary>
-        /// Verifies that factory method returns correcty type depending on session cookie.
-        /// </summary>
-        [Test]
-        public void TestCommandFactory_LoggedIn()
-        {
-            var l_oCopri = MockRepository.GenerateStub<ICopriServer>();
+		/// <summary>
+		/// Verifies that factory method returns correcty type depending on session cookie.
+		/// </summary>
+		[Test]
+		public void TestCommandFactory_LoggedIn()
+		{
+			var l_oCopri = MockRepository.GenerateStub<ICopriServer>();
 
-            var l_oCommand = new ConnectorCache(
-                new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
-                null /*UI language */,
-                "123",      // Logged in
-                "a@b",
-                l_oCopri).Command;
+			var l_oCommand = new ConnectorCache(
+				new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
+				null /*UI language */,
+				"123",      // Logged in
+				"a@b",
+				l_oCopri).Command;
 
-            Assert.AreEqual(typeof(CommandLoggedIn), l_oCommand.GetType());
-        }
+			Assert.AreEqual(typeof(CommandLoggedIn), l_oCommand.GetType());
+		}
 
-        /// <summary>
-        /// Verifies that factory method returns correcty type depending on session cookie.
-        /// </summary>
-        [Test]
-        public void TestQueryFactory_CachedServer()
-        {
-            var l_oCopri = MockRepository.GenerateStub<ICopriServer>();
+		/// <summary>
+		/// Verifies that factory method returns correcty type depending on session cookie.
+		/// </summary>
+		[Test]
+		public void TestQueryFactory_CachedServer()
+		{
+			var l_oCopri = MockRepository.GenerateStub<ICopriServer>();
 
-            var l_oQuery = new ConnectorCache(
-                new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
-                null /*UI language */,
-                "",
-                "",
-                l_oCopri).Query;
+			var l_oQuery = new ConnectorCache(
+				new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
+				null /*UI language */,
+				"",
+				"",
+				l_oCopri).Query;
 
-            Assert.AreEqual(typeof(TINK.Model.Connector.Query), l_oQuery.GetType());
-        }
+			Assert.AreEqual(typeof(TINK.Model.Connector.Query), l_oQuery.GetType());
+		}
 
-        /// <summary>
-        /// Verifies that factory method returns correcty type depending on session cookie.
-        /// </summary>
-        [Test]
-        public void TestQueryFactory_LoggedIn()
-        {
-            var l_oCopri = MockRepository.GenerateStub<ICopriServer>();
+		/// <summary>
+		/// Verifies that factory method returns correcty type depending on session cookie.
+		/// </summary>
+		[Test]
+		public void TestQueryFactory_LoggedIn()
+		{
+			var l_oCopri = MockRepository.GenerateStub<ICopriServer>();
 
-            var l_oQuery = new ConnectorCache(
-                new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
-                null /*UI language */,
-                "123",
-                "a@b",
-                l_oCopri).Query;
+			var l_oQuery = new ConnectorCache(
+				new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
+				null /*UI language */,
+				"123",
+				"a@b",
+				l_oCopri).Query;
 
-            Assert.AreEqual(typeof(QueryLoggedIn), l_oQuery.GetType());
-        }
-    }
+			Assert.AreEqual(typeof(QueryLoggedIn), l_oQuery.GetType());
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriCallsHttps.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriCallsHttps.cs
index 5d03f41..4ed8a72 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriCallsHttps.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriCallsHttps.cs
@@ -13,456 +13,456 @@ using static TINK.Repository.CopriCallsHttps;
 
 namespace UITest.Fixtures.Connector
 {
-    [TestFixture]
-    public class TestCopriCallsHttps
-    {
-        public const string CATEGORY_REQUIRESCOPRI = "RequiresCOPRI";
+	[TestFixture]
+	public class TestCopriCallsHttps
+	{
+		public const string CATEGORY_REQUIRESCOPRI = "RequiresCOPRI";
 
-        public const string CATEGORY_USESLIVESERVER = "RequiresCOPRI.Live";
+		public const string CATEGORY_USESLIVESERVER = "RequiresCOPRI.Live";
 
-        public const string CATEGORY_USESDEVELSERVER = "RequiresCOPRI.Devel";
+		public const string CATEGORY_USESDEVELSERVER = "RequiresCOPRI.Devel";
 
-        public const string TESTAGENT = "TestShareeLib";
+		public const string TESTAGENT = "TestShareeLib";
 
-        [TearDown]
-        public void TearDown()
-        {
-            Thread.Sleep(2000); // Sleep, otherwise copri will block requested calls.
-        }
+		[TearDown]
+		public void TearDown()
+		{
+			Thread.Sleep(2000); // Sleep, otherwise copri will block requested calls.
+		}
 
-        [Test]
-        public void TestIsConnected()
-        {
-            Assert.IsTrue(new CopriCallsHttps(new Uri("http://127.0.0.0/api"), new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), "123").IsConnected);
-        }
+		[Test]
+		public void TestIsConnected()
+		{
+			Assert.IsTrue(new CopriCallsHttps(new Uri("http://127.0.0.0/api"), new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), "123").IsConnected);
+		}
 
-        [Test]
-#if !NOLIVESERVER        
+		[Test]
+#if !NOLIVESERVER
         [Category(CATEGORY_USESLIVESERVER)]
 #elif !NODEVELSERVER
-        [Category(CATEGORY_USESDEVELSERVER)]
+		[Category(CATEGORY_USESDEVELSERVER)]
 #endif
-        public void TestLogin(
+		public void TestLogin(
 #if NOLIVESERVER
-            [Values(CopriServerUriList.SHAREE_DEVEL)] string url)
+			[Values(CopriServerUriList.SHAREE_DEVEL)] string url)
 #elif NODEVELSERVER
         [Values(CopriServerUriList.SHAREE_LIVE)]
         string url)
 #else
             [Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url)
 #endif
-        {
-            Func<string, string> command = (password) => new RequestBuilder(TinkApp.MerchantId, null /*UI language */).DoAuthorization(
-                TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Mail,
-                password,
-                TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.DeviceId);
+		{
+			Func<string, string> command = (password) => new RequestBuilder(TinkApp.MerchantId, null /*UI language */).DoAuthorization(
+				TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Mail,
+				password,
+				TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.DeviceId);
 
-            var l_oSessionCookieJM_Dev1 = DoAuthorizationAsync(
-                url,
-                command(TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Pwd),
-                () => command("*******"),
-                $"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestLogin)}").Result;
+			var l_oSessionCookieJM_Dev1 = DoAuthorizationAsync(
+				url,
+				command(TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Pwd),
+				() => command("*******"),
+				$"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestLogin)}").Result;
 
-            Assert.AreEqual(
-                string.Format("{0}{1}", "6103_4da3044c8657a04ba60e2eaa753bc51a_", "oiF2kahH"),
-                l_oSessionCookieJM_Dev1.authcookie,
-                "Session cookie must never change if user and hardware id does not change.");
-        }
+			Assert.AreEqual(
+				string.Format("{0}{1}", "6103_4da3044c8657a04ba60e2eaa753bc51a_", "oiF2kahH"),
+				l_oSessionCookieJM_Dev1.authcookie,
+				"Session cookie must never change if user and hardware id does not change.");
+		}
 
-        [Test]
-#if !NOLIVESERVER        
+		[Test]
+#if !NOLIVESERVER
         [Category(CATEGORY_USESLIVESERVER)]
 #elif !NODEVELSERVER
-        [Category(CATEGORY_USESDEVELSERVER)]
+		[Category(CATEGORY_USESDEVELSERVER)]
 #endif
-        public void TestLogin_UserUnknown(
+		public void TestLogin_UserUnknown(
 #if NOLIVESERVER
-            [Values(CopriServerUriList.SHAREE_DEVEL)] string url)
+			[Values(CopriServerUriList.SHAREE_DEVEL)] string url)
 #elif NODEVELSERVER
         [Values(CopriServerUriList.SHAREE_LIVE)]
         string url)
 #else
             [Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url)
 #endif
-        {
-            Func<string, string> command = (password) => new RequestBuilder(TinkApp.MerchantId, null /*UI language */).DoAuthorization(
-                TestTINKLib.LoginSessionCopriInfo.JavaministerGibtsNet.Mail,
-                password,
-                TestTINKLib.LoginSessionCopriInfo.JavaministerGibtsNet.DeviceId);
+		{
+			Func<string, string> command = (password) => new RequestBuilder(TinkApp.MerchantId, null /*UI language */).DoAuthorization(
+				TestTINKLib.LoginSessionCopriInfo.JavaministerGibtsNet.Mail,
+				password,
+				TestTINKLib.LoginSessionCopriInfo.JavaministerGibtsNet.DeviceId);
 
-            var l_oSessionCookieJM_Dev1 = DoAuthorizationAsync(
-                url,
-                command(TestTINKLib.LoginSessionCopriInfo.JavaministerGibtsNet.Pwd),
-                () => command("***********"),
-                $"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestLogin_UserUnknown)}").Result;
+			var l_oSessionCookieJM_Dev1 = DoAuthorizationAsync(
+				url,
+				command(TestTINKLib.LoginSessionCopriInfo.JavaministerGibtsNet.Pwd),
+				() => command("***********"),
+				$"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestLogin_UserUnknown)}").Result;
 
-            Assert.That(
-                l_oSessionCookieJM_Dev1,
-                Is.Not.Null);
+			Assert.That(
+				l_oSessionCookieJM_Dev1,
+				Is.Not.Null);
 
-            // From COPRI 4.1 cookie is empty, was null before
-            Assert.IsEmpty(l_oSessionCookieJM_Dev1.authcookie);
+			// From COPRI 4.1 cookie is empty, was null before
+			Assert.IsEmpty(l_oSessionCookieJM_Dev1.authcookie);
 
-            Assert.AreEqual(
-                "authorization",
-                l_oSessionCookieJM_Dev1.response);
+			Assert.AreEqual(
+				"authorization",
+				l_oSessionCookieJM_Dev1.response);
 
-            Assert.AreEqual(
-                "Failure: cannot generate authcookie",
-                l_oSessionCookieJM_Dev1.response_state);
-        }
+			Assert.AreEqual(
+				"Failure: cannot generate authcookie",
+				l_oSessionCookieJM_Dev1.response_state);
+		}
 
-        /// <summary> Log out functionality is only for test purposes. </summary>
-        [Test]
-#if !NOLIVESERVER        
+		/// <summary> Log out functionality is only for test purposes. </summary>
+		[Test]
+#if !NOLIVESERVER
         [Category(CATEGORY_USESLIVESERVER)]
 #elif !NODEVELSERVER
-        [Category(CATEGORY_USESDEVELSERVER)]
+		[Category(CATEGORY_USESDEVELSERVER)]
 #endif
-        public void TestLogout(
+		public void TestLogout(
 #if NOLIVESERVER
-            [Values(CopriServerUriList.SHAREE_DEVEL)] string url)
+			[Values(CopriServerUriList.SHAREE_DEVEL)] string url)
 #elif NODEVELSERVER
         [Values(CopriServerUriList.SHAREE_LIVE)]
         string url)
 #else
             [Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url)
 #endif
-        {
-            // Prerequisite: Login must be performed before logging out.
-            var l_oSessionCookie = CopriCallsHttpsReference.DoAuthorizeCall(
-                    url,
-                    TinkApp.MerchantId,
-                    TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Mail,
-                    TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Pwd,
-                    TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.DeviceId);
+		{
+			// Prerequisite: Login must be performed before logging out.
+			var l_oSessionCookie = CopriCallsHttpsReference.DoAuthorizeCall(
+					url,
+					TinkApp.MerchantId,
+					TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Mail,
+					TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Pwd,
+					TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.DeviceId);
 
-            Assert.IsFalse(
-                string.IsNullOrEmpty(l_oSessionCookie?.authcookie),
-                "Prerequisites not matched: User must be logged on before beeing able to log out.");
+			Assert.IsFalse(
+				string.IsNullOrEmpty(l_oSessionCookie?.authcookie),
+				"Prerequisites not matched: User must be logged on before beeing able to log out.");
 
-            // Verify logout
-            try
-            {
-                Assert.NotNull(DoAuthoutAsync(
-                        url,
-                        new RequestBuilderLoggedIn(
-                            TinkApp.MerchantId,
-                            null /*UI language */,
-                            TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).DoAuthout(),
-                        $"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestLogout)}"
-                    ).Result.GetIsResponseOk());
-            }
-            finally
-            {
-                // Log in again to ensure that tests do not change state of database (assumtion: user is always logged in).
-                CopriCallsHttpsReference.DoAuthorizeCall(
-                    url,
-                    TinkApp.MerchantId,
-                    TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Mail,
-                    TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Pwd,
-                    TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.DeviceId);
-            }
-        }
+			// Verify logout
+			try
+			{
+				Assert.NotNull(DoAuthoutAsync(
+						url,
+						new RequestBuilderLoggedIn(
+							TinkApp.MerchantId,
+							null /*UI language */,
+							TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).DoAuthout(),
+						$"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestLogout)}"
+					).Result.GetIsResponseOk());
+			}
+			finally
+			{
+				// Log in again to ensure that tests do not change state of database (assumtion: user is always logged in).
+				CopriCallsHttpsReference.DoAuthorizeCall(
+					url,
+					TinkApp.MerchantId,
+					TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Mail,
+					TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Pwd,
+					TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.DeviceId);
+			}
+		}
 
-        /// <summary>
-        /// Log out functionality is only for test purposes.
-        /// </summary>
-        [Test]
-#if !NOLIVESERVER        
+		/// <summary>
+		/// Log out functionality is only for test purposes.
+		/// </summary>
+		[Test]
+#if !NOLIVESERVER
         [Category(CATEGORY_USESLIVESERVER)]
 #elif !NODEVELSERVER
-        [Category(CATEGORY_USESDEVELSERVER)]
+		[Category(CATEGORY_USESDEVELSERVER)]
 #endif
-        public void TestLogout_NotLoggedIn(
+		public void TestLogout_NotLoggedIn(
 #if NOLIVESERVER
-            [Values(CopriServerUriList.SHAREE_DEVEL)] string url)
+			[Values(CopriServerUriList.SHAREE_DEVEL)] string url)
 #elif NODEVELSERVER
         [Values(CopriServerUriList.SHAREE_LIVE)]
         string url)
 #else
             [Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url)
 #endif
-        {
-            // Prerequisite: 
-            // Ensure that user is really logged out and get valid session cookie before verifying logout behavior.
-            var l_oLoginResponse = CopriCallsHttpsReference.DoAuthorizeCall(
-                    url,
-                    TinkApp.MerchantId,
-                    TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Mail,
-                    TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Pwd,
-                    TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.DeviceId);
+		{
+			// Prerequisite: 
+			// Ensure that user is really logged out and get valid session cookie before verifying logout behavior.
+			var l_oLoginResponse = CopriCallsHttpsReference.DoAuthorizeCall(
+					url,
+					TinkApp.MerchantId,
+					TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Mail,
+					TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Pwd,
+					TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.DeviceId);
 
-            Assert.IsFalse(
-                string.IsNullOrEmpty(l_oLoginResponse?.authcookie),
-                "Prerequisites not matched: User must be logged out before beeing able to log out.");
+			Assert.IsFalse(
+				string.IsNullOrEmpty(l_oLoginResponse?.authcookie),
+				"Prerequisites not matched: User must be logged out before beeing able to log out.");
 
-            CopriCallsHttpsReference.DoAuthoutCall(url, TinkApp.MerchantId, l_oLoginResponse.authcookie);
+			CopriCallsHttpsReference.DoAuthoutCall(url, TinkApp.MerchantId, l_oLoginResponse.authcookie);
 
-            try
-            {
-                // Verify logout
-                Assert.Throws<AuthcookieNotDefinedException>(
-                    () => DoAuthoutAsync(
-                        url,
-                        new RequestBuilderLoggedIn(TinkApp.MerchantId, null /*UI language */, l_oLoginResponse.authcookie).DoAuthout(),
-                        $"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestLogout_NotLoggedIn)}").Result.GetIsResponseOk());
-            }
-            finally
-            {
-                // Log in again. Otherwise subsequent tests might fail.
-                l_oLoginResponse = CopriCallsHttpsReference.DoAuthorizeCall(
-                    new CopriServerUriList().ActiveUri.AbsoluteUri,
-                    TinkApp.MerchantId,
-                    TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Mail,
-                    TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Pwd,
-                    TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.DeviceId);
-            }
-        }
+			try
+			{
+				// Verify logout
+				Assert.Throws<AuthcookieNotDefinedException>(
+					() => DoAuthoutAsync(
+						url,
+						new RequestBuilderLoggedIn(TinkApp.MerchantId, null /*UI language */, l_oLoginResponse.authcookie).DoAuthout(),
+						$"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestLogout_NotLoggedIn)}").Result.GetIsResponseOk());
+			}
+			finally
+			{
+				// Log in again. Otherwise subsequent tests might fail.
+				l_oLoginResponse = CopriCallsHttpsReference.DoAuthorizeCall(
+					new CopriServerUriList().ActiveUri.AbsoluteUri,
+					TinkApp.MerchantId,
+					TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Mail,
+					TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Pwd,
+					TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.DeviceId);
+			}
+		}
 
-        /// <summary> 
-        /// Log out is performed by app programmatically if authcookie is no more valid. 
-        /// Must work even if authcookie is no more valid, otherwise login would not be avalable.
-        /// </summary>
-        [Test]
-#if !NOLIVESERVER        
+		/// <summary> 
+		/// Log out is performed by app programmatically if authcookie is no more valid. 
+		/// Must work even if authcookie is no more valid, otherwise login would not be avalable.
+		/// </summary>
+		[Test]
+#if !NOLIVESERVER
         [Category(CATEGORY_USESLIVESERVER)]
 #elif !NODEVELSERVER
-        [Category(CATEGORY_USESDEVELSERVER)]
+		[Category(CATEGORY_USESDEVELSERVER)]
 #endif
-        public void TestLogout_AuthcookieUnknown(
+		public void TestLogout_AuthcookieUnknown(
 #if NOLIVESERVER
-            [Values(CopriServerUriList.SHAREE_DEVEL)] string url)
+			[Values(CopriServerUriList.SHAREE_DEVEL)] string url)
 #elif NODEVELSERVER
         [Values(CopriServerUriList.SHAREE_LIVE)]
         string url)
 #else
             [Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url)
 #endif
-        {
-            // Prerequisite: Login must be formormed before logging out.
-            var l_oSessionCookie = CopriCallsHttpsReference.DoAuthorizeCall(
-                url,
-                TinkApp.MerchantId,
-                TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Mail,
-                TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Pwd,
-                TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.DeviceId);
+		{
+			// Prerequisite: Login must be formormed before logging out.
+			var l_oSessionCookie = CopriCallsHttpsReference.DoAuthorizeCall(
+				url,
+				TinkApp.MerchantId,
+				TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Mail,
+				TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Pwd,
+				TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.DeviceId);
 
-            Assert.IsFalse(
-                string.IsNullOrEmpty(l_oSessionCookie?.authcookie),
-                "Prerequisites not matched: User must be logged on before beeing able to log out.");
+			Assert.IsFalse(
+				string.IsNullOrEmpty(l_oSessionCookie?.authcookie),
+				"Prerequisites not matched: User must be logged on before beeing able to log out.");
 
-            // Verify logout that expected excepton is thrown.
-            try
-            {
-                Assert.AreEqual(
-                    "Failure 1001: authcookie not defined", // Up to 2020-12-05 COPRI returned: "Failure 1004: authcookie not defined"
-                    DoAuthoutAsync(
-                            url,
-                            new RequestBuilderLoggedIn(
-                                TinkApp.MerchantId,
-                                null /*UI language */,
-                                TestTINKLib.LoginSessionCopriInfo.JavaministerKeksGibtsNet.AuthCookie).DoAuthout(),
-                            $"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestLogout_AuthcookieUnknown)}"
-                        ).Result.response_state);
-            }
-            finally
-            {
-                // Log in again to ensure that tests do not change state of database (assumtion: user is always logged in).
-                CopriCallsHttpsReference.DoAuthorizeCall(
-                    url,
-                    TinkApp.MerchantId,
-                    TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Mail,
-                    TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Pwd,
-                    TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.DeviceId);
-            }
-        }
+			// Verify logout that expected excepton is thrown.
+			try
+			{
+				Assert.AreEqual(
+					"Failure 1001: authcookie not defined", // Up to 2020-12-05 COPRI returned: "Failure 1004: authcookie not defined"
+					DoAuthoutAsync(
+							url,
+							new RequestBuilderLoggedIn(
+								TinkApp.MerchantId,
+								null /*UI language */,
+								TestTINKLib.LoginSessionCopriInfo.JavaministerKeksGibtsNet.AuthCookie).DoAuthout(),
+							$"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestLogout_AuthcookieUnknown)}"
+						).Result.response_state);
+			}
+			finally
+			{
+				// Log in again to ensure that tests do not change state of database (assumtion: user is always logged in).
+				CopriCallsHttpsReference.DoAuthorizeCall(
+					url,
+					TinkApp.MerchantId,
+					TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Mail,
+					TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Pwd,
+					TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.DeviceId);
+			}
+		}
 
-        /// <remarks>
-        /// From COPRI version v4.1 switched from TINK devel CopriServerUriList.TINK_DEVEL and CopriServerUriList.TINK_LIVE to CopriServerUriList.SHAREE_DEVEL.
-        /// </remarks>
-        [Test]
-#if !NOLIVESERVER        
+		/// <remarks>
+		/// From COPRI version v4.1 switched from TINK devel CopriServerUriList.TINK_DEVEL and CopriServerUriList.TINK_LIVE to CopriServerUriList.SHAREE_DEVEL.
+		/// </remarks>
+		[Test]
+#if !NOLIVESERVER
         [Category(CATEGORY_USESLIVESERVER)]
 #elif !NODEVELSERVER
-        [Category(CATEGORY_USESDEVELSERVER)]
+		[Category(CATEGORY_USESDEVELSERVER)]
 #endif
-        public void TestGetBikesAvailalbleCall_LoggedId(
+		public void TestGetBikesAvailalbleCall_LoggedId(
 #if NOLIVESERVER
-            [Values(CopriServerUriList.SHAREE_DEVEL)] string url)
+			[Values(CopriServerUriList.SHAREE_DEVEL)] string url)
 #elif NODEVELSERVER
         [Values(CopriServerUriList.SHAREE_LIVE)] string url)
 #else
             [Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url)
 #endif
-        {
-            // Check prerequisites: At least one bike must be available.
-            var bikesReference = CopriCallsHttpsReference.GetBikesAvailableCall(url, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes;
-            Assert.NotNull(bikesReference);
-            var bikeReference = bikesReference.FirstOrDefault().Value;
-            Assert.That(
-                bikeReference,
-                Is.Not.Null,
-                $"Prerequisites are not matched: No bikes available from server {url} returned but at least one bike for verification required.");
+		{
+			// Check prerequisites: At least one bike must be available.
+			var bikesReference = CopriCallsHttpsReference.GetBikesAvailableCall(url, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes;
+			Assert.NotNull(bikesReference);
+			var bikeReference = bikesReference.FirstOrDefault().Value;
+			Assert.That(
+				bikeReference,
+				Is.Not.Null,
+				$"Prerequisites are not matched: No bikes available from server {url} returned but at least one bike for verification required.");
 
-            // Verify list of bikes returned from first device
-            var request = new RequestBuilderLoggedIn(
-                TinkApp.MerchantId,
-                null /*UI language */,
-                TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).GetBikesAvailable();
+			// Verify list of bikes returned from first device
+			var request = new RequestBuilderLoggedIn(
+				TinkApp.MerchantId,
+				null /*UI language */,
+				TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).GetBikesAvailable();
 
-            var bikes = GetBikesAvailableAsync(
-                url,
-                request).Result.bikes;
+			var bikes = GetBikesAvailableAsync(
+				url,
+				request).Result.bikes;
 
-            Assert.That(
-                bikes,
-                Is.Not.Null,
-                "Response is null.");
+			Assert.That(
+				bikes,
+				Is.Not.Null,
+				"Response is null.");
 
-            var bike = bikes.FirstOrDefault().Value;
-            Assert.That(
-                bike,
-                Is.Not.Null,
-                "Response on GetBikesAvailableCall must contain at leas one bike.");
+			var bike = bikes.FirstOrDefault().Value;
+			Assert.That(
+				bike,
+				Is.Not.Null,
+				"Response on GetBikesAvailableCall must contain at leas one bike.");
 
-            // Check if entries are valid.
-            Assert.Greater(
-                bike.description.Length,
-                0,
-                "Bike despcription must never be empty.");
+			// Check if entries are valid.
+			Assert.Greater(
+				bike.description.Length,
+				0,
+				"Bike despcription must never be empty.");
 
-            Assert.That(
-                bike.bike,
-                Is.Not.Null,
-                "Bike index must never be null");
+			Assert.That(
+				bike.bike,
+				Is.Not.Null,
+				"Bike index must never be null");
 
-            Assert.AreEqual(
-                "available",
-                bike.state,
-                "Bike state must be available");
-        }
+			Assert.AreEqual(
+				"available",
+				bike.state,
+				"Bike state must be available");
+		}
 
-        /// <remarks>
-        /// From COPRI version v4.1 switched from TINK devel CopriServerUriList.TINK_DEVEL and CopriServerUriList.TINK_LIVE to CopriServerUriList.SHAREE_DEVEL.
-        /// </remarks>
-        [Test]
-#if !NOLIVESERVER        
+		/// <remarks>
+		/// From COPRI version v4.1 switched from TINK devel CopriServerUriList.TINK_DEVEL and CopriServerUriList.TINK_LIVE to CopriServerUriList.SHAREE_DEVEL.
+		/// </remarks>
+		[Test]
+#if !NOLIVESERVER
         [Category(CATEGORY_USESLIVESERVER)]
 #elif !NODEVELSERVER
-        [Category(CATEGORY_USESDEVELSERVER)]
+		[Category(CATEGORY_USESDEVELSERVER)]
 #endif
-        public void TestGetBikesAvailalbleCall_NotLoggedId(
+		public void TestGetBikesAvailalbleCall_NotLoggedId(
 #if NOLIVESERVER
-            [Values(CopriServerUriList.SHAREE_DEVEL)] string url)
+			[Values(CopriServerUriList.SHAREE_DEVEL)] string url)
 #elif NODEVELSERVER
             [Values(CopriServerUriList.SHAREE_LIVE)] string url)
 #else
             [Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url)
 #endif
-        {
-            // Check prerequisites: At least one bike must be available.
-            var bikeReference = CopriCallsHttpsReference.GetBikesAvailableCall(url, TinkApp.MerchantId)?.bikes?.FirstOrDefault().Value;
-            Assert.That(
-                bikeReference,
-                Is.Not.Null,
-                $"Prerequisites are not matched: No bikes available from server {url} returned but at least one bike for verification required.");
+		{
+			// Check prerequisites: At least one bike must be available.
+			var bikeReference = CopriCallsHttpsReference.GetBikesAvailableCall(url, TinkApp.MerchantId)?.bikes?.FirstOrDefault().Value;
+			Assert.That(
+				bikeReference,
+				Is.Not.Null,
+				$"Prerequisites are not matched: No bikes available from server {url} returned but at least one bike for verification required.");
 
-            // Verify list of bikes returned from first device
-            var request = new RequestBuilder(TinkApp.MerchantId, null /*UI language */).GetBikesAvailable();
+			// Verify list of bikes returned from first device
+			var request = new RequestBuilder(TinkApp.MerchantId, null /*UI language */).GetBikesAvailable();
 
-            var bikes = GetBikesAvailableAsync(
-                url,
-                request,
-                $"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestGetBikesAvailalbleCall_NotLoggedId)}").Result.bikes;
+			var bikes = GetBikesAvailableAsync(
+				url,
+				request,
+				$"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestGetBikesAvailalbleCall_NotLoggedId)}").Result.bikes;
 
-            Assert.That(
-                bikes,
-                Is.Not.Null,
-                "Response is null.");
+			Assert.That(
+				bikes,
+				Is.Not.Null,
+				"Response is null.");
 
-            var bike = bikes.FirstOrDefault().Value;
-            Assert.That(
-                bike,
-                Is.Not.Null,
-                "Response on GetBikesAvailableCall must contain at leas one bike.");
+			var bike = bikes.FirstOrDefault().Value;
+			Assert.That(
+				bike,
+				Is.Not.Null,
+				"Response on GetBikesAvailableCall must contain at leas one bike.");
 
-            // Check if entries are valid.
-            Assert.Greater(
-                bike.description.Length,
-                0,
-                "Bike despcription must never be empty.");
+			// Check if entries are valid.
+			Assert.Greater(
+				bike.description.Length,
+				0,
+				"Bike despcription must never be empty.");
 
-            Assert.That(
-                bike.bike,
-                Is.Not.Null,
-                "Bike index must never be null");
+			Assert.That(
+				bike.bike,
+				Is.Not.Null,
+				"Bike index must never be null");
 
-            Assert.AreEqual(
-                "available",
-                bike.state,
-                "Bike state must be available");
-        }
+			Assert.AreEqual(
+				"available",
+				bike.state,
+				"Bike state must be available");
+		}
 
-        /// <summary>
-        /// Attention: Behaves different if called with a period smaller 15minutes because bike will alreay be reserved.
-        /// </summary>
-        [Test, Explicit, Ignore("Avoid testrunner running explicit tests.")]
-        public void TestDoReserveCall(
+		/// <summary>
+		/// Attention: Behaves different if called with a period smaller 15minutes because bike will alreay be reserved.
+		/// </summary>
+		[Test, Explicit, Ignore("Avoid testrunner running explicit tests.")]
+		public void TestDoReserveCall(
 #if NOLIVESERVER
-            [Values(CopriServerUriList.SHAREE_DEVEL)] string url)
+			[Values(CopriServerUriList.SHAREE_DEVEL)] string url)
 #elif NODEVELSERVER
         [Values(CopriServerUriList.SHAREE_LIVE)]
         string url)
 #else
             [Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url)
 #endif
-        {
-            Assert.Less(
-                CopriCallsHttpsReference.GetBikesOccupiedCall(url, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes_occupied.Count,
-                3,
-                "Too many bikes requested/ booked.");
+		{
+			Assert.Less(
+				CopriCallsHttpsReference.GetBikesOccupiedCall(url, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes_occupied.Count,
+				3,
+				"Too many bikes requested/ booked.");
 
-            var l_oBikesAvailable = CopriCallsHttpsReference.GetBikesAvailableCall(CopriServerUriList.DevelopUri.AbsoluteUri, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes;
+			var l_oBikesAvailable = CopriCallsHttpsReference.GetBikesAvailableCall(CopriServerUriList.DevelopUri.AbsoluteUri, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes;
 
-            Assert.Greater(
-                l_oBikesAvailable.Count,
-                0,
-                "There must be at least one bike available.");
+			Assert.Greater(
+				l_oBikesAvailable.Count,
+				0,
+				"There must be at least one bike available.");
 
-            // Id of bike to book
-            string l_oBikeId = l_oBikesAvailable.ToArray()[0].Value.bike;
+			// Id of bike to book
+			string l_oBikeId = l_oBikesAvailable.ToArray()[0].Value.bike;
 
-            // Check prerequisites.
-            // State of bike for which to cancel booking must be available. 
-            Assert.NotNull(
-                CopriCallsHttpsReference.GetBikesAvailableCall(url, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes?.FirstOrDefault(x => x.Value.bike == l_oBikeId).Value,
-                "Prerequities check failed: Bike with given id must be available;");
+			// Check prerequisites.
+			// State of bike for which to cancel booking must be available. 
+			Assert.NotNull(
+				CopriCallsHttpsReference.GetBikesAvailableCall(url, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes?.FirstOrDefault(x => x.Value.bike == l_oBikeId).Value,
+				"Prerequities check failed: Bike with given id must be available;");
 
-            var l_oBookingResponse = DoReserveAsync(
-                CopriServerUriList.DevelopUri.AbsoluteUri,
-                new RequestBuilderLoggedIn(
-                    TinkApp.MerchantId, null /*UI language */, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).DoReserve(l_oBikeId)).Result;
+			var l_oBookingResponse = DoReserveAsync(
+				CopriServerUriList.DevelopUri.AbsoluteUri,
+				new RequestBuilderLoggedIn(
+					TinkApp.MerchantId, null /*UI language */, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).DoReserve(l_oBikeId)).Result;
 
-            try
-            {
-                // If response_state is "Failure 2001: booking bike 20 . maybe not available" probale test was run already and bike got reserved.
-                Assert.AreEqual(string.Format("OK: requested bike {0}", l_oBikeId), l_oBookingResponse.response_state);
-            }
-            finally
-            {
-                // Clean up to ensure that running tests does not modify data base.
-                CopriCallsHttpsReference.DoCancelReservationCall(url, TinkApp.MerchantId, l_oBikeId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie);
-            }
-        }
+			try
+			{
+				// If response_state is "Failure 2001: booking bike 20 . maybe not available" probale test was run already and bike got reserved.
+				Assert.AreEqual(string.Format("OK: requested bike {0}", l_oBikeId), l_oBookingResponse.response_state);
+			}
+			finally
+			{
+				// Clean up to ensure that running tests does not modify data base.
+				CopriCallsHttpsReference.DoCancelReservationCall(url, TinkApp.MerchantId, l_oBikeId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie);
+			}
+		}
 
-        /// <summary>
-        /// Attention: Behaves different if called with a period smaller 15minutes because bike will alreay be reserved.
-        /// </summary>
-        [Test, Explicit, Ignore("Avoid testrunner running explicit tests.")]
-        public void TestDoCancelReservationCall(
+		/// <summary>
+		/// Attention: Behaves different if called with a period smaller 15minutes because bike will alreay be reserved.
+		/// </summary>
+		[Test, Explicit, Ignore("Avoid testrunner running explicit tests.")]
+		public void TestDoCancelReservationCall(
 #if NOLIVESERVER
-            [Values(CopriServerUriList.SHAREE_DEVEL)] string url)
+			[Values(CopriServerUriList.SHAREE_DEVEL)] string url)
 #elif NODEVELSERVER
         [Values(CopriServerUriList.SHAREE_LIVE)]
         string url)
@@ -470,222 +470,222 @@ namespace UITest.Fixtures.Connector
             [Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url)
 #endif
 
-        {
-            Assert.Less(
-                CopriCallsHttpsReference.GetBikesOccupiedCall(url, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes_occupied.Count,
-                3,
-                "Too many bikes requested/ booked.");
+		{
+			Assert.Less(
+				CopriCallsHttpsReference.GetBikesOccupiedCall(url, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes_occupied.Count,
+				3,
+				"Too many bikes requested/ booked.");
 
-            var l_oBikesAvailable = CopriCallsHttpsReference.GetBikesAvailableCall(CopriServerUriList.DevelopUri.AbsoluteUri, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes;
+			var l_oBikesAvailable = CopriCallsHttpsReference.GetBikesAvailableCall(CopriServerUriList.DevelopUri.AbsoluteUri, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes;
 
-            Assert.Greater(
-                l_oBikesAvailable.Count,
-                0,
-                "There must be at least one bike available.");
+			Assert.Greater(
+				l_oBikesAvailable.Count,
+				0,
+				"There must be at least one bike available.");
 
-            // Id of bike to book
-            string l_oBikeId = l_oBikesAvailable.ToArray()[0].Value.bike;
+			// Id of bike to book
+			string l_oBikeId = l_oBikesAvailable.ToArray()[0].Value.bike;
 
-            // Check prerequisites.
-            var l_oBikeToCancel = CopriCallsHttpsReference.GetBikesAvailableCall(url, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes?.FirstOrDefault(x => x.Value.bike == l_oBikeId).Value;
-            if (l_oBikeToCancel != null)
-            {
-                // Bike is avilable. Do request before unning test.
-                CopriCallsHttpsReference.DoReserveCall(url, TinkApp.MerchantId, l_oBikeId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie);
-            }
+			// Check prerequisites.
+			var l_oBikeToCancel = CopriCallsHttpsReference.GetBikesAvailableCall(url, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes?.FirstOrDefault(x => x.Value.bike == l_oBikeId).Value;
+			if (l_oBikeToCancel != null)
+			{
+				// Bike is avilable. Do request before unning test.
+				CopriCallsHttpsReference.DoReserveCall(url, TinkApp.MerchantId, l_oBikeId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie);
+			}
 
-            // State of bike for which to cancel booking must be reserved. 
-            var l_oReservedBike = CopriCallsHttpsReference.GetBikesOccupiedCall(url, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).bikes_occupied.FirstOrDefault(x => x.Value.bike == l_oBikeId).Value;
-            Assert.NotNull(l_oReservedBike, string.Format("Setup test failed. Bike with id {0} must be booked before verifying cancel of booking.", l_oReservedBike));
-            Assert.AreEqual("requested", l_oReservedBike.state, string.Format("Setup test failed. Bike with id {0} must be booked before verifying cancel of booking.", l_oReservedBike));
+			// State of bike for which to cancel booking must be reserved. 
+			var l_oReservedBike = CopriCallsHttpsReference.GetBikesOccupiedCall(url, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).bikes_occupied.FirstOrDefault(x => x.Value.bike == l_oBikeId).Value;
+			Assert.NotNull(l_oReservedBike, string.Format("Setup test failed. Bike with id {0} must be booked before verifying cancel of booking.", l_oReservedBike));
+			Assert.AreEqual("requested", l_oReservedBike.state, string.Format("Setup test failed. Bike with id {0} must be booked before verifying cancel of booking.", l_oReservedBike));
 
-            // Test cancel booking
-            var l_oBookingResponse = DoCancelReservationAsync(
-                CopriServerUriList.DevelopUri.AbsoluteUri,
-                new RequestBuilderLoggedIn(
-                    TinkApp.MerchantId,
-                    null /*UI language */,
-                    TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).DoReserve(l_oBikeId)).Result;
+			// Test cancel booking
+			var l_oBookingResponse = DoCancelReservationAsync(
+				CopriServerUriList.DevelopUri.AbsoluteUri,
+				new RequestBuilderLoggedIn(
+					TinkApp.MerchantId,
+					null /*UI language */,
+					TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).DoReserve(l_oBikeId)).Result;
 
-            try
-            {
-                Assert.AreEqual(string.Format("OK: canceled bike {0}", l_oBikeId), l_oBookingResponse.response_state);
-            }
-            catch
-            {
-                // Clean up to ensure that running tests does not modify data base.
-                CopriCallsHttpsReference.DoCancelReservationCall(url, TinkApp.MerchantId, l_oBikeId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie);
-            }
-        }
+			try
+			{
+				Assert.AreEqual(string.Format("OK: canceled bike {0}", l_oBikeId), l_oBookingResponse.response_state);
+			}
+			catch
+			{
+				// Clean up to ensure that running tests does not modify data base.
+				CopriCallsHttpsReference.DoCancelReservationCall(url, TinkApp.MerchantId, l_oBikeId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie);
+			}
+		}
 
-        /// <summary>Tests the member.</summary>
-        /// <remarks>Timecode is no more verified since COPRI 4.1.</remarks>
-        [Test]
-#if !NOLIVESERVER        
+		/// <summary>Tests the member.</summary>
+		/// <remarks>Timecode is no more verified since COPRI 4.1.</remarks>
+		[Test]
+#if !NOLIVESERVER
         [Category(CATEGORY_USESLIVESERVER)]
 #elif !NODEVELSERVER
-        [Category(CATEGORY_USESDEVELSERVER)]
+		[Category(CATEGORY_USESDEVELSERVER)]
 #endif
-        public void TestGetBikesOccupiedCall_SomeRequestedBooked(
+		public void TestGetBikesOccupiedCall_SomeRequestedBooked(
 #if NOLIVESERVER
-            [Values(CopriServerUriList.SHAREE_DEVEL)] string url)
+			[Values(CopriServerUriList.SHAREE_DEVEL)] string url)
 #elif NODEVELSERVER
         [Values(CopriServerUriList.SHAREE_LIVE)]
         string url)
 #else
             [Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url)
 #endif
-        {
-            BikesReservedOccupiedResponse l_oBookingResponse;
-            var bikesOccupied = CopriCallsHttpsReference.GetBikesOccupiedCall(url, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes_occupied;
-            if (bikesOccupied == null || bikesOccupied.Count < 1)
-            {
-                // There must be at least one bike booked.
-                var bikesAvailable = CopriCallsHttpsReference.GetBikesAvailableCall(
-                    url,
-                    TinkApp.MerchantId,
-                    TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes;
+		{
+			BikesReservedOccupiedResponse l_oBookingResponse;
+			var bikesOccupied = CopriCallsHttpsReference.GetBikesOccupiedCall(url, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes_occupied;
+			if (bikesOccupied == null || bikesOccupied.Count < 1)
+			{
+				// There must be at least one bike booked.
+				var bikesAvailable = CopriCallsHttpsReference.GetBikesAvailableCall(
+					url,
+					TinkApp.MerchantId,
+					TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes;
 
-                Assert.Greater(
-                    bikesAvailable.Count,
-                    0,
-                    "Prerequisites are not matched: There must be at least one bike available.");
+				Assert.Greater(
+					bikesAvailable.Count,
+					0,
+					"Prerequisites are not matched: There must be at least one bike available.");
 
-                // Id of bike to book
-                var bike = bikesAvailable.ToArray()[0].Value;
+				// Id of bike to book
+				var bike = bikesAvailable.ToArray()[0].Value;
 
-                l_oBookingResponse = CopriCallsHttpsReference.DoReserveCall(
-                    bike.uri_operator + "/APIjsonserver",
-                    TinkApp.MerchantId,
-                    bike.bike,
-                    TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie);
+				l_oBookingResponse = CopriCallsHttpsReference.DoReserveCall(
+					bike.uri_operator + "/APIjsonserver",
+					TinkApp.MerchantId,
+					bike.bike,
+					TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie);
 
-                Assert.That(l_oBookingResponse.GetIsResponseOk("Testing cotext"),
-                    !Is.Null,
-                    $"Booking must succeed. {l_oBookingResponse.response_text}");
-            }
+				Assert.That(l_oBookingResponse.GetIsResponseOk("Testing cotext"),
+					!Is.Null,
+					$"Booking must succeed. {l_oBookingResponse.response_text}");
+			}
 
-            // Verify GetBikesOccupied call.
-            var l_oBike = CopriCallsHttpsReference.GetBikesOccupiedCall(url, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes_occupied?.FirstOrDefault().Value;
-            Assert.NotNull(l_oBike, "Response on GetBikesOccupiedCall of must contain at least one bike.");
+			// Verify GetBikesOccupied call.
+			var l_oBike = CopriCallsHttpsReference.GetBikesOccupiedCall(url, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes_occupied?.FirstOrDefault().Value;
+			Assert.NotNull(l_oBike, "Response on GetBikesOccupiedCall of must contain at least one bike.");
 
-            l_oBookingResponse = GetBikesOccupiedAsync(
-                url,
-                new RequestBuilderLoggedIn(TinkApp.MerchantId, null /*UI language */, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).GetBikesOccupied(),
-                $"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestGetBikesOccupiedCall_SomeRequestedBooked)}").Result;
+			l_oBookingResponse = GetBikesOccupiedAsync(
+				url,
+				new RequestBuilderLoggedIn(TinkApp.MerchantId, null /*UI language */, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).GetBikesOccupied(),
+				$"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestGetBikesOccupiedCall_SomeRequestedBooked)}").Result;
 
-            // Check first entry.
-            Assert.AreEqual(
-                string.Format("{0}{1}", TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie, TinkApp.MerchantId),
-                l_oBookingResponse.authcookie);
+			// Check first entry.
+			Assert.AreEqual(
+				string.Format("{0}{1}", TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie, TinkApp.MerchantId),
+				l_oBookingResponse.authcookie);
 
-            Assert.Greater(l_oBike.description.Length, 0, "Bike despcription must never be empty.");
-            Assert.That(l_oBike.bike, Is.Not.Null, "Bike index must not be null.");
-            Assert.That(
-                l_oBike.station,
-                Is.Not.Null,
-                "Station index must never be null");
-            Assert.Greater(l_oBike.state.Length, 0, "State info must never be null or empty.");
-            // Todo: Requested bikes do not have a gps position. What is about booked bikes?
-            // Assert.Greater(l_oBike.gps.Length, 0, "Gps position must never be empty.");
-            Assert.Greater(l_oBike.start_time.Length, 0, "Time when request/ booking was performed must never be null or empty.");
-        }
+			Assert.Greater(l_oBike.description.Length, 0, "Bike despcription must never be empty.");
+			Assert.That(l_oBike.bike, Is.Not.Null, "Bike index must not be null.");
+			Assert.That(
+				l_oBike.station,
+				Is.Not.Null,
+				"Station index must never be null");
+			Assert.Greater(l_oBike.state.Length, 0, "State info must never be null or empty.");
+			// Todo: Requested bikes do not have a gps position. What is about booked bikes?
+			// Assert.Greater(l_oBike.gps.Length, 0, "Gps position must never be empty.");
+			Assert.Greater(l_oBike.start_time.Length, 0, "Time when request/ booking was performed must never be null or empty.");
+		}
 
-        /// <summary> 
-        /// Tests the member.
-        /// Call GetBikesOccupiedCall is first call of app which fails (throws AuthcookieNotDefinedException) if auth cookie is invalid.
-        /// If app detects AuthcookieNotDefinedException exception user is logged out.
-        /// </summary>
-        [Test]
-#if !NOLIVESERVER        
+		/// <summary> 
+		/// Tests the member.
+		/// Call GetBikesOccupiedCall is first call of app which fails (throws AuthcookieNotDefinedException) if auth cookie is invalid.
+		/// If app detects AuthcookieNotDefinedException exception user is logged out.
+		/// </summary>
+		[Test]
+#if !NOLIVESERVER
         [Category(CATEGORY_USESLIVESERVER)]
 #elif !NODEVELSERVER
-        [Category(CATEGORY_USESDEVELSERVER)]
+		[Category(CATEGORY_USESDEVELSERVER)]
 #endif
-        public void TestGetBikesOccupiedCall_KeksGibtsNet(
+		public void TestGetBikesOccupiedCall_KeksGibtsNet(
 #if NOLIVESERVER
-            [Values(CopriServerUriList.SHAREE_DEVEL)] string url)
+			[Values(CopriServerUriList.SHAREE_DEVEL)] string url)
 #elif NODEVELSERVER
         [Values(CopriServerUriList.SHAREE_LIVE)] string url)
 #else
             [Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url)
 #endif
-        {
-            var request = new RequestBuilderLoggedIn(TinkApp.MerchantId, null /*UI language */, TestTINKLib.LoginSessionCopriInfo.JavaministerKeksGibtsNet.AuthCookie).GetBikesOccupied();
+		{
+			var request = new RequestBuilderLoggedIn(TinkApp.MerchantId, null /*UI language */, TestTINKLib.LoginSessionCopriInfo.JavaministerKeksGibtsNet.AuthCookie).GetBikesOccupied();
 
-            var l_oBookingResponse = GetBikesOccupiedAsync(
-                url,
-                request,
-                $"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestGetBikesOccupiedCall_KeksGibtsNet)}").Result;
+			var l_oBookingResponse = GetBikesOccupiedAsync(
+				url,
+				request,
+				$"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestGetBikesOccupiedCall_KeksGibtsNet)}").Result;
 
-            Assert.AreEqual(
-                "Failure 1001: authcookie on primary not defined",
-                l_oBookingResponse.response_state); // Up to 2020-12-05 COPRI returned: "Failure 1003: authcookie not defined"
-        }
+			Assert.AreEqual(
+				"Failure 1001: authcookie on primary not defined",
+				l_oBookingResponse.response_state); // Up to 2020-12-05 COPRI returned: "Failure 1003: authcookie not defined"
+		}
 
-        /// <summary>
-        /// Tests the member.
-        /// </summary>
-        /// <remarks>
-        /// From COPRI version v4.1 switched from TINK devel CopriServerUriList.TINK_DEVEL and CopriServerUriList.TINK_LIVE to CopriServerUriList.SHAREE_DEVEL.
-        /// </remarks>
-        [Test]
-        [Category(CATEGORY_REQUIRESCOPRI)]
-#if !NOLIVESERVER        
+		/// <summary>
+		/// Tests the member.
+		/// </summary>
+		/// <remarks>
+		/// From COPRI version v4.1 switched from TINK devel CopriServerUriList.TINK_DEVEL and CopriServerUriList.TINK_LIVE to CopriServerUriList.SHAREE_DEVEL.
+		/// </remarks>
+		[Test]
+		[Category(CATEGORY_REQUIRESCOPRI)]
+#if !NOLIVESERVER
         [Category(CATEGORY_USESLIVESERVER)]
 #endif
-        public void TestGetStationsAllCall_NotLoggedIn(
+		public void TestGetStationsAllCall_NotLoggedIn(
 #if NOLIVESERVER
-            [Values(CopriServerUriList.SHAREE_DEVEL)] string url)
+			[Values(CopriServerUriList.SHAREE_DEVEL)] string url)
 #elif NODEVELSERVER
             [Values(CopriServerUriList.SHAREE_LIVE)] string url)
 #else
             [Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url)
 #endif
-        {
-            // Check prerequisites: At least one bike must be available.
-            var l_oStationsReference = CopriCallsHttpsReference.GetStationsAllCall(url, TinkApp.MerchantId)?.stations;
-            Assert.IsTrue(
-                l_oStationsReference != null && l_oStationsReference.Count > 0,
-                "Prerequisites are not matched: There are no stations.");
+		{
+			// Check prerequisites: At least one bike must be available.
+			var l_oStationsReference = CopriCallsHttpsReference.GetStationsAllCall(url, TinkApp.MerchantId)?.stations;
+			Assert.IsTrue(
+				l_oStationsReference != null && l_oStationsReference.Count > 0,
+				"Prerequisites are not matched: There are no stations.");
 
-            // Verify implementation
-            var l_oStationsAll = GetStationsAsync(url, new RequestBuilder(TinkApp.MerchantId, null /*UI language */).GetStations()).Result;
-            Assert.NotNull(l_oStationsAll?.stations);
-            Assert.Greater(l_oStationsAll.stations.Count, 0);
-        }
+			// Verify implementation
+			var l_oStationsAll = GetStationsAsync(url, new RequestBuilder(TinkApp.MerchantId, null /*UI language */).GetStations()).Result;
+			Assert.NotNull(l_oStationsAll?.stations);
+			Assert.Greater(l_oStationsAll.stations.Count, 0);
+		}
 
-        /// <summary>
-        /// Tests the member.
-        /// </summary>
-        /// <remarks>
-        /// From COPRI version v4.1 switched from TINK devel CopriServerUriList.TINK_DEVEL and CopriServerUriList.TINK_LIVE to CopriServerUriList.SHAREE_DEVEL.
-        /// </remarks>
-        [Test]
-#if !NOLIVESERVER        
+		/// <summary>
+		/// Tests the member.
+		/// </summary>
+		/// <remarks>
+		/// From COPRI version v4.1 switched from TINK devel CopriServerUriList.TINK_DEVEL and CopriServerUriList.TINK_LIVE to CopriServerUriList.SHAREE_DEVEL.
+		/// </remarks>
+		[Test]
+#if !NOLIVESERVER
         [Category(CATEGORY_USESLIVESERVER)]
 #elif !NODEVELSERVER
-        [Category(CATEGORY_USESDEVELSERVER)]
+		[Category(CATEGORY_USESDEVELSERVER)]
 #endif
-        public void TestGetStationsAllCall_LoggedIn(
+		public void TestGetStationsAllCall_LoggedIn(
 #if NOLIVESERVER
-            [Values(CopriServerUriList.SHAREE_DEVEL)] string url)
+			[Values(CopriServerUriList.SHAREE_DEVEL)] string url)
 #elif NODEVELSERVER
             [Values(CopriServerUriList.SHAREE_LIVE)] string url)
 #else
             [Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url)
 #endif
-        {
-            var stationsAll = GetStationsAsync(
-                url,
-                new RequestBuilderLoggedIn(TinkApp.MerchantId, null /*UI language */, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).GetStations(),
-                $"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestGetStationsAllCall_LoggedIn)}").Result;
+		{
+			var stationsAll = GetStationsAsync(
+				url,
+				new RequestBuilderLoggedIn(TinkApp.MerchantId, null /*UI language */, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).GetStations(),
+				$"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestGetStationsAllCall_LoggedIn)}").Result;
 
-            Assert.NotNull(stationsAll?.stations);
-            Assert.That(
-                stationsAll.stations.Count,
-                Is.GreaterThan(0),
-                $"There must be at least one station.");
-        }
-    }
+			Assert.NotNull(stationsAll?.stations);
+			Assert.That(
+				stationsAll.stations.Count,
+				Is.GreaterThan(0),
+				$"There must be at least one station.");
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriCallsMemory.cs.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriCallsMemory.cs.cs
index cf65f1e..36c112f 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriCallsMemory.cs.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriCallsMemory.cs.cs
@@ -9,66 +9,66 @@ using static TINK.Repository.CopriCallsMemory;
 namespace TestTINKLib.Fixtures.Connector.Request
 {
 
-    [TestFixture]
-    public class TestCopriCallsMemory
-    {
-        [Test]
-        public void TestConsistency()
-        {
-            foreach (SampleSets l_oSampleSet in Enum.GetValues(typeof(SampleSets)))
-            {
-                var l_oCopri = new CopriCallsMemory("MyMerchId", l_oSampleSet, 1, "4da3044c8657a04ba60e2eaa753bc51a");
+	[TestFixture]
+	public class TestCopriCallsMemory
+	{
+		[Test]
+		public void TestConsistency()
+		{
+			foreach (SampleSets l_oSampleSet in Enum.GetValues(typeof(SampleSets)))
+			{
+				var l_oCopri = new CopriCallsMemory("MyMerchId", l_oSampleSet, 1, "4da3044c8657a04ba60e2eaa753bc51a");
 
-                for (var l_iStageIndex = 1; l_iStageIndex <= l_oCopri.StagesCount; l_iStageIndex++)
-                {
-                    Assert.That(l_oCopri.GetBikesAvailableAsync().Result?.bikes, Is.Not.Null, $"There must be at least one bike for sample set {l_oSampleSet}, stage {l_iStageIndex}.");
-                    VerifyBikeIdIsUnique(l_oCopri);
+				for (var l_iStageIndex = 1; l_iStageIndex <= l_oCopri.StagesCount; l_iStageIndex++)
+				{
+					Assert.That(l_oCopri.GetBikesAvailableAsync().Result?.bikes, Is.Not.Null, $"There must be at least one bike for sample set {l_oSampleSet}, stage {l_iStageIndex}.");
+					VerifyBikeIdIsUnique(l_oCopri);
 
-                    Assert.IsNull(
-                        l_oCopri.GetBikesAvailableAsync().Result.bikes.Values.FirstOrDefault(x => x.state != "available"),
-                        "Bikes available must return bikes which are all of state available.");
+					Assert.IsNull(
+						l_oCopri.GetBikesAvailableAsync().Result.bikes.Values.FirstOrDefault(x => x.state != "available"),
+						"Bikes available must return bikes which are all of state available.");
 
-                    Assert.IsNull(
-                        l_oCopri.GetBikesOccupiedAsync().Result.bikes_occupied.Values.FirstOrDefault(x => x.state == "available"),
-                        "Bikes occupied must return bikes which are either reserved or booked.");
-                }
-            }
-        }
+					Assert.IsNull(
+						l_oCopri.GetBikesOccupiedAsync().Result.bikes_occupied.Values.FirstOrDefault(x => x.state == "available"),
+						"Bikes occupied must return bikes which are either reserved or booked.");
+				}
+			}
+		}
 
-        /// <summary>
-        /// Test consistency for a single sample set, 
-        /// </summary>
-        /// <param name="p_oMemory"></param>
-        private void VerifyBikeIdIsUnique(CopriCallsMemory p_oMemory)
-        {
-            Dictionary<string, BikeInfoBase> l_oChecker = new Dictionary<string, BikeInfoBase>();
+		/// <summary>
+		/// Test consistency for a single sample set, 
+		/// </summary>
+		/// <param name="p_oMemory"></param>
+		private void VerifyBikeIdIsUnique(CopriCallsMemory p_oMemory)
+		{
+			Dictionary<string, BikeInfoBase> l_oChecker = new Dictionary<string, BikeInfoBase>();
 
-            var l_oBikesAvailable = p_oMemory.GetBikesAvailableAsync().Result;
-            foreach (var l_oBike in l_oBikesAvailable.bikes.Values)
-            {
-                Assert.IsFalse(
-                    l_oChecker.Keys.Contains(l_oBike.bike),
-                    string.Format(
-                        "Bike form available bikes with id {0} already exist in dictionary. Sample set is {1}, stage index {2}.",
-                        l_oBike.bike,
-                        p_oMemory.ActiveSampleSet,
-                        p_oMemory.ActiveStageIndex));
+			var l_oBikesAvailable = p_oMemory.GetBikesAvailableAsync().Result;
+			foreach (var l_oBike in l_oBikesAvailable.bikes.Values)
+			{
+				Assert.IsFalse(
+					l_oChecker.Keys.Contains(l_oBike.bike),
+					string.Format(
+						"Bike form available bikes with id {0} already exist in dictionary. Sample set is {1}, stage index {2}.",
+						l_oBike.bike,
+						p_oMemory.ActiveSampleSet,
+						p_oMemory.ActiveStageIndex));
 
-                l_oChecker.Add(l_oBike.bike, l_oBike);
-            }
+				l_oChecker.Add(l_oBike.bike, l_oBike);
+			}
 
-            var l_oBikesOccupied = p_oMemory.GetBikesOccupiedAsync().Result;
-            foreach (var l_oBike in l_oBikesOccupied.bikes_occupied.Values)
-            {
-                Assert.IsFalse(
-                    l_oChecker.Keys.Contains(l_oBike.bike),
-                    string.Format(
-                        "Bike from occupied bikes with id {0} already exist in dictionary. Sample set is {1}, stage index {2}.",
-                        l_oBike.bike,
-                        p_oMemory.ActiveSampleSet,
-                        p_oMemory.ActiveStageIndex));
-                l_oChecker.Add(l_oBike.bike, l_oBike);
-            }
-        }
-    }
+			var l_oBikesOccupied = p_oMemory.GetBikesOccupiedAsync().Result;
+			foreach (var l_oBike in l_oBikesOccupied.bikes_occupied.Values)
+			{
+				Assert.IsFalse(
+					l_oChecker.Keys.Contains(l_oBike.bike),
+					string.Format(
+						"Bike from occupied bikes with id {0} already exist in dictionary. Sample set is {1}, stage index {2}.",
+						l_oBike.bike,
+						p_oMemory.ActiveSampleSet,
+						p_oMemory.ActiveStageIndex));
+				l_oChecker.Add(l_oBike.bike, l_oBike);
+			}
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriCallsStatic.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriCallsStatic.cs
index 34f030b..084c305 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriCallsStatic.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriCallsStatic.cs
@@ -5,13 +5,13 @@ using TINK.Repository.Response;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Connector.Request
 {
-    [TestFixture]
-    public class TestCopriCallsStatic
-    {
-        [Test]
-        public void TestDeserializeObjectBikesAvailableValidResponse()
-        {
-            const string VALID_RESPONSE = @"
+	[TestFixture]
+	public class TestCopriCallsStatic
+	{
+		[Test]
+		public void TestDeserializeObjectBikesAvailableValidResponse()
+		{
+			const string VALID_RESPONSE = @"
               {
 	            ""shareejson"": {
 
@@ -34,23 +34,23 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Request
             }
             ";
 
-            // Ensure that answer holds a valid bike.
-            var l_oBike = CopriCallsStatic.DeserializeResponse<BikesAvailableResponse>(VALID_RESPONSE).bikes.FirstOrDefault().Value;
-            Assert.NotNull(l_oBike, "Response must contain at leas one bike.");
-            Assert.Greater(l_oBike.description.Length, 0, "Bike despcription must never be empty.");
-            Assert.AreEqual(l_oBike.bike, "26");
-            Assert.That(
-                l_oBike.station,
-                Is.EqualTo("4"),
-                "Station index must never be negative");
-            Assert.AreEqual("available", l_oBike.state);
-            Assert.That(l_oBike.gps, Is.Not.Null, "Gps position must never be empty.");
-        }
+			// Ensure that answer holds a valid bike.
+			var l_oBike = CopriCallsStatic.DeserializeResponse<BikesAvailableResponse>(VALID_RESPONSE).bikes.FirstOrDefault().Value;
+			Assert.NotNull(l_oBike, "Response must contain at leas one bike.");
+			Assert.Greater(l_oBike.description.Length, 0, "Bike despcription must never be empty.");
+			Assert.AreEqual(l_oBike.bike, "26");
+			Assert.That(
+				l_oBike.station,
+				Is.EqualTo("4"),
+				"Station index must never be negative");
+			Assert.AreEqual("available", l_oBike.state);
+			Assert.That(l_oBike.gps, Is.Not.Null, "Gps position must never be empty.");
+		}
 
-        [Test]
-        public void TestDeserializeObjectBikesAvailableValidResponse_NoDescription()
-        {
-            const string INVALID_RESPONSE = @"
+		[Test]
+		public void TestDeserializeObjectBikesAvailableValidResponse_NoDescription()
+		{
+			const string INVALID_RESPONSE = @"
               {
 	            ""shareejson"": {
 
@@ -72,20 +72,20 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Request
             }
             ";
 
-            // Ensure that answer holds a valid bike.
-            var l_oBike = CopriCallsStatic.DeserializeResponse<BikesAvailableResponse>(INVALID_RESPONSE).bikes.FirstOrDefault().Value;
-            Assert.NotNull(l_oBike, "Response must contain at leas one bike.");
-            Assert.IsNull(l_oBike.description);
-            Assert.That(l_oBike.bike, Is.Not.Null);
-            Assert.That(l_oBike.station, Is.Not.Null);
-            Assert.AreEqual("available", l_oBike.state);
-            Assert.That(l_oBike.gps, Is.Not.Null, "Gps position must never be empty.");
-        }
+			// Ensure that answer holds a valid bike.
+			var l_oBike = CopriCallsStatic.DeserializeResponse<BikesAvailableResponse>(INVALID_RESPONSE).bikes.FirstOrDefault().Value;
+			Assert.NotNull(l_oBike, "Response must contain at leas one bike.");
+			Assert.IsNull(l_oBike.description);
+			Assert.That(l_oBike.bike, Is.Not.Null);
+			Assert.That(l_oBike.station, Is.Not.Null);
+			Assert.AreEqual("available", l_oBike.state);
+			Assert.That(l_oBike.gps, Is.Not.Null, "Gps position must never be empty.");
+		}
 
-        [Test]
-        public void TestDeserializeObjectBikesAvailableValidResponse_NoBikeId()
-        {
-            const string VALID_RESPONSE = @"
+		[Test]
+		public void TestDeserializeObjectBikesAvailableValidResponse_NoBikeId()
+		{
+			const string VALID_RESPONSE = @"
             {
 	            ""shareejson"": {
 
@@ -105,20 +105,20 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Request
                 }
             }";
 
-            // Ensure that answer holds a valid bike.
-            var l_oBike = CopriCallsStatic.DeserializeResponse<BikesAvailableResponse>(VALID_RESPONSE).bikes.FirstOrDefault().Value;
-            Assert.NotNull(l_oBike, "Response must contain at leas one bike.");
-            Assert.Greater(l_oBike.description.Length, 0, "Bike despcription must never be empty.");
-            Assert.That(l_oBike.bike, Is.Null);
-            Assert.That(l_oBike.station, Is.Not.Null);
-            Assert.AreEqual("available", l_oBike.state);
-            Assert.That(l_oBike.gps, Is.Not.Null, "Gps position must never be empty.");
-        }
+			// Ensure that answer holds a valid bike.
+			var l_oBike = CopriCallsStatic.DeserializeResponse<BikesAvailableResponse>(VALID_RESPONSE).bikes.FirstOrDefault().Value;
+			Assert.NotNull(l_oBike, "Response must contain at leas one bike.");
+			Assert.Greater(l_oBike.description.Length, 0, "Bike despcription must never be empty.");
+			Assert.That(l_oBike.bike, Is.Null);
+			Assert.That(l_oBike.station, Is.Not.Null);
+			Assert.AreEqual("available", l_oBike.state);
+			Assert.That(l_oBike.gps, Is.Not.Null, "Gps position must never be empty.");
+		}
 
-        [Test]
-        public void TestDeserializeObjectBikesOccupiedValidResponse()
-        {
-            const string VALID_RESPONSE = @"
+		[Test]
+		public void TestDeserializeObjectBikesOccupiedValidResponse()
+		{
+			const string VALID_RESPONSE = @"
             {
 	            ""shareejson"": {
                     ""response_state"": ""OK"",
@@ -147,17 +147,17 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Request
                 }
             }";
 
-            // Ensure that answer holds a valid bike.
-            var l_oBike = CopriCallsStatic.DeserializeResponse<BikesReservedOccupiedResponse>(VALID_RESPONSE).bikes_occupied.FirstOrDefault().Value;
-            Assert.NotNull(l_oBike, "Response must contain at leas one bike.");
-            Assert.Greater(l_oBike.description.Length, 0, "Bike despcription must never be empty.");
-            Assert.That(l_oBike.bike, Is.Not.Null);
-            Assert.That(l_oBike.station, Is.Not.Null);
-            Assert.Greater(l_oBike.state.Length, 0, "State info must never be null or empty.");
-            // Todo: Requested bikes do not have a gps position. What is about booked bikes?
-            // Assert.Greater(l_oBike.gps.Length, 0, "Gps position must never be empty.");
-            Assert.Greater(l_oBike.start_time.Length, 0, "Time when request/ booking was performed must never be null or empty.");
-            Assert.Greater(l_oBike.timeCode.Length, 0, "Booking code must never be null or empty.");
-        }
-    }
+			// Ensure that answer holds a valid bike.
+			var l_oBike = CopriCallsStatic.DeserializeResponse<BikesReservedOccupiedResponse>(VALID_RESPONSE).bikes_occupied.FirstOrDefault().Value;
+			Assert.NotNull(l_oBike, "Response must contain at leas one bike.");
+			Assert.Greater(l_oBike.description.Length, 0, "Bike despcription must never be empty.");
+			Assert.That(l_oBike.bike, Is.Not.Null);
+			Assert.That(l_oBike.station, Is.Not.Null);
+			Assert.Greater(l_oBike.state.Length, 0, "State info must never be null or empty.");
+			// Todo: Requested bikes do not have a gps position. What is about booked bikes?
+			// Assert.Greater(l_oBike.gps.Length, 0, "Gps position must never be empty.");
+			Assert.Greater(l_oBike.start_time.Length, 0, "Time when request/ booking was performed must never be null or empty.");
+			Assert.Greater(l_oBike.timeCode.Length, 0, "Booking code must never be null or empty.");
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriServerUriList.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriServerUriList.cs
index 2b378d5..b046aab 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriServerUriList.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriServerUriList.cs
@@ -5,61 +5,61 @@ using TINK.Model.Services.CopriApi.ServerUris;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Connector
 {
-    [TestFixture]
-    public class TestCopriServerUriList
-    {
-        [Test]
-        public void TestConstruct()
-        {
-            var l_oUri = new CopriServerUriList();
+	[TestFixture]
+	public class TestCopriServerUriList
+	{
+		[Test]
+		public void TestConstruct()
+		{
+			var l_oUri = new CopriServerUriList();
 
-            Assert.Greater(l_oUri.Uris.Count, 0, "There must be at least one uri");
-            Assert.NotNull(l_oUri.ActiveUri);
-        }
+			Assert.Greater(l_oUri.Uris.Count, 0, "There must be at least one uri");
+			Assert.NotNull(l_oUri.ActiveUri);
+		}
 
-        [Test]
-        public void TestConstruct_AryStringString()
-        {
-            var l_oUri = new CopriServerUriList(
-                (new List<Uri> { new Uri("http://1.2.3.4"), new Uri("http://2.3.4.5"), new Uri("http://3.4.5.6") }).ToArray(),
-                new Uri("http://2.3.4.5"));
+		[Test]
+		public void TestConstruct_AryStringString()
+		{
+			var l_oUri = new CopriServerUriList(
+				(new List<Uri> { new Uri("http://1.2.3.4"), new Uri("http://2.3.4.5"), new Uri("http://3.4.5.6") }).ToArray(),
+				new Uri("http://2.3.4.5"));
 
-            Assert.AreEqual(3, l_oUri.Uris.Count);
-            Assert.AreEqual(new Uri("http://2.3.4.5"), l_oUri.ActiveUri);
-        }
+			Assert.AreEqual(3, l_oUri.Uris.Count);
+			Assert.AreEqual(new Uri("http://2.3.4.5"), l_oUri.ActiveUri);
+		}
 
-        [Test]
-        public void TestConstruct_AryStringString_NullList()
-        {
-            Assert.Throws<ArgumentException>(() => new CopriServerUriList(
-               null,
-               new Uri("http://2.3.4.5")));
-        }
+		[Test]
+		public void TestConstruct_AryStringString_NullList()
+		{
+			Assert.Throws<ArgumentException>(() => new CopriServerUriList(
+			   null,
+			   new Uri("http://2.3.4.5")));
+		}
 
-        [Test]
-        public void TestConstruct_AryStringString_InvalidList()
-        {
-            Assert.Throws<ArgumentException>(() => new CopriServerUriList(
-                (new List<Uri>()).ToArray(),
-                new Uri("http://2.3.4.5")));
-        }
+		[Test]
+		public void TestConstruct_AryStringString_InvalidList()
+		{
+			Assert.Throws<ArgumentException>(() => new CopriServerUriList(
+				(new List<Uri>()).ToArray(),
+				new Uri("http://2.3.4.5")));
+		}
 
-        [Test]
-        public void TestConstruct_AryStringString_InvalidActiveUri()
-        {
-            Assert.Throws<ArgumentException>(() => new CopriServerUriList(
-               (new List<Uri> { new Uri("http://1.2.3.4"), new Uri("http://2.3.4.5"), new Uri("http://3.4.5.6") }).ToArray(),
-               new Uri("http://9.9.9.9")));
-        }
+		[Test]
+		public void TestConstruct_AryStringString_InvalidActiveUri()
+		{
+			Assert.Throws<ArgumentException>(() => new CopriServerUriList(
+			   (new List<Uri> { new Uri("http://1.2.3.4"), new Uri("http://2.3.4.5"), new Uri("http://3.4.5.6") }).ToArray(),
+			   new Uri("http://9.9.9.9")));
+		}
 
 
-        [Test]
-        public void TestDefaultActiveUri()
-        {
-            Assert.AreEqual(
-                "https://shareeapp-primary.copri.eu/APIjsonserver",
-                CopriServerUriList.DefaultActiveUri.AbsoluteUri,
-                "In production environment, server address must always be app.tink-konstanz.de/APIjsonserver.");
-        }
-    }
+		[Test]
+		public void TestDefaultActiveUri()
+		{
+			Assert.AreEqual(
+				"https://shareeapp-primary.copri.eu/APIjsonserver",
+				CopriServerUriList.DefaultActiveUri.AbsoluteUri,
+				"In production environment, server address must always be app.tink-konstanz.de/APIjsonserver.");
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/TestFilter.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/TestFilter.cs
index e953cc3..9432b8e 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/TestFilter.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/TestFilter.cs
@@ -9,94 +9,94 @@ using TINK.Repository;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Connector
 {
-    /// <summary> Tests filter object. </summary>
-    [TestFixture]
-    public class TestFilter
-    {
-        /// <summary> Tests all stations. </summary>
-        [Test]
-        public void TestGetStationsAll()
-        {
-            var connector = new ConnectorCache(
-                new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
-                        null /*UI language */,
-                        string.Empty,
-                        string.Empty,
-                        new CopriCallsMemory001());
+	/// <summary> Tests filter object. </summary>
+	[TestFixture]
+	public class TestFilter
+	{
+		/// <summary> Tests all stations. </summary>
+		[Test]
+		public void TestGetStationsAll()
+		{
+			var connector = new ConnectorCache(
+				new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
+						null /*UI language */,
+						string.Empty,
+						string.Empty,
+						new CopriCallsMemory001());
 
-            var filter = new FilteredConnector(new List<string> { FilterHelper.CARGOBIKE, FilterHelper.CITYBIKE }, connector);
-            var stations = filter.Query.GetBikesAndStationsAsync().Result.Response;
-            Assert.AreEqual(41, stations.StationsAll.Count()); // Count of stations was 9 before switching to data provider CopriCallsMemory(CopriCallsMemory.SampleSets.Set2, 1)
+			var filter = new FilteredConnector(new List<string> { FilterHelper.CARGOBIKE, FilterHelper.CITYBIKE }, connector);
+			var stations = filter.Query.GetBikesAndStationsAsync().Result.Response;
+			Assert.AreEqual(41, stations.StationsAll.Count()); // Count of stations was 9 before switching to data provider CopriCallsMemory(CopriCallsMemory.SampleSets.Set2, 1)
 
-            filter = new FilteredConnector(new List<string> { FilterHelper.CARGOBIKE }, connector);
-            stations = filter.Query.GetBikesAndStationsAsync().Result.Response;
-            Assert.AreEqual(27, stations.StationsAll.Count());
+			filter = new FilteredConnector(new List<string> { FilterHelper.CARGOBIKE }, connector);
+			stations = filter.Query.GetBikesAndStationsAsync().Result.Response;
+			Assert.AreEqual(27, stations.StationsAll.Count());
 
-            filter = new FilteredConnector(new List<string> { FilterHelper.CITYBIKE }, connector);
-            stations = filter.Query.GetBikesAndStationsAsync().Result.Response;
-            Assert.AreEqual(21, stations.StationsAll.Count());
+			filter = new FilteredConnector(new List<string> { FilterHelper.CITYBIKE }, connector);
+			stations = filter.Query.GetBikesAndStationsAsync().Result.Response;
+			Assert.AreEqual(21, stations.StationsAll.Count());
 
-            filter = new FilteredConnector(new List<string> { "AGroupNamedNonsensDoesNotExist" }, connector);
-            stations = filter.Query.GetBikesAndStationsAsync().Result.Response;
-            Assert.AreEqual(0, stations.StationsAll.Count());
+			filter = new FilteredConnector(new List<string> { "AGroupNamedNonsensDoesNotExist" }, connector);
+			stations = filter.Query.GetBikesAndStationsAsync().Result.Response;
+			Assert.AreEqual(0, stations.StationsAll.Count());
 
-            filter = new FilteredConnector(new List<string>(), connector);
-            stations = filter.Query.GetBikesAndStationsAsync().Result.Response;
-            Assert.AreEqual(41, stations.StationsAll.Count());
+			filter = new FilteredConnector(new List<string>(), connector);
+			stations = filter.Query.GetBikesAndStationsAsync().Result.Response;
+			Assert.AreEqual(41, stations.StationsAll.Count());
 
-            filter = new FilteredConnector(null, connector);
-            stations = filter.Query.GetBikesAndStationsAsync().Result.Response;
-            Assert.AreEqual(41, stations.StationsAll.Count(), "Null means filter none.");
-        }
+			filter = new FilteredConnector(null, connector);
+			stations = filter.Query.GetBikesAndStationsAsync().Result.Response;
+			Assert.AreEqual(41, stations.StationsAll.Count(), "Null means filter none.");
+		}
 
-        /// <summary> Tests all stations. </summary>
-        [Test]
-        public void TestGetBikesAll()
-        {
-            var l_oConnector = new ConnectorCache(
-                new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
-                        null /*UI language */,
-                        string.Empty,
-                        string.Empty,
-                        new CopriCallsMemory001());
+		/// <summary> Tests all stations. </summary>
+		[Test]
+		public void TestGetBikesAll()
+		{
+			var l_oConnector = new ConnectorCache(
+				new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
+						null /*UI language */,
+						string.Empty,
+						string.Empty,
+						new CopriCallsMemory001());
 
-            var l_oFilter = new FilteredConnector(new List<string> { FilterHelper.CARGOBIKE, FilterHelper.CITYBIKE }, l_oConnector);
-            var l_oBikes = l_oFilter.Query.GetBikesAsync().Result.Response;
-            Assert.AreEqual(8, l_oBikes.Count()); // Count of stations was 12 CopriCallsMemory(CopriCallsMemory.SampleSets.Set2, 1)
+			var l_oFilter = new FilteredConnector(new List<string> { FilterHelper.CARGOBIKE, FilterHelper.CITYBIKE }, l_oConnector);
+			var l_oBikes = l_oFilter.Query.GetBikesAsync().Result.Response;
+			Assert.AreEqual(8, l_oBikes.Count()); // Count of stations was 12 CopriCallsMemory(CopriCallsMemory.SampleSets.Set2, 1)
 
-            l_oFilter = new FilteredConnector(new List<string> { FilterHelper.CARGOBIKE }, l_oConnector);
-            l_oBikes = l_oFilter.Query.GetBikesAsync().Result.Response;
-            Assert.AreEqual(3, l_oBikes.Count()); // Was 11
+			l_oFilter = new FilteredConnector(new List<string> { FilterHelper.CARGOBIKE }, l_oConnector);
+			l_oBikes = l_oFilter.Query.GetBikesAsync().Result.Response;
+			Assert.AreEqual(3, l_oBikes.Count()); // Was 11
 
-            l_oFilter = new FilteredConnector(new List<string> { FilterHelper.CITYBIKE }, l_oConnector);
-            l_oBikes = l_oFilter.Query.GetBikesAsync().Result.Response;
-            Assert.AreEqual(5, l_oBikes.Count()); // Was 1
+			l_oFilter = new FilteredConnector(new List<string> { FilterHelper.CITYBIKE }, l_oConnector);
+			l_oBikes = l_oFilter.Query.GetBikesAsync().Result.Response;
+			Assert.AreEqual(5, l_oBikes.Count()); // Was 1
 
-            l_oFilter = new FilteredConnector(new List<string> { "AGroupNamedNonsensDoesNotExist" }, l_oConnector);
-            l_oBikes = l_oFilter.Query.GetBikesAsync().Result.Response;
-            Assert.AreEqual(0, l_oBikes.Count());
+			l_oFilter = new FilteredConnector(new List<string> { "AGroupNamedNonsensDoesNotExist" }, l_oConnector);
+			l_oBikes = l_oFilter.Query.GetBikesAsync().Result.Response;
+			Assert.AreEqual(0, l_oBikes.Count());
 
-            l_oFilter = new FilteredConnector(new List<string>(), l_oConnector);
-            l_oBikes = l_oFilter.Query.GetBikesAsync().Result.Response;
-            Assert.AreEqual(8, l_oBikes.Count(), "List with zero element means filter all."); // Was 12
+			l_oFilter = new FilteredConnector(new List<string>(), l_oConnector);
+			l_oBikes = l_oFilter.Query.GetBikesAsync().Result.Response;
+			Assert.AreEqual(8, l_oBikes.Count(), "List with zero element means filter all."); // Was 12
 
-            l_oFilter = new FilteredConnector(null, l_oConnector);
-            l_oBikes = l_oFilter.Query.GetBikesAsync().Result.Response;
-            Assert.AreEqual(8, l_oBikes.Count(), "Null means filter none.");
-        }
+			l_oFilter = new FilteredConnector(null, l_oConnector);
+			l_oBikes = l_oFilter.Query.GetBikesAsync().Result.Response;
+			Assert.AreEqual(8, l_oBikes.Count(), "Null means filter none.");
+		}
 
-        [Test]
-        public void TestIsConnected()
-        {
-            var connector = Substitute.For<IConnector>();
-            connector.IsConnected.Returns(true);
-            Assert.IsTrue(new FilteredConnector(new List<string>(), connector).IsConnected);
-            var dummy = connector.Received().IsConnected;
+		[Test]
+		public void TestIsConnected()
+		{
+			var connector = Substitute.For<IConnector>();
+			connector.IsConnected.Returns(true);
+			Assert.IsTrue(new FilteredConnector(new List<string>(), connector).IsConnected);
+			var dummy = connector.Received().IsConnected;
 
-            connector = Substitute.For<IConnector>();
-            connector.IsConnected.Returns(false);
-            Assert.IsFalse(new FilteredConnector(new List<string>(), connector).IsConnected);
-            dummy = connector.Received().IsConnected;
-        }
-    }
+			connector = Substitute.For<IConnector>();
+			connector.IsConnected.Returns(false);
+			Assert.IsFalse(new FilteredConnector(new List<string>(), connector).IsConnected);
+			dummy = connector.Received().IsConnected;
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Logging/TestLoggingDirectoryManager.cs b/TestTINKLib/Fixtures/ObjectTests/Logging/TestLoggingDirectoryManager.cs
index 1c84094..1fb6c2a 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Logging/TestLoggingDirectoryManager.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Logging/TestLoggingDirectoryManager.cs
@@ -5,71 +5,71 @@ using TINK.Model.Logging;
 
 namespace TestTINKLib.Fixtures.ObjectTests
 {
-    [TestFixture]
-    public class TestLoggingDirectoryManager
-    {
-        [Test]
-        public void TestConstructInvalidArgs()
-        {
-            Assert.Throws<ArgumentException>(
-                () => new LoggingDirectoryManager(
-                    (name) => new List<string> { "2018_02_06_22_18_00" /* oldest */, "2018_02_06_23_10_00" /*youngest*/ , "2018_02_06_22_19_00", "2018_02_06_22_20_00" },
-                    (name) => false,
-                    (name) => { },
-                    (name) => { },
-                    "abc",
-                    '\\',
-                    0));
+	[TestFixture]
+	public class TestLoggingDirectoryManager
+	{
+		[Test]
+		public void TestConstructInvalidArgs()
+		{
+			Assert.Throws<ArgumentException>(
+				() => new LoggingDirectoryManager(
+					(name) => new List<string> { "2018_02_06_22_18_00" /* oldest */, "2018_02_06_23_10_00" /*youngest*/ , "2018_02_06_22_19_00", "2018_02_06_22_20_00" },
+					(name) => false,
+					(name) => { },
+					(name) => { },
+					"abc",
+					'\\',
+					0));
 
-            Assert.Throws<ArgumentException>(
-                () => new LoggingDirectoryManager(
-                    (name) => new List<string> { "2018_02_06_22_18_00" /* oldest */, "2018_02_06_23_10_00" /*youngest*/ , "2018_02_06_22_19_00", "20180206222000" },
-                    (name) => false,
-                    (name) => { },
-                    (name) => { },
-                    "",
-                    '\\',
-                    3));
-        }
+			Assert.Throws<ArgumentException>(
+				() => new LoggingDirectoryManager(
+					(name) => new List<string> { "2018_02_06_22_18_00" /* oldest */, "2018_02_06_23_10_00" /*youngest*/ , "2018_02_06_22_19_00", "20180206222000" },
+					(name) => false,
+					(name) => { },
+					(name) => { },
+					"",
+					'\\',
+					3));
+		}
 
-        [Test]
-        public void TestDeleteObsoleteLogs()
-        {
-            var l_oDeletedFilesList = new List<string>();
+		[Test]
+		public void TestDeleteObsoleteLogs()
+		{
+			var l_oDeletedFilesList = new List<string>();
 
-            var l_oManger = new LoggingDirectoryManager(
-                (name) => new List<string> { "2018_02_06_22_18_00" /* oldest */, "2018_02_06_23_10_00" /*youngest*/ , "2018_02_06_22_19_00", "20180206222000" },
-                (name) => false,
-                (name) => { },
-                (name) => { l_oDeletedFilesList.Add(name); },
-                "abc",
-                '\\',
-                3);
+			var l_oManger = new LoggingDirectoryManager(
+				(name) => new List<string> { "2018_02_06_22_18_00" /* oldest */, "2018_02_06_23_10_00" /*youngest*/ , "2018_02_06_22_19_00", "20180206222000" },
+				(name) => false,
+				(name) => { },
+				(name) => { l_oDeletedFilesList.Add(name); },
+				"abc",
+				'\\',
+				3);
 
-            l_oManger.DeleteObsoleteLogs();
+			l_oManger.DeleteObsoleteLogs();
 
-            Assert.AreEqual(2, l_oDeletedFilesList.Count);
-            Assert.IsTrue(l_oDeletedFilesList.Contains("2018_02_06_22_18_00"));
-            Assert.IsTrue(l_oDeletedFilesList.Contains("2018_02_06_22_19_00"));
-        }
+			Assert.AreEqual(2, l_oDeletedFilesList.Count);
+			Assert.IsTrue(l_oDeletedFilesList.Contains("2018_02_06_22_18_00"));
+			Assert.IsTrue(l_oDeletedFilesList.Contains("2018_02_06_22_19_00"));
+		}
 
-        [Test]
-        public void TestDeleteObsoleteLogs_EmptyDirectory()
-        {
-            var l_oDeletedFilesList = new List<string>();
+		[Test]
+		public void TestDeleteObsoleteLogs_EmptyDirectory()
+		{
+			var l_oDeletedFilesList = new List<string>();
 
-            var l_oManger = new LoggingDirectoryManager(
-                (name) => new List<string>(),
-                (name) => false,
-                (name) => { },
-                (name) => { l_oDeletedFilesList.Add(name); },
-                "abc",
-                '\\',
-                3);
+			var l_oManger = new LoggingDirectoryManager(
+				(name) => new List<string>(),
+				(name) => false,
+				(name) => { },
+				(name) => { l_oDeletedFilesList.Add(name); },
+				"abc",
+				'\\',
+				3);
 
-            l_oManger.DeleteObsoleteLogs();
+			l_oManger.DeleteObsoleteLogs();
 
-            Assert.AreEqual(0, l_oDeletedFilesList.Count);
-        }
-    }
+			Assert.AreEqual(0, l_oDeletedFilesList.Count);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Map/TestMapPageFilter.cs b/TestTINKLib/Fixtures/ObjectTests/Map/TestMapPageFilter.cs
index 61b15c0..41546e1 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Map/TestMapPageFilter.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Map/TestMapPageFilter.cs
@@ -6,38 +6,38 @@ using TINK.ViewModel.Map;
 
 namespace UITest.Fixtures.ObjectTests.Map
 {
-    [TestFixture]
-    public class TestMapPageFilter
-    {
-        [Test]
-        public void TestCurrentFilter_Empty()
-        {
-            var l_oFilter = new TinkKonradToggleViewModel(null);
-            Assert.IsEmpty(l_oFilter.CurrentFilter);
-        }
+	[TestFixture]
+	public class TestMapPageFilter
+	{
+		[Test]
+		public void TestCurrentFilter_Empty()
+		{
+			var l_oFilter = new TinkKonradToggleViewModel(null);
+			Assert.IsEmpty(l_oFilter.CurrentFilter);
+		}
 
-        [Test]
-        public void TestCurrentFilter()
-        {
-            var l_oFilter = new TinkKonradToggleViewModel(new GroupFilterMapPage(new Dictionary<string, FilterState> { { $"HOM_{FilterHelper.CARGOBIKE}", FilterState.On }, { "Konrad", FilterState.Off } }));
+		[Test]
+		public void TestCurrentFilter()
+		{
+			var l_oFilter = new TinkKonradToggleViewModel(new GroupFilterMapPage(new Dictionary<string, FilterState> { { $"HOM_{FilterHelper.CARGOBIKE}", FilterState.On }, { "Konrad", FilterState.Off } }));
 
-            Assert.AreEqual($"HOM_{FilterHelper.CARGOBIKE}", l_oFilter.CurrentFilter);
+			Assert.AreEqual($"HOM_{FilterHelper.CARGOBIKE}", l_oFilter.CurrentFilter);
 
-            l_oFilter = new TinkKonradToggleViewModel(new GroupFilterMapPage(new Dictionary<string, FilterState> { { $"HOM_{FilterHelper.CARGOBIKE}", FilterState.Off }, { $"HOM_{FilterHelper.CITYBIKE}", FilterState.On } }));
+			l_oFilter = new TinkKonradToggleViewModel(new GroupFilterMapPage(new Dictionary<string, FilterState> { { $"HOM_{FilterHelper.CARGOBIKE}", FilterState.Off }, { $"HOM_{FilterHelper.CITYBIKE}", FilterState.On } }));
 
-            Assert.AreEqual($"HOM_{FilterHelper.CITYBIKE}", l_oFilter.CurrentFilter);
-        }
+			Assert.AreEqual($"HOM_{FilterHelper.CITYBIKE}", l_oFilter.CurrentFilter);
+		}
 
-        [Test]
-        public void TestIsToggleVisible()
-        {
-            var l_oFilter = new TinkKonradToggleViewModel(new GroupFilterMapPage(new Dictionary<string, FilterState> { { $"HOM_{FilterHelper.CARGOBIKE}", FilterState.On } }));
+		[Test]
+		public void TestIsToggleVisible()
+		{
+			var l_oFilter = new TinkKonradToggleViewModel(new GroupFilterMapPage(new Dictionary<string, FilterState> { { $"HOM_{FilterHelper.CARGOBIKE}", FilterState.On } }));
 
-            Assert.IsFalse(l_oFilter.IsToggleVisible);
+			Assert.IsFalse(l_oFilter.IsToggleVisible);
 
-            l_oFilter = new TinkKonradToggleViewModel(new GroupFilterMapPage(new Dictionary<string, FilterState> { { $"HOM_{FilterHelper.CARGOBIKE}", FilterState.Off }, { $"HOM_{FilterHelper.CITYBIKE}", FilterState.On } }));
+			l_oFilter = new TinkKonradToggleViewModel(new GroupFilterMapPage(new Dictionary<string, FilterState> { { $"HOM_{FilterHelper.CARGOBIKE}", FilterState.Off }, { $"HOM_{FilterHelper.CITYBIKE}", FilterState.On } }));
 
-            Assert.IsTrue(l_oFilter.IsToggleVisible);
-        }
-    }
+			Assert.IsTrue(l_oFilter.IsToggleVisible);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Repository/Exception/TestBookingDeclinedException.cs b/TestTINKLib/Fixtures/ObjectTests/Repository/Exception/TestBookingDeclinedException.cs
index ee7e868..803d45b 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Repository/Exception/TestBookingDeclinedException.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Repository/Exception/TestBookingDeclinedException.cs
@@ -3,37 +3,37 @@ using TINK.Repository.Exception;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Repository.Exception
 {
-    [TestFixture]
-    public class TestBookingDeclinedException
-    {
-        [Test]
-        public void TestIsBookingDeclined()
-        {
-            const string responseText = "OK: BOOKING_REQUEST declined. Max count of 8 occupied bikes has been reached";
+	[TestFixture]
+	public class TestBookingDeclinedException
+	{
+		[Test]
+		public void TestIsBookingDeclined()
+		{
+			const string responseText = "OK: BOOKING_REQUEST declined. Max count of 8 occupied bikes has been reached";
 
-            BookingDeclinedException exception = null;
+			BookingDeclinedException exception = null;
 
-            Assert.That(() => BookingDeclinedException.IsBookingDeclined(responseText, out exception),
-                Is.EqualTo(true));
+			Assert.That(() => BookingDeclinedException.IsBookingDeclined(responseText, out exception),
+				Is.EqualTo(true));
 
-            Assert.That(() => exception.MaxBikesCount,
-                Is.EqualTo(8));
+			Assert.That(() => exception.MaxBikesCount,
+				Is.EqualTo(8));
 
-        }
+		}
 
-        [Test]
-        public void TestIsBookingDeclined_InvalidNumber()
-        {
-            const string responseText = "OK: BOOKING_REQUEST declined. Max count of 8 occupied bikes has been reached";
+		[Test]
+		public void TestIsBookingDeclined_InvalidNumber()
+		{
+			const string responseText = "OK: BOOKING_REQUEST declined. Max count of 8 occupied bikes has been reached";
 
-            BookingDeclinedException exception = null;
+			BookingDeclinedException exception = null;
 
-            Assert.That(() => BookingDeclinedException.IsBookingDeclined(responseText, out exception),
-                Is.EqualTo(true));
+			Assert.That(() => BookingDeclinedException.IsBookingDeclined(responseText, out exception),
+				Is.EqualTo(true));
 
-            Assert.That(() => exception.MaxBikesCount,
-                Is.EqualTo(8));
+			Assert.That(() => exception.MaxBikesCount,
+				Is.EqualTo(8));
 
-        }
-    }
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Repository/Exception/TestNoGPSDataException.cs b/TestTINKLib/Fixtures/ObjectTests/Repository/Exception/TestNoGPSDataException.cs
index ea0728c..270832a 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Repository/Exception/TestNoGPSDataException.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Repository/Exception/TestNoGPSDataException.cs
@@ -3,29 +3,29 @@ using TINK.Repository.Exception;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Repository.Exception
 {
-    [TestFixture]
-    public class TestNoGPSDataException
-    {
-        [Test]
-        public void TestIsNotAtStation()
-        {
-            const string responseText = "Failure 2245: No GPS data, state change forbidden.";
+	[TestFixture]
+	public class TestNoGPSDataException
+	{
+		[Test]
+		public void TestIsNotAtStation()
+		{
+			const string responseText = "Failure 2245: No GPS data, state change forbidden.";
 
-            NoGPSDataException exception = null;
+			NoGPSDataException exception = null;
 
-            Assert.That(() => NoGPSDataException.IsNoGPSData(responseText, out exception),
-                Is.EqualTo(true));
-        }
+			Assert.That(() => NoGPSDataException.IsNoGPSData(responseText, out exception),
+				Is.EqualTo(true));
+		}
 
-        [Test]
-        public void TestIsNotAtStation_InvalidNr()
-        {
-            const string responseText = "Failure 2248: No GPS data, state change forbidden.";
+		[Test]
+		public void TestIsNotAtStation_InvalidNr()
+		{
+			const string responseText = "Failure 2248: No GPS data, state change forbidden.";
 
-            NoGPSDataException exception = null;
+			NoGPSDataException exception = null;
 
-            Assert.That(() => NoGPSDataException.IsNoGPSData(responseText, out exception),
-                Is.EqualTo(false));
-        }
-    }
+			Assert.That(() => NoGPSDataException.IsNoGPSData(responseText, out exception),
+				Is.EqualTo(false));
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Repository/Exception/TestNotAtStationException.cs b/TestTINKLib/Fixtures/ObjectTests/Repository/Exception/TestNotAtStationException.cs
index 7d6bddb..c4dd011 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Repository/Exception/TestNotAtStationException.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Repository/Exception/TestNotAtStationException.cs
@@ -3,35 +3,35 @@ using TINK.Repository.Exception;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Repository.Exception
 {
-    [TestFixture]
-    public class TestNotAtStationException
-    {
-        [Test]
-        public void TestIsNotAtStation()
-        {
-            const string responseText = "Failure 2178: bike 1545 out of GEO fencing. 15986 meter distance to next station 105. OK: bike 1545 locked confirmed";
+	[TestFixture]
+	public class TestNotAtStationException
+	{
+		[Test]
+		public void TestIsNotAtStation()
+		{
+			const string responseText = "Failure 2178: bike 1545 out of GEO fencing. 15986 meter distance to next station 105. OK: bike 1545 locked confirmed";
 
-            NotAtStationException exception = null;
+			NotAtStationException exception = null;
 
-            Assert.That(() => NotAtStationException.IsNotAtStation(responseText, out exception),
-                Is.EqualTo(true));
+			Assert.That(() => NotAtStationException.IsNotAtStation(responseText, out exception),
+				Is.EqualTo(true));
 
-            Assert.That(() => exception.StationNr,
-                Is.EqualTo(105));
+			Assert.That(() => exception.StationNr,
+				Is.EqualTo(105));
 
-            Assert.That(() => exception.Distance,
-                Is.EqualTo(15986));
-        }
+			Assert.That(() => exception.Distance,
+				Is.EqualTo(15986));
+		}
 
-        [Test]
-        public void TestIsNotAtStation_InvalidNr()
-        {
-            const string responseText = "Failure 2177: bike 1545 out of GEO fencing. 15986 meter distance to next station 105. OK: bike 1545 locked confirmed";
+		[Test]
+		public void TestIsNotAtStation_InvalidNr()
+		{
+			const string responseText = "Failure 2177: bike 1545 out of GEO fencing. 15986 meter distance to next station 105. OK: bike 1545 locked confirmed";
 
-            NotAtStationException exception = null;
+			NotAtStationException exception = null;
 
-            Assert.That(() => NotAtStationException.IsNotAtStation(responseText, out exception),
-                Is.EqualTo(false));
-        }
-    }
+			Assert.That(() => NotAtStationException.IsNotAtStation(responseText, out exception),
+				Is.EqualTo(false));
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/Crypto/TestCryptoHelper.cs b/TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/Crypto/TestCryptoHelper.cs
index 7ee3b91..be241a5 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/Crypto/TestCryptoHelper.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/Crypto/TestCryptoHelper.cs
@@ -5,81 +5,81 @@ using TINK.Services.BluetoothLock.Crypto;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Services.BluetoothLock.Crypto
 {
-    [TestFixture]
-    public class TestCryptoHelper
-    {
-        /// <summary>
-        /// Ensures that decyption from haveltec- lib produces the same results than sharee lib.
-        /// </summary>
-        [Test]
-        public void Test_DecryptStringFromBytes_Aes()
-        {
-            // keyCopri (value copied from debugging session of sharing_ble_lib/ haveltec code)
-            var keyCopri = (new sbyte[] { -6, 53, 29, -112, 7, -83, -41, -7, 30, 45, -13, -2, -108, -29, -90, 71, 15, -74, -76, 32, 0, 0, 0, 0 }).Select(x => (byte)x).ToArray();
+	[TestFixture]
+	public class TestCryptoHelper
+	{
+		/// <summary>
+		/// Ensures that decyption from haveltec- lib produces the same results than sharee lib.
+		/// </summary>
+		[Test]
+		public void Test_DecryptStringFromBytes_Aes()
+		{
+			// keyCopri (value copied from debugging session of sharing_ble_lib/ haveltec code)
+			var keyCopri = (new sbyte[] { -6, 53, 29, -112, 7, -83, -41, -7, 30, 45, -13, -2, -108, -29, -90, 71, 15, -74, -76, 32, 0, 0, 0, 0 }).Select(x => (byte)x).ToArray();
 
-            // Encrypted seed value from lock (value copied from debugging session of sharing_ble_lib/ haveltec code)
-            var seedLockEnc = (new sbyte[] { 50, 51, -40, 64, 42, 82, 97, -24, 20, -39, -15, 126, 119, -110, 47, -18 }).Select(x => (byte)x).ToArray();
+			// Encrypted seed value from lock (value copied from debugging session of sharing_ble_lib/ haveltec code)
+			var seedLockEnc = (new sbyte[] { 50, 51, -40, 64, 42, 82, 97, -24, 20, -39, -15, 126, 119, -110, 47, -18 }).Select(x => (byte)x).ToArray();
 
-            // Decrypted seed value from lock (value copied from debugging session of sharing_ble_lib/ haveltec code)
-            var acces_key = (new sbyte[] { 19, -66, 55, 18, -106, -92, 70, -40, 117, -87, -19, 124, 19, 54, -18, -82 }).Select(x => (byte)x).ToArray();
+			// Decrypted seed value from lock (value copied from debugging session of sharing_ble_lib/ haveltec code)
+			var acces_key = (new sbyte[] { 19, -66, 55, 18, -106, -92, 70, -40, 117, -87, -19, 124, 19, 54, -18, -82 }).Select(x => (byte)x).ToArray();
 
-            var decrypt = new Cipher().Decrypt(keyCopri, seedLockEnc);
+			var decrypt = new Cipher().Decrypt(keyCopri, seedLockEnc);
 
-            Assert.IsTrue(acces_key.SequenceEqual(decrypt));
-        }
+			Assert.IsTrue(acces_key.SequenceEqual(decrypt));
+		}
 
 
-        [Test]
-        public void TestGetSeedLock()
-        {
-            // seed copri (value copied from debugging session of sharing_ble_lib/ haveltec code)
-            byte[] seedCopri = (new sbyte[] { -7, -69, 16, -52, 88, 38, -92, 82, -99, -79, 19, 16, -41, -127, 51, 24 }).Select(x => (byte)x).ToArray();
+		[Test]
+		public void TestGetSeedLock()
+		{
+			// seed copri (value copied from debugging session of sharing_ble_lib/ haveltec code)
+			byte[] seedCopri = (new sbyte[] { -7, -69, 16, -52, 88, 38, -92, 82, -99, -79, 19, 16, -41, -127, 51, 24 }).Select(x => (byte)x).ToArray();
 
-            // keyCopri (value copied from debugging session of sharing_ble_lib/ haveltec code)
-            byte[] keyCopri = (new sbyte[] { -6, 53, 29, -112, 7, -83, -41, -7, 30, 45, -13, -2, -108, -29, -90, 71, 15, -74, -76, 32, 0, 0, 0, 0 }).Select(x => (byte)x).ToArray();
+			// keyCopri (value copied from debugging session of sharing_ble_lib/ haveltec code)
+			byte[] keyCopri = (new sbyte[] { -6, 53, 29, -112, 7, -83, -41, -7, 30, 45, -13, -2, -108, -29, -90, 71, 15, -74, -76, 32, 0, 0, 0, 0 }).Select(x => (byte)x).ToArray();
 
-            // Encrypted seed value from lock (value copied from debugging session of sharing_ble_lib/ haveltec code)
-            byte[] seedLockEnc = (new sbyte[] { 92, 80, -36, -2, 101, -31, -23, -43, 71, 62, 126, -70, 54, -53, -119, -56 }).Select(x => (byte)x).ToArray();
+			// Encrypted seed value from lock (value copied from debugging session of sharing_ble_lib/ haveltec code)
+			byte[] seedLockEnc = (new sbyte[] { 92, 80, -36, -2, 101, -31, -23, -43, 71, 62, 126, -70, 54, -53, -119, -56 }).Select(x => (byte)x).ToArray();
 
-            //// Decryped seed value? access values? from lock (value copied from debugging session of sharing_ble_lib/ haveltec code)
-            byte[] seedLockDec = (new sbyte[] { 62, -51, 96, -80, 7, -84, 48, -104, 47, 51, -22, -23, 30, -10, -88, -97 }).Select(x => (byte)x).ToArray();
+			//// Decryped seed value? access values? from lock (value copied from debugging session of sharing_ble_lib/ haveltec code)
+			byte[] seedLockDec = (new sbyte[] { 62, -51, 96, -80, 7, -84, 48, -104, 47, 51, -22, -23, 30, -10, -88, -97 }).Select(x => (byte)x).ToArray();
 
-            var crypto = new AuthCryptoHelper(
-                seedLockEnc,
-                keyCopri,
-                null);
+			var crypto = new AuthCryptoHelper(
+				seedLockEnc,
+				keyCopri,
+				null);
 
-            var result = crypto.GetSeedLock();
+			var result = crypto.GetSeedLock();
 
-            Assert.IsTrue(seedLockDec.SequenceEqual(result));
-        }
+			Assert.IsTrue(seedLockDec.SequenceEqual(result));
+		}
 
 
-        [Test]
-        public void TestGetAccessKeyEncrypted()
-        {
-            // seed copri (value copied from debugging session of sharing_ble_lib/ haveltec code)
-            byte[] seedCopri = (new sbyte[] { -7, -69, 16, -52, 88, 38, -92, 82, -99, -79, 19, 16, -41, -127, 51, 24 }).Select(x => (byte)x).ToArray();
+		[Test]
+		public void TestGetAccessKeyEncrypted()
+		{
+			// seed copri (value copied from debugging session of sharing_ble_lib/ haveltec code)
+			byte[] seedCopri = (new sbyte[] { -7, -69, 16, -52, 88, 38, -92, 82, -99, -79, 19, 16, -41, -127, 51, 24 }).Select(x => (byte)x).ToArray();
 
-            // keyCopri (value copied from debugging session of sharing_ble_lib/ haveltec code)
-            byte[] keyCopri = (new sbyte[] { -6, 53, 29, -112, 7, -83, -41, -7, 30, 45, -13, -2, -108, -29, -90, 71, 15, -74, -76, 32, 0, 0, 0, 0 }).Select(x => (byte)x).ToArray();
+			// keyCopri (value copied from debugging session of sharing_ble_lib/ haveltec code)
+			byte[] keyCopri = (new sbyte[] { -6, 53, 29, -112, 7, -83, -41, -7, 30, 45, -13, -2, -108, -29, -90, 71, 15, -74, -76, 32, 0, 0, 0, 0 }).Select(x => (byte)x).ToArray();
 
-            // Encrypted seed value from lock (value copied from debugging session of sharing_ble_lib/ haveltec code)
-            byte[] seedLockEnc = (new sbyte[] { 92, 80, -36, -2, 101, -31, -23, -43, 71, 62, 126, -70, 54, -53, -119, -56 }).Select(x => (byte)x).ToArray();
+			// Encrypted seed value from lock (value copied from debugging session of sharing_ble_lib/ haveltec code)
+			byte[] seedLockEnc = (new sbyte[] { 92, 80, -36, -2, 101, -31, -23, -43, 71, 62, 126, -70, 54, -53, -119, -56 }).Select(x => (byte)x).ToArray();
 
-            // Decryped seed value? access values? from lock (value copied from debugging session of sharing_ble_lib/ haveltec code)
-            byte[] seedLockDec = (new sbyte[] { 62, -51, 96, -80, 7, -84, 48, -104, 47, 51, -22, -23, 30, -10, -88, -97 }).Select(x => (byte)x).ToArray();
+			// Decryped seed value? access values? from lock (value copied from debugging session of sharing_ble_lib/ haveltec code)
+			byte[] seedLockDec = (new sbyte[] { 62, -51, 96, -80, 7, -84, 48, -104, 47, 51, -22, -23, 30, -10, -88, -97 }).Select(x => (byte)x).ToArray();
 
-            var crypto = new AuthCryptoHelper(
-                seedLockEnc,
-                keyCopri,
-                null);
+			var crypto = new AuthCryptoHelper(
+				seedLockEnc,
+				keyCopri,
+				null);
 
-            var result = crypto.GetSeedLock();
+			var result = crypto.GetSeedLock();
 
-            Assert.AreEqual(
-                Encoding.UTF8.GetString(seedLockDec),
-                Encoding.UTF8.GetString(result));
-        }
-    }
+			Assert.AreEqual(
+				Encoding.UTF8.GetString(seedLockDec),
+				Encoding.UTF8.GetString(result));
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/Tdo/TestLockInfoAuthTdo.cs b/TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/Tdo/TestLockInfoAuthTdo.cs
index 6ac8d8c..e965744 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/Tdo/TestLockInfoAuthTdo.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/Tdo/TestLockInfoAuthTdo.cs
@@ -3,22 +3,22 @@ using TINK.Services.BluetoothLock.Tdo;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Services.BluetoothLock.Tdo
 {
-    [TestFixture]
-    public class TestLockInfoAuthTdo
-    {
-        [Test]
-        public void TestCtor()
-        {
-            var auth = new LockInfoAuthTdo.Builder
-            {
-                K_seed = null,
-                K_u = null,
-                K_a = null,
-            }.Build();
+	[TestFixture]
+	public class TestLockInfoAuthTdo
+	{
+		[Test]
+		public void TestCtor()
+		{
+			var auth = new LockInfoAuthTdo.Builder
+			{
+				K_seed = null,
+				K_u = null,
+				K_a = null,
+			}.Build();
 
-            Assert.That(auth.K_seed, Is.Not.Null);
-            Assert.That(auth.K_u, Is.Not.Null);
-            Assert.That(auth.K_a, Is.Not.Null);
-        }
-    }
+			Assert.That(auth.K_seed, Is.Not.Null);
+			Assert.That(auth.K_u, Is.Not.Null);
+			Assert.That(auth.K_a, Is.Not.Null);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/TestLockItBaseService.cs b/TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/TestLockItBaseService.cs
index d2311b7..6ddfc55 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/TestLockItBaseService.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/TestLockItBaseService.cs
@@ -11,83 +11,83 @@ using DeviceState = Plugin.BLE.Abstractions.DeviceState;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Services.BluetoothLock
 {
-    [TestFixture]
-    public class TestLockItBaseService
-    {
-        [Test]
-        public void TestConnect_Connected_InvalidArgs()
-        {
-            var device = Rhino.Mocks.MockRepository.GenerateStub<IDevice>();
-            var adapter = Rhino.Mocks.MockRepository.GenerateStub<IAdapter>();
-            var cipher = Rhino.Mocks.MockRepository.GenerateStub<TINK.Model.Device.ICipher>();
+	[TestFixture]
+	public class TestLockItBaseService
+	{
+		[Test]
+		public void TestConnect_Connected_InvalidArgs()
+		{
+			var device = Rhino.Mocks.MockRepository.GenerateStub<IDevice>();
+			var adapter = Rhino.Mocks.MockRepository.GenerateStub<IAdapter>();
+			var cipher = Rhino.Mocks.MockRepository.GenerateStub<TINK.Model.Device.ICipher>();
 
-            Rhino.Mocks.RhinoMocksExtensions.Stub(device, x => x.State).Return(DeviceState.Disconnected);
+			Rhino.Mocks.RhinoMocksExtensions.Stub(device, x => x.State).Return(DeviceState.Disconnected);
 
-            var exception = Assert.Throws<AggregateException>(
-                () => { var lockIt = LockItEventBased.Authenticate(device, null, adapter, cipher).Result; },
-                "If connected no auth is requied.");
+			var exception = Assert.Throws<AggregateException>(
+				() => { var lockIt = LockItEventBased.Authenticate(device, null, adapter, cipher).Result; },
+				"If connected no auth is requied.");
 
-            Assert.That(exception.InnerExceptions.Count > 0);
-            Assert.That(exception.InnerExceptions[0], Is.InstanceOf<BluetoothDisconnectedException>());
+			Assert.That(exception.InnerExceptions.Count > 0);
+			Assert.That(exception.InnerExceptions[0], Is.InstanceOf<BluetoothDisconnectedException>());
 
-        }
+		}
 
-        [Test]
-        public void TestConnect_Connected()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var cipher = Substitute.For<TINK.Model.Device.ICipher>();
-            var auth = Substitute.For<ICharacteristic>();
-            var lockControl = Substitute.For<IService>();
+		[Test]
+		public void TestConnect_Connected()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<TINK.Model.Device.ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var lockControl = Substitute.For<IService>();
 
-            var authTdo = new LockInfoAuthTdo.Builder
-            {
-                Id = 12,
-                K_seed = new byte[] { (byte)'i', (byte)'V', (byte)'F', (byte)'m', (byte)'u', (byte)'T', (byte)'n', (byte)'K', (byte)'q', (byte)'E', (byte)'Y', (byte)'h', (byte)'m', (byte)'T', (byte)'l', (byte)'e' },
-                K_u = new byte[16]
-            }.Build();
+			var authTdo = new LockInfoAuthTdo.Builder
+			{
+				Id = 12,
+				K_seed = new byte[] { (byte)'i', (byte)'V', (byte)'F', (byte)'m', (byte)'u', (byte)'T', (byte)'n', (byte)'K', (byte)'q', (byte)'E', (byte)'Y', (byte)'h', (byte)'m', (byte)'T', (byte)'l', (byte)'e' },
+				K_u = new byte[16]
+			}.Build();
 
-            device.State.Returns(DeviceState.Connected);
-            device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
-            lockControl.GetCharacteristicAsync(Arg.Any<Guid>()).Returns(Task.FromResult(auth));
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true)); // Write COPRI seed to lock
-            auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8])); // Read lock seed
-            cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
-            cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true)); // Write COPRI seed to lock
+			device.State.Returns(DeviceState.Connected);
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
+			lockControl.GetCharacteristicAsync(Arg.Any<Guid>()).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true)); // Write COPRI seed to lock
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8])); // Read lock seed
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true)); // Write COPRI seed to lock
 
-            device.Name.Returns("Origin");
+			device.Name.Returns("Origin");
 
-            Assert.AreEqual(
-                "Origin",
-                LockItEventBased.Authenticate(device, authTdo, adapter, cipher).Result.Name,
-                "If connected no auth is requied.");
-        }
+			Assert.AreEqual(
+				"Origin",
+				LockItEventBased.Authenticate(device, authTdo, adapter, cipher).Result.Name,
+				"If connected no auth is requied.");
+		}
 
-        [Test]
-        public void TestAuth()
-        {
-            var authTdo = new LockInfoAuthTdo.Builder
-            {
-                Id = 12,
-                K_seed = new byte[] { (byte)'c', (byte)'b', (byte)'z', (byte)'b', (byte)'y', (byte)'I', (byte)'q', (byte)'j', (byte)'v', (byte)'L', (byte)'V', (byte)'I', (byte)'t', (byte)'C', (byte)'B', (byte)'I' },
-                K_u = new byte[16]
-            }.Build();
+		[Test]
+		public void TestAuth()
+		{
+			var authTdo = new LockInfoAuthTdo.Builder
+			{
+				Id = 12,
+				K_seed = new byte[] { (byte)'c', (byte)'b', (byte)'z', (byte)'b', (byte)'y', (byte)'I', (byte)'q', (byte)'j', (byte)'v', (byte)'L', (byte)'V', (byte)'I', (byte)'t', (byte)'C', (byte)'B', (byte)'I' },
+				K_u = new byte[16]
+			}.Build();
 
-            var device = Rhino.Mocks.MockRepository.GenerateStub<IDevice>();
-            var adapter = Rhino.Mocks.MockRepository.GenerateStub<IAdapter>();
-            var cipher = Rhino.Mocks.MockRepository.GenerateStub<TINK.Model.Device.ICipher>();
+			var device = Rhino.Mocks.MockRepository.GenerateStub<IDevice>();
+			var adapter = Rhino.Mocks.MockRepository.GenerateStub<IAdapter>();
+			var cipher = Rhino.Mocks.MockRepository.GenerateStub<TINK.Model.Device.ICipher>();
 
-            Rhino.Mocks.RhinoMocksExtensions.Stub(device, x => x.State).Return(DeviceState.Disconnected);
+			Rhino.Mocks.RhinoMocksExtensions.Stub(device, x => x.State).Return(DeviceState.Disconnected);
 
-            // Use factory to create LockIt-object.
-            var exception = Assert.Throws<AggregateException>(
-                () => { var lockIt = LockItEventBased.Authenticate(device, authTdo, adapter, cipher).Result; },
-                "If connected no auth is requied.");
+			// Use factory to create LockIt-object.
+			var exception = Assert.Throws<AggregateException>(
+				() => { var lockIt = LockItEventBased.Authenticate(device, authTdo, adapter, cipher).Result; },
+				"If connected no auth is requied.");
 
-            Assert.That(exception.InnerExceptions.Count > 0);
-            Assert.That(exception.InnerExceptions[0], Is.InstanceOf<BluetoothDisconnectedException>());
-        }
-    }
+			Assert.That(exception.InnerExceptions.Count > 0);
+			Assert.That(exception.InnerExceptions[0], Is.InstanceOf<BluetoothDisconnectedException>());
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/TestLockServiceSimulation.cs b/TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/TestLockServiceSimulation.cs
index 143aea2..3a2b2ec 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/TestLockServiceSimulation.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/TestLockServiceSimulation.cs
@@ -10,27 +10,27 @@ using TINK.Services.BluetoothLock.Tdo;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Service.LockService
 {
-    [TestFixture]
-    public class TestLockServiceSimulation
-    {
-        [Test]
-        public void TestUpdateSimulationInstance_Update()
-        {
-            var service = new LocksServiceInReach();
+	[TestFixture]
+	public class TestLockServiceSimulation
+	{
+		[Test]
+		public void TestUpdateSimulationInstance_Update()
+		{
+			var service = new LocksServiceInReach();
 
-            var bikes = new BikeCollection(new Dictionary<string, TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo>()
-                {
-                    { "42",  new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("42", LockModel.ILockIt), new Drive(), 1, new Guid(),new byte[] { 1, 4 }, new byte[] { 3, 4 }, new byte[] { 3, 4 }, DateTime.Now, "a@b", "1" , null /*operator uri*/) },
-                    { "43",  new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("43", LockModel.ILockIt), new Drive(), 3, new Guid(),new byte[] { 4, 4 }, new byte[] { 4, 7 }, new byte[] { 5, 4 }, DateTime.Now, "c@b", "1" , null /*operator uri*/) }
-                }
-            );
+			var bikes = new BikeCollection(new Dictionary<string, TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo>()
+				{
+					{ "42",  new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("42", LockModel.ILockIt), new Drive(), 1, new Guid(),new byte[] { 1, 4 }, new byte[] { 3, 4 }, new byte[] { 3, 4 }, DateTime.Now, "a@b", "1" , null /*operator uri*/) },
+					{ "43",  new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("43", LockModel.ILockIt), new Drive(), 3, new Guid(),new byte[] { 4, 4 }, new byte[] { 4, 7 }, new byte[] { 5, 4 }, DateTime.Now, "c@b", "1" , null /*operator uri*/) }
+				}
+			);
 
-            if (service is ILocksServiceFake serviceFake)
-            {
-                serviceFake.UpdateSimulation(bikes);
-            }
+			if (service is ILocksServiceFake serviceFake)
+			{
+				serviceFake.UpdateSimulation(bikes);
+			}
 
-            Assert.AreEqual(2, service.GetLocksStateAsync(new List<LockInfoAuthTdo>(), new TimeSpan(0, 0, 3)).Result.Count());
-        }
-    }
+			Assert.AreEqual(2, service.GetLocksStateAsync(new List<LockInfoAuthTdo>(), new TimeSpan(0, 0, 3)).Result.Count());
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Services/TestLocksServicesContainerMutable.cs b/TestTINKLib/Fixtures/ObjectTests/Services/TestLocksServicesContainerMutable.cs
index 43f4e50..c5d10fc 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Services/TestLocksServicesContainerMutable.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Services/TestLocksServicesContainerMutable.cs
@@ -6,21 +6,21 @@ using TINK.Services.BluetoothLock;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Services
 {
-    [TestFixture]
-    public class TestLocksServicesContainerMutable
-    {
-        [Test]
-        public void TestCtorCustomServices()
-        {
-            var ciper = NSubstitute.Substitute.For<ICipher>();
-            var firstService = NSubstitute.Substitute.For<ILocksService>();
+	[TestFixture]
+	public class TestLocksServicesContainerMutable
+	{
+		[Test]
+		public void TestCtorCustomServices()
+		{
+			var ciper = NSubstitute.Substitute.For<ICipher>();
+			var firstService = NSubstitute.Substitute.For<ILocksService>();
 
-            Assert.That(
-                new LocksServicesContainerMutable(
-                    firstService.GetType().FullName,
-                    new HashSet<ILocksService>() { firstService }
-                ).Count,
-                Is.EqualTo(1));
-        }
-    }
+			Assert.That(
+				new LocksServicesContainerMutable(
+					firstService.GetType().FullName,
+					new HashSet<ILocksService>() { firstService }
+				).Count,
+				Is.EqualTo(1));
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Services/TestServicesContainerMutable.cs b/TestTINKLib/Fixtures/ObjectTests/Services/TestServicesContainerMutable.cs
index 0d9438a..39af348 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Services/TestServicesContainerMutable.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Services/TestServicesContainerMutable.cs
@@ -5,41 +5,41 @@ using TINK.Services;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Services
 {
-    [TestFixture]
-    public class TestServicesContainerMutable
-    {
-        [Test]
-        public void TestCtor()
-        {
-            var container = new ServicesContainerMutableT<object>(new List<object> { new A(), new B() }, typeof(B).FullName);
-            Assert.That(container.Active.GetType().FullName, Is.EqualTo("TestTINKLib.Fixtures.ObjectTests.Services.TestServicesContainerMutable+B"));
-        }
+	[TestFixture]
+	public class TestServicesContainerMutable
+	{
+		[Test]
+		public void TestCtor()
+		{
+			var container = new ServicesContainerMutableT<object>(new List<object> { new A(), new B() }, typeof(B).FullName);
+			Assert.That(container.Active.GetType().FullName, Is.EqualTo("TestTINKLib.Fixtures.ObjectTests.Services.TestServicesContainerMutable+B"));
+		}
 
-        [Test]
-        public void TestCtorExceptionDupes()
-        {
-            Assert.That(() => new ServicesContainerMutableT<object>(new List<object> { new A(), new B(), new A() }, typeof(B).FullName), Throws.InstanceOf<Exception>());
-        }
+		[Test]
+		public void TestCtorExceptionDupes()
+		{
+			Assert.That(() => new ServicesContainerMutableT<object>(new List<object> { new A(), new B(), new A() }, typeof(B).FullName), Throws.InstanceOf<Exception>());
+		}
 
-        [Test]
-        public void TestCtorExceptionActiveNotFound()
-        {
-            Assert.That(() => new ServicesContainerMutableT<object>(new List<object> { new A(), new B() }, "C"), Throws.InstanceOf<ArgumentException>());
-        }
+		[Test]
+		public void TestCtorExceptionActiveNotFound()
+		{
+			Assert.That(() => new ServicesContainerMutableT<object>(new List<object> { new A(), new B() }, "C"), Throws.InstanceOf<ArgumentException>());
+		}
 
-        [Test]
-        public void TestSetActive()
-        {
-            var container = new ServicesContainerMutableT<object>(new List<object> { new A(), new B() }, typeof(B).FullName);
-            container.SetActive(typeof(A).FullName);
-            Assert.That(container.Active.GetType().FullName, Is.EqualTo("TestTINKLib.Fixtures.ObjectTests.Services.TestServicesContainerMutable+A"));
-        }
+		[Test]
+		public void TestSetActive()
+		{
+			var container = new ServicesContainerMutableT<object>(new List<object> { new A(), new B() }, typeof(B).FullName);
+			container.SetActive(typeof(A).FullName);
+			Assert.That(container.Active.GetType().FullName, Is.EqualTo("TestTINKLib.Fixtures.ObjectTests.Services.TestServicesContainerMutable+A"));
+		}
 
 
-        private class A
-        { }
+		private class A
+		{ }
 
-        private class B
-        { }
-    }
+		private class B
+		{ }
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Settings/BluetoothLock/TestLockIt.cs b/TestTINKLib/Fixtures/ObjectTests/Settings/BluetoothLock/TestLockIt.cs
index a6cbddd..72a3718 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Settings/BluetoothLock/TestLockIt.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Settings/BluetoothLock/TestLockIt.cs
@@ -11,190 +11,190 @@ using TINK.Services.BluetoothLock.Tdo;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Settings.BluetoothLock
 {
-    [TestFixture]
-    public class TestLockIt
-    {
-        [Test]
-        public void TestAuthenticate_InvalidSeed()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var ciper = Substitute.For<TINK.Model.Device.ICipher>();
+	[TestFixture]
+	public class TestLockIt
+	{
+		[Test]
+		public void TestAuthenticate_InvalidSeed()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var ciper = Substitute.For<TINK.Model.Device.ICipher>();
 
-            var authInfo = new LockInfoAuthTdo.Builder
-            {
-                K_seed = new byte[] { 0 },
-                K_u = new byte[] { 1 }
-            }.Build();
+			var authInfo = new LockInfoAuthTdo.Builder
+			{
+				K_seed = new byte[] { 0 },
+				K_u = new byte[] { 1 }
+			}.Build();
 
-            device.State.Returns(DeviceState.Connected);
+			device.State.Returns(DeviceState.Connected);
 
-            device.Id.Returns(new Guid("00000000-0000-0000-0000-000000000001"));
+			device.Id.Returns(new Guid("00000000-0000-0000-0000-000000000001"));
 
-            Assert.That(() => LockItEventBased.Authenticate(device, authInfo, adapter, ciper), Throws.InstanceOf<AuthKeyException>());
-        }
+			Assert.That(() => LockItEventBased.Authenticate(device, authInfo, adapter, ciper), Throws.InstanceOf<AuthKeyException>());
+		}
 
-        [Test]
-        public void TestAuthenticate_InvalidAuthKey()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var ciper = Substitute.For<TINK.Model.Device.ICipher>();
+		[Test]
+		public void TestAuthenticate_InvalidAuthKey()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var ciper = Substitute.For<TINK.Model.Device.ICipher>();
 
-            var authInfo = new LockInfoAuthTdo.Builder
-            {
-                K_seed = new byte[] { (byte)'t', (byte)'q', (byte)'2', (byte)'n', (byte)'c', (byte)'A', (byte)'I', (byte)'v', (byte)'M', (byte)'t', (byte)'h', (byte)'g', (byte)'x', (byte)'a', (byte)'z', (byte)'B' },
-                K_u = new byte[] { }
-            }.Build();
+			var authInfo = new LockInfoAuthTdo.Builder
+			{
+				K_seed = new byte[] { (byte)'t', (byte)'q', (byte)'2', (byte)'n', (byte)'c', (byte)'A', (byte)'I', (byte)'v', (byte)'M', (byte)'t', (byte)'h', (byte)'g', (byte)'x', (byte)'a', (byte)'z', (byte)'B' },
+				K_u = new byte[] { }
+			}.Build();
 
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("00000000-0000-0000-0000-000000000001"));
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("00000000-0000-0000-0000-000000000001"));
 
-            Assert.That(async () => { await LockItEventBased.Authenticate(device, authInfo, adapter, ciper); }, Throws.InstanceOf<AuthKeyException>());
-        }
+			Assert.That(async () => { await LockItEventBased.Authenticate(device, authInfo, adapter, ciper); }, Throws.InstanceOf<AuthKeyException>());
+		}
 
-        [Test]
-        public void TestAuthenticate_Invalidated()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var cipher = Substitute.For<TINK.Model.Device.ICipher>();
-            var auth = Substitute.For<ICharacteristic>();
-            var lockControl = Substitute.For<IService>();
-            var state = Substitute.For<ICharacteristic>();
-            var activateLock = Substitute.For<ICharacteristic>();
+		[Test]
+		public void TestAuthenticate_Invalidated()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<TINK.Model.Device.ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var lockControl = Substitute.For<IService>();
+			var state = Substitute.For<ICharacteristic>();
+			var activateLock = Substitute.For<ICharacteristic>();
 
-            var authInfo = new LockInfoAuthTdo.Builder
-            {
-                K_seed = new byte[] { (byte)'z', (byte)'D', (byte)'G', (byte)'x', (byte)'q', (byte)'M', (byte)'f', (byte)'A', (byte)'F', (byte)'q', (byte)'g', (byte)'N', (byte)'V', (byte)'r', (byte)'N', (byte)'Y' },
-                K_u = new byte[] { 1 }
-            }.Build();
+			var authInfo = new LockInfoAuthTdo.Builder
+			{
+				K_seed = new byte[] { (byte)'z', (byte)'D', (byte)'G', (byte)'x', (byte)'q', (byte)'M', (byte)'f', (byte)'A', (byte)'F', (byte)'q', (byte)'g', (byte)'N', (byte)'V', (byte)'r', (byte)'N', (byte)'Y' },
+				K_u = new byte[] { 1 }
+			}.Build();
 
-            // Calls related to Authenticate functionality.
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
-            device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
-            lockControl.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
-            cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
-            cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("00000000-0000-0000-0000-000000000001"));
+			// Calls related to Authenticate functionality.
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
+			lockControl.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("00000000-0000-0000-0000-000000000001"));
 
-            // Call authenticate to invalidate seed
-            var lockIt = LockItEventBased.Authenticate(device, authInfo, adapter, cipher).Result;
+			// Call authenticate to invalidate seed
+			var lockIt = LockItEventBased.Authenticate(device, authInfo, adapter, cipher).Result;
 
-            // Authenticate again to 
-            var execption = Assert.Throws<AggregateException>(() => { var dummy = LockItEventBased.Authenticate(device, authInfo, adapter, cipher).Result; });
+			// Authenticate again to 
+			var execption = Assert.Throws<AggregateException>(() => { var dummy = LockItEventBased.Authenticate(device, authInfo, adapter, cipher).Result; });
 
-            Assert.That(
-                execption.InnerExceptions[0].Message,
-                Does.Contain("Seed 122,68,71,120,113,77,102,65,70,113,103,78,86,114,78,89 was already used."));
+			Assert.That(
+				execption.InnerExceptions[0].Message,
+				Does.Contain("Seed 122,68,71,120,113,77,102,65,70,113,103,78,86,114,78,89 was already used."));
 
-        }
+		}
 
-        [Test]
-        public void TestAuthenticate_GetAuthCharacteristicThrowsException()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var cipher = Substitute.For<TINK.Model.Device.ICipher>();
-            var auth = Substitute.For<ICharacteristic>();
-            var lockControl = Substitute.For<IService>();
-            var state = Substitute.For<ICharacteristic>();
-            var activateLock = Substitute.For<ICharacteristic>();
+		[Test]
+		public void TestAuthenticate_GetAuthCharacteristicThrowsException()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<TINK.Model.Device.ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var lockControl = Substitute.For<IService>();
+			var state = Substitute.For<ICharacteristic>();
+			var activateLock = Substitute.For<ICharacteristic>();
 
-            var authInfo = new LockInfoAuthTdo.Builder
-            {
-                K_seed = new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
-                K_u = new byte[] { 1 }
-            }.Build();
+			var authInfo = new LockInfoAuthTdo.Builder
+			{
+				K_seed = new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
+				K_u = new byte[] { 1 }
+			}.Build();
 
-            // Calls related to Authenticate functionality.
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
-            device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
-            lockControl.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult((ICharacteristic)null));
+			// Calls related to Authenticate functionality.
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
+			lockControl.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult((ICharacteristic)null));
 
-            // Authenticate again to 
-            Assert.That(() => LockItEventBased.Authenticate(device, authInfo, adapter, cipher), Throws.InstanceOf<CoundntGetCharacteristicException>());
-        }
+			// Authenticate again to 
+			Assert.That(() => LockItEventBased.Authenticate(device, authInfo, adapter, cipher), Throws.InstanceOf<CoundntGetCharacteristicException>());
+		}
 
-        [Test]
-        public async Task TestAuthenticate_GetLockState_Closed()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var cipher = Substitute.For<TINK.Model.Device.ICipher>();
-            var auth = Substitute.For<ICharacteristic>();
-            var lockControl = Substitute.For<IService>();
-            var state = Substitute.For<ICharacteristic>();
+		[Test]
+		public async Task TestAuthenticate_GetLockState_Closed()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<TINK.Model.Device.ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var lockControl = Substitute.For<IService>();
+			var state = Substitute.For<ICharacteristic>();
 
-            var authInfo = new LockInfoAuthTdo.Builder
-            {
-                K_seed = new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
-                K_u = new byte[] { 1 }
-            }.Build();
+			var authInfo = new LockInfoAuthTdo.Builder
+			{
+				K_seed = new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
+				K_u = new byte[] { 1 }
+			}.Build();
 
-            // Calls related to Authenticate functionality.
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
-            device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
-            lockControl.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
-            cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
-            cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("00000000-0000-0000-0000-000000000001"));
-            // Calls related to get lock state.
+			// Calls related to Authenticate functionality.
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
+			lockControl.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("00000000-0000-0000-0000-000000000001"));
+			// Calls related to get lock state.
 
-            // Call authenticate to invalidate seed
-            lockControl.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(state));
-            state.ReadAsync(Arg.Any<CancellationToken>()).Returns(new byte[] { 1 });
+			// Call authenticate to invalidate seed
+			lockControl.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(state));
+			state.ReadAsync(Arg.Any<CancellationToken>()).Returns(new byte[] { 1 });
 
-            var lockIt = LockItEventBased.Authenticate(device, authInfo, adapter, cipher).Result;
+			var lockIt = LockItEventBased.Authenticate(device, authInfo, adapter, cipher).Result;
 
-            Assert.That((await lockIt.GetLockStateAsync()).State, Is.EqualTo(LockitLockingState.Closed));
-        }
+			Assert.That((await lockIt.GetLockStateAsync()).State, Is.EqualTo(LockitLockingState.Closed));
+		}
 
-        [Test]
-        public void TestAuthenticate_GetLockState_GetStateCharacteristicThrowsException()
-        {
-            var device = Substitute.For<IDevice>();
-            var adapter = Substitute.For<IAdapter>();
-            var cipher = Substitute.For<TINK.Model.Device.ICipher>();
-            var auth = Substitute.For<ICharacteristic>();
-            var lockControl = Substitute.For<IService>();
+		[Test]
+		public void TestAuthenticate_GetLockState_GetStateCharacteristicThrowsException()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<TINK.Model.Device.ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var lockControl = Substitute.For<IService>();
 
-            var authInfo = new LockInfoAuthTdo.Builder
-            {
-                K_seed = new byte[] { (byte)'y', (byte)'D', (byte)'G', (byte)'x', (byte)'q', (byte)'M', (byte)'f', (byte)'A', (byte)'F', (byte)'q', (byte)'g', (byte)'N', (byte)'V', (byte)'r', (byte)'N', (byte)'Y' },
-                K_u = new byte[] { 1 }
-            }.Build();
+			var authInfo = new LockInfoAuthTdo.Builder
+			{
+				K_seed = new byte[] { (byte)'y', (byte)'D', (byte)'G', (byte)'x', (byte)'q', (byte)'M', (byte)'f', (byte)'A', (byte)'F', (byte)'q', (byte)'g', (byte)'N', (byte)'V', (byte)'r', (byte)'N', (byte)'Y' },
+				K_u = new byte[] { 1 }
+			}.Build();
 
-            // Calls related to Authenticate functionality.
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
-            device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
-            lockControl.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-            auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
-            cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
-            cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
-            auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
-            device.State.Returns(DeviceState.Connected);
-            device.Id.Returns(new Guid("00000000-0000-0000-0000-000000000001"));
+			// Calls related to Authenticate functionality.
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
+			lockControl.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("00000000-0000-0000-0000-000000000001"));
 
-            // Calls related to get lock state.
-            lockControl.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult((ICharacteristic)null));
+			// Calls related to get lock state.
+			lockControl.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult((ICharacteristic)null));
 
-            var lockIt = LockItEventBased.Authenticate(device, authInfo, adapter, cipher).Result;
+			var lockIt = LockItEventBased.Authenticate(device, authInfo, adapter, cipher).Result;
 
-            Assert.That(async () => (await lockIt.GetLockStateAsync()).State, Throws.InstanceOf<CoundntGetCharacteristicException>());
-        }
-    }
+			Assert.That(async () => (await lockIt.GetLockStateAsync()).State, Throws.InstanceOf<CoundntGetCharacteristicException>());
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Settings/TestGroupFilterSettings.cs b/TestTINKLib/Fixtures/ObjectTests/Settings/TestGroupFilterSettings.cs
index ad97168..bb61f2d 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Settings/TestGroupFilterSettings.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Settings/TestGroupFilterSettings.cs
@@ -7,18 +7,18 @@ using TINK.ViewModel.Settings;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Settings
 {
-    [TestFixture]
-    public class TestGroupFilterSettings
-    {
-        [Test]
-        public void TestDoFilter()
-        {
-            var l_oFilter = new GroupFilterSettings(new Dictionary<string, FilterState> { { $"HOM_{FilterHelper.CITYBIKE}", FilterState.Off }, { $"HOM_{FilterHelper.CARGOBIKE}", FilterState.On }, { "HOM_117025", FilterState.On } });
+	[TestFixture]
+	public class TestGroupFilterSettings
+	{
+		[Test]
+		public void TestDoFilter()
+		{
+			var l_oFilter = new GroupFilterSettings(new Dictionary<string, FilterState> { { $"HOM_{FilterHelper.CITYBIKE}", FilterState.Off }, { $"HOM_{FilterHelper.CARGOBIKE}", FilterState.On }, { "HOM_117025", FilterState.On } });
 
-            var l_oResult = l_oFilter.DoFilter(new List<string> { $"HOM_{FilterHelper.CITYBIKE}", $"HOM_{FilterHelper.CARGOBIKE}" });
+			var l_oResult = l_oFilter.DoFilter(new List<string> { $"HOM_{FilterHelper.CITYBIKE}", $"HOM_{FilterHelper.CARGOBIKE}" });
 
-            Assert.AreEqual(1, l_oResult.ToList().Count);
-            Assert.AreEqual($"HOM_{FilterHelper.CARGOBIKE}", l_oResult.ToList()[0]);
-        }
-    }
+			Assert.AreEqual(1, l_oResult.ToList().Count);
+			Assert.AreEqual($"HOM_{FilterHelper.CARGOBIKE}", l_oResult.ToList()[0]);
+		}
+	}
 }
\ No newline at end of file
diff --git a/TestTINKLib/Fixtures/ObjectTests/Settings/TestPollingParameters.cs b/TestTINKLib/Fixtures/ObjectTests/Settings/TestPollingParameters.cs
index d831545..3bc6266 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Settings/TestPollingParameters.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Settings/TestPollingParameters.cs
@@ -4,38 +4,38 @@ using TINK.Settings;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Settings
 {
-    [TestFixture]
-    public class TestPollingParameters
-    {
-        [Test]
-        public void TestConstruct()
-        {
-            Assert.IsTrue(new PollingParameters(new TimeSpan(0, 0, 11), true).IsActivated);
-            Assert.AreEqual(11, (new PollingParameters(new TimeSpan(0, 0, 11), true).Periode.TotalSeconds));
-        }
+	[TestFixture]
+	public class TestPollingParameters
+	{
+		[Test]
+		public void TestConstruct()
+		{
+			Assert.IsTrue(new PollingParameters(new TimeSpan(0, 0, 11), true).IsActivated);
+			Assert.AreEqual(11, (new PollingParameters(new TimeSpan(0, 0, 11), true).Periode.TotalSeconds));
+		}
 
-        [Test]
-        public void TestEquals()
-        {
-            Assert.IsTrue((new PollingParameters(new TimeSpan(0, 0, 11), true)) == (new PollingParameters(new TimeSpan(0, 0, 11), true)));
-            Assert.IsFalse((new PollingParameters(new TimeSpan(0, 0, 11), false)) == (new PollingParameters(new TimeSpan(0, 0, 11), true)));
-            Assert.IsFalse((new PollingParameters(new TimeSpan(0, 0, 12), true)) == (new PollingParameters(new TimeSpan(0, 0, 11), true)));
-        }
+		[Test]
+		public void TestEquals()
+		{
+			Assert.IsTrue((new PollingParameters(new TimeSpan(0, 0, 11), true)) == (new PollingParameters(new TimeSpan(0, 0, 11), true)));
+			Assert.IsFalse((new PollingParameters(new TimeSpan(0, 0, 11), false)) == (new PollingParameters(new TimeSpan(0, 0, 11), true)));
+			Assert.IsFalse((new PollingParameters(new TimeSpan(0, 0, 12), true)) == (new PollingParameters(new TimeSpan(0, 0, 11), true)));
+		}
 
-        [Test]
-        public void TestUnequals()
-        {
-            Assert.IsFalse((new PollingParameters(new TimeSpan(0, 0, 11), true)) != (new PollingParameters(new TimeSpan(0, 0, 11), true)));
-            Assert.IsTrue((new PollingParameters(new TimeSpan(0, 0, 11), false)) != (new PollingParameters(new TimeSpan(0, 0, 11), true)));
-            Assert.IsTrue((new PollingParameters(new TimeSpan(0, 0, 12), true)) != (new PollingParameters(new TimeSpan(0, 0, 11), true)));
-        }
+		[Test]
+		public void TestUnequals()
+		{
+			Assert.IsFalse((new PollingParameters(new TimeSpan(0, 0, 11), true)) != (new PollingParameters(new TimeSpan(0, 0, 11), true)));
+			Assert.IsTrue((new PollingParameters(new TimeSpan(0, 0, 11), false)) != (new PollingParameters(new TimeSpan(0, 0, 11), true)));
+			Assert.IsTrue((new PollingParameters(new TimeSpan(0, 0, 12), true)) != (new PollingParameters(new TimeSpan(0, 0, 11), true)));
+		}
 
-        [Test]
-        public void TestToString()
-        {
-            Assert.AreEqual(
-                "Polling is on=True, polling interval=11[sec].",
-                (new PollingParameters(new TimeSpan(0, 0, 11), true).ToString()));
-        }
-    }
+		[Test]
+		public void TestToString()
+		{
+			Assert.AreEqual(
+				"Polling is on=True, polling interval=11[sec].",
+				(new PollingParameters(new TimeSpan(0, 0, 11), true).ToString()));
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Settings/TestSettings.cs b/TestTINKLib/Fixtures/ObjectTests/Settings/TestSettings.cs
index 72eaf1c..a04969d 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Settings/TestSettings.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Settings/TestSettings.cs
@@ -8,38 +8,38 @@ using TINK.ViewModel.Settings;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Settings
 {
-    [TestFixture]
-    public class TestSettings
-    {
-        [Test]
-        public void TestConstructDefaults()
-        {
-            var settings = new TINK.Model.Settings.Settings();
+	[TestFixture]
+	public class TestSettings
+	{
+		[Test]
+		public void TestConstructDefaults()
+		{
+			var settings = new TINK.Model.Settings.Settings();
 
-            Assert.AreEqual(LogEventLevel.Error, settings.MinimumLogEventLevel);
+			Assert.AreEqual(LogEventLevel.Error, settings.MinimumLogEventLevel);
 
-            // Was GroupFilterHelper.GetSettingsFilterDefaults when used in TINK- context.
-            Assert.AreEqual(new GroupFilterSettings(), settings.GroupFilterSettings);
+			// Was GroupFilterHelper.GetSettingsFilterDefaults when used in TINK- context.
+			Assert.AreEqual(new GroupFilterSettings(), settings.GroupFilterSettings);
 
-            // Was GroupFilterHelper.GetMapPageFilterDefaults when used in TINK- context.
-            Assert.AreEqual(new GroupFilterMapPage(), settings.GroupFilterMapPage);
+			// Was GroupFilterHelper.GetMapPageFilterDefaults when used in TINK- context.
+			Assert.AreEqual(new GroupFilterMapPage(), settings.GroupFilterMapPage);
 
-            Assert.AreEqual(new CopriServerUriList().ActiveUri, settings.ActiveUri);
+			Assert.AreEqual(new CopriServerUriList().ActiveUri, settings.ActiveUri);
 
-            Assert.AreEqual(PollingParameters.Default, settings.PollingParameters);
+			Assert.AreEqual(PollingParameters.Default, settings.PollingParameters);
 
-            Assert.IsTrue(
-                settings.CenterMapToCurrentLocation,
-                "Center to map for sharee.bike because bt- locks require location info.");
-        }
+			Assert.IsTrue(
+				settings.CenterMapToCurrentLocation,
+				"Center to map for sharee.bike because bt- locks require location info.");
+		}
 
-        [Test]
-        public void TestCtorTink()
-        {
-            var settings = new TINK.Model.Settings.Settings(activeUri: new Uri(CopriServerUriList.TINK_LIVE));
-            Assert.IsFalse(
-                settings.CenterMapToCurrentLocation,
-                "Do not center to current location for TINK.");
-        }
-    }
+		[Test]
+		public void TestCtorTink()
+		{
+			var settings = new TINK.Model.Settings.Settings(activeUri: new Uri(CopriServerUriList.TINK_LIVE));
+			Assert.IsFalse(
+				settings.CenterMapToCurrentLocation,
+				"Do not center to current location for TINK.");
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/State/TestStateBookedInfo.cs b/TestTINKLib/Fixtures/ObjectTests/State/TestStateBookedInfo.cs
index b9d0343..f2cb385 100644
--- a/TestTINKLib/Fixtures/ObjectTests/State/TestStateBookedInfo.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/State/TestStateBookedInfo.cs
@@ -6,25 +6,25 @@ using TINK.Model.State;
 namespace TestTINKLib
 {
 
-    [TestFixture]
-    public class TestStateBookedInfo
-    {
-        [Test]
-        public void TestConstruct()
-        {
-            var l_oBookedInfo = new StateOccupiedInfo(new DateTime(2017, 09, 20, 23, 05, 0), "Heinz@mueller", "17 xxb");
+	[TestFixture]
+	public class TestStateBookedInfo
+	{
+		[Test]
+		public void TestConstruct()
+		{
+			var l_oBookedInfo = new StateOccupiedInfo(new DateTime(2017, 09, 20, 23, 05, 0), "Heinz@mueller", "17 xxb");
 
-            Assert.AreEqual(
-                new DateTime(2017, 09, 20, 23, 05, 0),
-                l_oBookedInfo.From);
+			Assert.AreEqual(
+				new DateTime(2017, 09, 20, 23, 05, 0),
+				l_oBookedInfo.From);
 
-            Assert.AreEqual(
-                "Heinz@mueller",
-                l_oBookedInfo.MailAddress);
+			Assert.AreEqual(
+				"Heinz@mueller",
+				l_oBookedInfo.MailAddress);
 
-            Assert.AreEqual(
-                "17 xxb",
-                l_oBookedInfo.Code);
-        }
-    }
+			Assert.AreEqual(
+				"17 xxb",
+				l_oBookedInfo.Code);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/State/TestStateDisposableInfo.cs b/TestTINKLib/Fixtures/ObjectTests/State/TestStateDisposableInfo.cs
index 2d9af5b..6f46db4 100644
--- a/TestTINKLib/Fixtures/ObjectTests/State/TestStateDisposableInfo.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/State/TestStateDisposableInfo.cs
@@ -5,13 +5,13 @@ using TINK.Model.State;
 namespace TestTINKLib
 {
 
-    [TestFixture]
-    public class TestStateDisposableInfo
-    {
-        [Test]
-        public void TestConstruct()
-        {
-            Assert.AreEqual(InUseStateEnum.Disposable, new StateAvailableInfo().Value);
-        }
-    }
+	[TestFixture]
+	public class TestStateDisposableInfo
+	{
+		[Test]
+		public void TestConstruct()
+		{
+			Assert.AreEqual(InUseStateEnum.Disposable, new StateAvailableInfo().Value);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/State/TestStateInfoMutable.cs b/TestTINKLib/Fixtures/ObjectTests/State/TestStateInfoMutable.cs
index a35f84e..e83afd0 100644
--- a/TestTINKLib/Fixtures/ObjectTests/State/TestStateInfoMutable.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/State/TestStateInfoMutable.cs
@@ -8,181 +8,181 @@ using TINK.Model.State;
 namespace TestTINKLib
 {
 
-    [TestFixture]
-    public class TestStateInfo
-    {
-        [Test]
-        public void TestConstruct()
-        {
-            var l_oInUseState = new StateInfoMutable(() => new DateTime(2017, 09, 20, 23, 20, 0));
+	[TestFixture]
+	public class TestStateInfo
+	{
+		[Test]
+		public void TestConstruct()
+		{
+			var l_oInUseState = new StateInfoMutable(() => new DateTime(2017, 09, 20, 23, 20, 0));
 
-            // Verify initial values of properties.
-            Assert.AreEqual(InUseStateEnum.Disposable, l_oInUseState.Value, "Default state is available");
-            Assert.AreEqual("Disposable", l_oInUseState.ToString());
-            Assert.IsNull(l_oInUseState.RemainingTime);
-            Assert.IsNull(l_oInUseState.From);
-            Assert.IsNull(l_oInUseState.Code);
-        }
+			// Verify initial values of properties.
+			Assert.AreEqual(InUseStateEnum.Disposable, l_oInUseState.Value, "Default state is available");
+			Assert.AreEqual("Disposable", l_oInUseState.ToString());
+			Assert.IsNull(l_oInUseState.RemainingTime);
+			Assert.IsNull(l_oInUseState.From);
+			Assert.IsNull(l_oInUseState.Code);
+		}
 
-        [Test]
-        public void TestConstructCopy()
-        {
-            // State is available.
-            var l_oSource = MockRepository.GenerateStub<IStateInfo>();
-            l_oSource.Stub(x => x.Value).Return(InUseStateEnum.Disposable);
+		[Test]
+		public void TestConstructCopy()
+		{
+			// State is available.
+			var l_oSource = MockRepository.GenerateStub<IStateInfo>();
+			l_oSource.Stub(x => x.Value).Return(InUseStateEnum.Disposable);
 
-            var l_oState = new StateInfoMutable(state: l_oSource);
+			var l_oState = new StateInfoMutable(state: l_oSource);
 
-            Assert.AreEqual(InUseStateEnum.Disposable, l_oState.Value);
-            Assert.IsNull(l_oState.RemainingTime);
-            Assert.IsNull(l_oState.From);
-            Assert.IsNull(l_oState.Code);
+			Assert.AreEqual(InUseStateEnum.Disposable, l_oState.Value);
+			Assert.IsNull(l_oState.RemainingTime);
+			Assert.IsNull(l_oState.From);
+			Assert.IsNull(l_oState.Code);
 
-            // State is requested.
-            l_oSource = MockRepository.GenerateStub<IStateInfo>();
-            l_oSource.Stub(x => x.Value).Return(InUseStateEnum.Reserved);
-            l_oSource.Stub(x => x.From).Return(new DateTime(2018, 1, 4, 17, 26, 0));
-            l_oSource.Stub(x => x.MailAddress).Return("who@the");
-            l_oSource.Stub(x => x.Code).Return("323");
+			// State is requested.
+			l_oSource = MockRepository.GenerateStub<IStateInfo>();
+			l_oSource.Stub(x => x.Value).Return(InUseStateEnum.Reserved);
+			l_oSource.Stub(x => x.From).Return(new DateTime(2018, 1, 4, 17, 26, 0));
+			l_oSource.Stub(x => x.MailAddress).Return("who@the");
+			l_oSource.Stub(x => x.Code).Return("323");
 
-            l_oState = new StateInfoMutable(() => new DateTime(2018, 1, 4, 17, 30, 1), l_oSource);
+			l_oState = new StateInfoMutable(() => new DateTime(2018, 1, 4, 17, 30, 1), l_oSource);
 
-            Assert.AreEqual(InUseStateEnum.Reserved, l_oState.Value);
-            Assert.AreEqual(new TimeSpan(0, 10, 59), l_oState.RemainingTime);
-            Assert.AreEqual(new DateTime(2018, 1, 4, 17, 26, 0), l_oState.From);
-            Assert.AreEqual("who@the", l_oState.MailAddress);
-            Assert.AreEqual("323", l_oState.Code);
+			Assert.AreEqual(InUseStateEnum.Reserved, l_oState.Value);
+			Assert.AreEqual(new TimeSpan(0, 10, 59), l_oState.RemainingTime);
+			Assert.AreEqual(new DateTime(2018, 1, 4, 17, 26, 0), l_oState.From);
+			Assert.AreEqual("who@the", l_oState.MailAddress);
+			Assert.AreEqual("323", l_oState.Code);
 
-            // State is booked.
-            l_oSource = MockRepository.GenerateStub<IStateInfo>();
-            l_oSource.Stub(x => x.Value).Return(InUseStateEnum.Booked);
-            l_oSource.Stub(x => x.From).Return(new DateTime(2018, 1, 4, 17, 00, 0));
-            l_oSource.Stub(x => x.MailAddress).Return("who@the");
-            l_oSource.Stub(x => x.Code).Return("323");
+			// State is booked.
+			l_oSource = MockRepository.GenerateStub<IStateInfo>();
+			l_oSource.Stub(x => x.Value).Return(InUseStateEnum.Booked);
+			l_oSource.Stub(x => x.From).Return(new DateTime(2018, 1, 4, 17, 00, 0));
+			l_oSource.Stub(x => x.MailAddress).Return("who@the");
+			l_oSource.Stub(x => x.Code).Return("323");
 
-            l_oState = new StateInfoMutable(() => new DateTime(2018, 1, 4, 17, 30, 1), l_oSource);
+			l_oState = new StateInfoMutable(() => new DateTime(2018, 1, 4, 17, 30, 1), l_oSource);
 
-            Assert.AreEqual(InUseStateEnum.Booked, l_oState.Value);
-            Assert.IsNull(l_oState.RemainingTime);
-            Assert.AreEqual(new DateTime(2018, 1, 4, 17, 00, 0), l_oState.From);
-            Assert.AreEqual("who@the", l_oState.MailAddress);
-            Assert.AreEqual("323", l_oState.Code);
-        }
+			Assert.AreEqual(InUseStateEnum.Booked, l_oState.Value);
+			Assert.IsNull(l_oState.RemainingTime);
+			Assert.AreEqual(new DateTime(2018, 1, 4, 17, 00, 0), l_oState.From);
+			Assert.AreEqual("who@the", l_oState.MailAddress);
+			Assert.AreEqual("323", l_oState.Code);
+		}
 
-        [Test]
-        public void TestDoUpdate()
-        {
-            var l_oReservedAt = new DateTime(2017, 09, 20, 22, 01, 00);
-            var l_oDateTimeMock = new DateTimeMocker(new List<DateTime> {
-                l_oReservedAt,                              // Booking time 
+		[Test]
+		public void TestDoUpdate()
+		{
+			var l_oReservedAt = new DateTime(2017, 09, 20, 22, 01, 00);
+			var l_oDateTimeMock = new DateTimeMocker(new List<DateTime> {
+				l_oReservedAt,                              // Booking time 
                 l_oReservedAt.Add(new TimeSpan(0, 4, 0)),    // Reserved for 4 mns
                 l_oReservedAt.Add(new TimeSpan(0, 16, 0))   // Time elapsed since booking 16 mns
                 });
 
-            var l_oStateInfo = new StateInfoMutable(l_oDateTimeMock.GetDateTime);
+			var l_oStateInfo = new StateInfoMutable(l_oDateTimeMock.GetDateTime);
 
-            // Update state from Copri.
-            l_oStateInfo.Load(
-                InUseStateEnum.Reserved, // Copri acknowledges state reserved.
-                l_oDateTimeMock.GetDateTime(),
-                "heiz@mustermann"); // Owner from Copri.
+			// Update state from Copri.
+			l_oStateInfo.Load(
+				InUseStateEnum.Reserved, // Copri acknowledges state reserved.
+				l_oDateTimeMock.GetDateTime(),
+				"heiz@mustermann"); // Owner from Copri.
 
-            // Invoke first update (after simulated 4mns)
-            l_oStateInfo.UpdateOnTimeElapsed();
-            Assert.AreEqual(InUseStateEnum.Reserved, l_oStateInfo.Value);
-            Assert.AreEqual(11, l_oStateInfo.RemainingTime.Value.Minutes);
-            Assert.AreEqual(new DateTime(2017, 09, 20, 22, 01, 00), l_oStateInfo.From.Value);
-            Assert.AreEqual("heiz@mustermann", l_oStateInfo.MailAddress);
-            Assert.IsNull(l_oStateInfo.Code);
+			// Invoke first update (after simulated 4mns)
+			l_oStateInfo.UpdateOnTimeElapsed();
+			Assert.AreEqual(InUseStateEnum.Reserved, l_oStateInfo.Value);
+			Assert.AreEqual(11, l_oStateInfo.RemainingTime.Value.Minutes);
+			Assert.AreEqual(new DateTime(2017, 09, 20, 22, 01, 00), l_oStateInfo.From.Value);
+			Assert.AreEqual("heiz@mustermann", l_oStateInfo.MailAddress);
+			Assert.IsNull(l_oStateInfo.Code);
 
-            // Invoke second update (after simulated 16 mns)
-            l_oStateInfo.UpdateOnTimeElapsed();
-            Assert.AreEqual(InUseStateEnum.Disposable, l_oStateInfo.Value);
-            Assert.IsNull(l_oStateInfo.RemainingTime);
-            Assert.IsNull(l_oStateInfo.From);
-            Assert.IsNull(l_oStateInfo.MailAddress);
-            Assert.IsNull(l_oStateInfo.Code);
-        }
+			// Invoke second update (after simulated 16 mns)
+			l_oStateInfo.UpdateOnTimeElapsed();
+			Assert.AreEqual(InUseStateEnum.Disposable, l_oStateInfo.Value);
+			Assert.IsNull(l_oStateInfo.RemainingTime);
+			Assert.IsNull(l_oStateInfo.From);
+			Assert.IsNull(l_oStateInfo.MailAddress);
+			Assert.IsNull(l_oStateInfo.Code);
+		}
 
-        [Test]
-        public void TestUpdateFromWebserver()
-        {
-            Func<DateTime> l_oNowMock = () => new DateTime(2017, 09, 21, 23, 40, 0);
-            var l_oStateInfo = new StateInfoMutable(l_oNowMock);
+		[Test]
+		public void TestUpdateFromWebserver()
+		{
+			Func<DateTime> l_oNowMock = () => new DateTime(2017, 09, 21, 23, 40, 0);
+			var l_oStateInfo = new StateInfoMutable(l_oNowMock);
 
-            l_oStateInfo.Load(InUseStateEnum.Booked, new DateTime(2017, 09, 21, 23, 30, 0), "heiz@mustermann", "21");
+			l_oStateInfo.Load(InUseStateEnum.Booked, new DateTime(2017, 09, 21, 23, 30, 0), "heiz@mustermann", "21");
 
-            Assert.AreEqual(InUseStateEnum.Booked, l_oStateInfo.Value);
-            Assert.AreEqual("Booked", l_oStateInfo.ToString());
-            Assert.IsNull(l_oStateInfo.RemainingTime);
-            Assert.AreEqual(new DateTime(2017, 09, 21, 23, 30, 0), l_oStateInfo.From.Value);
-            Assert.AreEqual("heiz@mustermann", l_oStateInfo.MailAddress);
-            Assert.AreEqual("21", l_oStateInfo.Code);
+			Assert.AreEqual(InUseStateEnum.Booked, l_oStateInfo.Value);
+			Assert.AreEqual("Booked", l_oStateInfo.ToString());
+			Assert.IsNull(l_oStateInfo.RemainingTime);
+			Assert.AreEqual(new DateTime(2017, 09, 21, 23, 30, 0), l_oStateInfo.From.Value);
+			Assert.AreEqual("heiz@mustermann", l_oStateInfo.MailAddress);
+			Assert.AreEqual("21", l_oStateInfo.Code);
 
-            DateTime FROM = new DateTime(2017, 09, 21, 23, 35, 0);
-            l_oStateInfo.Load(InUseStateEnum.Reserved, FROM, "heiz@mustermann", "22");
+			DateTime FROM = new DateTime(2017, 09, 21, 23, 35, 0);
+			l_oStateInfo.Load(InUseStateEnum.Reserved, FROM, "heiz@mustermann", "22");
 
-            // Verify initial values of properties.
-            Assert.AreEqual(InUseStateEnum.Reserved, l_oStateInfo.Value);
-            Assert.AreEqual("Reserved", l_oStateInfo.ToString());
-            Assert.AreEqual(new TimeSpan(0, 15, 0).Subtract(l_oNowMock().Subtract(FROM)).Minutes, l_oStateInfo.RemainingTime.Value.Minutes);
-            Assert.AreEqual(FROM, l_oStateInfo.From);
-            Assert.AreEqual("heiz@mustermann", l_oStateInfo.MailAddress);
-            Assert.AreEqual("22", l_oStateInfo.Code);
+			// Verify initial values of properties.
+			Assert.AreEqual(InUseStateEnum.Reserved, l_oStateInfo.Value);
+			Assert.AreEqual("Reserved", l_oStateInfo.ToString());
+			Assert.AreEqual(new TimeSpan(0, 15, 0).Subtract(l_oNowMock().Subtract(FROM)).Minutes, l_oStateInfo.RemainingTime.Value.Minutes);
+			Assert.AreEqual(FROM, l_oStateInfo.From);
+			Assert.AreEqual("heiz@mustermann", l_oStateInfo.MailAddress);
+			Assert.AreEqual("22", l_oStateInfo.Code);
 
-            l_oStateInfo.Load(InUseStateEnum.Disposable, new DateTime(1970, 1, 1, 0, 0, 0), "heiz@mustermann", "unused");
+			l_oStateInfo.Load(InUseStateEnum.Disposable, new DateTime(1970, 1, 1, 0, 0, 0), "heiz@mustermann", "unused");
 
-            // Verify initial values of properties.
-            Assert.AreEqual(InUseStateEnum.Disposable, l_oStateInfo.Value);
-            Assert.AreEqual("Disposable", l_oStateInfo.ToString());
-            Assert.IsNull(l_oStateInfo.RemainingTime);
-            Assert.IsNull(l_oStateInfo.From);
-            Assert.IsNull(l_oStateInfo.MailAddress);
-            Assert.IsNull(l_oStateInfo.Code);
-        }
+			// Verify initial values of properties.
+			Assert.AreEqual(InUseStateEnum.Disposable, l_oStateInfo.Value);
+			Assert.AreEqual("Disposable", l_oStateInfo.ToString());
+			Assert.IsNull(l_oStateInfo.RemainingTime);
+			Assert.IsNull(l_oStateInfo.From);
+			Assert.IsNull(l_oStateInfo.MailAddress);
+			Assert.IsNull(l_oStateInfo.Code);
+		}
 
-        [Test]
-        public void TestLoad()
-        {
-            var l_oState = new StateInfoMutable(
-                () => new DateTime(2018, 01, 03, 21, 14, 0)); // Now
-            Assert.AreEqual(InUseStateEnum.Disposable, l_oState.Value);
-            Assert.IsNull(l_oState.From);
-            Assert.IsNull(l_oState.RemainingTime);
-            Assert.IsNull(l_oState.MailAddress);
-            Assert.IsNull(l_oState.Code);
+		[Test]
+		public void TestLoad()
+		{
+			var l_oState = new StateInfoMutable(
+				() => new DateTime(2018, 01, 03, 21, 14, 0)); // Now
+			Assert.AreEqual(InUseStateEnum.Disposable, l_oState.Value);
+			Assert.IsNull(l_oState.From);
+			Assert.IsNull(l_oState.RemainingTime);
+			Assert.IsNull(l_oState.MailAddress);
+			Assert.IsNull(l_oState.Code);
 
-            // Construct requested state object.
-            var l_oSource = new StateInfo(
-                () => new DateTime(2018, 01, 03, 21, 53, 0),
-                new DateTime(2018, 01, 03, 21, 13, 0), // Requested from
-                "a@b",
-                "123");
-            l_oState.Load(l_oSource);
-            Assert.AreEqual(InUseStateEnum.Reserved, l_oState.Value);
-            Assert.AreEqual(new DateTime(2018, 01, 03, 21, 13, 0), l_oState.From);
-            Assert.AreEqual(14, l_oState.RemainingTime.Value.Minutes);
-            Assert.AreEqual("a@b", l_oState.MailAddress);
-            Assert.AreEqual("123", l_oState.Code);
+			// Construct requested state object.
+			var l_oSource = new StateInfo(
+				() => new DateTime(2018, 01, 03, 21, 53, 0),
+				new DateTime(2018, 01, 03, 21, 13, 0), // Requested from
+				"a@b",
+				"123");
+			l_oState.Load(l_oSource);
+			Assert.AreEqual(InUseStateEnum.Reserved, l_oState.Value);
+			Assert.AreEqual(new DateTime(2018, 01, 03, 21, 13, 0), l_oState.From);
+			Assert.AreEqual(14, l_oState.RemainingTime.Value.Minutes);
+			Assert.AreEqual("a@b", l_oState.MailAddress);
+			Assert.AreEqual("123", l_oState.Code);
 
 
-            // Construct booked state object.
-            l_oSource = new StateInfo(new DateTime(2018, 01, 03, 21, 37, 0), "a@b", "123");
-            l_oState.Load(l_oSource);
-            Assert.AreEqual(InUseStateEnum.Booked, l_oState.Value);
-            Assert.AreEqual(new DateTime(2018, 01, 03, 21, 37, 0), l_oState.From);
-            Assert.IsNull(l_oState.RemainingTime);
-            Assert.AreEqual("a@b", l_oState.MailAddress);
-            Assert.AreEqual("123", l_oState.Code);
+			// Construct booked state object.
+			l_oSource = new StateInfo(new DateTime(2018, 01, 03, 21, 37, 0), "a@b", "123");
+			l_oState.Load(l_oSource);
+			Assert.AreEqual(InUseStateEnum.Booked, l_oState.Value);
+			Assert.AreEqual(new DateTime(2018, 01, 03, 21, 37, 0), l_oState.From);
+			Assert.IsNull(l_oState.RemainingTime);
+			Assert.AreEqual("a@b", l_oState.MailAddress);
+			Assert.AreEqual("123", l_oState.Code);
 
-            // Construct disposable object
-            l_oSource = new StateInfo();
-            l_oState.Load(l_oSource);
-            Assert.AreEqual(InUseStateEnum.Disposable, l_oState.Value);
-            Assert.IsNull(l_oState.From);
-            Assert.IsNull(l_oState.RemainingTime);
-            Assert.IsNull(l_oState.MailAddress);
-            Assert.IsNull(l_oState.Code);
-        }
-    }
+			// Construct disposable object
+			l_oSource = new StateInfo();
+			l_oState.Load(l_oSource);
+			Assert.AreEqual(InUseStateEnum.Disposable, l_oState.Value);
+			Assert.IsNull(l_oState.From);
+			Assert.IsNull(l_oState.RemainingTime);
+			Assert.IsNull(l_oState.MailAddress);
+			Assert.IsNull(l_oState.Code);
+		}
+	}
 }
\ No newline at end of file
diff --git a/TestTINKLib/Fixtures/ObjectTests/State/TestStateInfoSerializeJSON.cs b/TestTINKLib/Fixtures/ObjectTests/State/TestStateInfoSerializeJSON.cs
index b2a0bf1..8be1bb7 100644
--- a/TestTINKLib/Fixtures/ObjectTests/State/TestStateInfoSerializeJSON.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/State/TestStateInfoSerializeJSON.cs
@@ -7,70 +7,70 @@ using TINK.Model.State;
 namespace TestTINKLib.Fixtures.State
 {
 
-    [TestFixture]
-    public class TestStateInfoSerializeJSON
-    {
-        [Test]
-        public void TestSerializeJSON_Disposable()
-        {
-            string l_strJSONDetected;
-            {
-                // Create object to test.
-                var l_oInUseState = new StateInfoMutable(() => new DateTime(2017, 09, 20, 23, 20, 0));
+	[TestFixture]
+	public class TestStateInfoSerializeJSON
+	{
+		[Test]
+		public void TestSerializeJSON_Disposable()
+		{
+			string l_strJSONDetected;
+			{
+				// Create object to test.
+				var l_oInUseState = new StateInfoMutable(() => new DateTime(2017, 09, 20, 23, 20, 0));
 
-                // Serialize object and verify json
-                l_strJSONDetected = JsonConvert.SerializeObject(l_oInUseState, new JsonSerializerSettings
-                {
-                    TypeNameHandling = TypeNameHandling.Auto,
-                    NullValueHandling = NullValueHandling.Ignore,
-                });
+				// Serialize object and verify json
+				l_strJSONDetected = JsonConvert.SerializeObject(l_oInUseState, new JsonSerializerSettings
+				{
+					TypeNameHandling = TypeNameHandling.Auto,
+					NullValueHandling = NullValueHandling.Ignore,
+				});
 
-                const string EXPECTED = @"
+				const string EXPECTED = @"
                     {
                         ""StateInfoObject"":
                         {
                             ""$type"":""TINK.Model.State.StateAvailableInfo, TINKLib""
                         }
                     }";
-                Assert.AreEqual(
-                    TestHelper.PrepareXmlForStringCompare(EXPECTED.Replace("\n", string.Empty).Replace("\r", string.Empty)),
-                    TestHelper.PrepareXmlForStringCompare(l_strJSONDetected.Replace("\n", string.Empty).Replace("\r", string.Empty)));
-            }
+				Assert.AreEqual(
+					TestHelper.PrepareXmlForStringCompare(EXPECTED.Replace("\n", string.Empty).Replace("\r", string.Empty)),
+					TestHelper.PrepareXmlForStringCompare(l_strJSONDetected.Replace("\n", string.Empty).Replace("\r", string.Empty)));
+			}
 
-            {
-                // Deserialize object
-                var l_oInUseStateTarget = JsonConvert.DeserializeObject<StateInfoMutable>(l_strJSONDetected, new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.Auto });
+			{
+				// Deserialize object
+				var l_oInUseStateTarget = JsonConvert.DeserializeObject<StateInfoMutable>(l_strJSONDetected, new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.Auto });
 
-                // Verify state.
-                Assert.AreEqual(InUseStateEnum.Disposable, l_oInUseStateTarget.Value);
-                Assert.AreEqual("Disposable", l_oInUseStateTarget.ToString());
-                Assert.IsNull(l_oInUseStateTarget.RemainingTime);
-                Assert.IsNull(l_oInUseStateTarget.From);
-                Assert.IsNull(l_oInUseStateTarget.MailAddress);
-                Assert.IsNull(l_oInUseStateTarget.Code);
-            }
-        }
-        [Test]
-        public void TestSerializeJSON_Booked()
-        {
-            // Create object to test.
-            var l_oInUseState = new StateInfoMutable(
-                () => new DateTime(2017, 11, 18, 23, 20, 0) // Mocked time stamp returned when StateInfo- object is crated
-            );
+				// Verify state.
+				Assert.AreEqual(InUseStateEnum.Disposable, l_oInUseStateTarget.Value);
+				Assert.AreEqual("Disposable", l_oInUseStateTarget.ToString());
+				Assert.IsNull(l_oInUseStateTarget.RemainingTime);
+				Assert.IsNull(l_oInUseStateTarget.From);
+				Assert.IsNull(l_oInUseStateTarget.MailAddress);
+				Assert.IsNull(l_oInUseStateTarget.Code);
+			}
+		}
+		[Test]
+		public void TestSerializeJSON_Booked()
+		{
+			// Create object to test.
+			var l_oInUseState = new StateInfoMutable(
+				() => new DateTime(2017, 11, 18, 23, 20, 0) // Mocked time stamp returned when StateInfo- object is crated
+			);
 
-            l_oInUseState.Load(
-                InUseStateEnum.Booked,
-                new DateTime(2017, 11, 18, 23, 19, 0),  // Time booked at
-                "heiz@mustermann",
-                "173"); // Code
+			l_oInUseState.Load(
+				InUseStateEnum.Booked,
+				new DateTime(2017, 11, 18, 23, 19, 0),  // Time booked at
+				"heiz@mustermann",
+				"173"); // Code
 
-            Assert.AreEqual(InUseStateEnum.Booked, l_oInUseState.Value);
-            Assert.AreEqual("heiz@mustermann", l_oInUseState.MailAddress);
-            Assert.AreEqual(new DateTime(2017, 11, 18, 23, 19, 0), l_oInUseState.From);
-            Assert.AreEqual("173", l_oInUseState.Code);
+			Assert.AreEqual(InUseStateEnum.Booked, l_oInUseState.Value);
+			Assert.AreEqual("heiz@mustermann", l_oInUseState.MailAddress);
+			Assert.AreEqual(new DateTime(2017, 11, 18, 23, 19, 0), l_oInUseState.From);
+			Assert.AreEqual("173", l_oInUseState.Code);
 
-            // Verify json
-            const string EXPECTED = @"
+			// Verify json
+			const string EXPECTED = @"
             {
                 ""StateInfoObject"":
                 {
@@ -80,52 +80,52 @@ namespace TestTINKLib.Fixtures.State
                 }
             }";
 
-            var l_oDetected = JsonConvert.SerializeObject(l_oInUseState, new JsonSerializerSettings
-            {
-                TypeNameHandling = TypeNameHandling.Auto,
-                NullValueHandling = NullValueHandling.Ignore,
-            });
+			var l_oDetected = JsonConvert.SerializeObject(l_oInUseState, new JsonSerializerSettings
+			{
+				TypeNameHandling = TypeNameHandling.Auto,
+				NullValueHandling = NullValueHandling.Ignore,
+			});
 
-            Assert.AreEqual(
-                TestHelper.PrepareXmlForStringCompare(EXPECTED).Replace("\n", string.Empty).Replace("\r", string.Empty),
-                TestHelper.PrepareXmlForStringCompare(l_oDetected).Replace("\n", string.Empty).Replace("\r", string.Empty));
+			Assert.AreEqual(
+				TestHelper.PrepareXmlForStringCompare(EXPECTED).Replace("\n", string.Empty).Replace("\r", string.Empty),
+				TestHelper.PrepareXmlForStringCompare(l_oDetected).Replace("\n", string.Empty).Replace("\r", string.Empty));
 
-            // Deserialize object an verify state.
-            var l_oStateTarget = JsonConvert.DeserializeObject<StateInfoMutable>(l_oDetected, new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.Auto });
-            // Verify state.
-            Assert.AreEqual(InUseStateEnum.Booked, l_oStateTarget.Value);
-            Assert.AreEqual(new DateTime(2017, 11, 18, 23, 19, 0), l_oInUseState.From);
-            Assert.AreEqual("heiz@mustermann", l_oStateTarget.MailAddress);
-            Assert.AreEqual("173", l_oInUseState.Code);
-        }
+			// Deserialize object an verify state.
+			var l_oStateTarget = JsonConvert.DeserializeObject<StateInfoMutable>(l_oDetected, new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.Auto });
+			// Verify state.
+			Assert.AreEqual(InUseStateEnum.Booked, l_oStateTarget.Value);
+			Assert.AreEqual(new DateTime(2017, 11, 18, 23, 19, 0), l_oInUseState.From);
+			Assert.AreEqual("heiz@mustermann", l_oStateTarget.MailAddress);
+			Assert.AreEqual("173", l_oInUseState.Code);
+		}
 
-        [Test]
-        public void TestSerializeJSON_Reserved_NoCode()
-        {
-            string l_strJSONDetected;
+		[Test]
+		public void TestSerializeJSON_Reserved_NoCode()
+		{
+			string l_strJSONDetected;
 
-            {
-                // Create object to test.
-                var l_oInUseState = new StateInfoMutable(() => new DateTime(2017, 09, 21, 23, 20, 0));
-                l_oInUseState.Load(
-                    InUseStateEnum.Reserved,
-                    new DateTime(2017, 09, 21, 23, 20, 0),
-                    "heiz@mustermann");
+			{
+				// Create object to test.
+				var l_oInUseState = new StateInfoMutable(() => new DateTime(2017, 09, 21, 23, 20, 0));
+				l_oInUseState.Load(
+					InUseStateEnum.Reserved,
+					new DateTime(2017, 09, 21, 23, 20, 0),
+					"heiz@mustermann");
 
-                Assert.AreEqual(InUseStateEnum.Reserved, l_oInUseState.Value);
-                Assert.AreEqual("heiz@mustermann", l_oInUseState.MailAddress);
-                Assert.AreEqual(new DateTime(2017, 09, 21, 23, 20, 0), l_oInUseState.From);
-                Assert.AreEqual(new TimeSpan(0, 15, 0), l_oInUseState.RemainingTime);
-                Assert.IsNull(l_oInUseState.Code);
+				Assert.AreEqual(InUseStateEnum.Reserved, l_oInUseState.Value);
+				Assert.AreEqual("heiz@mustermann", l_oInUseState.MailAddress);
+				Assert.AreEqual(new DateTime(2017, 09, 21, 23, 20, 0), l_oInUseState.From);
+				Assert.AreEqual(new TimeSpan(0, 15, 0), l_oInUseState.RemainingTime);
+				Assert.IsNull(l_oInUseState.Code);
 
-                l_strJSONDetected = JsonConvert.SerializeObject(l_oInUseState, new JsonSerializerSettings
-                {
-                    TypeNameHandling = TypeNameHandling.Auto,
-                    NullValueHandling = NullValueHandling.Ignore,
-                });
+				l_strJSONDetected = JsonConvert.SerializeObject(l_oInUseState, new JsonSerializerSettings
+				{
+					TypeNameHandling = TypeNameHandling.Auto,
+					NullValueHandling = NullValueHandling.Ignore,
+				});
 
-                // Verify json
-                const string EXPECTED = @"
+				// Verify json
+				const string EXPECTED = @"
                 {
                     ""StateInfoObject"":
                     {
@@ -135,54 +135,54 @@ namespace TestTINKLib.Fixtures.State
                     }
                 }";
 
-                Assert.AreEqual(
-                    TestHelper.PrepareXmlForStringCompare(EXPECTED.Replace("\n", string.Empty).Replace("\r", string.Empty)),
-                    TestHelper.PrepareXmlForStringCompare(l_strJSONDetected.Replace("\n", string.Empty).Replace("\r", string.Empty)));
-            }
+				Assert.AreEqual(
+					TestHelper.PrepareXmlForStringCompare(EXPECTED.Replace("\n", string.Empty).Replace("\r", string.Empty)),
+					TestHelper.PrepareXmlForStringCompare(l_strJSONDetected.Replace("\n", string.Empty).Replace("\r", string.Empty)));
+			}
 
-            {
-                // Deserialize object an verify state.
-                var l_oStateTarget = JsonConvert.DeserializeObject<StateInfoMutable>(l_strJSONDetected, new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.Auto });
-                // Verify state.
-                Assert.AreEqual(InUseStateEnum.Reserved, l_oStateTarget.Value);
-                Assert.AreEqual("heiz@mustermann", l_oStateTarget.MailAddress);
-                Assert.AreEqual(new DateTime(2017, 09, 21, 23, 20, 0), l_oStateTarget.From);
-                Assert.IsNull(l_oStateTarget.RemainingTime, "If deserialized date time provider is DateTime.Now. With a from- value of 2017-11- ... there is no more time remaining.");
-                Assert.IsNull(l_oStateTarget.Code);
-            }
-        }
+			{
+				// Deserialize object an verify state.
+				var l_oStateTarget = JsonConvert.DeserializeObject<StateInfoMutable>(l_strJSONDetected, new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.Auto });
+				// Verify state.
+				Assert.AreEqual(InUseStateEnum.Reserved, l_oStateTarget.Value);
+				Assert.AreEqual("heiz@mustermann", l_oStateTarget.MailAddress);
+				Assert.AreEqual(new DateTime(2017, 09, 21, 23, 20, 0), l_oStateTarget.From);
+				Assert.IsNull(l_oStateTarget.RemainingTime, "If deserialized date time provider is DateTime.Now. With a from- value of 2017-11- ... there is no more time remaining.");
+				Assert.IsNull(l_oStateTarget.Code);
+			}
+		}
 
-        [Test]
-        public void TestSerializeJSON_Reserved()
-        {
-            string l_strJSONDetected;
+		[Test]
+		public void TestSerializeJSON_Reserved()
+		{
+			string l_strJSONDetected;
 
-            {
-                Func<DateTime> l_oNow = () => new DateTime(2017, 11, 18, 23, 18, 0);
-                // Create object to test.
-                var l_oInUseState = new StateInfoMutable(l_oNow);
+			{
+				Func<DateTime> l_oNow = () => new DateTime(2017, 11, 18, 23, 18, 0);
+				// Create object to test.
+				var l_oInUseState = new StateInfoMutable(l_oNow);
 
-                DateTime l_oFrom = new DateTime(2017, 11, 18, 23, 18, 0);
-                l_oInUseState.Load(
-                    InUseStateEnum.Reserved,
-                    l_oFrom,
-                    "z@C",
-                    "01815A");
+				DateTime l_oFrom = new DateTime(2017, 11, 18, 23, 18, 0);
+				l_oInUseState.Load(
+					InUseStateEnum.Reserved,
+					l_oFrom,
+					"z@C",
+					"01815A");
 
-                Assert.AreEqual(InUseStateEnum.Reserved, l_oInUseState.Value);
-                Assert.AreEqual("z@C", l_oInUseState.MailAddress);
-                Assert.AreEqual(new DateTime(2017, 11, 18, 23, 18, 0), l_oInUseState.From);
-                Assert.AreEqual((new TimeSpan(0, 15, 0)).Subtract(l_oNow().Subtract(l_oFrom)), l_oInUseState.RemainingTime);
-                Assert.AreEqual("01815A", l_oInUseState.Code);
+				Assert.AreEqual(InUseStateEnum.Reserved, l_oInUseState.Value);
+				Assert.AreEqual("z@C", l_oInUseState.MailAddress);
+				Assert.AreEqual(new DateTime(2017, 11, 18, 23, 18, 0), l_oInUseState.From);
+				Assert.AreEqual((new TimeSpan(0, 15, 0)).Subtract(l_oNow().Subtract(l_oFrom)), l_oInUseState.RemainingTime);
+				Assert.AreEqual("01815A", l_oInUseState.Code);
 
-                l_strJSONDetected = JsonConvert.SerializeObject(l_oInUseState, new JsonSerializerSettings
-                {
-                    TypeNameHandling = TypeNameHandling.Auto,
-                    NullValueHandling = NullValueHandling.Ignore,
-                });
+				l_strJSONDetected = JsonConvert.SerializeObject(l_oInUseState, new JsonSerializerSettings
+				{
+					TypeNameHandling = TypeNameHandling.Auto,
+					NullValueHandling = NullValueHandling.Ignore,
+				});
 
-                // Verify json
-                const string EXPECTED = @"
+				// Verify json
+				const string EXPECTED = @"
                 {
                     ""StateInfoObject"":
                     {
@@ -193,21 +193,21 @@ namespace TestTINKLib.Fixtures.State
                     }
                 }";
 
-                Assert.AreEqual(
-                    TestHelper.PrepareXmlForStringCompare(EXPECTED.Replace("\n", string.Empty).Replace("\r", string.Empty)),
-                    TestHelper.PrepareXmlForStringCompare(l_strJSONDetected.Replace("\n", string.Empty).Replace("\r", string.Empty)));
-            }
+				Assert.AreEqual(
+					TestHelper.PrepareXmlForStringCompare(EXPECTED.Replace("\n", string.Empty).Replace("\r", string.Empty)),
+					TestHelper.PrepareXmlForStringCompare(l_strJSONDetected.Replace("\n", string.Empty).Replace("\r", string.Empty)));
+			}
 
-            {
-                // Deserialize object an verify state.
-                var l_oStateTarget = JsonConvert.DeserializeObject<StateInfoMutable>(l_strJSONDetected, new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.Auto });
-                // Verify state.
-                Assert.AreEqual(InUseStateEnum.Reserved, l_oStateTarget.Value);
-                Assert.AreEqual("z@C", l_oStateTarget.MailAddress);
-                Assert.AreEqual(new DateTime(2017, 11, 18, 23, 18, 0), l_oStateTarget.From);
-                Assert.IsNull(l_oStateTarget.RemainingTime, "If deserialized date time provider is DateTime.Now. With a from- value of 2017-11- ... there is no more time remaining.");
-                Assert.AreEqual("01815A", l_oStateTarget.Code);
-            }
-        }
-    }
+			{
+				// Deserialize object an verify state.
+				var l_oStateTarget = JsonConvert.DeserializeObject<StateInfoMutable>(l_strJSONDetected, new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.Auto });
+				// Verify state.
+				Assert.AreEqual(InUseStateEnum.Reserved, l_oStateTarget.Value);
+				Assert.AreEqual("z@C", l_oStateTarget.MailAddress);
+				Assert.AreEqual(new DateTime(2017, 11, 18, 23, 18, 0), l_oStateTarget.From);
+				Assert.IsNull(l_oStateTarget.RemainingTime, "If deserialized date time provider is DateTime.Now. With a from- value of 2017-11- ... there is no more time remaining.");
+				Assert.AreEqual("01815A", l_oStateTarget.Code);
+			}
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/State/TestStateRequestedInfo.cs b/TestTINKLib/Fixtures/ObjectTests/State/TestStateRequestedInfo.cs
index ae8ece7..4081d51 100644
--- a/TestTINKLib/Fixtures/ObjectTests/State/TestStateRequestedInfo.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/State/TestStateRequestedInfo.cs
@@ -7,84 +7,84 @@ using TINK.Model.State;
 namespace TestTINKLib
 {
 
-    [TestFixture]
-    public class TestStateRequestedInfo
-    {
-        [Test]
-        public void TestConstruct_FromApp()
-        {
-            Assert.AreEqual(
-                InUseStateEnum.Reserved,
-                new StateRequestedInfo(() => new DateTime(2017, 09, 20, 12, 1, 0), new DateTime(2017, 09, 20, 12, 0, 0), "a@b", null).Value);
+	[TestFixture]
+	public class TestStateRequestedInfo
+	{
+		[Test]
+		public void TestConstruct_FromApp()
+		{
+			Assert.AreEqual(
+				InUseStateEnum.Reserved,
+				new StateRequestedInfo(() => new DateTime(2017, 09, 20, 12, 1, 0), new DateTime(2017, 09, 20, 12, 0, 0), "a@b", null).Value);
 
-            Assert.AreEqual(
-                "a@b",
-                new StateRequestedInfo(() => new DateTime(2017, 09, 20, 12, 1, 0), new DateTime(2017, 09, 20, 12, 0, 0), "a@b", null).MailAddress);
+			Assert.AreEqual(
+				"a@b",
+				new StateRequestedInfo(() => new DateTime(2017, 09, 20, 12, 1, 0), new DateTime(2017, 09, 20, 12, 0, 0), "a@b", null).MailAddress);
 
-            Assert.IsNull(
-                new StateRequestedInfo(() => new DateTime(2017, 09, 20, 12, 1, 0), new DateTime(2017, 09, 20, 12, 0, 0), "a@b", null).Code);
+			Assert.IsNull(
+				new StateRequestedInfo(() => new DateTime(2017, 09, 20, 12, 1, 0), new DateTime(2017, 09, 20, 12, 0, 0), "a@b", null).Code);
 
-            Assert.AreEqual(
-                new DateTime(2017, 09, 20, 12, 0, 0),
-                new StateRequestedInfo(() => new DateTime(2017, 09, 20, 12, 1, 0), new DateTime(2017, 09, 20, 12, 0, 0), "a@b", null).From);
+			Assert.AreEqual(
+				new DateTime(2017, 09, 20, 12, 0, 0),
+				new StateRequestedInfo(() => new DateTime(2017, 09, 20, 12, 1, 0), new DateTime(2017, 09, 20, 12, 0, 0), "a@b", null).From);
 
-            Assert.IsTrue(
-                new StateRequestedInfo(() => new DateTime(2017, 09, 20, 12, 1, 0), new DateTime(2017, 09, 20, 12, 0, 0), "a@b", null).GetIsStillReserved(out TimeSpan? l_oRemainigTime));
+			Assert.IsTrue(
+				new StateRequestedInfo(() => new DateTime(2017, 09, 20, 12, 1, 0), new DateTime(2017, 09, 20, 12, 0, 0), "a@b", null).GetIsStillReserved(out TimeSpan? l_oRemainigTime));
 
-            Assert.AreEqual(
-                14,
-                l_oRemainigTime.Value.Minutes);
-        }
+			Assert.AreEqual(
+				14,
+				l_oRemainigTime.Value.Minutes);
+		}
 
-        [Test]
-        public void TestConstruct_FromWebserver()
-        {
-            Assert.AreEqual(
-                InUseStateEnum.Reserved,
-                new StateRequestedInfo(() => new DateTime(2017, 09, 20), new DateTime(2017, 09, 19), "a@b", "372").Value);
+		[Test]
+		public void TestConstruct_FromWebserver()
+		{
+			Assert.AreEqual(
+				InUseStateEnum.Reserved,
+				new StateRequestedInfo(() => new DateTime(2017, 09, 20), new DateTime(2017, 09, 19), "a@b", "372").Value);
 
-            Assert.AreEqual(
-                "a@b",
-                new StateRequestedInfo(() => new DateTime(2017, 09, 20), new DateTime(2017, 09, 19), "a@b", "372").MailAddress);
+			Assert.AreEqual(
+				"a@b",
+				new StateRequestedInfo(() => new DateTime(2017, 09, 20), new DateTime(2017, 09, 19), "a@b", "372").MailAddress);
 
-            Assert.AreEqual(
-                "372",
-                new StateRequestedInfo(() => new DateTime(2017, 09, 20), new DateTime(2017, 09, 19), "a@b", "372").Code);
+			Assert.AreEqual(
+				"372",
+				new StateRequestedInfo(() => new DateTime(2017, 09, 20), new DateTime(2017, 09, 19), "a@b", "372").Code);
 
-            Assert.AreEqual(
-                new DateTime(2017, 09, 19),
-                new StateRequestedInfo(() => new DateTime(2017, 09, 20), new DateTime(2017, 09, 19), "a@b", "372").From);
+			Assert.AreEqual(
+				new DateTime(2017, 09, 19),
+				new StateRequestedInfo(() => new DateTime(2017, 09, 20), new DateTime(2017, 09, 19), "a@b", "372").From);
 
-            Assert.IsTrue(
-                new StateRequestedInfo(() => new DateTime(2017, 09, 20, 12, 12, 0), new DateTime(2017, 09, 20, 12, 0, 0), "a@b", "372").GetIsStillReserved(out TimeSpan? l_oRemainigTime));
+			Assert.IsTrue(
+				new StateRequestedInfo(() => new DateTime(2017, 09, 20, 12, 12, 0), new DateTime(2017, 09, 20, 12, 0, 0), "a@b", "372").GetIsStillReserved(out TimeSpan? l_oRemainigTime));
 
-            Assert.AreEqual(
-                3,
-                l_oRemainigTime.Value.Minutes);
-        }
+			Assert.AreEqual(
+				3,
+				l_oRemainigTime.Value.Minutes);
+		}
 
-        [Test]
-        public void TestTryUpdateOnTimeElapsed()
-        {
-            var l_oReservedAt = new DateTime(2017, 09, 20, 22, 01, 00);
-            var l_oDateTimeMock = new DateTimeMocker(new List<DateTime> {
-                l_oReservedAt.Add(new TimeSpan(0, 4, 0)),    // Reserved for 4 mns
+		[Test]
+		public void TestTryUpdateOnTimeElapsed()
+		{
+			var l_oReservedAt = new DateTime(2017, 09, 20, 22, 01, 00);
+			var l_oDateTimeMock = new DateTimeMocker(new List<DateTime> {
+				l_oReservedAt.Add(new TimeSpan(0, 4, 0)),    // Reserved for 4 mns
                 l_oReservedAt.Add(new TimeSpan(0, 16, 0))   // Time elapsed since booking 16 mns
                 });
 
-            var l_oReservedInfo = new StateRequestedInfo(l_oDateTimeMock.GetDateTime, l_oReservedAt, "a@b", null);
-            Assert.AreEqual("a@b", l_oReservedInfo.MailAddress);
-            Assert.AreEqual(new DateTime(2017, 09, 20, 22, 01, 00), l_oReservedInfo.From, "a@b");
+			var l_oReservedInfo = new StateRequestedInfo(l_oDateTimeMock.GetDateTime, l_oReservedAt, "a@b", null);
+			Assert.AreEqual("a@b", l_oReservedInfo.MailAddress);
+			Assert.AreEqual(new DateTime(2017, 09, 20, 22, 01, 00), l_oReservedInfo.From, "a@b");
 
-            // Invoke first update (after simulated 4mns)
-            Assert.IsTrue(l_oReservedInfo.GetIsStillReserved(out TimeSpan? l_oRemainigTime));
-            Assert.AreEqual(11, l_oRemainigTime.Value.Minutes);
-            Assert.AreEqual(new DateTime(2017, 09, 20, 22, 01, 00), l_oReservedInfo.From, "a@b");
+			// Invoke first update (after simulated 4mns)
+			Assert.IsTrue(l_oReservedInfo.GetIsStillReserved(out TimeSpan? l_oRemainigTime));
+			Assert.AreEqual(11, l_oRemainigTime.Value.Minutes);
+			Assert.AreEqual(new DateTime(2017, 09, 20, 22, 01, 00), l_oReservedInfo.From, "a@b");
 
-            // Invoke second update (after simulated 16 mns)
-            Assert.IsFalse(l_oReservedInfo.GetIsStillReserved(out l_oRemainigTime));
-            Assert.IsNull(l_oRemainigTime);
-            Assert.AreEqual(new DateTime(2017, 09, 20, 22, 01, 00), l_oReservedInfo.From, "a@b");
-        }
-    }
+			// Invoke second update (after simulated 16 mns)
+			Assert.IsFalse(l_oReservedInfo.GetIsStillReserved(out l_oRemainigTime));
+			Assert.IsNull(l_oRemainigTime);
+			Assert.AreEqual(new DateTime(2017, 09, 20, 22, 01, 00), l_oReservedInfo.From, "a@b");
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/State/TestStateRequestedInfoSerializeJSON.cs b/TestTINKLib/Fixtures/ObjectTests/State/TestStateRequestedInfoSerializeJSON.cs
index 1f5f32c..35d596e 100644
--- a/TestTINKLib/Fixtures/ObjectTests/State/TestStateRequestedInfoSerializeJSON.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/State/TestStateRequestedInfoSerializeJSON.cs
@@ -7,37 +7,37 @@ using TINK.Model.State;
 namespace TestTINKLib.Fixtures.State
 {
 
-    [TestFixture]
-    public class TestStateReInquestedfoSerializeJSON
-    {
-        [Test]
-        public void TestSerializeJSON()
-        {
-            // Create object to test.
-            var l_oReservedInfo = new StateRequestedInfo(
-                () => new DateTime(2017, 09, 20),
-                new DateTime(2017, 09, 19),
-                "a@b",
-                "372");
+	[TestFixture]
+	public class TestStateReInquestedfoSerializeJSON
+	{
+		[Test]
+		public void TestSerializeJSON()
+		{
+			// Create object to test.
+			var l_oReservedInfo = new StateRequestedInfo(
+				() => new DateTime(2017, 09, 20),
+				new DateTime(2017, 09, 19),
+				"a@b",
+				"372");
 
-            // Serialize object
-            // Serialize object and verify.
-            var l_oDetected = JsonConvert.SerializeObject(l_oReservedInfo);
-            // Verify xml
-            const string EXPECTED = @"{""From"":""2017 - 09 - 19T00: 00:00"",""MailAddress"":""a @b"",""Code"":""372""}";
-            Assert.AreEqual(
-                TestHelper.PrepareXmlForStringCompare(EXPECTED),
-                TestHelper.PrepareXmlForStringCompare(l_oDetected));
+			// Serialize object
+			// Serialize object and verify.
+			var l_oDetected = JsonConvert.SerializeObject(l_oReservedInfo);
+			// Verify xml
+			const string EXPECTED = @"{""From"":""2017 - 09 - 19T00: 00:00"",""MailAddress"":""a @b"",""Code"":""372""}";
+			Assert.AreEqual(
+				TestHelper.PrepareXmlForStringCompare(EXPECTED),
+				TestHelper.PrepareXmlForStringCompare(l_oDetected));
 
-            // Deserialize object.
-            var l_oInfoTarge = JsonConvert.DeserializeObject<StateRequestedInfo>(l_oDetected);
+			// Deserialize object.
+			var l_oInfoTarge = JsonConvert.DeserializeObject<StateRequestedInfo>(l_oDetected);
 
-            // Verify state.
-            Assert.AreEqual(InUseStateEnum.Reserved, l_oInfoTarge.Value);
-            Assert.AreEqual("a@b", l_oInfoTarge.MailAddress);
-            Assert.AreEqual("372", l_oInfoTarge.Code);
-            Assert.AreEqual(new DateTime(2017, 9, 19, 0, 0, 0), l_oInfoTarge.From);
-        }
+			// Verify state.
+			Assert.AreEqual(InUseStateEnum.Reserved, l_oInfoTarge.Value);
+			Assert.AreEqual("a@b", l_oInfoTarge.MailAddress);
+			Assert.AreEqual("372", l_oInfoTarge.Code);
+			Assert.AreEqual(new DateTime(2017, 9, 19, 0, 0, 0), l_oInfoTarge.From);
+		}
 
-    }
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Station/TestNullStation.cs b/TestTINKLib/Fixtures/ObjectTests/Station/TestNullStation.cs
index c1ffcc8..da8f7f8 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Station/TestNullStation.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Station/TestNullStation.cs
@@ -4,26 +4,26 @@ using TINK.Model.Station;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Station
 {
-    [TestFixture]
-    public class TestNullStation
-    {
-        [Test]
-        public void TestConstruct()
-        {
-            var nullStation = new NullStation();
+	[TestFixture]
+	public class TestNullStation
+	{
+		[Test]
+		public void TestConstruct()
+		{
+			var nullStation = new NullStation();
 
-            // Was -1 before swiching type of id from int to string when switching from COPRI version v4.0 to v4.1
-            Assert.That(
-                nullStation.Id,
-                Is.Null);
+			// Was -1 before swiching type of id from int to string when switching from COPRI version v4.0 to v4.1
+			Assert.That(
+				nullStation.Id,
+				Is.Null);
 
-            Assert.AreEqual(0, nullStation.Group.ToList().Count);
-            Assert.AreEqual(string.Empty, nullStation.StationName);
-            Assert.IsNaN(nullStation.Position.Latitude);
-            Assert.IsNaN(nullStation.Position.Longitude);
-            Assert.That(
-                nullStation.OperatorData,
-                Is.Not.Null);
-        }
-    }
+			Assert.AreEqual(0, nullStation.Group.ToList().Count);
+			Assert.AreEqual(string.Empty, nullStation.StationName);
+			Assert.IsNaN(nullStation.Position.Latitude);
+			Assert.IsNaN(nullStation.Position.Longitude);
+			Assert.That(
+				nullStation.OperatorData,
+				Is.Not.Null);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Station/TestStation.cs b/TestTINKLib/Fixtures/ObjectTests/Station/TestStation.cs
index 413fc97..cae4beb 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Station/TestStation.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Station/TestStation.cs
@@ -7,43 +7,43 @@ using TINK.Model;
 namespace TestTINKLib.Fixtures.Station
 {
 
-    [TestFixture]
-    public class TestStation
-    {
-        [Test]
-        public void TestConstruct()
-        {
-            var l_oStation = new TINK.Model.Station.Station("7", new HashSet<string>(new List<string> { "TINK" }).ToList(), PositionFactory.Create(1, 2), "Hallo");
-            Assert.AreEqual("7", l_oStation.Id);
-            Assert.AreEqual("TINK", string.Join(",", l_oStation.Group));
-            Assert.AreEqual(1, l_oStation.Position.Latitude);
-            Assert.AreEqual(2, l_oStation.Position.Longitude);
-            Assert.AreEqual("Hallo", l_oStation.StationName);
-        }
+	[TestFixture]
+	public class TestStation
+	{
+		[Test]
+		public void TestConstruct()
+		{
+			var l_oStation = new TINK.Model.Station.Station("7", new HashSet<string>(new List<string> { "TINK" }).ToList(), PositionFactory.Create(1, 2), "Hallo");
+			Assert.AreEqual("7", l_oStation.Id);
+			Assert.AreEqual("TINK", string.Join(",", l_oStation.Group));
+			Assert.AreEqual(1, l_oStation.Position.Latitude);
+			Assert.AreEqual(2, l_oStation.Position.Longitude);
+			Assert.AreEqual("Hallo", l_oStation.StationName);
+		}
 
-        [Test]
-        public void TestConstruct_InvalidStationName()
-        {
-            var l_oStation = new TINK.Model.Station.Station("7", new HashSet<string>(new List<string> { "TINK" }).ToList(), PositionFactory.Create(1, 2), null);
-            Assert.AreEqual("7", l_oStation.Id);
-            Assert.AreEqual("TINK", string.Join(",", l_oStation.Group));
-            Assert.AreEqual(1, l_oStation.Position.Latitude);
-            Assert.AreEqual(2, l_oStation.Position.Longitude);
-            Assert.AreEqual("", l_oStation.StationName);
-        }
+		[Test]
+		public void TestConstruct_InvalidStationName()
+		{
+			var l_oStation = new TINK.Model.Station.Station("7", new HashSet<string>(new List<string> { "TINK" }).ToList(), PositionFactory.Create(1, 2), null);
+			Assert.AreEqual("7", l_oStation.Id);
+			Assert.AreEqual("TINK", string.Join(",", l_oStation.Group));
+			Assert.AreEqual(1, l_oStation.Position.Latitude);
+			Assert.AreEqual(2, l_oStation.Position.Longitude);
+			Assert.AreEqual("", l_oStation.StationName);
+		}
 
-        [Test]
-        public void TestConstruct_InvalidStationGroup()
-        {
-            Assert.Throws<ArgumentException>(() => new TINK.Model.Station.Station("7", null, PositionFactory.Create(1, 2), "Hallo"));
-        }
+		[Test]
+		public void TestConstruct_InvalidStationGroup()
+		{
+			Assert.Throws<ArgumentException>(() => new TINK.Model.Station.Station("7", null, PositionFactory.Create(1, 2), "Hallo"));
+		}
 
-        [Test]
-        public void TestConstruct_NoOperator()
-        {
-            Assert.That(
-                new TINK.Model.Station.Station("7", new List<string>(), PositionFactory.Create(1, 2), "Hallo").OperatorData,
-                Is.Not.Null);
-        }
-    }
+		[Test]
+		public void TestConstruct_NoOperator()
+		{
+			Assert.That(
+				new TINK.Model.Station.Station("7", new List<string>(), PositionFactory.Create(1, 2), "Hallo").OperatorData,
+				Is.Not.Null);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/TestFilterCollection.cs b/TestTINKLib/Fixtures/ObjectTests/TestFilterCollection.cs
index 4f6ca6b..bc52acd 100644
--- a/TestTINKLib/Fixtures/ObjectTests/TestFilterCollection.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/TestFilterCollection.cs
@@ -5,22 +5,22 @@ using TINK.ViewModel.Map;
 
 namespace TestTINKLib.Fixtures.ObjectTests
 {
-    [TestFixture]
-    public class TestFilterCollection
-    {
-        [Test]
-        public void TestGetGroup()
-        {
-            var l_oFilterColl = new GroupFilterMapPage(new Dictionary<string, FilterState>
-            {
-                { "TINK", FilterState.On },
-                { "Konrad", FilterState.On }
-            });
+	[TestFixture]
+	public class TestFilterCollection
+	{
+		[Test]
+		public void TestGetGroup()
+		{
+			var l_oFilterColl = new GroupFilterMapPage(new Dictionary<string, FilterState>
+			{
+				{ "TINK", FilterState.On },
+				{ "Konrad", FilterState.On }
+			});
 
-            var l_oFilterGroup = l_oFilterColl.GetGroup();
-            Assert.AreEqual(2, l_oFilterGroup.Count);
-            Assert.AreEqual("TINK", l_oFilterGroup[0]);
-            Assert.AreEqual("Konrad", l_oFilterGroup[1]);
-        }
-    }
+			var l_oFilterGroup = l_oFilterColl.GetGroup();
+			Assert.AreEqual(2, l_oFilterGroup.Count);
+			Assert.AreEqual("TINK", l_oFilterGroup[0]);
+			Assert.AreEqual("Konrad", l_oFilterGroup[1]);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/TestFilterCollectionStore.cs b/TestTINKLib/Fixtures/ObjectTests/TestFilterCollectionStore.cs
index 03336b2..7e9ca6a 100644
--- a/TestTINKLib/Fixtures/ObjectTests/TestFilterCollectionStore.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/TestFilterCollectionStore.cs
@@ -5,120 +5,120 @@ using TINK.Model.Settings;
 
 namespace TestTINKLib.Fixtures.ObjectTests
 {
-    [TestFixture]
-    public class TestFilterCollectionStore
-    {
-        [Test]
-        public void TestSerialize_Null()
-        {
-            var l_oSettings = new Dictionary<string, string>().SetGroupFilterSettings(null);
-            var l_oFilterColl = JsonSettingsDictionary.GetGoupFilterSettings(l_oSettings);
+	[TestFixture]
+	public class TestFilterCollectionStore
+	{
+		[Test]
+		public void TestSerialize_Null()
+		{
+			var l_oSettings = new Dictionary<string, string>().SetGroupFilterSettings(null);
+			var l_oFilterColl = JsonSettingsDictionary.GetGoupFilterSettings(l_oSettings);
 
-            Assert.IsNull(l_oFilterColl);
-        }
+			Assert.IsNull(l_oFilterColl);
+		}
 
-        [Test]
-        public void TestSerialize_Invalid()
-        {
-            var l_oSettings = new Dictionary<string, string>().SetGroupFilterSettings(new Dictionary<string, FilterState>());
-            var l_oFilterColl = JsonSettingsDictionary.GetGoupFilterSettings(l_oSettings);
+		[Test]
+		public void TestSerialize_Invalid()
+		{
+			var l_oSettings = new Dictionary<string, string>().SetGroupFilterSettings(new Dictionary<string, FilterState>());
+			var l_oFilterColl = JsonSettingsDictionary.GetGoupFilterSettings(l_oSettings);
 
-            Assert.IsNull(l_oFilterColl);
-        }
+			Assert.IsNull(l_oFilterColl);
+		}
 
-        [Test]
-        public void TestSerializeLegacy()
-        {
-            var l_oSettings = new Dictionary<string, string>().SetGroupFilterSettings(
-            new Dictionary<string, FilterState>
-            {
-                { "TINK.Copri", FilterState.On },
-                { "TINK.SMS", FilterState.Off},
-                { "Konrad", FilterState.On }
-            });
+		[Test]
+		public void TestSerializeLegacy()
+		{
+			var l_oSettings = new Dictionary<string, string>().SetGroupFilterSettings(
+			new Dictionary<string, FilterState>
+			{
+				{ "TINK.Copri", FilterState.On },
+				{ "TINK.SMS", FilterState.Off},
+				{ "Konrad", FilterState.On }
+			});
 
-            var l_oFilterColl = JsonSettingsDictionary.GetGoupFilterSettings(l_oSettings);
+			var l_oFilterColl = JsonSettingsDictionary.GetGoupFilterSettings(l_oSettings);
 
-            Assert.AreEqual(2, l_oFilterColl.Count);
-            Assert.AreEqual(FilterState.On, l_oFilterColl["TINK"]);
-            Assert.AreEqual(FilterState.On, l_oFilterColl["Konrad"]);
+			Assert.AreEqual(2, l_oFilterColl.Count);
+			Assert.AreEqual(FilterState.On, l_oFilterColl["TINK"]);
+			Assert.AreEqual(FilterState.On, l_oFilterColl["Konrad"]);
 
-            l_oSettings = new Dictionary<string, string>().SetGroupFilterSettings(
-            new Dictionary<string, FilterState>
-            {
-                { "TINK.Copri", FilterState.Off },
-                { "TINK.SMS", FilterState.On},
-                { "Konrad", FilterState.On }
-            });
+			l_oSettings = new Dictionary<string, string>().SetGroupFilterSettings(
+			new Dictionary<string, FilterState>
+			{
+				{ "TINK.Copri", FilterState.Off },
+				{ "TINK.SMS", FilterState.On},
+				{ "Konrad", FilterState.On }
+			});
 
-            l_oFilterColl = JsonSettingsDictionary.GetGoupFilterSettings(l_oSettings);
+			l_oFilterColl = JsonSettingsDictionary.GetGoupFilterSettings(l_oSettings);
 
-            Assert.AreEqual(2, l_oFilterColl.Count);
-            Assert.AreEqual(FilterState.Off, l_oFilterColl["TINK"]);
-            Assert.AreEqual(FilterState.On, l_oFilterColl["Konrad"]);
-        }
+			Assert.AreEqual(2, l_oFilterColl.Count);
+			Assert.AreEqual(FilterState.Off, l_oFilterColl["TINK"]);
+			Assert.AreEqual(FilterState.On, l_oFilterColl["Konrad"]);
+		}
 
-        [Test]
-        public void TestSerializeInvalid()
-        {
-            var l_oSettings = new Dictionary<string, string>()
-                .SetGroupFilterSettings(
-                    new Dictionary<string, FilterState>
-                    {
-                        { "TINK.SMS", FilterState.Off},
-                        { "Konrad", FilterState.On }
-                    });
+		[Test]
+		public void TestSerializeInvalid()
+		{
+			var l_oSettings = new Dictionary<string, string>()
+				.SetGroupFilterSettings(
+					new Dictionary<string, FilterState>
+					{
+						{ "TINK.SMS", FilterState.Off},
+						{ "Konrad", FilterState.On }
+					});
 
-            var l_oFilterColl = JsonSettingsDictionary.GetGoupFilterSettings(l_oSettings);
+			var l_oFilterColl = JsonSettingsDictionary.GetGoupFilterSettings(l_oSettings);
 
-            Assert.AreEqual(2, l_oFilterColl.Count);
-            Assert.AreEqual(FilterState.Off, l_oFilterColl["TINK"]);
-            Assert.AreEqual(FilterState.On, l_oFilterColl["Konrad"]);
-        }
+			Assert.AreEqual(2, l_oFilterColl.Count);
+			Assert.AreEqual(FilterState.Off, l_oFilterColl["TINK"]);
+			Assert.AreEqual(FilterState.On, l_oFilterColl["Konrad"]);
+		}
 
-        [Test]
-        public void TestSerializeRoundtrip()
-        {
-            var l_oSettings = new Dictionary<string, string>()
-                            .SetGroupFilterSettings(
-                                new Dictionary<string, FilterState>
-                                {
-                                    { "TINK", FilterState.On },
-                                    { "Konrad", FilterState.On }
-                                });
+		[Test]
+		public void TestSerializeRoundtrip()
+		{
+			var l_oSettings = new Dictionary<string, string>()
+							.SetGroupFilterSettings(
+								new Dictionary<string, FilterState>
+								{
+									{ "TINK", FilterState.On },
+									{ "Konrad", FilterState.On }
+								});
 
-            var l_oFilterColl = JsonSettingsDictionary.GetGoupFilterSettings(l_oSettings);
+			var l_oFilterColl = JsonSettingsDictionary.GetGoupFilterSettings(l_oSettings);
 
-            Assert.AreEqual(2, l_oFilterColl.Count);
-            Assert.AreEqual(FilterState.On, l_oFilterColl["TINK"]);
-            Assert.AreEqual(FilterState.On, l_oFilterColl["Konrad"]);
+			Assert.AreEqual(2, l_oFilterColl.Count);
+			Assert.AreEqual(FilterState.On, l_oFilterColl["TINK"]);
+			Assert.AreEqual(FilterState.On, l_oFilterColl["Konrad"]);
 
-            l_oSettings = new Dictionary<string, string>().SetGroupFilterSettings(
-            new Dictionary<string, FilterState>
-            {
-                { "TINK", FilterState.Off },
-                { "Konrad", FilterState.On }
-            });
+			l_oSettings = new Dictionary<string, string>().SetGroupFilterSettings(
+			new Dictionary<string, FilterState>
+			{
+				{ "TINK", FilterState.Off },
+				{ "Konrad", FilterState.On }
+			});
 
-            l_oFilterColl = JsonSettingsDictionary.GetGoupFilterSettings(l_oSettings);
+			l_oFilterColl = JsonSettingsDictionary.GetGoupFilterSettings(l_oSettings);
 
-            Assert.AreEqual(2, l_oFilterColl.Count);
-            Assert.AreEqual(FilterState.Off, l_oFilterColl["TINK"]);
-            Assert.AreEqual(FilterState.On, l_oFilterColl["Konrad"]);
-        }
+			Assert.AreEqual(2, l_oFilterColl.Count);
+			Assert.AreEqual(FilterState.Off, l_oFilterColl["TINK"]);
+			Assert.AreEqual(FilterState.On, l_oFilterColl["Konrad"]);
+		}
 
-        [Test]
-        public void Test_ToString_Emtpy()
-        {
-            Assert.AreEqual("{}", FilterCollectionStore.ToString(new Dictionary<string, FilterState>()));
-        }
+		[Test]
+		public void Test_ToString_Emtpy()
+		{
+			Assert.AreEqual("{}", FilterCollectionStore.ToString(new Dictionary<string, FilterState>()));
+		}
 
-        [Test]
-        public void Test_ToString()
-        {
-            Assert.AreEqual(
-                "{(Test1= Off), (Test2= On)}",
-                FilterCollectionStore.ToString(new Dictionary<string, FilterState> { { "Test1", FilterState.Off }, { "Test2", FilterState.On } }));
-        }
-    }
+		[Test]
+		public void Test_ToString()
+		{
+			Assert.AreEqual(
+				"{(Test1= Off), (Test2= On)}",
+				FilterCollectionStore.ToString(new Dictionary<string, FilterState> { { "Test1", FilterState.Off }, { "Test2", FilterState.On } }));
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/User/Account/TestAccount.cs b/TestTINKLib/Fixtures/ObjectTests/User/Account/TestAccount.cs
index 726b799..f98b0d7 100644
--- a/TestTINKLib/Fixtures/ObjectTests/User/Account/TestAccount.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/User/Account/TestAccount.cs
@@ -4,55 +4,55 @@ using NUnit.Framework;
 
 namespace UITest.Fixtures.ObjectTests.User.Account
 {
-    [TestFixture]
-    public class TestAccount
-    {
-        [Test]
-        public void TestConstruct()
-        {
-            // Act 
-            var account = new TINK.Model.User.Account.Account(
-                "hans.musterman@hotmail.com", // Mail
-                "myPasswd", // Pwd
-                false,
-                "aktuellerKeks", // Cookie
-                new List<string> { "Honkey", "Tonkey" }, // Group
-                TINK.Model.User.Account.Permissions.None);
+	[TestFixture]
+	public class TestAccount
+	{
+		[Test]
+		public void TestConstruct()
+		{
+			// Act 
+			var account = new TINK.Model.User.Account.Account(
+				"hans.musterman@hotmail.com", // Mail
+				"myPasswd", // Pwd
+				false,
+				"aktuellerKeks", // Cookie
+				new List<string> { "Honkey", "Tonkey" }, // Group
+				TINK.Model.User.Account.Permissions.None);
 
-            // Assert
-            Assert.AreEqual("hans.musterman@hotmail.com", account.Mail);
-            Assert.AreEqual("myPasswd", account.Pwd);
-            Assert.That(account.IsAgbAcknowledged, Is.False);
-            Assert.AreEqual("aktuellerKeks", account.SessionCookie);
-            Assert.AreEqual("Honkey,Tonkey", String.Join(",", account.Group));
-            Assert.AreEqual(TINK.Model.User.Account.Permissions.None, account.DebugLevel);
-        }
+			// Assert
+			Assert.AreEqual("hans.musterman@hotmail.com", account.Mail);
+			Assert.AreEqual("myPasswd", account.Pwd);
+			Assert.That(account.IsAgbAcknowledged, Is.False);
+			Assert.AreEqual("aktuellerKeks", account.SessionCookie);
+			Assert.AreEqual("Honkey,Tonkey", String.Join(",", account.Group));
+			Assert.AreEqual(TINK.Model.User.Account.Permissions.None, account.DebugLevel);
+		}
 
-        [Test]
-        public void TestConstruct_Copy()
-        {
-            var account = new TINK.Model.User.Account.Account(new TINK.Model.User.Account.Account(
-                "a@b",
-                "112",
-                true, // Agbs have been acknowledged 
-                "3330",
-                new List<string> { "Honkey", "Tonkey" },
-                TINK.Model.User.Account.Permissions.None));
+		[Test]
+		public void TestConstruct_Copy()
+		{
+			var account = new TINK.Model.User.Account.Account(new TINK.Model.User.Account.Account(
+				"a@b",
+				"112",
+				true, // Agbs have been acknowledged 
+				"3330",
+				new List<string> { "Honkey", "Tonkey" },
+				TINK.Model.User.Account.Permissions.None));
 
-            Assert.AreEqual("a@b", account.Mail);
-            Assert.AreEqual("112", account.Pwd);
-            Assert.That(account.IsAgbAcknowledged, Is.True);
-            Assert.AreEqual("3330", account.SessionCookie);
-            Assert.AreEqual("Honkey,Tonkey", String.Join(",", account.Group));
-            Assert.AreEqual(TINK.Model.User.Account.Permissions.None, account.DebugLevel);
-        }
+			Assert.AreEqual("a@b", account.Mail);
+			Assert.AreEqual("112", account.Pwd);
+			Assert.That(account.IsAgbAcknowledged, Is.True);
+			Assert.AreEqual("3330", account.SessionCookie);
+			Assert.AreEqual("Honkey,Tonkey", String.Join(",", account.Group));
+			Assert.AreEqual(TINK.Model.User.Account.Permissions.None, account.DebugLevel);
+		}
 
-        [Test]
-        public void TestConstruct_InvalidGroup()
-        {
-            Assert.Throws<ArgumentException>(() => new TINK.Model.User.Account.Account("a@b", "112", false, "3330", null, TINK.Model.User.Account.Permissions.None));
-            Assert.Throws<ArgumentException>(() => new TINK.Model.User.Account.Account(null));
+		[Test]
+		public void TestConstruct_InvalidGroup()
+		{
+			Assert.Throws<ArgumentException>(() => new TINK.Model.User.Account.Account("a@b", "112", false, "3330", null, TINK.Model.User.Account.Permissions.None));
+			Assert.Throws<ArgumentException>(() => new TINK.Model.User.Account.Account(null));
 
-        }
-    }
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/User/Account/TestAccountExtensions.cs b/TestTINKLib/Fixtures/ObjectTests/User/Account/TestAccountExtensions.cs
index eb7750e..25e71b0 100644
--- a/TestTINKLib/Fixtures/ObjectTests/User/Account/TestAccountExtensions.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/User/Account/TestAccountExtensions.cs
@@ -7,45 +7,45 @@ using TINK.Model.User.Account;
 
 namespace TestTINKLib.Fixtures.ObjectTests.User.Account
 {
-    [TestFixture]
-    public class TestAccountExtensions
-    {
-        /// <summary> If no user is logged in filter is not applied. </summary>
-        [Test]
-        public void TestDoFilter_NoUserLoggedIn()
-        {
-            var l_oAccount = MockRepository.GenerateMock<IAccount>();
+	[TestFixture]
+	public class TestAccountExtensions
+	{
+		/// <summary> If no user is logged in filter is not applied. </summary>
+		[Test]
+		public void TestDoFilter_NoUserLoggedIn()
+		{
+			var l_oAccount = MockRepository.GenerateMock<IAccount>();
 
-            l_oAccount.Stub((x) => x.Mail).Return("a@b");
-            l_oAccount.Stub((x) => x.SessionCookie).Return(""); // User is not logged in
-            l_oAccount.Stub((x) => x.Group).Return(new List<string> { $"HOM_{FilterHelper.CARGOBIKE}", "HOM_117025" });
+			l_oAccount.Stub((x) => x.Mail).Return("a@b");
+			l_oAccount.Stub((x) => x.SessionCookie).Return(""); // User is not logged in
+			l_oAccount.Stub((x) => x.Group).Return(new List<string> { $"HOM_{FilterHelper.CARGOBIKE}", "HOM_117025" });
 
-            var l_oSource = new List<string> { $"HOM_{FilterHelper.CARGOBIKE}", $"HOM_{FilterHelper.CITYBIKE}", "HOM_117025" };
+			var l_oSource = new List<string> { $"HOM_{FilterHelper.CARGOBIKE}", $"HOM_{FilterHelper.CITYBIKE}", "HOM_117025" };
 
-            var l_oResult = l_oAccount.DoFilter(l_oSource);
+			var l_oResult = l_oAccount.DoFilter(l_oSource);
 
-            Assert.AreEqual(3, l_oResult.ToList().Count);
-            Assert.AreEqual($"HOM_{FilterHelper.CARGOBIKE}", l_oResult.ToList()[0]);
-            Assert.AreEqual($"HOM_{FilterHelper.CITYBIKE}", l_oResult.ToList()[1]);
-            Assert.AreEqual("HOM_117025", l_oResult.ToList()[2]);
-        }
-        /// <summary> </summary>
-        [Test]
-        public void TestDoFilter()
-        {
-            var l_oAccount = MockRepository.GenerateMock<IAccount>();
+			Assert.AreEqual(3, l_oResult.ToList().Count);
+			Assert.AreEqual($"HOM_{FilterHelper.CARGOBIKE}", l_oResult.ToList()[0]);
+			Assert.AreEqual($"HOM_{FilterHelper.CITYBIKE}", l_oResult.ToList()[1]);
+			Assert.AreEqual("HOM_117025", l_oResult.ToList()[2]);
+		}
+		/// <summary> </summary>
+		[Test]
+		public void TestDoFilter()
+		{
+			var l_oAccount = MockRepository.GenerateMock<IAccount>();
 
-            l_oAccount.Stub((x) => x.Mail).Return("a@b");
-            l_oAccount.Stub((x) => x.SessionCookie).Return("123");
-            l_oAccount.Stub((x) => x.Group).Return(new List<string> { $"HOM_{FilterHelper.CARGOBIKE}", "HOM_117025" });
+			l_oAccount.Stub((x) => x.Mail).Return("a@b");
+			l_oAccount.Stub((x) => x.SessionCookie).Return("123");
+			l_oAccount.Stub((x) => x.Group).Return(new List<string> { $"HOM_{FilterHelper.CARGOBIKE}", "HOM_117025" });
 
-            var l_oSource = new List<string> { $"HOM_{FilterHelper.CARGOBIKE}", $"HOM_{FilterHelper.CITYBIKE}", "HOM_117025" };
+			var l_oSource = new List<string> { $"HOM_{FilterHelper.CARGOBIKE}", $"HOM_{FilterHelper.CITYBIKE}", "HOM_117025" };
 
-            var l_oResult = l_oAccount.DoFilter(l_oSource);
+			var l_oResult = l_oAccount.DoFilter(l_oSource);
 
-            Assert.AreEqual(2, l_oResult.ToList().Count);
-            Assert.AreEqual($"HOM_{FilterHelper.CARGOBIKE}", l_oResult.ToList()[0]);
-            Assert.AreEqual("HOM_117025", l_oResult.ToList()[1]);
-        }
-    }
+			Assert.AreEqual(2, l_oResult.ToList().Count);
+			Assert.AreEqual($"HOM_{FilterHelper.CARGOBIKE}", l_oResult.ToList()[0]);
+			Assert.AreEqual("HOM_117025", l_oResult.ToList()[1]);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/User/Account/TestValidator.cs b/TestTINKLib/Fixtures/ObjectTests/User/Account/TestValidator.cs
index f6a32eb..878e86c 100644
--- a/TestTINKLib/Fixtures/ObjectTests/User/Account/TestValidator.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/User/Account/TestValidator.cs
@@ -5,26 +5,26 @@ using TINK.Model.User.Account;
 namespace TestTINKLib
 {
 
-    [TestFixture]
-    public class TestValidator
-    {
-        [Test]
-        public void TestValidateMailAndPasswordDelegate()
-        {
-            Assert.AreEqual(Elements.None, Validator.ValidateMailAndPasswordDelegate(null, null).ValidElement);
+	[TestFixture]
+	public class TestValidator
+	{
+		[Test]
+		public void TestValidateMailAndPasswordDelegate()
+		{
+			Assert.AreEqual(Elements.None, Validator.ValidateMailAndPasswordDelegate(null, null).ValidElement);
 
-            Assert.AreEqual(Elements.None, Validator.ValidateMailAndPasswordDelegate("", null).ValidElement);
+			Assert.AreEqual(Elements.None, Validator.ValidateMailAndPasswordDelegate("", null).ValidElement);
 
-            Assert.AreEqual(Elements.None, Validator.ValidateMailAndPasswordDelegate("a", null).ValidElement);
+			Assert.AreEqual(Elements.None, Validator.ValidateMailAndPasswordDelegate("a", null).ValidElement);
 
-            Assert.AreEqual(Elements.None, Validator.ValidateMailAndPasswordDelegate("a@", null).ValidElement);
+			Assert.AreEqual(Elements.None, Validator.ValidateMailAndPasswordDelegate("a@", null).ValidElement);
 
 
-            Assert.AreEqual(Elements.Mail, Validator.ValidateMailAndPasswordDelegate("a@c", "").ValidElement);
+			Assert.AreEqual(Elements.Mail, Validator.ValidateMailAndPasswordDelegate("a@c", "").ValidElement);
 
-            Assert.AreEqual(Elements.Mail, Validator.ValidateMailAndPasswordDelegate("a@c", "123").ValidElement);
+			Assert.AreEqual(Elements.Mail, Validator.ValidateMailAndPasswordDelegate("a@c", "123").ValidElement);
 
-            Assert.AreEqual(Elements.Mail | Elements.Password, Validator.ValidateMailAndPasswordDelegate("a@c", "123456789"  /* password */).ValidElement);
-        }
-    }
+			Assert.AreEqual(Elements.Mail | Elements.Password, Validator.ValidateMailAndPasswordDelegate("a@c", "123456789"  /* password */).ValidElement);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/User/TestUser.cs b/TestTINKLib/Fixtures/ObjectTests/User/TestUser.cs
index 46faa89..5fc702e 100644
--- a/TestTINKLib/Fixtures/ObjectTests/User/TestUser.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/User/TestUser.cs
@@ -12,88 +12,88 @@ using static TINK.Repository.CopriCallsMemory;
 namespace TestTINKLib
 {
 
-    [TestFixture]
-    public class TestUser
-    {
-        [Test]
-        public void TestConstruct_NotLoggedIn_NoUsername()
-        {
-            var storeMock = new StoreMock(); // Account without user name, password and cookie
+	[TestFixture]
+	public class TestUser
+	{
+		[Test]
+		public void TestConstruct_NotLoggedIn_NoUsername()
+		{
+			var storeMock = new StoreMock(); // Account without user name, password and cookie
 
-            var l_oUser = new User(
-                storeMock,
-                storeMock.Load().Result,
-                "HwId1000000000000");
+			var l_oUser = new User(
+				storeMock,
+				storeMock.Load().Result,
+				"HwId1000000000000");
 
-            Assert.IsFalse(l_oUser.IsLoggedIn);
-            Assert.IsNull(l_oUser.Mail);
-            Assert.IsNull(l_oUser.Password);
-            Assert.IsNull(l_oUser.SessionCookie);
-        }
+			Assert.IsFalse(l_oUser.IsLoggedIn);
+			Assert.IsNull(l_oUser.Mail);
+			Assert.IsNull(l_oUser.Password);
+			Assert.IsNull(l_oUser.SessionCookie);
+		}
 
-        [Test]
-        public void TestConstruct_NotLoggedIn_NoCookie()
-        {
-            var storeMock = new StoreMock(new Account("John", "123", true, null, new List<string>())); // Account without session cookie.
+		[Test]
+		public void TestConstruct_NotLoggedIn_NoCookie()
+		{
+			var storeMock = new StoreMock(new Account("John", "123", true, null, new List<string>())); // Account without session cookie.
 
-            var user = new User(
-                storeMock,
-                storeMock.Load().Result,
-                "123456789");
+			var user = new User(
+				storeMock,
+				storeMock.Load().Result,
+				"123456789");
 
-            Assert.IsFalse(user.IsLoggedIn);
-            Assert.AreEqual("John", user.Mail);
-            Assert.AreEqual("123", user.Password);
-            Assert.IsNull(user.SessionCookie);
-        }
+			Assert.IsFalse(user.IsLoggedIn);
+			Assert.AreEqual("John", user.Mail);
+			Assert.AreEqual("123", user.Password);
+			Assert.IsNull(user.SessionCookie);
+		}
 
-        [Test]
-        public void TestConstruct_LoggedIn()
-        {
-            var l_oStoreMock = new StoreMock(new Account("John", "123", false, "9512", new List<string> { "TINK" }));
+		[Test]
+		public void TestConstruct_LoggedIn()
+		{
+			var l_oStoreMock = new StoreMock(new Account("John", "123", false, "9512", new List<string> { "TINK" }));
 
-            var l_oUser = new User(
-                l_oStoreMock,
-                l_oStoreMock.Load().Result,
-                "123456789");
+			var l_oUser = new User(
+				l_oStoreMock,
+				l_oStoreMock.Load().Result,
+				"123456789");
 
-            Assert.IsTrue(l_oUser.IsLoggedIn, "If store does not hold cookie user is considered to not be logged in");
+			Assert.IsTrue(l_oUser.IsLoggedIn, "If store does not hold cookie user is considered to not be logged in");
 
-            Assert.AreEqual("John", l_oUser.Mail);
-            Assert.AreEqual("123", l_oUser.Password);
-            Assert.AreEqual("9512", l_oUser.SessionCookie);
-        }
+			Assert.AreEqual("John", l_oUser.Mail);
+			Assert.AreEqual("123", l_oUser.Password);
+			Assert.AreEqual("9512", l_oUser.SessionCookie);
+		}
 
-        /// <summary>Test logging in. </summary>
-        [Test]
-        public async Task TestSetCredentials()
-        {
-            var l_oConnector = new ConnectorCache(
-                    new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
-                    null /*UI language */,
-                    string.Empty,
-                    string.Empty,
-                    new CopriCallsMemory("MyMerchId", SampleSets.Set2, 1));
+		/// <summary>Test logging in. </summary>
+		[Test]
+		public async Task TestSetCredentials()
+		{
+			var l_oConnector = new ConnectorCache(
+					new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
+					null /*UI language */,
+					string.Empty,
+					string.Empty,
+					new CopriCallsMemory("MyMerchId", SampleSets.Set2, 1));
 
-            var l_oStoreMock = new StoreMock(); // Account without user name, password and cookie
+			var l_oStoreMock = new StoreMock(); // Account without user name, password and cookie
 
-            var l_oUser = new User(
-                l_oStoreMock,
-                l_oStoreMock.Load().Result,
-                "HwId1000000000000");
+			var l_oUser = new User(
+				l_oStoreMock,
+				l_oStoreMock.Load().Result,
+				"HwId1000000000000");
 
-            Assert.IsFalse(l_oUser.IsLoggedIn);
-            Assert.IsNull(l_oUser.Mail);
+			Assert.IsFalse(l_oUser.IsLoggedIn);
+			Assert.IsNull(l_oUser.Mail);
 
-            IAccount l_oAccount = l_oConnector.Command.DoLogin(
-                LoginSessionCopriInfo.JavaministerHardwareNr1.Mail,
-                LoginSessionCopriInfo.JavaministerHardwareNr1.Pwd,
-                l_oUser.DeviceId).Result;
+			IAccount l_oAccount = l_oConnector.Command.DoLogin(
+				LoginSessionCopriInfo.JavaministerHardwareNr1.Mail,
+				LoginSessionCopriInfo.JavaministerHardwareNr1.Pwd,
+				l_oUser.DeviceId).Result;
 
-            await l_oUser.Login(l_oAccount);
-            Assert.IsTrue(l_oUser.IsLoggedIn);
+			await l_oUser.Login(l_oAccount);
+			Assert.IsTrue(l_oUser.IsLoggedIn);
 
-            Assert.AreEqual(LoginSessionCopriInfo.JavaministerHardwareNr1.Mail, l_oUser.Mail);
-        }
-    }
+			Assert.AreEqual(LoginSessionCopriInfo.JavaministerHardwareNr1.Mail, l_oUser.Mail);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Account/TestAccountPageViewModel.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/Account/TestAccountPageViewModel.cs
index 5326e45..06ee6e3 100644
--- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Account/TestAccountPageViewModel.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/Account/TestAccountPageViewModel.cs
@@ -27,234 +27,234 @@ using static TINK.Repository.CopriCallsMemory;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Account
 {
-    public class TestAccountPageViewModel
-    {
-        [Test]
-        public void TestConstruct_NotLoggedIn()
-        {
-            const string MERCH_ID = "MyMerchId";
+	public class TestAccountPageViewModel
+	{
+		[Test]
+		public void TestConstruct_NotLoggedIn()
+		{
+			const string MERCH_ID = "MyMerchId";
 
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: typeof(LocksServiceMock).FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(),
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.Set2, 1, sessionCookie)),
-                merchantId: MERCH_ID,
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: new LocksServiceMock(), // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: typeof(LocksServiceMock).FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(),
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.Set2, 1, sessionCookie)),
+				merchantId: MERCH_ID,
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: new LocksServiceMock(), // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
 
-            var viewService = MockRepository.GenerateStub<IViewService>();
+			var viewService = MockRepository.GenerateStub<IViewService>();
 
-            var settingsPageViewModel = new AccountPageViewModel(
-                tinkApp,
-                (uri) => { },
-                viewService);
+			var settingsPageViewModel = new AccountPageViewModel(
+				tinkApp,
+				(uri) => { },
+				viewService);
 
 
-            Assert.AreEqual("No user logged in.", settingsPageViewModel.LoggedInInfo);
-            Assert.IsFalse(settingsPageViewModel.IsBookingStateInfoVisible, "No user logged in.");
-            Assert.AreEqual(string.Empty, settingsPageViewModel.BookingStateInfo);
-        }
+			Assert.AreEqual("No user logged in.", settingsPageViewModel.LoggedInInfo);
+			Assert.IsFalse(settingsPageViewModel.IsBookingStateInfoVisible, "No user logged in.");
+			Assert.AreEqual(string.Empty, settingsPageViewModel.BookingStateInfo);
+		}
 
-        [Test]
-        public async Task TestConstruct()
-        {
-            const string MERCH_ID = "MyMerchId";
+		[Test]
+		public async Task TestConstruct()
+		{
+			const string MERCH_ID = "MyMerchId";
 
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: typeof(LocksServiceMock).FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "UnknownCookie", new List<string> { "TINK" })),
-                                                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.Set2, 1, sessionCookie)),
-                merchantId: MERCH_ID,
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: new LocksServiceMock(), // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: typeof(LocksServiceMock).FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "UnknownCookie", new List<string> { "TINK" })),
+												isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.Set2, 1, sessionCookie)),
+				merchantId: MERCH_ID,
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: new LocksServiceMock(), // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
 
-            var viewService = MockRepository.GenerateStub<IViewService>();
+			var viewService = MockRepository.GenerateStub<IViewService>();
 
-            var settingsPageViewModel = new AccountPageViewModel(
-                tinkApp,
-                (uri) => { },
-                viewService);
+			var settingsPageViewModel = new AccountPageViewModel(
+				tinkApp,
+				(uri) => { },
+				viewService);
 
-            await settingsPageViewModel.OnAppearing();
+			await settingsPageViewModel.OnAppearing();
 
-            Assert.AreEqual("Logged in as a@b.", settingsPageViewModel.LoggedInInfo);
-            Assert.IsFalse(settingsPageViewModel.IsBookingStateInfoVisible, "A user is logged but no bikes requested/ booked.");
-            Assert.AreEqual(string.Empty, settingsPageViewModel.BookingStateInfo);
-        }
+			Assert.AreEqual("Logged in as a@b.", settingsPageViewModel.LoggedInInfo);
+			Assert.IsFalse(settingsPageViewModel.IsBookingStateInfoVisible, "A user is logged but no bikes requested/ booked.");
+			Assert.AreEqual(string.Empty, settingsPageViewModel.BookingStateInfo);
+		}
 
-        [Test]
-        public async Task TestConstruct_TwoBikes()
-        {
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: typeof(LocksServiceMock).FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "6103_112e96b36ba33de245943c5ffaf369cd_", new List<string> { "TINK" })),
-                                                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
-                merchantId: "MyMerchId",
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: new LocksServiceMock(), // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
+		[Test]
+		public async Task TestConstruct_TwoBikes()
+		{
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: typeof(LocksServiceMock).FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "6103_112e96b36ba33de245943c5ffaf369cd_", new List<string> { "TINK" })),
+												isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
+				merchantId: "MyMerchId",
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: new LocksServiceMock(), // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
 
-            var viewService = MockRepository.GenerateStub<IViewService>();
-            var settingsPageViewModel = new AccountPageViewModel(
-                tinkApp,
-                (uri) => { },
-                viewService);
+			var viewService = MockRepository.GenerateStub<IViewService>();
+			var settingsPageViewModel = new AccountPageViewModel(
+				tinkApp,
+				(uri) => { },
+				viewService);
 
-            await settingsPageViewModel.OnAppearing();
+			await settingsPageViewModel.OnAppearing();
 
-            Assert.AreEqual("Logged in as a@b.", settingsPageViewModel.LoggedInInfo);
-            Assert.IsTrue(settingsPageViewModel.IsBookingStateInfoVisible, "A user is logged but no bikes requested/ booked.");
-            Assert.AreEqual("Aktuell 2 Fahrräder reserviert/ gebucht.", settingsPageViewModel.BookingStateInfo);
-        }
+			Assert.AreEqual("Logged in as a@b.", settingsPageViewModel.LoggedInInfo);
+			Assert.IsTrue(settingsPageViewModel.IsBookingStateInfoVisible, "A user is logged but no bikes requested/ booked.");
+			Assert.AreEqual("Aktuell 2 Fahrräder reserviert/ gebucht.", settingsPageViewModel.BookingStateInfo);
+		}
 
-        [Test]
-        public async Task TestConstruct_TwoBikes_Offline()
-        {
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: typeof(LocksServiceMock).FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "6103_112e96b36ba33de245943c5ffaf369cd_", new List<string> { "TINK" })),
-                                                isConnectedFunc: () => false,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
-                merchantId: "MyMerchId",
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: new LocksServiceMock(), // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null, // Offline
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
+		[Test]
+		public async Task TestConstruct_TwoBikes_Offline()
+		{
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: typeof(LocksServiceMock).FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "6103_112e96b36ba33de245943c5ffaf369cd_", new List<string> { "TINK" })),
+												isConnectedFunc: () => false,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
+				merchantId: "MyMerchId",
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: new LocksServiceMock(), // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null, // Offline
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
 
-            var viewService = MockRepository.GenerateStub<IViewService>();
-            var settingsPageViewModel = new AccountPageViewModel(
-                tinkApp,
-                (uri) => { },
-                viewService);
+			var viewService = MockRepository.GenerateStub<IViewService>();
+			var settingsPageViewModel = new AccountPageViewModel(
+				tinkApp,
+				(uri) => { },
+				viewService);
 
-            await settingsPageViewModel.OnAppearing();
+			await settingsPageViewModel.OnAppearing();
 
-            Assert.AreEqual("Logged in as a@b.", settingsPageViewModel.LoggedInInfo);
-            Assert.IsTrue(settingsPageViewModel.IsBookingStateInfoVisible, "A user is logged but no bikes requested/ booked.");
-            Assert.AreEqual("Aktuell 2 Fahrräder reserviert/ gebucht. Verbindungsstatus: Offline.", settingsPageViewModel.BookingStateInfo);
-        }
+			Assert.AreEqual("Logged in as a@b.", settingsPageViewModel.LoggedInInfo);
+			Assert.IsTrue(settingsPageViewModel.IsBookingStateInfoVisible, "A user is logged but no bikes requested/ booked.");
+			Assert.AreEqual("Aktuell 2 Fahrräder reserviert/ gebucht. Verbindungsstatus: Offline.", settingsPageViewModel.BookingStateInfo);
+		}
 
-        [Test]
-        public async Task TestConstruct_TwoBikes_WebConnectCommunicationError()
-        {
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: typeof(LocksServiceMock).FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "6103_112e96b36ba33de245943c5ffaf369cd_", new List<string> { "TINK" })),
-                                                isConnectedFunc: () => false,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new TINK.Model.Connector.Connector(
-                    uri,
-                    new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                    null /*UI language */,
-                    sessionCookie,
-                    mail,
-                    server: new CopriProviderHttps(
-                        uri,
-                        TinkApp.MerchantId,
-                        new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                        null /*UI language */,
-                        sessionCookie: sessionCookie,
-                        cacheServer: new CopriCallsCacheMemory001(sessionCookie: sessionCookie),
-                        httpsServer: new ExceptionServer((msg) => new WebConnectFailureException(msg, new Exception("Source expection."))))),
-                merchantId: "MyMerchId",
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: new LocksServiceMock(), // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null, // Offline
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
+		[Test]
+		public async Task TestConstruct_TwoBikes_WebConnectCommunicationError()
+		{
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: typeof(LocksServiceMock).FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "6103_112e96b36ba33de245943c5ffaf369cd_", new List<string> { "TINK" })),
+												isConnectedFunc: () => false,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new TINK.Model.Connector.Connector(
+					uri,
+					new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+					null /*UI language */,
+					sessionCookie,
+					mail,
+					server: new CopriProviderHttps(
+						uri,
+						TinkApp.MerchantId,
+						new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+						null /*UI language */,
+						sessionCookie: sessionCookie,
+						cacheServer: new CopriCallsCacheMemory001(sessionCookie: sessionCookie),
+						httpsServer: new ExceptionServer((msg) => new WebConnectFailureException(msg, new Exception("Source expection."))))),
+				merchantId: "MyMerchId",
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: new LocksServiceMock(), // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null, // Offline
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
 
-            var viewService = MockRepository.GenerateStub<IViewService>();
-            var settingsPageViewModel = new AccountPageViewModel(
-                tinkApp,
-                (uri) => { },
-                viewService);
+			var viewService = MockRepository.GenerateStub<IViewService>();
+			var settingsPageViewModel = new AccountPageViewModel(
+				tinkApp,
+				(uri) => { },
+				viewService);
 
-            await settingsPageViewModel.OnAppearing();
+			await settingsPageViewModel.OnAppearing();
 
-            Assert.AreEqual("Logged in as a@b.", settingsPageViewModel.LoggedInInfo); // CopriCallsCacheMemory(SampleSets.Set2,
-            Assert.IsTrue(settingsPageViewModel.IsBookingStateInfoVisible, "A user is logged but no bikes requested/ booked.");
-            Assert.AreEqual("Aktuell 2 Fahrräder reserviert/ gebucht. Verbindungsstatus: Offline.", settingsPageViewModel.BookingStateInfo);
-        }
-    }
+			Assert.AreEqual("Logged in as a@b.", settingsPageViewModel.LoggedInInfo); // CopriCallsCacheMemory(SampleSets.Set2,
+			Assert.IsTrue(settingsPageViewModel.IsBookingStateInfoVisible, "A user is logged but no bikes requested/ booked.");
+			Assert.AreEqual("Aktuell 2 Fahrräder reserviert/ gebucht. Verbindungsstatus: Offline.", settingsPageViewModel.BookingStateInfo);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Bikes/Bike/BluetoothLock/TestRequestHandlerFactory.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/Bikes/Bike/BluetoothLock/TestRequestHandlerFactory.cs
index f182584..ba6ff37 100644
--- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Bikes/Bike/BluetoothLock/TestRequestHandlerFactory.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/Bikes/Bike/BluetoothLock/TestRequestHandlerFactory.cs
@@ -16,147 +16,147 @@ using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 {
-    /// <summary>
-    /// Moved to TestShareeLib (.Net Core)
-    /// </summary>
-    [TestFixture]
-    public class TestRequestHandlerFactory
-    {
-        [Test]
-        public void TestCreate()
-        {
-            // Verify handler for disposable bike.
-            var bike = new BikeInfoMutable(
-                new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", TINK.Model.Bikes.BikeInfoNS.BikeNS.LockModel.ILockIt), new Drive(), 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "12"),
-                "My Station Name");
-            Assert.AreEqual(InUseStateEnum.Disposable, bike.State.Value);
-            Assert.AreEqual(LockingState.UnknownDisconnected, bike.LockInfo.State);
-            Assert.AreEqual(
-                typeof(DisposableDisconnected),
-                RequestHandlerFactory.Create(
-                    bike,
-                    () => false, // isConnectedDelegate
-                    (connected) => null, // connectorFactory
-                    new GeolocationMock(), // geolocation
-                    new LocksServiceMock(), // LockService
-                    null, // viewUpdateManager
-                    NSubstitute.Substitute.For<ISmartDevice>(),
-                    null /* viewService */ ,
-                    MockRepository.GenerateStub<IBikesViewModel>(),
-                    MockRepository.GenerateStub<IUser>()).GetType());
+	/// <summary>
+	/// Moved to TestShareeLib (.Net Core)
+	/// </summary>
+	[TestFixture]
+	public class TestRequestHandlerFactory
+	{
+		[Test]
+		public void TestCreate()
+		{
+			// Verify handler for disposable bike.
+			var bike = new BikeInfoMutable(
+				new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", TINK.Model.Bikes.BikeInfoNS.BikeNS.LockModel.ILockIt), new Drive(), 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "12"),
+				"My Station Name");
+			Assert.AreEqual(InUseStateEnum.Disposable, bike.State.Value);
+			Assert.AreEqual(LockingState.UnknownDisconnected, bike.LockInfo.State);
+			Assert.AreEqual(
+				typeof(DisposableDisconnected),
+				RequestHandlerFactory.Create(
+					bike,
+					() => false, // isConnectedDelegate
+					(connected) => null, // connectorFactory
+					new GeolocationMock(), // geolocation
+					new LocksServiceMock(), // LockService
+					null, // viewUpdateManager
+					NSubstitute.Substitute.For<ISmartDevice>(),
+					null /* viewService */ ,
+					MockRepository.GenerateStub<IBikesViewModel>(),
+					MockRepository.GenerateStub<IUser>()).GetType());
 
-            // Verify handler for requested bike with state unknown.
-            bike = new BikeInfoMutable(
-                new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), 0 /* lock Id */, new Guid(), /*K User*/ null, /*K Admin*/ null, /*K Seed*/  null, new DateTime(2020, 1, 1), "a@b.com", "12", null, null, () => new DateTime(2020, 1, 1), false, new List<string>()),
-                "My Station Name");
-            Assert.AreEqual(
-                typeof(ReservedDisconnected),
-                RequestHandlerFactory.Create(
-                    bike,
-                    () => false, // isConnectedDelegate
-                    (connected) => null, // connectorFactory
-                    new GeolocationMock(), // geolocation
-                    new LocksServiceMock(), // LockService
-                    null, // viewUpdateManager
-                    NSubstitute.Substitute.For<ISmartDevice>(),
-                    null /* viewService */,
-                    MockRepository.GenerateStub<IBikesViewModel>(),
-                    MockRepository.GenerateStub<IUser>()).GetType());
+			// Verify handler for requested bike with state unknown.
+			bike = new BikeInfoMutable(
+				new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), 0 /* lock Id */, new Guid(), /*K User*/ null, /*K Admin*/ null, /*K Seed*/  null, new DateTime(2020, 1, 1), "a@b.com", "12", null, null, () => new DateTime(2020, 1, 1), false, new List<string>()),
+				"My Station Name");
+			Assert.AreEqual(
+				typeof(ReservedDisconnected),
+				RequestHandlerFactory.Create(
+					bike,
+					() => false, // isConnectedDelegate
+					(connected) => null, // connectorFactory
+					new GeolocationMock(), // geolocation
+					new LocksServiceMock(), // LockService
+					null, // viewUpdateManager
+					NSubstitute.Substitute.For<ISmartDevice>(),
+					null /* viewService */,
+					MockRepository.GenerateStub<IBikesViewModel>(),
+					MockRepository.GenerateStub<IUser>()).GetType());
 
-            // Verify handler for requested bike with state closed.
-            bike = new BikeInfoMutable(
-                new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), 0 /* lock Id*/, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b.com", "12", null, null, () => new DateTime(2020, 1, 1), false, new List<string>()),
-                "My Station Name");
-            bike.LockInfo.State = LockingState.Closed;
-            Assert.AreEqual(
-                typeof(ReservedClosed),
-                RequestHandlerFactory.Create(
-                    bike,
-                    () => false, // isConnectedDelegate
-                    (connected) => null, // connectorFactory
-                    new GeolocationMock(), // geolocation
-                    new LocksServiceMock(), // LockService
-                    null, // viewUpdateManager
-                    NSubstitute.Substitute.For<ISmartDevice>(),
-                    null /* viewService */,
-                    MockRepository.GenerateStub<IBikesViewModel>(),
-                    MockRepository.GenerateStub<IUser>()).GetType());
+			// Verify handler for requested bike with state closed.
+			bike = new BikeInfoMutable(
+				new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), 0 /* lock Id*/, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b.com", "12", null, null, () => new DateTime(2020, 1, 1), false, new List<string>()),
+				"My Station Name");
+			bike.LockInfo.State = LockingState.Closed;
+			Assert.AreEqual(
+				typeof(ReservedClosed),
+				RequestHandlerFactory.Create(
+					bike,
+					() => false, // isConnectedDelegate
+					(connected) => null, // connectorFactory
+					new GeolocationMock(), // geolocation
+					new LocksServiceMock(), // LockService
+					null, // viewUpdateManager
+					NSubstitute.Substitute.For<ISmartDevice>(),
+					null /* viewService */,
+					MockRepository.GenerateStub<IBikesViewModel>(),
+					MockRepository.GenerateStub<IUser>()).GetType());
 
-            // Verify handler for requested bike with state open.
-            bike = new BikeInfoMutable(
-                new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), 0 /* lock Id*/, new Guid(), null /* user key */, null, null, new DateTime(2020, 1, 1), "a@b.com", "12", null, null, () => new DateTime(2020, 1, 1), false, new List<string>()),
-                "My Station Name");
-            bike.LockInfo.State = LockingState.Open;
-            Assert.AreEqual(
-                typeof(ReservedOpen),
-                RequestHandlerFactory.Create(
-                    bike,
-                    () => false, // isConnectedDelegate
-                    (connected) => null, // connectorFactory
-                    new GeolocationMock(), // geolocation
-                    new LocksServiceMock(), // LockService
-                    null, // viewUpdateManager
-                    NSubstitute.Substitute.For<ISmartDevice>(),
-                    null /* viewService */,
-                    MockRepository.GenerateStub<IBikesViewModel>(),
-                    MockRepository.GenerateStub<IUser>()).GetType());
+			// Verify handler for requested bike with state open.
+			bike = new BikeInfoMutable(
+				new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), 0 /* lock Id*/, new Guid(), null /* user key */, null, null, new DateTime(2020, 1, 1), "a@b.com", "12", null, null, () => new DateTime(2020, 1, 1), false, new List<string>()),
+				"My Station Name");
+			bike.LockInfo.State = LockingState.Open;
+			Assert.AreEqual(
+				typeof(ReservedOpen),
+				RequestHandlerFactory.Create(
+					bike,
+					() => false, // isConnectedDelegate
+					(connected) => null, // connectorFactory
+					new GeolocationMock(), // geolocation
+					new LocksServiceMock(), // LockService
+					null, // viewUpdateManager
+					NSubstitute.Substitute.For<ISmartDevice>(),
+					null /* viewService */,
+					MockRepository.GenerateStub<IBikesViewModel>(),
+					MockRepository.GenerateStub<IUser>()).GetType());
 
-            // Verify handler for booked bike with state closed.
-            bike = new BikeInfoMutable(
-                new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), 0 /* lock Id*/, new Guid(), null, null, null, new System.DateTime(2020, 1, 1), "a@b.com", "12", null /*operator uri*/, null, false, new List<string>()),
-                "My Station Name");
-            bike.LockInfo.State = LockingState.Closed;
-            Assert.AreEqual(
-                typeof(BookedClosed),
-                RequestHandlerFactory.Create(
-                    bike,
-                    () => false, // isConnectedDelegate
-                    (connected) => null, // connectorFactory
-                    new GeolocationMock(), // geolocation
-                    new LocksServiceMock(), // LockService
-                    null, // viewUpdateManager
-                    NSubstitute.Substitute.For<ISmartDevice>(),
-                    null /* viewService */,
-                    MockRepository.GenerateStub<IBikesViewModel>(),
-                    MockRepository.GenerateStub<IUser>()).GetType());
+			// Verify handler for booked bike with state closed.
+			bike = new BikeInfoMutable(
+				new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), 0 /* lock Id*/, new Guid(), null, null, null, new System.DateTime(2020, 1, 1), "a@b.com", "12", null /*operator uri*/, null, false, new List<string>()),
+				"My Station Name");
+			bike.LockInfo.State = LockingState.Closed;
+			Assert.AreEqual(
+				typeof(BookedClosed),
+				RequestHandlerFactory.Create(
+					bike,
+					() => false, // isConnectedDelegate
+					(connected) => null, // connectorFactory
+					new GeolocationMock(), // geolocation
+					new LocksServiceMock(), // LockService
+					null, // viewUpdateManager
+					NSubstitute.Substitute.For<ISmartDevice>(),
+					null /* viewService */,
+					MockRepository.GenerateStub<IBikesViewModel>(),
+					MockRepository.GenerateStub<IUser>()).GetType());
 
-            // Verify handler for booked bike with state open.
-            bike = new BikeInfoMutable(
-                new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), 0 /* lock Id*/, new Guid(), null, null, null, new System.DateTime(2020, 1, 1), "a@b.com", "12", null /*operator uri*/, null, false, new List<string>()),
-                "My Station Name");
-            bike.LockInfo.State = LockingState.Open;
-            Assert.AreEqual(
-                typeof(BookedOpen),
-                RequestHandlerFactory.Create(
-                    bike,
-                    () => false, // isConnectedDelegate
-                    (connected) => null, // connectorFactory
-                    new GeolocationMock(), // geolocation
-                    new LocksServiceMock(), // LockService
-                    null, // viewUpdateManager
-                    NSubstitute.Substitute.For<ISmartDevice>(),
-                    null /* viewService */,
-                    MockRepository.GenerateStub<IBikesViewModel>(),
-                    MockRepository.GenerateStub<IUser>()).GetType());
+			// Verify handler for booked bike with state open.
+			bike = new BikeInfoMutable(
+				new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), 0 /* lock Id*/, new Guid(), null, null, null, new System.DateTime(2020, 1, 1), "a@b.com", "12", null /*operator uri*/, null, false, new List<string>()),
+				"My Station Name");
+			bike.LockInfo.State = LockingState.Open;
+			Assert.AreEqual(
+				typeof(BookedOpen),
+				RequestHandlerFactory.Create(
+					bike,
+					() => false, // isConnectedDelegate
+					(connected) => null, // connectorFactory
+					new GeolocationMock(), // geolocation
+					new LocksServiceMock(), // LockService
+					null, // viewUpdateManager
+					NSubstitute.Substitute.For<ISmartDevice>(),
+					null /* viewService */,
+					MockRepository.GenerateStub<IBikesViewModel>(),
+					MockRepository.GenerateStub<IUser>()).GetType());
 
-            // Verify handler for booked bike with state unknown.
-            bike = new BikeInfoMutable(
-                new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), 0 /* lock Id*/, new Guid(), null, null, null, new System.DateTime(2020, 1, 1), "a@b.com", "12", null /*operator uri*/, null, false, new List<string>()),
-                "My Station Name");
+			// Verify handler for booked bike with state unknown.
+			bike = new BikeInfoMutable(
+				new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), 0 /* lock Id*/, new Guid(), null, null, null, new System.DateTime(2020, 1, 1), "a@b.com", "12", null /*operator uri*/, null, false, new List<string>()),
+				"My Station Name");
 
-            Assert.AreEqual(
-                typeof(BookedDisconnected),
-                RequestHandlerFactory.Create(
-                    bike,
-                    () => false, // isConnectedDelegate
-                    (connected) => null, // connectorFactory
-                    new GeolocationMock(), // geolocation
-                    new LocksServiceMock(), // LockService
-                    null, // viewUpdateManager
-                    NSubstitute.Substitute.For<ISmartDevice>(),
-                    null /* viewService */,
-                    MockRepository.GenerateStub<IBikesViewModel>(),
-                    MockRepository.GenerateStub<IUser>()).GetType());
-        }
-    }
+			Assert.AreEqual(
+				typeof(BookedDisconnected),
+				RequestHandlerFactory.Create(
+					bike,
+					() => false, // isConnectedDelegate
+					(connected) => null, // connectorFactory
+					new GeolocationMock(), // geolocation
+					new LocksServiceMock(), // LockService
+					null, // viewUpdateManager
+					NSubstitute.Substitute.For<ISmartDevice>(),
+					null /* viewService */,
+					MockRepository.GenerateStub<IBikesViewModel>(),
+					MockRepository.GenerateStub<IUser>()).GetType());
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Info/TestInfoViewModel.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/Info/TestInfoViewModel.cs
index daed332..3edd6dc 100644
--- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Info/TestInfoViewModel.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/Info/TestInfoViewModel.cs
@@ -3,13 +3,13 @@ using TINK.ViewModel.Info;
 
 namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Info
 {
-    [TestFixture]
-    public class TestInfoViewModel
-    {
-        [Test]
-        public void TestOnAppearing()
-        {
-            var viewModel = new InfoPageViewModel("Hosti", "agbResourcePath", "privacyResourcePath", "impressResourcePath", false, "de", (url) => string.Empty);
-        }
-    }
+	[TestFixture]
+	public class TestInfoViewModel
+	{
+		[Test]
+		public void TestOnAppearing()
+		{
+			var viewModel = new InfoPageViewModel("Hosti", "agbResourcePath", "privacyResourcePath", "impressResourcePath", false, "de", (url) => string.Empty);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Map/TestMapPageFilter.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/Map/TestMapPageFilter.cs
index f1740d7..7364747 100644
--- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Map/TestMapPageFilter.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/Map/TestMapPageFilter.cs
@@ -5,157 +5,157 @@ using TINK.ViewModel.Map;
 namespace UITest.Fixtures.ObjectTests.ViewModel.Map
 {
 
-    [TestFixture]
-    public class TestMapPageViewModel
-    {
-        /// <summary>
-        /// Verifies that if Konrad is turned off in settings map page filter does no more contain Konrad option.
-        /// </summary>
-        [Test]
-        public void TestGetFilterDictinaryMapPage_NoKonrad_TinkOnKonradOff()
-        {
-            var l_oDict = GroupFilterMapPageHelper.CreateUpdated(
-                new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),  // Last map page filter (Konrad was still available but off)
-                new List<string> { "TINK" });                                                     // Filters from settings page.
+	[TestFixture]
+	public class TestMapPageViewModel
+	{
+		/// <summary>
+		/// Verifies that if Konrad is turned off in settings map page filter does no more contain Konrad option.
+		/// </summary>
+		[Test]
+		public void TestGetFilterDictinaryMapPage_NoKonrad_TinkOnKonradOff()
+		{
+			var l_oDict = GroupFilterMapPageHelper.CreateUpdated(
+				new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),  // Last map page filter (Konrad was still available but off)
+				new List<string> { "TINK" });                                                     // Filters from settings page.
 
-            Assert.AreEqual(1, l_oDict.Count);
-            Assert.IsTrue(l_oDict.ContainsKey("TINK"));
-            Assert.AreEqual(FilterState.On, l_oDict["TINK"]);
-        }
+			Assert.AreEqual(1, l_oDict.Count);
+			Assert.IsTrue(l_oDict.ContainsKey("TINK"));
+			Assert.AreEqual(FilterState.On, l_oDict["TINK"]);
+		}
 
-        /// <summary>
-        /// Verifies that if Konrad is turned off in settings map page filter does no more contain Konrad option.
-        /// </summary>
-        [Test]
-        public void TestGetFilterDictinaryMapPage_NoKonrad_TinkOffKonradOn()
-        {
-            var l_oDict = GroupFilterMapPageHelper.CreateUpdated(
-                new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.Off }, { "Konrad", FilterState.On } }),  // Last map page filter (Konrad was still available but off)
-            new List<string> { "TINK" });                                                         // Filters from settings page.
+		/// <summary>
+		/// Verifies that if Konrad is turned off in settings map page filter does no more contain Konrad option.
+		/// </summary>
+		[Test]
+		public void TestGetFilterDictinaryMapPage_NoKonrad_TinkOffKonradOn()
+		{
+			var l_oDict = GroupFilterMapPageHelper.CreateUpdated(
+				new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.Off }, { "Konrad", FilterState.On } }),  // Last map page filter (Konrad was still available but off)
+			new List<string> { "TINK" });                                                         // Filters from settings page.
 
-            Assert.AreEqual(1, l_oDict.Count);
-            Assert.IsTrue(l_oDict.ContainsKey("TINK"));
-            Assert.AreEqual(FilterState.On, l_oDict["TINK"]);
-        }
+			Assert.AreEqual(1, l_oDict.Count);
+			Assert.IsTrue(l_oDict.ContainsKey("TINK"));
+			Assert.AreEqual(FilterState.On, l_oDict["TINK"]);
+		}
 
-        /// <summary>
-        /// Verifies that if TINK.* is turned off in settings map page filter does no more contain TINK option.
-        /// </summary>
-        [Test]
-        public void TestGetFilterDictinaryMapPage_NoTink_TinkOnKonradOff()
-        {
-            var l_oDict = GroupFilterMapPageHelper.CreateUpdated(
-                new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),  // Last map page filter (Konrad was still available but off)
-            new List<string> { "Konrad" });                                                                         // Filters from settings page.
+		/// <summary>
+		/// Verifies that if TINK.* is turned off in settings map page filter does no more contain TINK option.
+		/// </summary>
+		[Test]
+		public void TestGetFilterDictinaryMapPage_NoTink_TinkOnKonradOff()
+		{
+			var l_oDict = GroupFilterMapPageHelper.CreateUpdated(
+				new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),  // Last map page filter (Konrad was still available but off)
+			new List<string> { "Konrad" });                                                                         // Filters from settings page.
 
-            Assert.AreEqual(1, l_oDict.Count);
-            Assert.IsTrue(l_oDict.ContainsKey("Konrad"));
-            Assert.AreEqual(FilterState.On, l_oDict["Konrad"]);
-        }
+			Assert.AreEqual(1, l_oDict.Count);
+			Assert.IsTrue(l_oDict.ContainsKey("Konrad"));
+			Assert.AreEqual(FilterState.On, l_oDict["Konrad"]);
+		}
 
-        /// <summary>
-        /// Verifies that if Konrad is turned on in settings map page filter is updated with entry Konrad.
-        /// </summary>
-        [Test]
-        public void TestGetFilterDictinaryMapPage_TinkOn()
-        {
-            var l_oDict = GroupFilterMapPageHelper.CreateUpdated(
-                new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On } }), // Last map page filter (Konrad was still available but off)
-                new List<string> { "TINK", "Konrad" });                       // Filters from settings page.
+		/// <summary>
+		/// Verifies that if Konrad is turned on in settings map page filter is updated with entry Konrad.
+		/// </summary>
+		[Test]
+		public void TestGetFilterDictinaryMapPage_TinkOn()
+		{
+			var l_oDict = GroupFilterMapPageHelper.CreateUpdated(
+				new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On } }), // Last map page filter (Konrad was still available but off)
+				new List<string> { "TINK", "Konrad" });                       // Filters from settings page.
 
-            Assert.AreEqual(2, l_oDict.Count);
-            Assert.IsTrue(l_oDict.ContainsKey("TINK"));
-            Assert.AreEqual(FilterState.Off, l_oDict["TINK"]);
-            Assert.IsTrue(l_oDict.ContainsKey("Konrad"));
-            Assert.AreEqual(FilterState.On, l_oDict["Konrad"]);
-        }
+			Assert.AreEqual(2, l_oDict.Count);
+			Assert.IsTrue(l_oDict.ContainsKey("TINK"));
+			Assert.AreEqual(FilterState.Off, l_oDict["TINK"]);
+			Assert.IsTrue(l_oDict.ContainsKey("Konrad"));
+			Assert.AreEqual(FilterState.On, l_oDict["Konrad"]);
+		}
 
-        /// <summary>
-        /// Verifies that if Konrad is turned on in settings map page filter is updated with entry Konrad.
-        /// </summary>
-        [Test]
-        public void TestGetFilterDictinaryMapPage_TinkOff()
-        {
-            var l_oDict = GroupFilterMapPageHelper.CreateUpdated(
-                new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.Off } }),    // Last map page filter (Konrad was still available but off)
-            new List<string> { "TINK", "Konrad" });                   // Filters from settings page.
+		/// <summary>
+		/// Verifies that if Konrad is turned on in settings map page filter is updated with entry Konrad.
+		/// </summary>
+		[Test]
+		public void TestGetFilterDictinaryMapPage_TinkOff()
+		{
+			var l_oDict = GroupFilterMapPageHelper.CreateUpdated(
+				new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.Off } }),    // Last map page filter (Konrad was still available but off)
+			new List<string> { "TINK", "Konrad" });                   // Filters from settings page.
 
-            Assert.AreEqual(2, l_oDict.Count);
-            Assert.IsTrue(l_oDict.ContainsKey("TINK"));
-            Assert.AreEqual(FilterState.Off, l_oDict["TINK"]);
-            Assert.IsTrue(l_oDict.ContainsKey("Konrad"));
-            Assert.AreEqual(FilterState.On, l_oDict["Konrad"]);
-        }
+			Assert.AreEqual(2, l_oDict.Count);
+			Assert.IsTrue(l_oDict.ContainsKey("TINK"));
+			Assert.AreEqual(FilterState.Off, l_oDict["TINK"]);
+			Assert.IsTrue(l_oDict.ContainsKey("Konrad"));
+			Assert.AreEqual(FilterState.On, l_oDict["Konrad"]);
+		}
 
-        /// <summary>
-        /// Verifies that map page filters are not touched if state is consitend.
-        /// </summary>
-        [Test]
-        public void TestGetFilterDictinaryMapPage_AllOn_KonradActivated()
-        {
-            var l_oDict = GroupFilterMapPageHelper.CreateUpdated(
-                new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.Off }, { "Konrad", FilterState.On } }),  // Last map page filter (Konrad was still available but off)
-                new List<string> { "TINK", "Konrad" });                                           // Filters from settings page.
+		/// <summary>
+		/// Verifies that map page filters are not touched if state is consitend.
+		/// </summary>
+		[Test]
+		public void TestGetFilterDictinaryMapPage_AllOn_KonradActivated()
+		{
+			var l_oDict = GroupFilterMapPageHelper.CreateUpdated(
+				new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.Off }, { "Konrad", FilterState.On } }),  // Last map page filter (Konrad was still available but off)
+				new List<string> { "TINK", "Konrad" });                                           // Filters from settings page.
 
-            Assert.AreEqual(2, l_oDict.Count);
-            Assert.IsTrue(l_oDict.ContainsKey("TINK"));
-            Assert.AreEqual(FilterState.Off, l_oDict["TINK"]);
-            Assert.IsTrue(l_oDict.ContainsKey("Konrad"));
-            Assert.AreEqual(FilterState.On, l_oDict["Konrad"]);
-        }
+			Assert.AreEqual(2, l_oDict.Count);
+			Assert.IsTrue(l_oDict.ContainsKey("TINK"));
+			Assert.AreEqual(FilterState.Off, l_oDict["TINK"]);
+			Assert.IsTrue(l_oDict.ContainsKey("Konrad"));
+			Assert.AreEqual(FilterState.On, l_oDict["Konrad"]);
+		}
 
-        /// <summary>
-        /// Verifies that map page filters are not touched if state is consitend..
-        /// </summary>
-        [Test]
-        public void TestGetFilterDictinaryMapPage_AllOn_TinkActivated()
-        {
-            var l_oDict = GroupFilterMapPageHelper.CreateUpdated(
-                new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),  // Last map page filter (Konrad was still available but off)
-            new List<string> { "TINK", "Konrad" });                                               // Filters from settings page.
+		/// <summary>
+		/// Verifies that map page filters are not touched if state is consitend..
+		/// </summary>
+		[Test]
+		public void TestGetFilterDictinaryMapPage_AllOn_TinkActivated()
+		{
+			var l_oDict = GroupFilterMapPageHelper.CreateUpdated(
+				new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),  // Last map page filter (Konrad was still available but off)
+			new List<string> { "TINK", "Konrad" });                                               // Filters from settings page.
 
-            Assert.AreEqual(2, l_oDict.Count);
-            Assert.IsTrue(l_oDict.ContainsKey("TINK"));
-            Assert.AreEqual(FilterState.On, l_oDict["TINK"]);
-            Assert.IsTrue(l_oDict.ContainsKey("Konrad"));
-            Assert.AreEqual(FilterState.Off, l_oDict["Konrad"]);
-        }
+			Assert.AreEqual(2, l_oDict.Count);
+			Assert.IsTrue(l_oDict.ContainsKey("TINK"));
+			Assert.AreEqual(FilterState.On, l_oDict["TINK"]);
+			Assert.IsTrue(l_oDict.ContainsKey("Konrad"));
+			Assert.AreEqual(FilterState.Off, l_oDict["Konrad"]);
+		}
 
-        /// <summary>
-        /// Verifies that map page filters are not touched if state is consitend.
-        /// </summary>
-        [Test]
-        public void TestGetFilterDictinaryMapPage_NullFilter()
-        {
-            var l_oDict = GroupFilterMapPageHelper.CreateUpdated(
-                new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),  // Last map page filter (Konrad was still available but off)
-                null);
+		/// <summary>
+		/// Verifies that map page filters are not touched if state is consitend.
+		/// </summary>
+		[Test]
+		public void TestGetFilterDictinaryMapPage_NullFilter()
+		{
+			var l_oDict = GroupFilterMapPageHelper.CreateUpdated(
+				new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),  // Last map page filter (Konrad was still available but off)
+				null);
 
-            Assert.AreEqual(2, l_oDict.Count, "Do not apply any filter if filter value null is detected.");
-            Assert.IsTrue(l_oDict.ContainsKey("TINK"));
-            Assert.AreEqual(FilterState.On, l_oDict["TINK"]);
-            Assert.IsTrue(l_oDict.ContainsKey("Konrad"));
-            Assert.AreEqual(FilterState.Off, l_oDict["Konrad"]);
+			Assert.AreEqual(2, l_oDict.Count, "Do not apply any filter if filter value null is detected.");
+			Assert.IsTrue(l_oDict.ContainsKey("TINK"));
+			Assert.AreEqual(FilterState.On, l_oDict["TINK"]);
+			Assert.IsTrue(l_oDict.ContainsKey("Konrad"));
+			Assert.AreEqual(FilterState.Off, l_oDict["Konrad"]);
 
-            l_oDict = GroupFilterMapPageHelper.CreateUpdated(
-                null,
-                null);
+			l_oDict = GroupFilterMapPageHelper.CreateUpdated(
+				null,
+				null);
 
-            Assert.IsNull(l_oDict, "Do not apply any filter if filter value null is detected.");
-        }
+			Assert.IsNull(l_oDict, "Do not apply any filter if filter value null is detected.");
+		}
 
-        [Test]
-        public void TestDoToggle()
-        {
-            var l_oFilter = new TinkKonradToggleViewModel(new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }));
+		[Test]
+		public void TestDoToggle()
+		{
+			var l_oFilter = new TinkKonradToggleViewModel(new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }));
 
-            l_oFilter = new TinkKonradToggleViewModel(l_oFilter.FilterDictionary).DoToggle();
+			l_oFilter = new TinkKonradToggleViewModel(l_oFilter.FilterDictionary).DoToggle();
 
-            Assert.AreEqual("Konrad", l_oFilter.CurrentFilter);
+			Assert.AreEqual("Konrad", l_oFilter.CurrentFilter);
 
-            l_oFilter = new TinkKonradToggleViewModel(l_oFilter.FilterDictionary).DoToggle();
+			l_oFilter = new TinkKonradToggleViewModel(l_oFilter.FilterDictionary).DoToggle();
 
-            Assert.AreEqual("TINK", l_oFilter.CurrentFilter);
-        }
-    }
+			Assert.AreEqual("TINK", l_oFilter.CurrentFilter);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Map/TestMapPageViewModel.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/Map/TestMapPageViewModel.cs
index 8907fd0..217a156 100644
--- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Map/TestMapPageViewModel.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/Map/TestMapPageViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -27,561 +27,561 @@ using Xamarin.Forms;
 namespace TestShareeLib.UseCases.Startup
 {
 
-    [TestFixture]
-    public class TestMapPageViewModel
-    {
-        [Test]
-        public async Task TestConstruct()
-        {
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: typeof(LocksServiceMock).FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(),
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
-                merchantId: "MyMerchId",
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: new LocksServiceMock(), // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var viewService = Substitute.For<IViewService>();
-            var navigationService = Substitute.For<INavigation>();
-            var locationPermission = Substitute.For<ILocationPermission>();
-
-            locationPermission.CheckStatusAsync().Returns(Status.Granted);
-
-            var viewModel = new MapPageViewModel(
-                tinkApp,
-                locationPermission,
-                Substitute.For<IBluetoothLE>(),
-                Substitute.For<IGeolocation>(),
-                (mapspan) => { },
-                viewService,
-                navigationService);
-
-            try
-            {
-                await viewModel.OnAppearing(); // Is called when page shows.
-
-                Assert.IsNull(viewModel.Exception);
-
-                // Verify pins on map
-                Assert.AreEqual(27, viewModel.Pins.Count); // Were 8 pins when loading from CopriCallsMemory(SampleSets.Set2, 1, sessionCookie)
-                Assert.That(
-                    viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green")).Tag,
-                    Is.EqualTo("FR101"),
-                    "Station FR105 must be marked green because there is are bike.");
-                Assert.That(
-                    viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red")).Tag,
-                    Is.EqualTo("KN12"),
-                    "Station KN12 must be marked red because there is no bike."); // Was station id 31
-
-                // Verify buttons
-                Assert.IsTrue(viewModel.IsToggleVisible, "TINK and Konrad are activated in settings.");
-                Assert.AreEqual(Color.Blue, viewModel.TinkColor, "TINK bikes are shown.");
-
-                Assert.AreEqual(Color.Gray, viewModel.KonradColor, "Konrad bikes are hidden.");
-
-                var statusInfoText = viewModel.StatusInfoText;
-                Assert.That(
-                    statusInfoText,
-                    Does.Contain("Updating...").Or.Contain(""),
-                    $"Unexpected text {statusInfoText} detected.",
-                    "Text might be \"Updating...\" or empty depending on acivity of update thread.");
-            }
-            finally
-            {
-                await viewModel.OnDisappearing();
-            }
-        }
-
-        [Test]
-        public async Task TestConstruct_KonradActive()
-        {
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: typeof(LocksServiceMock).FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(),
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
-                merchantId: "MyMerchId",
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: new LocksServiceMock(), // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var viewService = Substitute.For<IViewService>();
-            var navigationService = Substitute.For<INavigation>();
-            var locationPermission = Substitute.For<ILocationPermission>();
-
-            locationPermission.CheckStatusAsync().Returns(Status.Granted);
-
-            var viewModel = new MapPageViewModel(
-                tinkApp,
-                locationPermission,
-                NSubstitute.Substitute.For<Plugin.BLE.Abstractions.Contracts.IBluetoothLE>(),
-                NSubstitute.Substitute.For<IGeolocation>(),
-                (mapspan) => { },
-                viewService,
-                navigationService);
-
-            try
-            {
-                await viewModel.OnAppearing(); // Is called when page shows.
-
-                Assert.IsNull(viewModel.Exception);
-
-                // Verify pins on map
-                Assert.AreEqual(21, viewModel.Pins.Count); // Were 2 pins when loading from CopriCallsMemory(SampleSets.Set2, 1, sessionCookie)
-                Assert.That(
-                    viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green")).Tag, // Was station 5
-                    Is.EqualTo("FR103"),
-                    "Station FR101 must be marked green because there is are bike.");
-                Assert.That(
-                    viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red")).Tag, // Was station 14
-                    Is.EqualTo("KN12"),
-                    "Station KN12 must be marked red because there is no bike.");
-
-                // Verify buttons
-                Assert.IsTrue(viewModel.IsToggleVisible, "TINK and Konrad are activated in settings.");
-                Assert.AreEqual(Color.Gray, viewModel.TinkColor, "TINK bikes are hidden.");
-
-                Assert.AreEqual(Color.Red, viewModel.KonradColor, "Konrad bikes are shown.");
-
-                Assert.IsTrue(
-                    new[] { "Updating...", "" }.Contains(viewModel.StatusInfoText),
-                    "Text might be \"Updating...\" or empty depending on acivity of update thread.");
-            }
-            finally
-            {
-                await viewModel.OnDisappearing();
-            }
-        }
-
-        [Test]
-        public async Task TestConstruct_KonradOnly()
-        {
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: typeof(LocksServiceMock).FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(),
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
-                merchantId: "MyMerchId",
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: new LocksServiceMock(), // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to 
-
-            var viewService = Substitute.For<IViewService>();
-            var navigationService = Substitute.For<INavigation>();
-            var locationPermission = Substitute.For<ILocationPermission>();
-
-            locationPermission.CheckStatusAsync().Returns(Status.Granted);
-
-            var viewModel = new MapPageViewModel(
-                tinkApp,
-                locationPermission,
-                Substitute.For<Plugin.BLE.Abstractions.Contracts.IBluetoothLE>(),
-                Substitute.For<IGeolocation>(),
-                (mapspan) => { },
-                viewService,
-                navigationService);
-
-            try
-            {
-                await viewModel.OnAppearing(); // Is called when page shows.
-
-                Assert.IsNull(viewModel.Exception);
-
-                // Verify pins on map
-                Assert.AreEqual(21, viewModel.Pins.Count); // Were 2 when loading from CopriCallsMemory(SampleSets.Set2, 1, sessionCookie)
-                Assert.That(
-                    viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green")).Tag, // Was station id 31
-                    Is.EqualTo("FR103"),
-                    "Station FR101 must be marked green because there is are bike.");
-                Assert.That(
-                    viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red")).Tag, // Was 14
-                    Is.EqualTo("KN12"),
-                    "Station KN12 must be marked red because there is no bike.");
-
-                // Verify buttons
-                Assert.IsFalse(viewModel.IsToggleVisible, "TINK and Konrad is deactivated from settings.");
-
-                Assert.IsTrue(
-                    new[] { "Updating...", "" }.Contains(viewModel.StatusInfoText),
-                    "Text might be \"Updating...\" or empty depending on acivity of update thread.");
-            }
-            finally
-            {
-                await viewModel.OnDisappearing();
-            }
-        }
-
-        [Test]
-        public async Task TestConstruct_TinkOnly()
-        {
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: typeof(LocksServiceMock).FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(),
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
-                merchantId: "MyMerchId",
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: new LocksServiceMock(), // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173));
-
-            var viewService = Substitute.For<IViewService>();
-            var navigationService = Substitute.For<INavigation>();
-            var locationPermission = Substitute.For<ILocationPermission>();
-
-            locationPermission.CheckStatusAsync().Returns(Status.Granted);
-
-            var viewModel = new MapPageViewModel(
-                tinkApp,
-                locationPermission,
-                Substitute.For<Plugin.BLE.Abstractions.Contracts.IBluetoothLE>(),
-                Substitute.For<IGeolocation>(),
-                (mapspan) => { },
-                viewService,
-                navigationService);
-
-            try
-            {
-                await viewModel.OnAppearing(); // Is called when page shows.
-
-                Assert.IsNull(viewModel.Exception);
-
-                // Verify pins on map
-                Assert.AreEqual(27, viewModel.Pins.Count); // Were 8 pin when loading from CopriCallsMemory(SampleSets.Set2, 1, sessionCookie)
-                Assert.That(
-                    viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green")).Tag,
-                    Is.EqualTo("FR101"), // Was station id 4
-                    "Station FR101 must be marked green because there is are bike.");
-                Assert.That(
-                    viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red")).Tag, // Was 31
-                    Is.EqualTo("KN12"), // Was station id 31
-                    "Station KN12 must be marked red because there is no bike.");
-
-                // Verify buttons
-                Assert.IsFalse(viewModel.IsToggleVisible, "TINK and Konrad is deactivated from settings.");
-
-                Assert.IsTrue(
-                    new[] { "Updating...", "" }.Contains(viewModel.StatusInfoText),
-                    "Text might be \"Updating...\" or empty depending on acivity of update thread.");
-            }
-            finally
-            {
-                await viewModel.OnDisappearing();
-            }
-        }
-
-        [Test]
-        public async Task TestConstruct_Offline()
-        {
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: typeof(LocksServiceMock).FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(),
-                isConnectedFunc: () => false,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
-                merchantId: "MyMerchId",
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: new LocksServiceMock(), // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to 
-
-            var viewService = Substitute.For<IViewService>();
-            var navigationService = Substitute.For<INavigation>();
-            var locationPermission = Substitute.For<ILocationPermission>();
-
-            locationPermission.CheckStatusAsync().Returns(Status.Granted);
-
-            var viewModel = new MapPageViewModel(
-                tinkApp,
-                locationPermission,
-                Substitute.For<Plugin.BLE.Abstractions.Contracts.IBluetoothLE>(),
-                Substitute.For<IGeolocation>(),
-                (mapspan) => { },
-                viewService,
-                navigationService);
-
-            try
-            {
-                await viewModel.OnAppearing(); // Is called when page shows.
-
-                Assert.IsNull(viewModel.Exception);
-
-                // Verify pins on map
-                Assert.AreEqual(27, viewModel.Pins.Count); // Were 8 pins when loading from CopriCallsMemory(SampleSets.Set2, 1, sessionCookie)
-                Assert.That(
-                    viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green")).Tag, // Was station id 4
-                    Is.EqualTo("FR101"),
-                    "Station FR101 must be marked green because there is are bike.");
-                Assert.That(
-                    viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red")).Tag, // Was 31
-                    Is.EqualTo("KN12"),
-                    "Station KN12 must be marked red because there is no bike.");
-
-                // Verify buttons
-                Assert.IsTrue(viewModel.IsToggleVisible, "TINK and Konrad are activated in settings.");
-                Assert.AreEqual(Color.Blue, viewModel.TinkColor, "TINK bikes are hidden.");
-
-                Assert.AreEqual(Color.Gray, viewModel.KonradColor, "Konrad bikes are shown.");
-
-
-                Assert.AreEqual("Offline.", viewModel.StatusInfoText);
-            }
-            finally
-            {
-                await viewModel.OnDisappearing();
-            }
-        }
-
-        [Test]
-        public async Task TestConstruct_WebConnectCommunicationError()
-        {
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    true /* IsReportLevelVerbose */,
-                    activeLockService: typeof(LocksServiceMock).FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(),
-                isConnectedFunc: () => false,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new Connector(
-                    uri,
-                    new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                    null /*UI language */,
-                    sessionCookie,
-                    mail,
-                    server: new CopriProviderHttps(
-                        uri,
-                        TinkApp.MerchantId,
-                        new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                        null /*UI language */,
-                        sessionCookie: sessionCookie,
-                        cacheServer: new CopriCallsCacheMemory001(sessionCookie: sessionCookie),
-                        httpsServer: new ExceptionServer((msg) => new WebConnectFailureException(msg, new Exception("Source expection."))))),
-                merchantId: "MyMerchId",
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: new LocksServiceMock(), // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to 
-
-            var viewService = Substitute.For<IViewService>();
-            var navigationService = Substitute.For<INavigation>();
-            var locationPermission = Substitute.For<ILocationPermission>();
-
-            locationPermission.CheckStatusAsync().Returns(Status.Granted);
-
-            var viewModel = new MapPageViewModel(
-                tinkApp,
-                locationPermission,
-                Substitute.For<Plugin.BLE.Abstractions.Contracts.IBluetoothLE>(),
-                Substitute.For<IGeolocation>(),
-                (mapspan) => { },
-                viewService,
-                navigationService);
-
-            try
-            {
-                await viewModel.OnAppearing(); // Is called when page shows.
-
-                Assert.AreEqual(
-                    "Simulated error thrown at GetStationsAsync.",
-                    viewModel.Exception.Message);
-
-                // Verify pins on map
-                Assert.AreEqual(27, viewModel.Pins.Count);
-                Assert.That(
-                    viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green")).Tag, // Was station id 4
-                    Is.EqualTo("FR101"),
-                    "Station FR101 must be marked green because there is are bike.");
-                Assert.That(
-                    viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red")).Tag, // Was 31
-                    Is.EqualTo("KN12"),
-                    "Station KN12 must be marked red because there is no bike.");
-
-                // Verify buttons
-                Assert.IsTrue(viewModel.IsToggleVisible, "TINK and Konrad are activated in settings.");
-                Assert.AreEqual(Color.Blue, viewModel.TinkColor, "TINK bikes are hidden.");
-
-                Assert.AreEqual(Color.Gray, viewModel.KonradColor, "Konrad bikes are shown.");
-
-                Assert.AreEqual("Connection interrupted, server unreachable.", viewModel.StatusInfoText);
-            }
-            finally
-            {
-                await viewModel.OnDisappearing();
-            }
-        }
-
-        [Test]
-        public async Task TestConstruct_GeneralPurposeCommunicationError()
-        {
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
-                    new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    true /* IsReportLevelVerbose */,
-                    activeLockService: typeof(LocksServiceMock).FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(),
-                isConnectedFunc: () => false,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new Connector(
-                    uri,
-                    new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                    null /*UI language */,
-                    sessionCookie,
-                    mail,
-                    server: new CopriProviderHttps(
-                        uri,
-                        TinkApp.MerchantId,
-                        new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                        null /*UI language */,
-                        sessionCookie: sessionCookie,
-                        cacheServer: new CopriCallsCacheMemory001(sessionCookie: sessionCookie),
-                        httpsServer: new ExceptionServer((msg) => new Exception(msg)))),
-                merchantId: "MyMerchId",
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: new LocksServiceMock(), // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to 
-
-
-            var viewService = Substitute.For<IViewService>();
-            var navigationService = Substitute.For<INavigation>();
-            var locationPermission = Substitute.For<ILocationPermission>();
-
-            locationPermission.CheckStatusAsync().Returns(Status.Granted);
-
-            var viewModel = new MapPageViewModel(
-                tinkApp,
-                locationPermission,
-                Substitute.For<Plugin.BLE.Abstractions.Contracts.IBluetoothLE>(),
-                Substitute.For<IGeolocation>(),
-                (mapspan) => { },
-                viewService,
-                navigationService);
-
-            try
-            {
-                await viewModel.OnAppearing(); // Is called when page shows.
-
-                Assert.AreEqual(
-                    "Simulated error thrown at GetStationsAsync.",
-                    viewModel.Exception.Message);
-
-                // Verify pins on map
-                Assert.AreEqual(27, viewModel.Pins.Count);
-                Assert.That(
-                    viewModel.Pins.Where(pin => pin.Icon.Id.Contains("Open_Green")).Select(pin => pin.Tag.ToString()),
-                    Does.Contain("FR101"), // Was station id 4
-                    "Station FR103 must be marked green because there is are bike.");
-                Assert.That(
-                    viewModel.Pins.Where(pin => pin.Icon.Id.Contains("Open_Red")).Select(pin => pin.Tag.ToString()),
-                    Does.Contain("KN12"), // Was station id 31
-                    "Station 31 must be marked red because there is no bike.");
-
-                // Verify buttons
-                Assert.IsTrue(viewModel.IsToggleVisible, "TINK and Konrad are activated in settings.");
-                Assert.AreEqual(Color.Blue, viewModel.TinkColor, "TINK bikes are hidden.");
-
-                Assert.AreEqual(Color.Gray, viewModel.KonradColor, "Konrad bikes are shown.");
-
-                Assert.AreEqual("Connection interrupted.", viewModel.StatusInfoText);
-            }
-            finally
-            {
-                await viewModel.OnDisappearing();
-            }
-        }
-    }
+	[TestFixture]
+	public class TestMapPageViewModel
+	{
+		[Test]
+		public async Task TestConstruct()
+		{
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: typeof(LocksServiceMock).FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(),
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
+				merchantId: "MyMerchId",
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: new LocksServiceMock(), // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var viewService = Substitute.For<IViewService>();
+			var navigationService = Substitute.For<INavigation>();
+			var locationPermission = Substitute.For<ILocationPermission>();
+
+			locationPermission.CheckStatusAsync().Returns(Status.Granted);
+
+			var viewModel = new MapPageViewModel(
+				tinkApp,
+				locationPermission,
+				Substitute.For<IBluetoothLE>(),
+				Substitute.For<IGeolocation>(),
+				(mapspan) => { },
+				viewService,
+				navigationService);
+
+			try
+			{
+				await viewModel.OnAppearing(); // Is called when page shows.
+
+				Assert.IsNull(viewModel.Exception);
+
+				// Verify pins on map
+				Assert.AreEqual(27, viewModel.Pins.Count); // Were 8 pins when loading from CopriCallsMemory(SampleSets.Set2, 1, sessionCookie)
+				Assert.That(
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green")).Tag,
+					Is.EqualTo("FR101"),
+					"Station FR105 must be marked green because there is are bike.");
+				Assert.That(
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red")).Tag,
+					Is.EqualTo("KN12"),
+					"Station KN12 must be marked red because there is no bike."); // Was station id 31
+
+				// Verify buttons
+				Assert.IsTrue(viewModel.IsToggleVisible, "TINK and Konrad are activated in settings.");
+				Assert.AreEqual(Color.White, viewModel.TinkColor, "TINK bikes are shown.");
+
+				Assert.AreEqual(Color.FromRgba(0, 0, 0, 0), viewModel.KonradColor, "Konrad bikes are hidden.");
+
+				var statusInfoText = viewModel.StatusInfoText;
+				Assert.That(
+					statusInfoText,
+					Does.Contain("Updating...").Or.Contain(""),
+					$"Unexpected text {statusInfoText} detected.",
+					"Text might be \"Updating...\" or empty depending on acivity of update thread.");
+			}
+			finally
+			{
+				await viewModel.OnDisappearing();
+			}
+		}
+
+		[Test]
+		public async Task TestConstruct_KonradActive()
+		{
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: typeof(LocksServiceMock).FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(),
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
+				merchantId: "MyMerchId",
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: new LocksServiceMock(), // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var viewService = Substitute.For<IViewService>();
+			var navigationService = Substitute.For<INavigation>();
+			var locationPermission = Substitute.For<ILocationPermission>();
+
+			locationPermission.CheckStatusAsync().Returns(Status.Granted);
+
+			var viewModel = new MapPageViewModel(
+				tinkApp,
+				locationPermission,
+				NSubstitute.Substitute.For<Plugin.BLE.Abstractions.Contracts.IBluetoothLE>(),
+				NSubstitute.Substitute.For<IGeolocation>(),
+				(mapspan) => { },
+				viewService,
+				navigationService);
+
+			try
+			{
+				await viewModel.OnAppearing(); // Is called when page shows.
+
+				Assert.IsNull(viewModel.Exception);
+
+				// Verify pins on map
+				Assert.AreEqual(21, viewModel.Pins.Count); // Were 2 pins when loading from CopriCallsMemory(SampleSets.Set2, 1, sessionCookie)
+				Assert.That(
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green")).Tag, // Was station 5
+					Is.EqualTo("FR103"),
+					"Station FR101 must be marked green because there is are bike.");
+				Assert.That(
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red")).Tag, // Was station 14
+					Is.EqualTo("KN12"),
+					"Station KN12 must be marked red because there is no bike.");
+
+				// Verify buttons
+				Assert.IsTrue(viewModel.IsToggleVisible, "TINK and Konrad are activated in settings.");
+				Assert.AreEqual(Color.FromRgba(0, 0, 0, 0), viewModel.TinkColor, "TINK bikes are hidden.");
+
+				Assert.AreEqual(Color.White, viewModel.KonradColor, "Konrad bikes are shown.");
+
+				Assert.IsTrue(
+					new[] { "Updating...", "" }.Contains(viewModel.StatusInfoText),
+					"Text might be \"Updating...\" or empty depending on acivity of update thread.");
+			}
+			finally
+			{
+				await viewModel.OnDisappearing();
+			}
+		}
+
+		[Test]
+		public async Task TestConstruct_KonradOnly()
+		{
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CITYBIKE, FilterState.On } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: typeof(LocksServiceMock).FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(),
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
+				merchantId: "MyMerchId",
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: new LocksServiceMock(), // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to 
+
+			var viewService = Substitute.For<IViewService>();
+			var navigationService = Substitute.For<INavigation>();
+			var locationPermission = Substitute.For<ILocationPermission>();
+
+			locationPermission.CheckStatusAsync().Returns(Status.Granted);
+
+			var viewModel = new MapPageViewModel(
+				tinkApp,
+				locationPermission,
+				Substitute.For<Plugin.BLE.Abstractions.Contracts.IBluetoothLE>(),
+				Substitute.For<IGeolocation>(),
+				(mapspan) => { },
+				viewService,
+				navigationService);
+
+			try
+			{
+				await viewModel.OnAppearing(); // Is called when page shows.
+
+				Assert.IsNull(viewModel.Exception);
+
+				// Verify pins on map
+				Assert.AreEqual(21, viewModel.Pins.Count); // Were 2 when loading from CopriCallsMemory(SampleSets.Set2, 1, sessionCookie)
+				Assert.That(
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green")).Tag, // Was station id 31
+					Is.EqualTo("FR103"),
+					"Station FR101 must be marked green because there is are bike.");
+				Assert.That(
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red")).Tag, // Was 14
+					Is.EqualTo("KN12"),
+					"Station KN12 must be marked red because there is no bike.");
+
+				// Verify buttons
+				Assert.IsFalse(viewModel.IsToggleVisible, "TINK and Konrad is deactivated from settings.");
+
+				Assert.IsTrue(
+					new[] { "Updating...", "" }.Contains(viewModel.StatusInfoText),
+					"Text might be \"Updating...\" or empty depending on acivity of update thread.");
+			}
+			finally
+			{
+				await viewModel.OnDisappearing();
+			}
+		}
+
+		[Test]
+		public async Task TestConstruct_TinkOnly()
+		{
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: typeof(LocksServiceMock).FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(),
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
+				merchantId: "MyMerchId",
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: new LocksServiceMock(), // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173));
+
+			var viewService = Substitute.For<IViewService>();
+			var navigationService = Substitute.For<INavigation>();
+			var locationPermission = Substitute.For<ILocationPermission>();
+
+			locationPermission.CheckStatusAsync().Returns(Status.Granted);
+
+			var viewModel = new MapPageViewModel(
+				tinkApp,
+				locationPermission,
+				Substitute.For<Plugin.BLE.Abstractions.Contracts.IBluetoothLE>(),
+				Substitute.For<IGeolocation>(),
+				(mapspan) => { },
+				viewService,
+				navigationService);
+
+			try
+			{
+				await viewModel.OnAppearing(); // Is called when page shows.
+
+				Assert.IsNull(viewModel.Exception);
+
+				// Verify pins on map
+				Assert.AreEqual(27, viewModel.Pins.Count); // Were 8 pin when loading from CopriCallsMemory(SampleSets.Set2, 1, sessionCookie)
+				Assert.That(
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green")).Tag,
+					Is.EqualTo("FR101"), // Was station id 4
+					"Station FR101 must be marked green because there is are bike.");
+				Assert.That(
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red")).Tag, // Was 31
+					Is.EqualTo("KN12"), // Was station id 31
+					"Station KN12 must be marked red because there is no bike.");
+
+				// Verify buttons
+				Assert.IsFalse(viewModel.IsToggleVisible, "TINK and Konrad is deactivated from settings.");
+
+				Assert.IsTrue(
+					new[] { "Updating...", "" }.Contains(viewModel.StatusInfoText),
+					"Text might be \"Updating...\" or empty depending on acivity of update thread.");
+			}
+			finally
+			{
+				await viewModel.OnDisappearing();
+			}
+		}
+
+		[Test]
+		public async Task TestConstruct_Offline()
+		{
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: typeof(LocksServiceMock).FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(),
+				isConnectedFunc: () => false,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
+				merchantId: "MyMerchId",
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: new LocksServiceMock(), // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to 
+
+			var viewService = Substitute.For<IViewService>();
+			var navigationService = Substitute.For<INavigation>();
+			var locationPermission = Substitute.For<ILocationPermission>();
+
+			locationPermission.CheckStatusAsync().Returns(Status.Granted);
+
+			var viewModel = new MapPageViewModel(
+				tinkApp,
+				locationPermission,
+				Substitute.For<Plugin.BLE.Abstractions.Contracts.IBluetoothLE>(),
+				Substitute.For<IGeolocation>(),
+				(mapspan) => { },
+				viewService,
+				navigationService);
+
+			try
+			{
+				await viewModel.OnAppearing(); // Is called when page shows.
+
+				Assert.IsNull(viewModel.Exception);
+
+				// Verify pins on map
+				Assert.AreEqual(27, viewModel.Pins.Count); // Were 8 pins when loading from CopriCallsMemory(SampleSets.Set2, 1, sessionCookie)
+				Assert.That(
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green")).Tag, // Was station id 4
+					Is.EqualTo("FR101"),
+					"Station FR101 must be marked green because there is are bike.");
+				Assert.That(
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red")).Tag, // Was 31
+					Is.EqualTo("KN12"),
+					"Station KN12 must be marked red because there is no bike.");
+
+				// Verify buttons
+				Assert.IsTrue(viewModel.IsToggleVisible, "TINK and Konrad are activated in settings.");
+				Assert.AreEqual(Color.White, viewModel.TinkColor, "TINK bikes are hidden.");
+
+				Assert.AreEqual(Color.FromRgba(0, 0, 0, 0), viewModel.KonradColor, "Konrad bikes are shown.");
+
+
+				Assert.AreEqual("Offline.", viewModel.StatusInfoText);
+			}
+			finally
+			{
+				await viewModel.OnDisappearing();
+			}
+		}
+
+		[Test]
+		public async Task TestConstruct_WebConnectCommunicationError()
+		{
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					true /* IsReportLevelVerbose */,
+					activeLockService: typeof(LocksServiceMock).FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(),
+				isConnectedFunc: () => false,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new Connector(
+					uri,
+					new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+					null /*UI language */,
+					sessionCookie,
+					mail,
+					server: new CopriProviderHttps(
+						uri,
+						TinkApp.MerchantId,
+						new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+						null /*UI language */,
+						sessionCookie: sessionCookie,
+						cacheServer: new CopriCallsCacheMemory001(sessionCookie: sessionCookie),
+						httpsServer: new ExceptionServer((msg) => new WebConnectFailureException(msg, new Exception("Source expection."))))),
+				merchantId: "MyMerchId",
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: new LocksServiceMock(), // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to 
+
+			var viewService = Substitute.For<IViewService>();
+			var navigationService = Substitute.For<INavigation>();
+			var locationPermission = Substitute.For<ILocationPermission>();
+
+			locationPermission.CheckStatusAsync().Returns(Status.Granted);
+
+			var viewModel = new MapPageViewModel(
+				tinkApp,
+				locationPermission,
+				Substitute.For<Plugin.BLE.Abstractions.Contracts.IBluetoothLE>(),
+				Substitute.For<IGeolocation>(),
+				(mapspan) => { },
+				viewService,
+				navigationService);
+
+			try
+			{
+				await viewModel.OnAppearing(); // Is called when page shows.
+
+				Assert.AreEqual(
+					"Simulated error thrown at GetStationsAsync.",
+					viewModel.Exception.Message);
+
+				// Verify pins on map
+				Assert.AreEqual(27, viewModel.Pins.Count);
+				Assert.That(
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green")).Tag, // Was station id 4
+					Is.EqualTo("FR101"),
+					"Station FR101 must be marked green because there is are bike.");
+				Assert.That(
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red")).Tag, // Was 31
+					Is.EqualTo("KN12"),
+					"Station KN12 must be marked red because there is no bike.");
+
+				// Verify buttons
+				Assert.IsTrue(viewModel.IsToggleVisible, "TINK and Konrad are activated in settings.");
+				Assert.AreEqual(Color.White, viewModel.TinkColor, "TINK bikes are hidden.");
+
+				Assert.AreEqual(Color.FromRgba(0, 0, 0, 0), viewModel.KonradColor, "Konrad bikes are shown.");
+
+				Assert.AreEqual("Connection interrupted, server unreachable.", viewModel.StatusInfoText);
+			}
+			finally
+			{
+				await viewModel.OnDisappearing();
+			}
+		}
+
+		[Test]
+		public async Task TestConstruct_GeneralPurposeCommunicationError()
+		{
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					true /* IsReportLevelVerbose */,
+					activeLockService: typeof(LocksServiceMock).FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(),
+				isConnectedFunc: () => false,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new Connector(
+					uri,
+					new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+					null /*UI language */,
+					sessionCookie,
+					mail,
+					server: new CopriProviderHttps(
+						uri,
+						TinkApp.MerchantId,
+						new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+						null /*UI language */,
+						sessionCookie: sessionCookie,
+						cacheServer: new CopriCallsCacheMemory001(sessionCookie: sessionCookie),
+						httpsServer: new ExceptionServer((msg) => new Exception(msg)))),
+				merchantId: "MyMerchId",
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: new LocksServiceMock(), // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to 
+
+
+			var viewService = Substitute.For<IViewService>();
+			var navigationService = Substitute.For<INavigation>();
+			var locationPermission = Substitute.For<ILocationPermission>();
+
+			locationPermission.CheckStatusAsync().Returns(Status.Granted);
+
+			var viewModel = new MapPageViewModel(
+				tinkApp,
+				locationPermission,
+				Substitute.For<Plugin.BLE.Abstractions.Contracts.IBluetoothLE>(),
+				Substitute.For<IGeolocation>(),
+				(mapspan) => { },
+				viewService,
+				navigationService);
+
+			try
+			{
+				await viewModel.OnAppearing(); // Is called when page shows.
+
+				Assert.AreEqual(
+					"Simulated error thrown at GetStationsAsync.",
+					viewModel.Exception.Message);
+
+				// Verify pins on map
+				Assert.AreEqual(27, viewModel.Pins.Count);
+				Assert.That(
+					viewModel.Pins.Where(pin => pin.Icon.Id.Contains("Open_Green")).Select(pin => pin.Tag.ToString()),
+					Does.Contain("FR101"), // Was station id 4
+					"Station FR103 must be marked green because there is are bike.");
+				Assert.That(
+					viewModel.Pins.Where(pin => pin.Icon.Id.Contains("Open_Red")).Select(pin => pin.Tag.ToString()),
+					Does.Contain("KN12"), // Was station id 31
+					"Station 31 must be marked red because there is no bike.");
+
+				// Verify buttons
+				Assert.IsTrue(viewModel.IsToggleVisible, "TINK and Konrad are activated in settings.");
+				Assert.AreEqual(Color.White, viewModel.TinkColor, "TINK bikes are hidden.");
+
+				Assert.AreEqual(Color.FromRgba(0, 0, 0, 0), viewModel.KonradColor, "Konrad bikes are shown.");
+
+				Assert.AreEqual("Connection interrupted.", viewModel.StatusInfoText);
+			}
+			finally
+			{
+				await viewModel.OnDisappearing();
+			}
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Settings/TestFilterCollectionMutable.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/Settings/TestFilterCollectionMutable.cs
index b38e0d0..fef563e 100644
--- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Settings/TestFilterCollectionMutable.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/Settings/TestFilterCollectionMutable.cs
@@ -7,104 +7,104 @@ using TINK.ViewModel.Settings;
 namespace UITest.Fixtures.ObjectTests.ViewModel.Settings
 {
 
-    [TestFixture]
-    public class TestFilterCollectionMutable
-    {
-        [Test]
-        public void TestConstruct_NoConradAccount()
-        {
-            var l_oColl = new SettingsBikeFilterViewModel(
-                new GroupFilterSettings(new Dictionary<string, FilterState> {
-                     {"TINK",  FilterState.On },
-                     {"Konrad", FilterState.On}
-                    }),
-                new List<string> { "TINK" });
+	[TestFixture]
+	public class TestFilterCollectionMutable
+	{
+		[Test]
+		public void TestConstruct_NoConradAccount()
+		{
+			var l_oColl = new SettingsBikeFilterViewModel(
+				new GroupFilterSettings(new Dictionary<string, FilterState> {
+					 {"TINK",  FilterState.On },
+					 {"Konrad", FilterState.On}
+					}),
+				new List<string> { "TINK" });
 
-            Assert.AreEqual("TINK", l_oColl[0].Key);
-            Assert.IsTrue(l_oColl[0].IsActivated);
-            Assert.IsTrue(l_oColl[0].IsEnabled);
+			Assert.AreEqual("TINK", l_oColl[0].Key);
+			Assert.IsTrue(l_oColl[0].IsActivated);
+			Assert.IsTrue(l_oColl[0].IsEnabled);
 
-            Assert.AreEqual("Konrad", l_oColl[1].Key);
-            Assert.IsFalse(l_oColl[1].IsActivated, "Konrad must be off if user is not part of group.");
-            Assert.IsFalse(l_oColl[1].IsEnabled, "Konrad must be disabled if user is not part of group.");
+			Assert.AreEqual("Konrad", l_oColl[1].Key);
+			Assert.IsFalse(l_oColl[1].IsActivated, "Konrad must be off if user is not part of group.");
+			Assert.IsFalse(l_oColl[1].IsEnabled, "Konrad must be disabled if user is not part of group.");
 
-            Assert.AreEqual(FilterState.On, l_oColl.FilterCollection["TINK"]);
-            Assert.AreEqual(FilterState.On, l_oColl.FilterCollection["Konrad"], "Filter state must be preserved.");
-        }
+			Assert.AreEqual(FilterState.On, l_oColl.FilterCollection["TINK"]);
+			Assert.AreEqual(FilterState.On, l_oColl.FilterCollection["Konrad"], "Filter state must be preserved.");
+		}
 
-        [Test]
-        public void TestConstruct_ConradAccount()
-        {
-            var l_oColl = new SettingsBikeFilterViewModel(
-                new GroupFilterSettings(new Dictionary<string, FilterState> {
-                     {"TINK",  FilterState.On },
-                     {"Konrad", FilterState.On}
-                    }),
-                new List<string> { "TINK", "Konrad" });
+		[Test]
+		public void TestConstruct_ConradAccount()
+		{
+			var l_oColl = new SettingsBikeFilterViewModel(
+				new GroupFilterSettings(new Dictionary<string, FilterState> {
+					 {"TINK",  FilterState.On },
+					 {"Konrad", FilterState.On}
+					}),
+				new List<string> { "TINK", "Konrad" });
 
-            Assert.AreEqual("TINK", l_oColl[0].Key);
-            Assert.IsTrue(l_oColl[0].IsActivated);
-            Assert.IsTrue(l_oColl[0].IsEnabled);
+			Assert.AreEqual("TINK", l_oColl[0].Key);
+			Assert.IsTrue(l_oColl[0].IsActivated);
+			Assert.IsTrue(l_oColl[0].IsEnabled);
 
-            Assert.AreEqual("Konrad", l_oColl[1].Key);
-            Assert.IsTrue(l_oColl[1].IsActivated);
-            Assert.IsTrue(l_oColl[1].IsEnabled);
+			Assert.AreEqual("Konrad", l_oColl[1].Key);
+			Assert.IsTrue(l_oColl[1].IsActivated);
+			Assert.IsTrue(l_oColl[1].IsEnabled);
 
-            Assert.AreEqual(FilterState.On, l_oColl.FilterCollection["TINK"]);
-            Assert.AreEqual(FilterState.On, l_oColl.FilterCollection["Konrad"], "Filter state must be preserved.");
-        }
+			Assert.AreEqual(FilterState.On, l_oColl.FilterCollection["TINK"]);
+			Assert.AreEqual(FilterState.On, l_oColl.FilterCollection["Konrad"], "Filter state must be preserved.");
+		}
 
-        [Test]
-        public void TestConstruct_TurnOff()
-        {
-            var l_oColl = new SettingsBikeFilterViewModel(
-                new GroupFilterSettings(new Dictionary<string, FilterState> {
-                     {"TINK",  FilterState.On },
-                     {"Konrad", FilterState.On}
-                    }),
-                new List<string> { "TINK", "Konrad" });
+		[Test]
+		public void TestConstruct_TurnOff()
+		{
+			var l_oColl = new SettingsBikeFilterViewModel(
+				new GroupFilterSettings(new Dictionary<string, FilterState> {
+					 {"TINK",  FilterState.On },
+					 {"Konrad", FilterState.On}
+					}),
+				new List<string> { "TINK", "Konrad" });
 
-            // Check prerequisites.
-            Assert.AreEqual("TINK", l_oColl[0].Key);
-            Assert.IsTrue(l_oColl[0].IsActivated);
-            Assert.IsTrue(l_oColl[0].IsEnabled);
+			// Check prerequisites.
+			Assert.AreEqual("TINK", l_oColl[0].Key);
+			Assert.IsTrue(l_oColl[0].IsActivated);
+			Assert.IsTrue(l_oColl[0].IsEnabled);
 
-            Assert.AreEqual("Konrad", l_oColl[1].Key);
-            Assert.IsTrue(l_oColl[1].IsActivated);
-            Assert.IsTrue(l_oColl[1].IsEnabled);
+			Assert.AreEqual("Konrad", l_oColl[1].Key);
+			Assert.IsTrue(l_oColl[1].IsActivated);
+			Assert.IsTrue(l_oColl[1].IsEnabled);
 
-            Assert.AreEqual(FilterState.On, l_oColl.FilterCollection["TINK"]);
-            Assert.AreEqual(FilterState.On, l_oColl.FilterCollection["Konrad"], "Filter state must be preserved.");
+			Assert.AreEqual(FilterState.On, l_oColl.FilterCollection["TINK"]);
+			Assert.AreEqual(FilterState.On, l_oColl.FilterCollection["Konrad"], "Filter state must be preserved.");
 
-            // Turn filter konrad off.
-            l_oColl[1].IsActivated = false;
+			// Turn filter konrad off.
+			l_oColl[1].IsActivated = false;
 
-            // Verify changes.
-            Assert.AreEqual(FilterState.On, l_oColl.FilterCollection["TINK"]);
-            Assert.AreEqual(FilterState.Off, l_oColl.FilterCollection["Konrad"], "Filter state must be preserved.");
-        }
+			// Verify changes.
+			Assert.AreEqual(FilterState.On, l_oColl.FilterCollection["TINK"]);
+			Assert.AreEqual(FilterState.Off, l_oColl.FilterCollection["Konrad"], "Filter state must be preserved.");
+		}
 
-        [Test]
-        public void TestConstruct_NoUserLoggedIn()
-        {
-            var l_oColl = new SettingsBikeFilterViewModel(
-                new GroupFilterSettings(new Dictionary<string, FilterState> {
-                     {"TINK",  FilterState.On },
-                     {"Konrad", FilterState.On}
-                    }),
-                null);
+		[Test]
+		public void TestConstruct_NoUserLoggedIn()
+		{
+			var l_oColl = new SettingsBikeFilterViewModel(
+				new GroupFilterSettings(new Dictionary<string, FilterState> {
+					 {"TINK",  FilterState.On },
+					 {"Konrad", FilterState.On}
+					}),
+				null);
 
-            // Check prerequisites.
-            Assert.AreEqual("TINK", l_oColl[0].Key);
-            Assert.IsTrue(l_oColl[0].IsActivated);
-            Assert.IsTrue(l_oColl[0].IsEnabled);
+			// Check prerequisites.
+			Assert.AreEqual("TINK", l_oColl[0].Key);
+			Assert.IsTrue(l_oColl[0].IsActivated);
+			Assert.IsTrue(l_oColl[0].IsEnabled);
 
-            Assert.AreEqual("Konrad", l_oColl[1].Key);
-            Assert.IsTrue(l_oColl[1].IsActivated);
-            Assert.IsTrue(l_oColl[1].IsEnabled);
+			Assert.AreEqual("Konrad", l_oColl[1].Key);
+			Assert.IsTrue(l_oColl[1].IsActivated);
+			Assert.IsTrue(l_oColl[1].IsEnabled);
 
-            Assert.AreEqual(FilterState.On, l_oColl.FilterCollection["TINK"]);
-            Assert.AreEqual(FilterState.On, l_oColl.FilterCollection["Konrad"], "Filter state must be preserved.");
-        }
-    }
+			Assert.AreEqual(FilterState.On, l_oColl.FilterCollection["TINK"]);
+			Assert.AreEqual(FilterState.On, l_oColl.FilterCollection["Konrad"], "Filter state must be preserved.");
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeAtStationInUseStateInfoProvider.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeAtStationInUseStateInfoProvider.cs
index 0834fe0..62793b2 100644
--- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeAtStationInUseStateInfoProvider.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeAtStationInUseStateInfoProvider.cs
@@ -4,24 +4,24 @@ using TINK.ViewModel;
 
 namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 {
-    [TestFixture]
-    public class TestBikeAtStationInUseStateInfoProvider
-    {
-        [Test]
-        public void TestGetReservedInfo()
-        {
-            Assert.That(new BikeAtStationInUseStateInfoProvider().GetReservedInfo(null), Is.EqualTo("Max. reservation time of 15 min. expired."));
-            Assert.That(new BikeAtStationInUseStateInfoProvider().GetReservedInfo(null, code: "Code123"), Is.Not.Null);
-            Assert.That(new BikeAtStationInUseStateInfoProvider().GetReservedInfo(TimeSpan.FromSeconds(3), code: "Code123"), Is.Not.Null);
-            Assert.That(new BikeAtStationInUseStateInfoProvider().GetReservedInfo(TimeSpan.FromSeconds(60)), Is.EqualTo("Still 1 min. reserved."));
-        }
+	[TestFixture]
+	public class TestBikeAtStationInUseStateInfoProvider
+	{
+		[Test]
+		public void TestGetReservedInfo()
+		{
+			Assert.That(new BikeAtStationInUseStateInfoProvider().GetReservedInfo(null), Is.EqualTo("Max. reservation time of 15 min. expired."));
+			Assert.That(new BikeAtStationInUseStateInfoProvider().GetReservedInfo(null, code: "Code123"), Is.Not.Null);
+			Assert.That(new BikeAtStationInUseStateInfoProvider().GetReservedInfo(TimeSpan.FromSeconds(3), code: "Code123"), Is.Not.Null);
+			Assert.That(new BikeAtStationInUseStateInfoProvider().GetReservedInfo(TimeSpan.FromSeconds(60)), Is.EqualTo("Still 1 min. reserved."));
+		}
 
-        [Test]
-        public void Test()
-        {
-            Assert.That(new BikeAtStationInUseStateInfoProvider().GetBookedInfo(null), Is.EqualTo("Bike is rented."));
-            Assert.That(new BikeAtStationInUseStateInfoProvider().GetBookedInfo(DateTime.Parse("2020-12-19 0:22"), code: "Code123"), Is.Not.Null);
-            Assert.That(new BikeAtStationInUseStateInfoProvider().GetBookedInfo(DateTime.Parse("2020-12-19 0:22"), code: "Code123"), Is.EqualTo("Code Code123, rented since 19. December 00:22."));
-        }
-    }
+		[Test]
+		public void Test()
+		{
+			Assert.That(new BikeAtStationInUseStateInfoProvider().GetBookedInfo(null), Is.EqualTo("Bike is rented."));
+			Assert.That(new BikeAtStationInUseStateInfoProvider().GetBookedInfo(DateTime.Parse("2020-12-19 0:22"), code: "Code123"), Is.Not.Null);
+			Assert.That(new BikeAtStationInUseStateInfoProvider().GetBookedInfo(DateTime.Parse("2020-12-19 0:22"), code: "Code123"), Is.EqualTo("Code Code123, rented since 19. December 00:22."));
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeAtStationViewModel.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeAtStationViewModel.cs
index 440a2a1..fda34cc 100644
--- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeAtStationViewModel.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeAtStationViewModel.cs
@@ -16,224 +16,224 @@ using Xamarin.Forms;
 namespace UITest.Fixtures.ViewModel
 {
 
-    [TestFixture]
-    public class TestBikeAtStationViewModel
-    {
-        private class BikeInfoMutable : TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable
-        {
-            public BikeInfoMutable(
-                string id,
-                LockModel lockModel,
-                bool isDemo = false,
-                IEnumerable<string> group = null,
-                WheelType? wheelType = null,
-                TypeOfBike? typeOfBike = null,
-                string description = null,
-                string stationId = null,
-                string stationName = null,
-                Uri operatorUri = null,
-                Func<DateTime> dateTimeProvider = null,
-                IStateInfo stateInfo = null) : base(
-                    new Bike(id, lockModel, wheelType, typeOfBike, description),
-                    new Drive(),
-                    isDemo,
-                    group,
-                    stationId,
-                    stationName,
-                    operatorUri,
-                    null,
-                    dateTimeProvider,
-                    stateInfo)
-            {
-            }
-        }
-        /// <summary>
-        /// Tests base class functionaltiy by using child.
-        /// </summary>
-        [Test]
-        public void TestStateText_NotLoggedIn()
-        {
-            var l_oBike = new BikeInfoMutable("2", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Two, TypeOfBike.Cargo);
+	[TestFixture]
+	public class TestBikeAtStationViewModel
+	{
+		private class BikeInfoMutable : TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable
+		{
+			public BikeInfoMutable(
+				string id,
+				LockModel lockModel,
+				bool isDemo = false,
+				IEnumerable<string> group = null,
+				WheelType? wheelType = null,
+				TypeOfBike? typeOfBike = null,
+				string description = null,
+				string stationId = null,
+				string stationName = null,
+				Uri operatorUri = null,
+				Func<DateTime> dateTimeProvider = null,
+				IStateInfo stateInfo = null) : base(
+					new Bike(id, lockModel, wheelType, typeOfBike, description),
+					new Drive(),
+					isDemo,
+					group,
+					stationId,
+					stationName,
+					operatorUri,
+					null,
+					dateTimeProvider,
+					stateInfo)
+			{
+			}
+		}
+		/// <summary>
+		/// Tests base class functionaltiy by using child.
+		/// </summary>
+		[Test]
+		public void TestStateText_NotLoggedIn()
+		{
+			var l_oBike = new BikeInfoMutable("2", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Two, TypeOfBike.Cargo);
 
-            var l_oStoreMock = new StoreMock(); // Account without user name, password and cookie
+			var l_oStoreMock = new StoreMock(); // Account without user name, password and cookie
 
-            var l_oUser = new User(
-                    l_oStoreMock,
-                    l_oStoreMock.Load().Result,
-                    "123456789"); // Device identifier
+			var l_oUser = new User(
+					l_oStoreMock,
+					l_oStoreMock.Load().Result,
+					"123456789"); // Device identifier
 
-            // Verify prerequisites
-            Assert.AreEqual(InUseStateEnum.Disposable, l_oBike.State.Value);
-            Assert.IsFalse(l_oUser.IsLoggedIn);
+			// Verify prerequisites
+			Assert.AreEqual(InUseStateEnum.Disposable, l_oBike.State.Value);
+			Assert.IsFalse(l_oUser.IsLoggedIn);
 
-            // Verify view model.
-            var l_oViewModel = new TINK.ViewModel.Bikes.Bike.BC.BikeViewModel(
-                null,
-                null,
-                null,
-                null,
-                NSubstitute.Substitute.For<ISmartDevice>(),
-                null,
-                l_oBike,
-                l_oUser,
-                new MyBikeInUseStateInfoProvider(),
-                MockRepository.GenerateStub<IBikesViewModel>(),
-                url => { });
+			// Verify view model.
+			var l_oViewModel = new TINK.ViewModel.Bikes.Bike.BC.BikeViewModel(
+				null,
+				null,
+				null,
+				null,
+				NSubstitute.Substitute.For<ISmartDevice>(),
+				null,
+				l_oBike,
+				l_oUser,
+				new MyBikeInUseStateInfoProvider(),
+				MockRepository.GenerateStub<IBikesViewModel>(),
+				url => { });
 
-            Assert.AreEqual("2", l_oViewModel.Name);
-            Assert.AreEqual("", l_oViewModel.DisplayId);
-            Assert.AreEqual("2", l_oViewModel.Id);
-            Assert.AreEqual("Available.", l_oViewModel.StateText);
-            Assert.AreEqual(Color.Default, l_oViewModel.StateColor);
-        }
+			Assert.AreEqual("2", l_oViewModel.Name);
+			Assert.AreEqual("", l_oViewModel.DisplayId);
+			Assert.AreEqual("2", l_oViewModel.Id);
+			Assert.AreEqual("Available.", l_oViewModel.StateText);
+			Assert.AreEqual(Color.Default, l_oViewModel.StateColor);
+		}
 
-        /// <summary>
-        /// Tests base class functionaltiy by using child.
-        /// </summary>
-        [Test]
-        public void TestStateText_LoggedIn_Reserved()
-        {
-            var l_oViewModel = TestBikeViewModel.TestStateText_LoggedIn_Reserved(
-                (bike, user) => new TINK.ViewModel.Bikes.Bike.BC.BikeViewModel(
-                    null,
-                    null,
-                    null,
-                    null,
-                    NSubstitute.Substitute.For<ISmartDevice>(),
-                    null,
-                    bike,
-                    user,
-                    new BikeAtStationInUseStateInfoProvider(),
-                    MockRepository.GenerateStub<IBikesViewModel>(),
-                    url => { }));
+		/// <summary>
+		/// Tests base class functionaltiy by using child.
+		/// </summary>
+		[Test]
+		public void TestStateText_LoggedIn_Reserved()
+		{
+			var l_oViewModel = TestBikeViewModel.TestStateText_LoggedIn_Reserved(
+				(bike, user) => new TINK.ViewModel.Bikes.Bike.BC.BikeViewModel(
+					null,
+					null,
+					null,
+					null,
+					NSubstitute.Substitute.For<ISmartDevice>(),
+					null,
+					bike,
+					user,
+					new BikeAtStationInUseStateInfoProvider(),
+					MockRepository.GenerateStub<IBikesViewModel>(),
+					url => { }));
 
-            Assert.AreEqual("Still 15 min. reserved.", l_oViewModel.StateText);
-        }
+			Assert.AreEqual("Still 15 min. reserved.", l_oViewModel.StateText);
+		}
 
-        /// <summary>
-        /// Tests base class functionaltiy by using child.
-        /// </summary>
-        [Test]
-        public void TestStateText_LoggedIn_ReservedWithCopriConnect()
-        {
-            var l_oViewModel = TestBikeViewModel.TestStateText_LoggedIn_ReservedWithCopriConnect(
-                (bike, user) => new TINK.ViewModel.Bikes.Bike.BC.BikeViewModel(
-                    null,
-                    null,
-                    null,
-                    null,
-                    NSubstitute.Substitute.For<ISmartDevice>(),
-                    null,
-                    bike,
-                    user,
-                    new BikeAtStationInUseStateInfoProvider(),
-                    MockRepository.GenerateStub<IBikesViewModel>(),
-                    url => { }));
+		/// <summary>
+		/// Tests base class functionaltiy by using child.
+		/// </summary>
+		[Test]
+		public void TestStateText_LoggedIn_ReservedWithCopriConnect()
+		{
+			var l_oViewModel = TestBikeViewModel.TestStateText_LoggedIn_ReservedWithCopriConnect(
+				(bike, user) => new TINK.ViewModel.Bikes.Bike.BC.BikeViewModel(
+					null,
+					null,
+					null,
+					null,
+					NSubstitute.Substitute.For<ISmartDevice>(),
+					null,
+					bike,
+					user,
+					new BikeAtStationInUseStateInfoProvider(),
+					MockRepository.GenerateStub<IBikesViewModel>(),
+					url => { }));
 
-            Assert.AreEqual("Code 4asdfA, still 7 min. reserved.", l_oViewModel.StateText);
-        }
+			Assert.AreEqual("Code 4asdfA, still 7 min. reserved.", l_oViewModel.StateText);
+		}
 
-        /// <summary>
-        /// Tests base class functionaltiy by using child.
-        /// </summary>
-        [Test]
-        public void TestStateText_LoggedIn_Booked()
-        {
-            var l_oViewModel = TestBikeViewModel.TestStateText_LoggedIn_Booked(
-                (bike, user) => new TINK.ViewModel.Bikes.Bike.BC.BikeViewModel(
-                    null,
-                    null,
-                    null,
-                    null,
-                    NSubstitute.Substitute.For<ISmartDevice>(),
-                    null,
-                    bike,
-                    user,
-                    new BikeAtStationInUseStateInfoProvider(),
-                    MockRepository.GenerateStub<IBikesViewModel>(),
-                    url => { }));
+		/// <summary>
+		/// Tests base class functionaltiy by using child.
+		/// </summary>
+		[Test]
+		public void TestStateText_LoggedIn_Booked()
+		{
+			var l_oViewModel = TestBikeViewModel.TestStateText_LoggedIn_Booked(
+				(bike, user) => new TINK.ViewModel.Bikes.Bike.BC.BikeViewModel(
+					null,
+					null,
+					null,
+					null,
+					NSubstitute.Substitute.For<ISmartDevice>(),
+					null,
+					bike,
+					user,
+					new BikeAtStationInUseStateInfoProvider(),
+					MockRepository.GenerateStub<IBikesViewModel>(),
+					url => { }));
 
-            Assert.AreEqual(
-                $"Code 4asdfA, rented since {new DateTime(2018, 10, 24, 21, 49, 00).ToString("dd. MMMM HH:mm")}.",
-                l_oViewModel.StateText);
-        }
+			Assert.AreEqual(
+				$"Code 4asdfA, rented since {new DateTime(2018, 10, 24, 21, 49, 00).ToString("dd. MMMM HH:mm")}.",
+				l_oViewModel.StateText);
+		}
 
-        /// <summary>
-        /// Tests base class functionaltiy by using child.
-        /// </summary>
-        [Test]
-        public void TestStateText_LoggedIn_ReservedBySomeoneElse()
-        {
-            var l_oBike = new BikeInfoMutable("2", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Two, TypeOfBike.Cargo, "Test description", "3");
+		/// <summary>
+		/// Tests base class functionaltiy by using child.
+		/// </summary>
+		[Test]
+		public void TestStateText_LoggedIn_ReservedBySomeoneElse()
+		{
+			var l_oBike = new BikeInfoMutable("2", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Two, TypeOfBike.Cargo, "Test description", "3");
 
-            l_oBike.State.Load(
-                InUseStateEnum.Reserved,
-                new DateTime(2017, 10, 24, 21, 49, 3),
-                "ragu@gnu-systems.de",
-                "4asdfA");
+			l_oBike.State.Load(
+				InUseStateEnum.Reserved,
+				new DateTime(2017, 10, 24, 21, 49, 3),
+				"ragu@gnu-systems.de",
+				"4asdfA");
 
-            var l_oStoreMock = new StoreMock(new Account("john@long", "123456789" /* password */, false, "987654321" /* session cookie */, new List<string> { "TINK" }));
+			var l_oStoreMock = new StoreMock(new Account("john@long", "123456789" /* password */, false, "987654321" /* session cookie */, new List<string> { "TINK" }));
 
-            var l_oViewModel = new TINK.ViewModel.Bikes.Bike.BC.BikeViewModel(
-                null,
-                null,
-                null,
-                null,
-                NSubstitute.Substitute.For<ISmartDevice>(),
-                null,
-                l_oBike,
-                new User(
-                    l_oStoreMock,
-                    l_oStoreMock.Load().Result,
-                    "123456789"), // Device id
-                new BikeAtStationInUseStateInfoProvider(),
-                MockRepository.GenerateStub<IBikesViewModel>(),
-                url => { });
+			var l_oViewModel = new TINK.ViewModel.Bikes.Bike.BC.BikeViewModel(
+				null,
+				null,
+				null,
+				null,
+				NSubstitute.Substitute.For<ISmartDevice>(),
+				null,
+				l_oBike,
+				new User(
+					l_oStoreMock,
+					l_oStoreMock.Load().Result,
+					"123456789"), // Device id
+				new BikeAtStationInUseStateInfoProvider(),
+				MockRepository.GenerateStub<IBikesViewModel>(),
+				url => { });
 
-            Assert.AreEqual("Test description", l_oViewModel.Name);
-            Assert.AreEqual("2", l_oViewModel.DisplayId);
-            Assert.AreEqual("2", l_oViewModel.Id);
-            Assert.AreEqual("Fahrrad bereits reserviert durch anderen Nutzer.", l_oViewModel.StateText);
-            Assert.AreEqual(Color.Red, l_oViewModel.StateColor);
-        }
+			Assert.AreEqual("Test description", l_oViewModel.Name);
+			Assert.AreEqual("2", l_oViewModel.DisplayId);
+			Assert.AreEqual("2", l_oViewModel.Id);
+			Assert.AreEqual("Fahrrad bereits reserviert durch anderen Nutzer.", l_oViewModel.StateText);
+			Assert.AreEqual(Color.Red, l_oViewModel.StateColor);
+		}
 
-        /// <summary>
-        /// Tests base class functionaltiy by using child.
-        /// </summary>
-        [Test]
-        public void TestStateText_LoggedIn_BookedBySomeoneElse()
-        {
-            var l_oBike = new BikeInfoMutable("2", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Two, TypeOfBike.Cargo, "Test description", "3");
+		/// <summary>
+		/// Tests base class functionaltiy by using child.
+		/// </summary>
+		[Test]
+		public void TestStateText_LoggedIn_BookedBySomeoneElse()
+		{
+			var l_oBike = new BikeInfoMutable("2", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Two, TypeOfBike.Cargo, "Test description", "3");
 
-            l_oBike.State.Load(
-                InUseStateEnum.Booked,
-                new DateTime(2017, 10, 24, 21, 49, 3),
-                "ragu@gnu-systems.de",
-                "4asdfA");
+			l_oBike.State.Load(
+				InUseStateEnum.Booked,
+				new DateTime(2017, 10, 24, 21, 49, 3),
+				"ragu@gnu-systems.de",
+				"4asdfA");
 
-            var l_oStoreMock = new StoreMock(new Account("john@long", "123456789" /* password */, false, "987654321" /* session cookie */, new List<string> { "TINK" }));
+			var l_oStoreMock = new StoreMock(new Account("john@long", "123456789" /* password */, false, "987654321" /* session cookie */, new List<string> { "TINK" }));
 
-            var l_oViewModel = new TINK.ViewModel.Bikes.Bike.BC.BikeViewModel(
-                null,
-                null,
-                null,
-                null,
-                NSubstitute.Substitute.For<ISmartDevice>(),
-                null,
-                l_oBike,
-                new User(
-                    l_oStoreMock,
-                    l_oStoreMock.Load().Result,
-                    "123456789"),
-                new BikeAtStationInUseStateInfoProvider(),
-                MockRepository.GenerateStub<IBikesViewModel>(),
-                url => { });
+			var l_oViewModel = new TINK.ViewModel.Bikes.Bike.BC.BikeViewModel(
+				null,
+				null,
+				null,
+				null,
+				NSubstitute.Substitute.For<ISmartDevice>(),
+				null,
+				l_oBike,
+				new User(
+					l_oStoreMock,
+					l_oStoreMock.Load().Result,
+					"123456789"),
+				new BikeAtStationInUseStateInfoProvider(),
+				MockRepository.GenerateStub<IBikesViewModel>(),
+				url => { });
 
-            Assert.AreEqual("Test description", l_oViewModel.Name);
-            Assert.AreEqual("2", l_oViewModel.DisplayId);
-            Assert.AreEqual("2", l_oViewModel.Id);
-            Assert.AreEqual("Fahrrad bereits gebucht durch anderen Nutzer.", l_oViewModel.StateText);
-            Assert.AreEqual(Color.Red, l_oViewModel.StateColor);
-        }
-    }
+			Assert.AreEqual("Test description", l_oViewModel.Name);
+			Assert.AreEqual("2", l_oViewModel.DisplayId);
+			Assert.AreEqual("2", l_oViewModel.Id);
+			Assert.AreEqual("Fahrrad bereits gebucht durch anderen Nutzer.", l_oViewModel.StateText);
+			Assert.AreEqual(Color.Red, l_oViewModel.StateColor);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeViewModel.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeViewModel.cs
index 02b7a9b..88d78d1 100644
--- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeViewModel.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeViewModel.cs
@@ -12,148 +12,148 @@ using static TINK.Repository.CopriCallsMemory;
 
 namespace UITest.Fixtures.ViewModel
 {
-    public class TestBikeViewModel
-    {
-        private class BikeInfoMutable : TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable
-        {
-            public BikeInfoMutable(
-                string id,
-                LockModel lockModel,
-                bool pisDemo = false,
-                IEnumerable<string> group = null,
-                WheelType? wheelType = null,
-                TypeOfBike? typeOfBike = null,
-                string description = null,
-                string stationId = null,
-                string stationName = null,
-                Uri operatorUri = null,
-                Func<DateTime> dateTimeProvider = null,
-                IStateInfo stateInfo = null) : base(
-                    new Bike(id, lockModel, wheelType, typeOfBike, description),
-                    new TINK.Model.Bikes.BikeInfoNS.DriveNS.Drive(),
-                    pisDemo,
-                    group,
-                    stationId,
-                    stationName,
-                    operatorUri,
-                    null,
-                    dateTimeProvider,
-                    stateInfo)
-            {
-            }
-        }
-        /// <summary>
-        /// Tests base class functionaltiy by using child.
-        /// </summary>
-        public static BikeViewModelBase TestStateText_LoggedIn_Reserved(Func<TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable, User, BikeViewModelBase> p_oFactory)
-        {
-            var l_oBike = new BikeInfoMutable(
-                "2",
-                LockModel.ILockIt,
-                false,
-                new List<string> { "TINK" },
-                WheelType.Trike,
-                TypeOfBike.Cargo,
-                "Test description",
-                "3",
-                "Radstation",
-                null,
-                () => new DateTime(1980, 1, 1)); // Now time stamp
+	public class TestBikeViewModel
+	{
+		private class BikeInfoMutable : TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable
+		{
+			public BikeInfoMutable(
+				string id,
+				LockModel lockModel,
+				bool pisDemo = false,
+				IEnumerable<string> group = null,
+				WheelType? wheelType = null,
+				TypeOfBike? typeOfBike = null,
+				string description = null,
+				string stationId = null,
+				string stationName = null,
+				Uri operatorUri = null,
+				Func<DateTime> dateTimeProvider = null,
+				IStateInfo stateInfo = null) : base(
+					new Bike(id, lockModel, wheelType, typeOfBike, description),
+					new TINK.Model.Bikes.BikeInfoNS.DriveNS.Drive(),
+					pisDemo,
+					group,
+					stationId,
+					stationName,
+					operatorUri,
+					null,
+					dateTimeProvider,
+					stateInfo)
+			{
+			}
+		}
+		/// <summary>
+		/// Tests base class functionaltiy by using child.
+		/// </summary>
+		public static BikeViewModelBase TestStateText_LoggedIn_Reserved(Func<TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable, User, BikeViewModelBase> p_oFactory)
+		{
+			var l_oBike = new BikeInfoMutable(
+				"2",
+				LockModel.ILockIt,
+				false,
+				new List<string> { "TINK" },
+				WheelType.Trike,
+				TypeOfBike.Cargo,
+				"Test description",
+				"3",
+				"Radstation",
+				null,
+				() => new DateTime(1980, 1, 1)); // Now time stamp
 
-            // Update state from Copri.
-            l_oBike.State.Load(
-                InUseStateEnum.Reserved, // Copri acknowledges state reserved.
-                new DateTime(1980, 1, 1), // Date when bike was booked.
-                "ragu@gnu-systems.de"); // Owner from Copri.
+			// Update state from Copri.
+			l_oBike.State.Load(
+				InUseStateEnum.Reserved, // Copri acknowledges state reserved.
+				new DateTime(1980, 1, 1), // Date when bike was booked.
+				"ragu@gnu-systems.de"); // Owner from Copri.
 
-            var l_oStoreMock = new StoreMock(new Account("ragu@gnu-systems.de", "123456789"  /* password */, false, "987654321" /* session cookie */, new List<string> { "TINK" }));
-            var l_oUser = new User(
-                    l_oStoreMock,
-                    l_oStoreMock.Load().Result,
-                    "123456789");
+			var l_oStoreMock = new StoreMock(new Account("ragu@gnu-systems.de", "123456789"  /* password */, false, "987654321" /* session cookie */, new List<string> { "TINK" }));
+			var l_oUser = new User(
+					l_oStoreMock,
+					l_oStoreMock.Load().Result,
+					"123456789");
 
-            // Verify prerequisites
-            Assert.AreEqual(InUseStateEnum.Reserved, l_oBike.State.Value);
-            Assert.IsTrue(l_oUser.IsLoggedIn);
-            Assert.AreEqual(l_oBike.State.MailAddress, l_oUser.Mail);
+			// Verify prerequisites
+			Assert.AreEqual(InUseStateEnum.Reserved, l_oBike.State.Value);
+			Assert.IsTrue(l_oUser.IsLoggedIn);
+			Assert.AreEqual(l_oBike.State.MailAddress, l_oUser.Mail);
 
-            // Do not update from Copri 
-            var l_oViewModel = p_oFactory(l_oBike, l_oUser);
+			// Do not update from Copri 
+			var l_oViewModel = p_oFactory(l_oBike, l_oUser);
 
-            return l_oViewModel;
-        }
+			return l_oViewModel;
+		}
 
-        /// <summary>
-        /// Tests base class functionaltiy by using child.
-        /// </summary>
-        public static BikeViewModelBase TestStateText_LoggedIn_ReservedWithCopriConnect(Func<TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable, User, BikeViewModelBase> p_oFactory)
-        {
-            var l_oBike = new BikeInfoMutable(
-                "2",
-                LockModel.ILockIt,
-                false,
-                new List<string> { "TINK" },
-                WheelType.Trike,
-                TypeOfBike.Cargo,
-                "Test description",
-                "3",
-                "Radstation",
-                null,
-                () => (new DateTime(1980, 1, 1)).Add(new TimeSpan(0, 8, 0)));
+		/// <summary>
+		/// Tests base class functionaltiy by using child.
+		/// </summary>
+		public static BikeViewModelBase TestStateText_LoggedIn_ReservedWithCopriConnect(Func<TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable, User, BikeViewModelBase> p_oFactory)
+		{
+			var l_oBike = new BikeInfoMutable(
+				"2",
+				LockModel.ILockIt,
+				false,
+				new List<string> { "TINK" },
+				WheelType.Trike,
+				TypeOfBike.Cargo,
+				"Test description",
+				"3",
+				"Radstation",
+				null,
+				() => (new DateTime(1980, 1, 1)).Add(new TimeSpan(0, 8, 0)));
 
-            // Update state from Copri.
-            l_oBike.State.Load(
-                InUseStateEnum.Reserved, // Copri acknowledges state reserved.
-                new DateTime(1980, 1, 1),
-                "ragu@gnu-systems.de", // Owner from Copri.
-                "4asdfA"); // Reservation code from Copri
+			// Update state from Copri.
+			l_oBike.State.Load(
+				InUseStateEnum.Reserved, // Copri acknowledges state reserved.
+				new DateTime(1980, 1, 1),
+				"ragu@gnu-systems.de", // Owner from Copri.
+				"4asdfA"); // Reservation code from Copri
 
-            var l_oStoreMock = new StoreMock(new Account("ragu@gnu-systems.de", "123456789"  /* password */, false, "987654321" /* session cookie */, new List<string> { "TINK" }));
-            var l_oUser = new User(
-                    l_oStoreMock, // Mocks account store functionality.
-                    l_oStoreMock.Load().Result,
-                    "123456789");
+			var l_oStoreMock = new StoreMock(new Account("ragu@gnu-systems.de", "123456789"  /* password */, false, "987654321" /* session cookie */, new List<string> { "TINK" }));
+			var l_oUser = new User(
+					l_oStoreMock, // Mocks account store functionality.
+					l_oStoreMock.Load().Result,
+					"123456789");
 
-            // Verify prerequisites
-            Assert.AreEqual(InUseStateEnum.Reserved, l_oBike.State.Value);
-            Assert.IsTrue(l_oUser.IsLoggedIn);
-            Assert.AreEqual(l_oBike.State.MailAddress, l_oUser.Mail);
+			// Verify prerequisites
+			Assert.AreEqual(InUseStateEnum.Reserved, l_oBike.State.Value);
+			Assert.IsTrue(l_oUser.IsLoggedIn);
+			Assert.AreEqual(l_oBike.State.MailAddress, l_oUser.Mail);
 
-            var l_oViewModel = p_oFactory(l_oBike, l_oUser); // Bikes collection mock.
+			var l_oViewModel = p_oFactory(l_oBike, l_oUser); // Bikes collection mock.
 
-            return l_oViewModel;
-        }
+			return l_oViewModel;
+		}
 
-        /// <summary>
-        /// Tests base class functionaltiy by using child.
-        /// </summary>
-        public static BikeViewModelBase TestStateText_LoggedIn_Booked(Func<TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable, User, BikeViewModelBase> p_oFactory)
-        {
-            var l_oBike = new BikeInfoMutable("2", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Two, TypeOfBike.Cargo, "Test description", "3");
+		/// <summary>
+		/// Tests base class functionaltiy by using child.
+		/// </summary>
+		public static BikeViewModelBase TestStateText_LoggedIn_Booked(Func<TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable, User, BikeViewModelBase> p_oFactory)
+		{
+			var l_oBike = new BikeInfoMutable("2", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Two, TypeOfBike.Cargo, "Test description", "3");
 
-            // Update from Copri.
-            l_oBike.State.Load(
-                InUseStateEnum.Booked,
-                new DateTime(2017, 10, 24, 21, 49, 3),
-                "ragu@gnu-systems.de",
-                "4asdfA");
+			// Update from Copri.
+			l_oBike.State.Load(
+				InUseStateEnum.Booked,
+				new DateTime(2017, 10, 24, 21, 49, 3),
+				"ragu@gnu-systems.de",
+				"4asdfA");
 
-            var l_oCopriServer = new CopriCallsMemory("MyMerchId", SampleSets.Set1, 1);
+			var l_oCopriServer = new CopriCallsMemory("MyMerchId", SampleSets.Set1, 1);
 
-            var l_oStoreMock = new StoreMock(new Account("ragu@gnu-systems.de", "123456789"  /* password */, false, "987654321" /* session cookie */, new List<string> { "TINK" }));
-            var l_oUser = new User(
-                    l_oStoreMock,
-                    l_oStoreMock.Load().Result,
-                    "123456789"); // Device id
+			var l_oStoreMock = new StoreMock(new Account("ragu@gnu-systems.de", "123456789"  /* password */, false, "987654321" /* session cookie */, new List<string> { "TINK" }));
+			var l_oUser = new User(
+					l_oStoreMock,
+					l_oStoreMock.Load().Result,
+					"123456789"); // Device id
 
-            // Verify prerequisites
-            Assert.AreEqual(InUseStateEnum.Booked, l_oBike.State.Value);
-            Assert.IsTrue(l_oUser.IsLoggedIn);
-            Assert.AreEqual(l_oBike.State.MailAddress, l_oUser.Mail);
+			// Verify prerequisites
+			Assert.AreEqual(InUseStateEnum.Booked, l_oBike.State.Value);
+			Assert.IsTrue(l_oUser.IsLoggedIn);
+			Assert.AreEqual(l_oBike.State.MailAddress, l_oUser.Mail);
 
-            var l_oViewModel = p_oFactory(l_oBike, l_oUser);
+			var l_oViewModel = p_oFactory(l_oBike, l_oUser);
 
-            return l_oViewModel;
-        }
-    }
+			return l_oViewModel;
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeViewModelFactory.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeViewModelFactory.cs
index 5acf06d..a82fbe0 100644
--- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeViewModelFactory.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeViewModelFactory.cs
@@ -13,70 +13,70 @@ using TINK.ViewModel.Bikes.Bike;
 
 namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 {
-    [TestFixture]
-    public class TestBikeViewModelFactory
-    {
-        [Test]
-        public void TestCreateBluetoothLock()
-        {
-            Assert.AreEqual(
-                typeof(TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel),
-                BikeViewModelFactory.Create(
-                    () => false, // Is connected delegate,
-                    (isconnected) => null, // connectorFactory
-                    new GeolocationMock(), // geolocation
-                    new LocksServiceMock(), // lock service
-                    (index) => { }, // bikeRemoveDelegate
-                    null, // viewUpdateManager
-                    NSubstitute.Substitute.For<ISmartDevice>(),
-                    null, // viewService
-                    new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("42", TINK.Model.Bikes.BikeInfoNS.BikeNS.LockModel.ILockIt), new Drive(), 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "42"), "My Station Name"),
-                    MockRepository.GenerateStub<IUser>(), // user
-                    MockRepository.GenerateStub<IInUseStateInfoProvider>(),
-                    MockRepository.GenerateStub<IBikesViewModel>(),
-                    url => { }).GetType()); // stateInfoProvider
-        }
+	[TestFixture]
+	public class TestBikeViewModelFactory
+	{
+		[Test]
+		public void TestCreateBluetoothLock()
+		{
+			Assert.AreEqual(
+				typeof(TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel),
+				BikeViewModelFactory.Create(
+					() => false, // Is connected delegate,
+					(isconnected) => null, // connectorFactory
+					new GeolocationMock(), // geolocation
+					new LocksServiceMock(), // lock service
+					(index) => { }, // bikeRemoveDelegate
+					null, // viewUpdateManager
+					NSubstitute.Substitute.For<ISmartDevice>(),
+					null, // viewService
+					new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("42", TINK.Model.Bikes.BikeInfoNS.BikeNS.LockModel.ILockIt), new Drive(), 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "42"), "My Station Name"),
+					MockRepository.GenerateStub<IUser>(), // user
+					MockRepository.GenerateStub<IInUseStateInfoProvider>(),
+					MockRepository.GenerateStub<IBikesViewModel>(),
+					url => { }).GetType()); // stateInfoProvider
+		}
 
-        [Test]
-        public void TestCreateCopri()
-        {
-            Assert.AreEqual(
-                typeof(TINK.ViewModel.Bikes.Bike.CopriLock.BikeViewModel),
-                BikeViewModelFactory.Create(
-                    () => false, // Is connected delegate,
-                    (isconnected) => null, // connectorFactory
-                    new GeolocationMock(), // geolocation
-                    new LocksServiceMock(), // lock service
-                    (index) => { }, // bikeRemoveDelegate
-                    null, // viewUpdateManager
-                    NSubstitute.Substitute.For<ISmartDevice>(),
-                    null, // viewService
-                    new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("42", LockModel.ILockIt), new Drive(), "17", new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo.Builder { State = TINK.Model.Bikes.BikeInfoNS.CopriLock.LockingState.Closed }.Build()), "My Station Name"),
-                    MockRepository.GenerateStub<IUser>(), // user
-                    MockRepository.GenerateStub<IInUseStateInfoProvider>(),
-                    MockRepository.GenerateStub<IBikesViewModel>(),
-                    url => { }).GetType()); // stateInfoProvider
-        }
+		[Test]
+		public void TestCreateCopri()
+		{
+			Assert.AreEqual(
+				typeof(TINK.ViewModel.Bikes.Bike.CopriLock.BikeViewModel),
+				BikeViewModelFactory.Create(
+					() => false, // Is connected delegate,
+					(isconnected) => null, // connectorFactory
+					new GeolocationMock(), // geolocation
+					new LocksServiceMock(), // lock service
+					(index) => { }, // bikeRemoveDelegate
+					null, // viewUpdateManager
+					NSubstitute.Substitute.For<ISmartDevice>(),
+					null, // viewService
+					new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("42", LockModel.ILockIt), new Drive(), "17", new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo.Builder { State = TINK.Model.Bikes.BikeInfoNS.CopriLock.LockingState.Closed }.Build()), "My Station Name"),
+					MockRepository.GenerateStub<IUser>(), // user
+					MockRepository.GenerateStub<IInUseStateInfoProvider>(),
+					MockRepository.GenerateStub<IBikesViewModel>(),
+					url => { }).GetType()); // stateInfoProvider
+		}
 
-        [Test]
-        public void TestCreateUnsupported()
-        {
-            Assert.That(
-                BikeViewModelFactory.Create(
-                    () => false, // Is connected delegate,
-                    (isconnected) => null, // connectorFactory
-                    new GeolocationMock(), // geolocation
-                    new LocksServiceMock(), // lock service
-                    (index) => { }, // bikeRemoveDelegate
-                    null, // viewUpdateManager
-                    NSubstitute.Substitute.For<ISmartDevice>(),
-                    null, // viewService
-                    new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("42", TINK.Model.Bikes.BikeInfoNS.BikeNS.LockModel.ILockIt), new Drive(), 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "42"), "My Station Name"),
-                    MockRepository.GenerateStub<IUser>(), // user
-                    MockRepository.GenerateStub<IInUseStateInfoProvider>(),
-                    MockRepository.GenerateStub<IBikesViewModel>(),
-                    url => { }),
-                Is.Null);
-        }
-    }
+		[Test]
+		public void TestCreateUnsupported()
+		{
+			Assert.That(
+				BikeViewModelFactory.Create(
+					() => false, // Is connected delegate,
+					(isconnected) => null, // connectorFactory
+					new GeolocationMock(), // geolocation
+					new LocksServiceMock(), // lock service
+					(index) => { }, // bikeRemoveDelegate
+					null, // viewUpdateManager
+					NSubstitute.Substitute.For<ISmartDevice>(),
+					null, // viewService
+					new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("42", TINK.Model.Bikes.BikeInfoNS.BikeNS.LockModel.ILockIt), new Drive(), 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "42"), "My Station Name"),
+					MockRepository.GenerateStub<IUser>(), // user
+					MockRepository.GenerateStub<IInUseStateInfoProvider>(),
+					MockRepository.GenerateStub<IBikesViewModel>(),
+					url => { }),
+				Is.Null);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikeInUseStateInfoProvider.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikeInUseStateInfoProvider.cs
index 0e00485..5fe5140 100644
--- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikeInUseStateInfoProvider.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikeInUseStateInfoProvider.cs
@@ -4,28 +4,28 @@ using TINK.ViewModel;
 
 namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 {
-    [TestFixture]
-    public class TestMyBikeInUseStateInfoProvider
-    {
-        [Test]
-        public void TestGetReservedInfo()
-        {
-            Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(null), Is.EqualTo("Max. reservation time of 15 min. expired."));
-            Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(null, code: "Code12"), Is.Not.Null);
-            Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(null, "12"), Is.EqualTo("Location 12, max. reservation time of 15 min. expired."));
-            Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(null, "12", "Code12"), Is.Not.Null);
-            Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(TimeSpan.FromSeconds(10)), Is.Not.Null);
-            Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(TimeSpan.FromSeconds(10), "123"), Is.EqualTo("Location Station 123, still 0 min. reserved."));
-            Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(TimeSpan.FromSeconds(10), "123", "code123"), Is.Not.Null);
-        }
+	[TestFixture]
+	public class TestMyBikeInUseStateInfoProvider
+	{
+		[Test]
+		public void TestGetReservedInfo()
+		{
+			Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(null), Is.EqualTo("Max. reservation time of 15 min. expired."));
+			Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(null, code: "Code12"), Is.Not.Null);
+			Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(null, "12"), Is.EqualTo("Location 12, max. reservation time of 15 min. expired."));
+			Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(null, "12", "Code12"), Is.Not.Null);
+			Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(TimeSpan.FromSeconds(10)), Is.Not.Null);
+			Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(TimeSpan.FromSeconds(10), "123"), Is.EqualTo("Location Station 123, still 0 min. reserved."));
+			Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(TimeSpan.FromSeconds(10), "123", "code123"), Is.Not.Null);
+		}
 
-        [Test]
-        public void TestGetBookedInfoInfo()
-        {
-            Assert.That(new MyBikeInUseStateInfoProvider().GetBookedInfo(null), Is.EqualTo("Bike is rented."));
-            Assert.That(new MyBikeInUseStateInfoProvider().GetBookedInfo(DateTime.Now, "123", "Code123"), Is.Not.Null);
-            Assert.That(new MyBikeInUseStateInfoProvider().GetBookedInfo(DateTime.Now, code: "Code123"), Is.Not.Null);
-            Assert.That(new MyBikeInUseStateInfoProvider().GetBookedInfo(DateTime.Parse("2020-12-19 0:22"), "123"), Is.EqualTo("Rented since 19. December 00:22."));
-        }
-    }
+		[Test]
+		public void TestGetBookedInfoInfo()
+		{
+			Assert.That(new MyBikeInUseStateInfoProvider().GetBookedInfo(null), Is.EqualTo("Bike is rented."));
+			Assert.That(new MyBikeInUseStateInfoProvider().GetBookedInfo(DateTime.Now, "123", "Code123"), Is.Not.Null);
+			Assert.That(new MyBikeInUseStateInfoProvider().GetBookedInfo(DateTime.Now, code: "Code123"), Is.Not.Null);
+			Assert.That(new MyBikeInUseStateInfoProvider().GetBookedInfo(DateTime.Parse("2020-12-19 0:22"), "123"), Is.EqualTo("Rented since 19. December 00:22."));
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikePageViewModel.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikePageViewModel.cs
index 505c51e..5ad8e2e 100644
--- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikePageViewModel.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikePageViewModel.cs
@@ -8,81 +8,81 @@ using TINK.ViewModel.Bikes;
 namespace UITest.Fixtures.ViewModel
 {
 
-    [TestFixture]
-    public class TestMyBikesPageViewModel
-    {
-        /// <summary>
-        /// Tests base class functionaltiy by using child.
-        /// </summary>
-        [Test]
-        public void TestStateText_LoggedIn_Reserved()
-        {
-            var l_oViewModel = TestBikeViewModel.TestStateText_LoggedIn_Reserved(
-                (bike, user) => new TINK.ViewModel.Bikes.Bike.BC.BikeViewModel(
-                    null,
-                    null,
-                    null,
-                    null,
-                    NSubstitute.Substitute.For<ISmartDevice>(),
-                    null,
-                    bike,
-                    user,
-                    new MyBikeInUseStateInfoProvider(),
-                    MockRepository.GenerateStub<IBikesViewModel>(),
-                    url => { }));
+	[TestFixture]
+	public class TestMyBikesPageViewModel
+	{
+		/// <summary>
+		/// Tests base class functionaltiy by using child.
+		/// </summary>
+		[Test]
+		public void TestStateText_LoggedIn_Reserved()
+		{
+			var l_oViewModel = TestBikeViewModel.TestStateText_LoggedIn_Reserved(
+				(bike, user) => new TINK.ViewModel.Bikes.Bike.BC.BikeViewModel(
+					null,
+					null,
+					null,
+					null,
+					NSubstitute.Substitute.For<ISmartDevice>(),
+					null,
+					bike,
+					user,
+					new MyBikeInUseStateInfoProvider(),
+					MockRepository.GenerateStub<IBikesViewModel>(),
+					url => { }));
 
 
-            Assert.AreEqual("Location Station 3, still 15 min. reserved.", l_oViewModel.StateText);
-        }
+			Assert.AreEqual("Location Station 3, still 15 min. reserved.", l_oViewModel.StateText);
+		}
 
-        /// <summary>
-        /// Tests base class functionaltiy by using child.
-        /// </summary>
-        [Test]
-        public void TestStateText_LoggedIn_ReservedWithCopriConnect()
-        {
-            var l_oViewModel = TestBikeViewModel.TestStateText_LoggedIn_ReservedWithCopriConnect(
-                (bike, user) => new TINK.ViewModel.Bikes.Bike.BC.BikeViewModel(
-                    null,
-                    null,
-                    null,
-                    null,
-                    NSubstitute.Substitute.For<ISmartDevice>(),
-                    null,
-                    bike,
-                    user,
-                    new MyBikeInUseStateInfoProvider(),
-                    MockRepository.GenerateStub<IBikesViewModel>(),
-                    url => { }));
+		/// <summary>
+		/// Tests base class functionaltiy by using child.
+		/// </summary>
+		[Test]
+		public void TestStateText_LoggedIn_ReservedWithCopriConnect()
+		{
+			var l_oViewModel = TestBikeViewModel.TestStateText_LoggedIn_ReservedWithCopriConnect(
+				(bike, user) => new TINK.ViewModel.Bikes.Bike.BC.BikeViewModel(
+					null,
+					null,
+					null,
+					null,
+					NSubstitute.Substitute.For<ISmartDevice>(),
+					null,
+					bike,
+					user,
+					new MyBikeInUseStateInfoProvider(),
+					MockRepository.GenerateStub<IBikesViewModel>(),
+					url => { }));
 
-            Assert.AreEqual("Code 4asdfA, location Station 3, still 7 min. reserved.", l_oViewModel.StateText);
-        }
+			Assert.AreEqual("Code 4asdfA, location Station 3, still 7 min. reserved.", l_oViewModel.StateText);
+		}
 
 
-        /// <summary>
-        /// Tests base class functionaltiy by using child.
-        /// </summary>
-        /// 
-        [Test]
-        public void TestStateText_LoggedIn_Booked()
-        {
-            var l_oViewModel = TestBikeViewModel.TestStateText_LoggedIn_Booked(
-                (bike, user) => new TINK.ViewModel.Bikes.Bike.BC.BikeViewModel(
-                    null,
-                    null,
-                    null,
-                    null,
-                    NSubstitute.Substitute.For<ISmartDevice>(),
-                    null,
-                    bike,
-                    user,
-                    new MyBikeInUseStateInfoProvider(),
-                    MockRepository.GenerateStub<IBikesViewModel>(),
-                    url => { }));
+		/// <summary>
+		/// Tests base class functionaltiy by using child.
+		/// </summary>
+		/// 
+		[Test]
+		public void TestStateText_LoggedIn_Booked()
+		{
+			var l_oViewModel = TestBikeViewModel.TestStateText_LoggedIn_Booked(
+				(bike, user) => new TINK.ViewModel.Bikes.Bike.BC.BikeViewModel(
+					null,
+					null,
+					null,
+					null,
+					NSubstitute.Substitute.For<ISmartDevice>(),
+					null,
+					bike,
+					user,
+					new MyBikeInUseStateInfoProvider(),
+					MockRepository.GenerateStub<IBikesViewModel>(),
+					url => { }));
 
-            Assert.AreEqual(
-               $"Code 4asdfA, location Station 3, rented since {new DateTime(2018, 10, 24, 21, 49, 00).ToString("dd. MMMM HH:mm")}.",
-                l_oViewModel.StateText);
-        }
-    }
+			Assert.AreEqual(
+			   $"Code 4asdfA, location Station 3, rented since {new DateTime(2018, 10, 24, 21, 49, 00).ToString("dd. MMMM HH:mm")}.",
+				l_oViewModel.StateText);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikesPageViewModel.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikesPageViewModel.cs
index f1d795d..05fb047 100644
--- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikesPageViewModel.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikesPageViewModel.cs
@@ -31,813 +31,813 @@ using static TINK.Repository.CopriCallsMemory;
 
 namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 {
-    [TestFixture]
-    public class TestMyBikesPageViewModel
-    {
-        [Test]
-        public async Task TestConstruct_Droid()
-        {
-            var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            locksService.TimeOut.Returns(timeOut);
-            timeOut.MultiConnect.Returns(new TimeSpan(0));
-
-            // Fake location permissions to be set
-            permissions.CheckStatusAsync().Returns(Task.FromResult(Status.Granted));
-            geolocation.Active.IsGeolcationEnabled.Returns(true); // Fake gps to be on
-            bluetooth.State.Returns(BluetoothState.On); // Fake bluetooth to be on
-
-            // Fake bluetooth answer for locks with id 2200545 and 2200537.
-            locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(
-                new List<LockInfoTdo> {
-                    { new LockInfoTdo.Builder { Id = 2200545, State = LockitLockingState.Open }.Build() },
-                    { new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
-                    }
-                );
-            const string MERCH_ID = "MyMerchId";
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
-                merchantId: MERCH_ID,
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: null,
-                locationServicesContainer: geolocation,
-                locksService: locksService, // Cipher
-                device: new DeviceMock(), // Permissions,
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var myBikes = new MyBikesPageViewModel(
-                tinkApp.ActiveUser,
-                permissions, /* permissions */
-                bluetooth, /* bluetooth */
-                Device.Android,
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                geolocation.Active, // geolocation
-                locksService,
-                tinkApp.Stations,
-                tinkApp.Polling,
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                url => { });
-
-            await myBikes.OnAppearing();
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                permissions.CheckStatusAsync();
-                var glDummy = geolocation.Active.Received().IsGeolcationEnabled;
-                var btDummy = bluetooth.Received().State;
-                locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>());
-            });
-
-            Assert.IsEmpty(myBikes.StatusInfoText);
-
-            Assert.AreEqual(2, myBikes.Count);
-            Assert.IsTrue(myBikes.IsIdle);
-            Assert.IsTrue(myBikes.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            var bike1545 = myBikes.FirstOrDefault(x => x.Id == "1545") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            var bike1537 = myBikes.FirstOrDefault(x => x.Id == "1537") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            Assert.AreEqual($"Rented since {DateTime.Parse("2020-11-06 17:53:22.784681+01"):dd. MMMM HH:mm}.", bike1545.StateText);
-            Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
-            Assert.AreEqual("Close lock", bike1545.LockitButtonText);
-            Assert.AreEqual("Open lock", bike1537.LockitButtonText);
-
-            Assert.IsFalse(myBikes.IsNoBikesOccupiedVisible);
-            Assert.IsEmpty(myBikes.NoBikesOccupiedText);
-        }
-
-        [Test]
-        public async Task TestConstruct_Droid_NoPermissions_OpenSettings()
-        {
-            var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            locksService.TimeOut.Returns(timeOut);
-            timeOut.MultiConnect.Returns(new TimeSpan(0));
-
-            // Fake location permissions not to be set
-            permissions.CheckStatusAsync().Returns(Task.FromResult(Status.Denied));
-
-            // Fake anwser on question whether to open permissions dialog
-            viewService.DisplayAlert(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>()).Returns(true);
-
-            locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(
-                new List<LockInfoTdo> {
-                    { new LockInfoTdo.Builder { Id = 2200545, State = LockitLockingState.Open }.Build() },
-                    { new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
-                }
-            );
-            const string MERCH_ID = "MyMerchId";
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
-                merchantId: MERCH_ID,
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: null,
-                locationServicesContainer: geolocation,
-                locksService: locksService, // Cipher
-                device: new DeviceMock(), // Permissions,
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var myBikes = new MyBikesPageViewModel(
-                tinkApp.ActiveUser,
-                permissions, /* permissions */
-                bluetooth, /* bluetooth */
-                Device.Android,
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                geolocation.Active, // geolocation
-                locksService,
-                tinkApp.Stations,
-                tinkApp.Polling,
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                url => { });
-
-            await myBikes.OnAppearing();
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                permissions.CheckStatusAsync();
-                var glDummy = geolocation.Active.Received().IsGeolcationEnabled;
-                permissions.RequestAsync(); // Ask user from permissions.
-                viewService.DisplayAlert(
-                    "Hint",
-                    "Please allow location sharing so that bike lock/locks can be managed.\r\nOpen sharing dialog?",
-                    "Yes",
-                    "No");
-                permissions.OpenAppSettings();
-            });
-
-            Assert.IsEmpty(myBikes.StatusInfoText, "Unexpected status info text detected.");
-
-            Assert.AreEqual(2, myBikes.Count);
-            Assert.IsTrue(myBikes.IsIdle);
-            Assert.IsTrue(myBikes.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            var bike1545 = myBikes.FirstOrDefault(x => x.Id == "1545") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            var bike1537 = myBikes.FirstOrDefault(x => x.Id == "1537") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            Assert.AreEqual($"Rented since {DateTime.Parse("2020-11-06 17:53:22.784681+01"):dd. MMMM HH:mm}.", bike1545.StateText);
-            Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
-            Assert.AreEqual("Search lock", bike1545.LockitButtonText);
-            Assert.AreEqual("Search lock", bike1537.LockitButtonText);
-
-            Assert.IsFalse(myBikes.IsNoBikesOccupiedVisible);
-            Assert.IsEmpty(myBikes.NoBikesOccupiedText, "There must not be any bikes occupied.");
-        }
-
-        [Test]
-        public async Task TestConstruct_Droid_NoPermissions()
-        {
-            var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            locksService.TimeOut.Returns(timeOut);
-            timeOut.MultiConnect.Returns(new TimeSpan(0));
-
-            // Fake location permissions not to be set
-            permissions.CheckStatusAsync().Returns(Task.FromResult(Status.Denied));
-
-            permissions.OpenAppSettings().Throws<Exception>(); // Ensures that method is not called and fixture succeeds.
-
-            // Fake anwser on question whether to open permissions dialog
-            viewService.DisplayAlert(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>()).Returns(false);
-
-            // Fake bluetooth answer for locks with id 2200545 and 2200537.
-            var lockInfoTdo = new List<LockInfoTdo> {
-                { new LockInfoTdo.Builder { Id = 2200545, State = LockitLockingState.Open }.Build() },
-                { new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
-                };
-
-            locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(lockInfoTdo);
-            const string MERCH_ID = "MyMerchId";
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
-                merchantId: MERCH_ID,
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: null,
-                locationServicesContainer: geolocation,
-                locksService: locksService, // Cipher
-                device: new DeviceMock(), // Permissions,
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var myBikes = new MyBikesPageViewModel(
-                tinkApp.ActiveUser,
-                permissions, /* permissions */
-                bluetooth, /* bluetooth */
-                Device.Android,
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                geolocation.Active, // geolocation
-                locksService,
-                tinkApp.Stations,
-                tinkApp.Polling,
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                url => { });
-
-            await myBikes.OnAppearing();
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                permissions.CheckStatusAsync();
-                var glDummy = geolocation.Active.Received().IsGeolcationEnabled;
-                permissions.RequestAsync(); // Ask user from permissions.
-                viewService.DisplayAlert(
-                    "Hint",
-                    "Please allow location sharing so that bike lock/locks can be managed.\r\nOpen sharing dialog?",
-                    "Yes",
-                    "No");
-            });
-
-            Assert.IsEmpty(myBikes.StatusInfoText, "Unexpected status info text detected.");
-
-            Assert.AreEqual(2, myBikes.Count);
-            Assert.IsTrue(myBikes.IsIdle);
-            Assert.IsTrue(myBikes.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            var bike1545 = myBikes.FirstOrDefault(x => x.Id == "1545") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            var bike1537 = myBikes.FirstOrDefault(x => x.Id == "1537") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            Assert.AreEqual($"Rented since {DateTime.Parse("2020-11-06 17:53:22.784681+01"):dd. MMMM HH:mm}.", bike1545.StateText);
-            Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
-            Assert.AreEqual("Search lock", bike1545.LockitButtonText);
-            Assert.AreEqual("Search lock", bike1537.LockitButtonText);
-
-            Assert.IsFalse(myBikes.IsNoBikesOccupiedVisible);
-            Assert.IsEmpty(myBikes.NoBikesOccupiedText, "There must not be any bikes occupied.");
-        }
-
-        [Test]
-        public async Task TestConstruct_Droid_GeolocationOff()
-        {
-            var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            locksService.TimeOut.Returns(timeOut);
-            timeOut.MultiConnect.Returns(new TimeSpan(0));
-
-            // Fake location permissions to be set
-            permissions.CheckStatusAsync().Returns(Task.FromResult(Status.Granted));
-            geolocation.Active.IsGeolcationEnabled.Returns(false); // Fake gps to be off
-
-            // Fake bluetooth answer for locks with id 2200545 and 2200537.
-            locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(
-            new List<LockInfoTdo> {
-                { new LockInfoTdo.Builder { Id = 2200545, State = LockitLockingState.Open }.Build() },
-                { new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
-            }
-            );
-            const string MERCH_ID = "MyMerchId";
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
-                merchantId: MERCH_ID,
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: null,
-                locationServicesContainer: geolocation,
-                locksService: locksService, // Cipher
-                device: new DeviceMock(), // Permissions,
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var myBikes = new MyBikesPageViewModel(
-                tinkApp.ActiveUser,
-                permissions, /* permissions */
-                bluetooth, /* bluetooth */
-                Device.Android,
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                geolocation.Active, // geolocation
-                locksService,
-                tinkApp.Stations,
-                tinkApp.Polling,
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                url => { });
-
-            await myBikes.OnAppearing();
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                permissions.CheckStatusAsync();
-                var glDummy = geolocation.Active.Received().IsGeolcationEnabled;
-                viewService.DisplayAlert(
-                        "Hint",
-                        "Please activate location so that bike lock can be found!",
-                        "OK");
-            });
-
-            Assert.IsEmpty(myBikes.StatusInfoText);
-
-            Assert.AreEqual(2, myBikes.Count);
-            Assert.IsTrue(myBikes.IsIdle);
-            Assert.IsTrue(myBikes.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            var bike1545 = myBikes.FirstOrDefault(x => x.Id == "1545") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            var bike1537 = myBikes.FirstOrDefault(x => x.Id == "1537") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            Assert.AreEqual($"Rented since {DateTime.Parse("2020-11-06 17:53:22.784681+01"):dd. MMMM HH:mm}.", bike1545.StateText);
-            Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
-            Assert.AreEqual("Search lock", bike1545.LockitButtonText);
-            Assert.AreEqual("Search lock", bike1537.LockitButtonText);
-
-            Assert.IsFalse(myBikes.IsNoBikesOccupiedVisible);
-            Assert.IsEmpty(myBikes.NoBikesOccupiedText);
-        }
-
-        [Test]
-        public async Task TestConstruct_Droid_BluetoothOff()
-        {
-            var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            locksService.TimeOut.Returns(timeOut);
-            timeOut.MultiConnect.Returns(new TimeSpan(0));
-
-            // Fake location permissions to be set
-            permissions.CheckStatusAsync().Returns(Task.FromResult(Status.Granted));
-            geolocation.Active.IsGeolcationEnabled.Returns(true); // Fake gps to be on
-            bluetooth.State.Returns(BluetoothState.Off); // Fake bluetooth to be off
-
-            var lockInfoTdo = new List<LockInfoTdo> {
-                { new LockInfoTdo.Builder { Id = 2200545, State = LockitLockingState.Open }.Build() },
-                { new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
-                };
-
-            locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(lockInfoTdo);
-            const string MERCH_ID = "MyMerchId";
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
-                merchantId: MERCH_ID,
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: null,
-                locationServicesContainer: geolocation,
-                locksService: locksService, // Cipher
-                device: new DeviceMock(), // Permissions,
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var myBikes = new MyBikesPageViewModel(
-                tinkApp.ActiveUser,
-                permissions, /* permissions */
-                bluetooth, /* bluetooth */
-                Device.Android,
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                geolocation.Active, // geolocation
-                locksService,
-                tinkApp.Stations,
-                tinkApp.Polling,
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                url => { });
-
-            await myBikes.OnAppearing();
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                permissions.CheckStatusAsync();
-                var glDummy = geolocation.Active.Received().IsGeolcationEnabled;
-                var btDummy = bluetooth.Received().State;
-                viewService.DisplayAlert(
-                        "Hint",
-                        "Please enable Bluetooth to manage bike lock/locks.",
-                        "OK");
-            });
-
-            Assert.That(
-                myBikes.StatusInfoText,
-                Is.Empty,
-                "Status info text must be empty.");
-
-            Assert.AreEqual(2, myBikes.Count);
-            Assert.IsTrue(myBikes.IsIdle);
-            Assert.IsTrue(myBikes.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            var bike1545 = myBikes.FirstOrDefault(x => x.Id == "1545") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            var bike1537 = myBikes.FirstOrDefault(x => x.Id == "1537") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
-            Assert.AreEqual($"Rented since {DateTime.Parse("2020-11-06 17:53:22.784681+01"):dd. MMMM HH:mm}.", bike1545.StateText);
-            Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
-            Assert.AreEqual("Search lock", bike1545.LockitButtonText);
-            Assert.AreEqual("Search lock", bike1537.LockitButtonText);
-
-            Assert.IsFalse(myBikes.IsNoBikesOccupiedVisible);
-            Assert.That(
-                myBikes.NoBikesOccupiedText,
-                Is.Empty,
-                "Label which informs that no bikes are reserved/ rented must be empty.");
-        }
-
-        [Test]
-        public async Task TestConstruct_NoBikesOccupied()
-        {
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            locksService.TimeOut.Returns(timeOut);
-            timeOut.MultiConnect.Returns(new TimeSpan(0));
-            const string MERCH_ID = "MyMerchId";
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "Invalid_SessionCookie", new List<string> { "TINK" })),
-                                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.Set2, 1, sessionCookie)),
-                merchantId: MERCH_ID,
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: locksService, // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var myBikes = new MyBikesPageViewModel(
-                tinkApp.ActiveUser,
-                permissions, // Permissions,
-                bluetooth,
-                Device.iOS,
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                new GeolocationMock(),
-                locksService,
-                tinkApp.Stations,
-                tinkApp.Polling,
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                url => { });
-
-            await myBikes.OnAppearing();
-
-            Assert.IsTrue(new List<string> { "Updating...", string.Empty }.Contains(myBikes.StatusInfoText));
-
-            Assert.AreEqual(0, myBikes.Count);
-            Assert.IsTrue(myBikes.IsIdle);
-            Assert.IsFalse(myBikes.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            Assert.IsTrue(myBikes.IsNoBikesOccupiedVisible);
-            Assert.AreEqual("Momentan sind keine Fahrräder auf Benutzer a@b reserviert/ gebucht.", myBikes.NoBikesOccupiedText);
-        }
-
-        [Test]
-        public async Task TestConstruct_Offline()
-        {
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            locksService.TimeOut.Returns(timeOut);
-            timeOut.MultiConnect.Returns(new TimeSpan(0));
-            const string MERCH_ID = "MyMerchId";
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "4da3044c8657a04ba60e2eaa753bc51a", new List<string> { "TINK" })),
-                                isConnectedFunc: () => false,
-                            connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.Set2, 1, sessionCookie)),
-                merchantId: MERCH_ID,
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: null,
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: locksService, // Cipher
-                device: new DeviceMock(), // Permissions
-                specialFolder: new SpecialFolderMock(),
-                cipher: null, // Offline
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var myBikes = new MyBikesPageViewModel(
-                tinkApp.ActiveUser,
-                permissions, // Permissions,
-                bluetooth,
-                Device.iOS,
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                new GeolocationMock(),
-                locksService,
-                tinkApp.Stations,
-                tinkApp.Polling,
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                url => { });
-
-            await myBikes.OnAppearing();
-
-            Assert.AreEqual("Offline.", myBikes.StatusInfoText);
-
-            Assert.AreEqual(2, myBikes.Count);
-            Assert.IsTrue(myBikes.IsIdle);
-            Assert.IsTrue(myBikes.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            Assert.AreEqual("Rented since 28. November 13:06.", myBikes.FirstOrDefault(x => x.Id == "7").StateText);
-            Assert.AreEqual("Rented since 28. November 11:01.", myBikes.FirstOrDefault(x => x.Id == "8").StateText);
-
-            Assert.IsFalse(myBikes.IsNoBikesOccupiedVisible);
-            Assert.AreEqual(string.Empty, myBikes.NoBikesOccupiedText);
-        }
-
-        [Test]
-        public async Task TestTinkApp_WebConnectCommunicationError()
-        {
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            locksService.TimeOut.Returns(timeOut);
-            timeOut.MultiConnect.Returns(new TimeSpan(0));
-            const string MERCH_ID = "MyMerchId";
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "4da3044c8657a04ba60e2eaa753bc51a", new List<string> { "TINK" })),
-                                isConnectedFunc: () => false,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new TINK.Model.Connector.Connector(
-                    uri,
-                    new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                    null /*UI language */,
-                    sessionCookie,
-                    mail,
-                    server: new CopriProviderHttps(
-                        uri,
-                        TinkApp.MerchantId,
-                        new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                        null /*UI language */,
-                        sessionCookie: sessionCookie,
-                        cacheServer: new CopriCallsCacheMemory(MERCH_ID, sessionCookie: sessionCookie),
-                        httpsServer: new ExceptionServer((msg) => new WebConnectFailureException(msg, new Exception("Source expection."))))),
-                merchantId: MERCH_ID,
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: locksService, // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null, // Offline
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var myBikes = new MyBikesPageViewModel(
-                tinkApp.ActiveUser,
-                permissions, // Permissions,
-                bluetooth,
-                Device.iOS,
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                new GeolocationMock(),
-                locksService,
-                tinkApp.Stations,
-                tinkApp.Polling,
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                url => { })
-            {
-                IsReportLevelVerbose = true
-            };
-
-            await myBikes.OnAppearing();
-
-            Assert.AreEqual("Connection interrupted, server unreachable.", myBikes.StatusInfoText);
-
-            Assert.AreEqual(2, myBikes.Count);
-            Assert.IsTrue(myBikes.IsIdle);
-            Assert.IsTrue(myBikes.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            Assert.AreEqual("Rented since 28. November 13:06.", myBikes.FirstOrDefault(x => x.Id == "7").StateText);
-            Assert.AreEqual("Rented since 28. November 11:01.", myBikes.FirstOrDefault(x => x.Id == "8").StateText);
-
-            Assert.IsFalse(myBikes.IsNoBikesOccupiedVisible);
-            Assert.AreEqual(string.Empty, myBikes.NoBikesOccupiedText);
-        }
-
-        [Test]
-        public async Task TestTinkApp_GeneralPurposeError()
-        {
-            var locksService = Substitute.For<ILocksService>();
-            var timeOut = Substitute.For<ITimeOutProvider>();
-            var viewService = Substitute.For<IViewService>();
-            var permissions = Substitute.For<ILocationPermission>();
-            var bluetooth = Substitute.For<IBluetoothLE>();
-
-            locksService.TimeOut.Returns(timeOut);
-            timeOut.MultiConnect.Returns(new TimeSpan(0));
-            const string MERCH_ID = "MyMerchId";
-            var tinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: locksService.GetType().FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "4da3044c8657a04ba60e2eaa753bc51a", new List<string> { "TINK" })),
-                                isConnectedFunc: () => false,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new TINK.Model.Connector.Connector(
-                    uri,
-                    new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                    null /*UI language */,
-                    sessionCookie,
-                    mail,
-                    server: new CopriProviderHttps(
-                        uri,
-                        TinkApp.MerchantId,
-                        new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-                        null /*UI language */,
-                        sessionCookie: sessionCookie,
-                        cacheServer: new CopriCallsCacheMemory(MERCH_ID, sessionCookie: sessionCookie),
-                        httpsServer: new ExceptionServer((msg) => new Exception(msg)))),
-                merchantId: MERCH_ID,
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: null,
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: locksService, // Cipher
-                device: new DeviceMock(), // Permissions.
-                specialFolder: new SpecialFolderMock(),
-                cipher: null, // Offline
-                theme: null,
-                postAction: (d, obj) => d(obj),
-                currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
-                whatsNewShownInVersion: null); // Whats new page was never shown.
-
-            var myBikes = new MyBikesPageViewModel(
-                tinkApp.ActiveUser,
-                permissions, // Permissions,
-                bluetooth,
-                Device.iOS,
-                () => tinkApp.GetIsConnected(),
-                (isConnected) => tinkApp.GetConnector(isConnected),
-                new GeolocationMock(),
-                locksService,
-                tinkApp.Stations,
-                tinkApp.Polling,
-                (d, obj) => d(obj),
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                url => { })
-            {
-                IsReportLevelVerbose = true
-            };
-
-            await myBikes.OnAppearing();
-
-            Assert.AreEqual("Connection interrupted.", myBikes.StatusInfoText);
-
-            Assert.AreEqual(2, myBikes.Count);
-            Assert.IsTrue(myBikes.IsIdle);
-            Assert.IsTrue(myBikes.IsBikesListVisible, "If there are any bikes, list must be visible.");
-
-            Assert.AreEqual("Rented since 28. November 13:06.", myBikes.FirstOrDefault(x => x.Id == "7").StateText);
-            Assert.AreEqual("Rented since 28. November 11:01.", myBikes.FirstOrDefault(x => x.Id == "8").StateText);
-
-            Assert.IsFalse(myBikes.IsNoBikesOccupiedVisible);
-            Assert.AreEqual(string.Empty, myBikes.NoBikesOccupiedText);
-        }
-    }
+	[TestFixture]
+	public class TestMyBikesPageViewModel
+	{
+		[Test]
+		public async Task TestConstruct_Droid()
+		{
+			var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			locksService.TimeOut.Returns(timeOut);
+			timeOut.MultiConnect.Returns(new TimeSpan(0));
+
+			// Fake location permissions to be set
+			permissions.CheckStatusAsync().Returns(Task.FromResult(Status.Granted));
+			geolocation.Active.IsGeolcationEnabled.Returns(true); // Fake gps to be on
+			bluetooth.State.Returns(BluetoothState.On); // Fake bluetooth to be on
+
+			// Fake bluetooth answer for locks with id 2200545 and 2200537.
+			locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(
+				new List<LockInfoTdo> {
+					{ new LockInfoTdo.Builder { Id = 2200545, State = LockitLockingState.Open }.Build() },
+					{ new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
+					}
+				);
+			const string MERCH_ID = "MyMerchId";
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
+				merchantId: MERCH_ID,
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: null,
+				locationServicesContainer: geolocation,
+				locksService: locksService, // Cipher
+				device: new DeviceMock(), // Permissions,
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var myBikes = new MyBikesPageViewModel(
+				tinkApp.ActiveUser,
+				permissions, /* permissions */
+				bluetooth, /* bluetooth */
+				Device.Android,
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				geolocation.Active, // geolocation
+				locksService,
+				tinkApp.Stations,
+				tinkApp.Polling,
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				url => { });
+
+			await myBikes.OnAppearing();
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				permissions.CheckStatusAsync();
+				var glDummy = geolocation.Active.Received().IsGeolcationEnabled;
+				var btDummy = bluetooth.Received().State;
+				locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>());
+			});
+
+			Assert.IsEmpty(myBikes.StatusInfoText);
+
+			Assert.AreEqual(2, myBikes.Count);
+			Assert.IsTrue(myBikes.IsIdle);
+			Assert.IsTrue(myBikes.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			var bike1545 = myBikes.FirstOrDefault(x => x.Id == "1545") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			var bike1537 = myBikes.FirstOrDefault(x => x.Id == "1537") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			Assert.AreEqual($"Rented since {DateTime.Parse("2020-11-06 17:53:22.784681+01"):dd. MMMM HH:mm}.", bike1545.StateText);
+			Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
+			Assert.AreEqual("Close lock", bike1545.LockitButtonText);
+			Assert.AreEqual("Open lock", bike1537.LockitButtonText);
+
+			Assert.IsFalse(myBikes.IsNoBikesOccupiedVisible);
+			Assert.IsEmpty(myBikes.NoBikesOccupiedText);
+		}
+
+		[Test]
+		public async Task TestConstruct_Droid_NoPermissions_OpenSettings()
+		{
+			var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			locksService.TimeOut.Returns(timeOut);
+			timeOut.MultiConnect.Returns(new TimeSpan(0));
+
+			// Fake location permissions not to be set
+			permissions.CheckStatusAsync().Returns(Task.FromResult(Status.Denied));
+
+			// Fake anwser on question whether to open permissions dialog
+			viewService.DisplayAlert(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>()).Returns(true);
+
+			locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(
+				new List<LockInfoTdo> {
+					{ new LockInfoTdo.Builder { Id = 2200545, State = LockitLockingState.Open }.Build() },
+					{ new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
+				}
+			);
+			const string MERCH_ID = "MyMerchId";
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
+				merchantId: MERCH_ID,
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: null,
+				locationServicesContainer: geolocation,
+				locksService: locksService, // Cipher
+				device: new DeviceMock(), // Permissions,
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var myBikes = new MyBikesPageViewModel(
+				tinkApp.ActiveUser,
+				permissions, /* permissions */
+				bluetooth, /* bluetooth */
+				Device.Android,
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				geolocation.Active, // geolocation
+				locksService,
+				tinkApp.Stations,
+				tinkApp.Polling,
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				url => { });
+
+			await myBikes.OnAppearing();
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				permissions.CheckStatusAsync();
+				var glDummy = geolocation.Active.Received().IsGeolcationEnabled;
+				permissions.RequestAsync(); // Ask user from permissions.
+				viewService.DisplayAlert(
+					"Hint",
+					"Please allow location sharing so that bike lock/locks can be managed.\r\nOpen sharing dialog?",
+					"Yes",
+					"No");
+				permissions.OpenAppSettings();
+			});
+
+			Assert.IsEmpty(myBikes.StatusInfoText, "Unexpected status info text detected.");
+
+			Assert.AreEqual(2, myBikes.Count);
+			Assert.IsTrue(myBikes.IsIdle);
+			Assert.IsTrue(myBikes.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			var bike1545 = myBikes.FirstOrDefault(x => x.Id == "1545") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			var bike1537 = myBikes.FirstOrDefault(x => x.Id == "1537") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			Assert.AreEqual($"Rented since {DateTime.Parse("2020-11-06 17:53:22.784681+01"):dd. MMMM HH:mm}.", bike1545.StateText);
+			Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
+			Assert.AreEqual("Search lock", bike1545.LockitButtonText);
+			Assert.AreEqual("Search lock", bike1537.LockitButtonText);
+
+			Assert.IsFalse(myBikes.IsNoBikesOccupiedVisible);
+			Assert.IsEmpty(myBikes.NoBikesOccupiedText, "There must not be any bikes occupied.");
+		}
+
+		[Test]
+		public async Task TestConstruct_Droid_NoPermissions()
+		{
+			var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			locksService.TimeOut.Returns(timeOut);
+			timeOut.MultiConnect.Returns(new TimeSpan(0));
+
+			// Fake location permissions not to be set
+			permissions.CheckStatusAsync().Returns(Task.FromResult(Status.Denied));
+
+			permissions.OpenAppSettings().Throws<Exception>(); // Ensures that method is not called and fixture succeeds.
+
+			// Fake anwser on question whether to open permissions dialog
+			viewService.DisplayAlert(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>()).Returns(false);
+
+			// Fake bluetooth answer for locks with id 2200545 and 2200537.
+			var lockInfoTdo = new List<LockInfoTdo> {
+				{ new LockInfoTdo.Builder { Id = 2200545, State = LockitLockingState.Open }.Build() },
+				{ new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
+				};
+
+			locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(lockInfoTdo);
+			const string MERCH_ID = "MyMerchId";
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
+				merchantId: MERCH_ID,
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: null,
+				locationServicesContainer: geolocation,
+				locksService: locksService, // Cipher
+				device: new DeviceMock(), // Permissions,
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var myBikes = new MyBikesPageViewModel(
+				tinkApp.ActiveUser,
+				permissions, /* permissions */
+				bluetooth, /* bluetooth */
+				Device.Android,
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				geolocation.Active, // geolocation
+				locksService,
+				tinkApp.Stations,
+				tinkApp.Polling,
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				url => { });
+
+			await myBikes.OnAppearing();
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				permissions.CheckStatusAsync();
+				var glDummy = geolocation.Active.Received().IsGeolcationEnabled;
+				permissions.RequestAsync(); // Ask user from permissions.
+				viewService.DisplayAlert(
+					"Hint",
+					"Please allow location sharing so that bike lock/locks can be managed.\r\nOpen sharing dialog?",
+					"Yes",
+					"No");
+			});
+
+			Assert.IsEmpty(myBikes.StatusInfoText, "Unexpected status info text detected.");
+
+			Assert.AreEqual(2, myBikes.Count);
+			Assert.IsTrue(myBikes.IsIdle);
+			Assert.IsTrue(myBikes.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			var bike1545 = myBikes.FirstOrDefault(x => x.Id == "1545") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			var bike1537 = myBikes.FirstOrDefault(x => x.Id == "1537") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			Assert.AreEqual($"Rented since {DateTime.Parse("2020-11-06 17:53:22.784681+01"):dd. MMMM HH:mm}.", bike1545.StateText);
+			Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
+			Assert.AreEqual("Search lock", bike1545.LockitButtonText);
+			Assert.AreEqual("Search lock", bike1537.LockitButtonText);
+
+			Assert.IsFalse(myBikes.IsNoBikesOccupiedVisible);
+			Assert.IsEmpty(myBikes.NoBikesOccupiedText, "There must not be any bikes occupied.");
+		}
+
+		[Test]
+		public async Task TestConstruct_Droid_GeolocationOff()
+		{
+			var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			locksService.TimeOut.Returns(timeOut);
+			timeOut.MultiConnect.Returns(new TimeSpan(0));
+
+			// Fake location permissions to be set
+			permissions.CheckStatusAsync().Returns(Task.FromResult(Status.Granted));
+			geolocation.Active.IsGeolcationEnabled.Returns(false); // Fake gps to be off
+
+			// Fake bluetooth answer for locks with id 2200545 and 2200537.
+			locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(
+			new List<LockInfoTdo> {
+				{ new LockInfoTdo.Builder { Id = 2200545, State = LockitLockingState.Open }.Build() },
+				{ new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
+			}
+			);
+			const string MERCH_ID = "MyMerchId";
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
+				merchantId: MERCH_ID,
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: null,
+				locationServicesContainer: geolocation,
+				locksService: locksService, // Cipher
+				device: new DeviceMock(), // Permissions,
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var myBikes = new MyBikesPageViewModel(
+				tinkApp.ActiveUser,
+				permissions, /* permissions */
+				bluetooth, /* bluetooth */
+				Device.Android,
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				geolocation.Active, // geolocation
+				locksService,
+				tinkApp.Stations,
+				tinkApp.Polling,
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				url => { });
+
+			await myBikes.OnAppearing();
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				permissions.CheckStatusAsync();
+				var glDummy = geolocation.Active.Received().IsGeolcationEnabled;
+				viewService.DisplayAlert(
+						"Hint",
+						"Please activate location so that bike lock can be found!",
+						"OK");
+			});
+
+			Assert.IsEmpty(myBikes.StatusInfoText);
+
+			Assert.AreEqual(2, myBikes.Count);
+			Assert.IsTrue(myBikes.IsIdle);
+			Assert.IsTrue(myBikes.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			var bike1545 = myBikes.FirstOrDefault(x => x.Id == "1545") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			var bike1537 = myBikes.FirstOrDefault(x => x.Id == "1537") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			Assert.AreEqual($"Rented since {DateTime.Parse("2020-11-06 17:53:22.784681+01"):dd. MMMM HH:mm}.", bike1545.StateText);
+			Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
+			Assert.AreEqual("Search lock", bike1545.LockitButtonText);
+			Assert.AreEqual("Search lock", bike1537.LockitButtonText);
+
+			Assert.IsFalse(myBikes.IsNoBikesOccupiedVisible);
+			Assert.IsEmpty(myBikes.NoBikesOccupiedText);
+		}
+
+		[Test]
+		public async Task TestConstruct_Droid_BluetoothOff()
+		{
+			var geolocation = Substitute.For<IServicesContainer<IGeolocation>>();
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			locksService.TimeOut.Returns(timeOut);
+			timeOut.MultiConnect.Returns(new TimeSpan(0));
+
+			// Fake location permissions to be set
+			permissions.CheckStatusAsync().Returns(Task.FromResult(Status.Granted));
+			geolocation.Active.IsGeolcationEnabled.Returns(true); // Fake gps to be on
+			bluetooth.State.Returns(BluetoothState.Off); // Fake bluetooth to be off
+
+			var lockInfoTdo = new List<LockInfoTdo> {
+				{ new LockInfoTdo.Builder { Id = 2200545, State = LockitLockingState.Open }.Build() },
+				{ new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
+				};
+
+			locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(lockInfoTdo);
+			const string MERCH_ID = "MyMerchId";
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
+				merchantId: MERCH_ID,
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: null,
+				locationServicesContainer: geolocation,
+				locksService: locksService, // Cipher
+				device: new DeviceMock(), // Permissions,
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var myBikes = new MyBikesPageViewModel(
+				tinkApp.ActiveUser,
+				permissions, /* permissions */
+				bluetooth, /* bluetooth */
+				Device.Android,
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				geolocation.Active, // geolocation
+				locksService,
+				tinkApp.Stations,
+				tinkApp.Polling,
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				url => { });
+
+			await myBikes.OnAppearing();
+
+			// Verify behaviour
+			Received.InOrder(() =>
+			{
+				permissions.CheckStatusAsync();
+				var glDummy = geolocation.Active.Received().IsGeolcationEnabled;
+				var btDummy = bluetooth.Received().State;
+				viewService.DisplayAlert(
+						"Hint",
+						"Please enable Bluetooth to manage bike lock/locks.",
+						"OK");
+			});
+
+			Assert.That(
+				myBikes.StatusInfoText,
+				Is.Empty,
+				"Status info text must be empty.");
+
+			Assert.AreEqual(2, myBikes.Count);
+			Assert.IsTrue(myBikes.IsIdle);
+			Assert.IsTrue(myBikes.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			var bike1545 = myBikes.FirstOrDefault(x => x.Id == "1545") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			var bike1537 = myBikes.FirstOrDefault(x => x.Id == "1537") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
+			Assert.AreEqual($"Rented since {DateTime.Parse("2020-11-06 17:53:22.784681+01"):dd. MMMM HH:mm}.", bike1545.StateText);
+			Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
+			Assert.AreEqual("Search lock", bike1545.LockitButtonText);
+			Assert.AreEqual("Search lock", bike1537.LockitButtonText);
+
+			Assert.IsFalse(myBikes.IsNoBikesOccupiedVisible);
+			Assert.That(
+				myBikes.NoBikesOccupiedText,
+				Is.Empty,
+				"Label which informs that no bikes are reserved/ rented must be empty.");
+		}
+
+		[Test]
+		public async Task TestConstruct_NoBikesOccupied()
+		{
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			locksService.TimeOut.Returns(timeOut);
+			timeOut.MultiConnect.Returns(new TimeSpan(0));
+			const string MERCH_ID = "MyMerchId";
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "Invalid_SessionCookie", new List<string> { "TINK" })),
+								isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.Set2, 1, sessionCookie)),
+				merchantId: MERCH_ID,
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: locksService, // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var myBikes = new MyBikesPageViewModel(
+				tinkApp.ActiveUser,
+				permissions, // Permissions,
+				bluetooth,
+				Device.iOS,
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				new GeolocationMock(),
+				locksService,
+				tinkApp.Stations,
+				tinkApp.Polling,
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				url => { });
+
+			await myBikes.OnAppearing();
+
+			Assert.IsTrue(new List<string> { "Updating...", string.Empty }.Contains(myBikes.StatusInfoText));
+
+			Assert.AreEqual(0, myBikes.Count);
+			Assert.IsTrue(myBikes.IsIdle);
+			Assert.IsFalse(myBikes.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			Assert.IsTrue(myBikes.IsNoBikesOccupiedVisible);
+			Assert.AreEqual("Momentan sind keine Fahrräder auf Benutzer a@b reserviert/ gebucht.", myBikes.NoBikesOccupiedText);
+		}
+
+		[Test]
+		public async Task TestConstruct_Offline()
+		{
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			locksService.TimeOut.Returns(timeOut);
+			timeOut.MultiConnect.Returns(new TimeSpan(0));
+			const string MERCH_ID = "MyMerchId";
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "4da3044c8657a04ba60e2eaa753bc51a", new List<string> { "TINK" })),
+								isConnectedFunc: () => false,
+							connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.Set2, 1, sessionCookie)),
+				merchantId: MERCH_ID,
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: null,
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: locksService, // Cipher
+				device: new DeviceMock(), // Permissions
+				specialFolder: new SpecialFolderMock(),
+				cipher: null, // Offline
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var myBikes = new MyBikesPageViewModel(
+				tinkApp.ActiveUser,
+				permissions, // Permissions,
+				bluetooth,
+				Device.iOS,
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				new GeolocationMock(),
+				locksService,
+				tinkApp.Stations,
+				tinkApp.Polling,
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				url => { });
+
+			await myBikes.OnAppearing();
+
+			Assert.AreEqual("Offline.", myBikes.StatusInfoText);
+
+			Assert.AreEqual(2, myBikes.Count);
+			Assert.IsTrue(myBikes.IsIdle);
+			Assert.IsTrue(myBikes.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			Assert.AreEqual("Rented since 28. November 13:06.", myBikes.FirstOrDefault(x => x.Id == "7").StateText);
+			Assert.AreEqual("Rented since 28. November 11:01.", myBikes.FirstOrDefault(x => x.Id == "8").StateText);
+
+			Assert.IsFalse(myBikes.IsNoBikesOccupiedVisible);
+			Assert.AreEqual(string.Empty, myBikes.NoBikesOccupiedText);
+		}
+
+		[Test]
+		public async Task TestTinkApp_WebConnectCommunicationError()
+		{
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			locksService.TimeOut.Returns(timeOut);
+			timeOut.MultiConnect.Returns(new TimeSpan(0));
+			const string MERCH_ID = "MyMerchId";
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "4da3044c8657a04ba60e2eaa753bc51a", new List<string> { "TINK" })),
+								isConnectedFunc: () => false,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new TINK.Model.Connector.Connector(
+					uri,
+					new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+					null /*UI language */,
+					sessionCookie,
+					mail,
+					server: new CopriProviderHttps(
+						uri,
+						TinkApp.MerchantId,
+						new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+						null /*UI language */,
+						sessionCookie: sessionCookie,
+						cacheServer: new CopriCallsCacheMemory(MERCH_ID, sessionCookie: sessionCookie),
+						httpsServer: new ExceptionServer((msg) => new WebConnectFailureException(msg, new Exception("Source expection."))))),
+				merchantId: MERCH_ID,
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: locksService, // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null, // Offline
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var myBikes = new MyBikesPageViewModel(
+				tinkApp.ActiveUser,
+				permissions, // Permissions,
+				bluetooth,
+				Device.iOS,
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				new GeolocationMock(),
+				locksService,
+				tinkApp.Stations,
+				tinkApp.Polling,
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				url => { })
+			{
+				IsReportLevelVerbose = true
+			};
+
+			await myBikes.OnAppearing();
+
+			Assert.AreEqual("Connection interrupted, server unreachable.", myBikes.StatusInfoText);
+
+			Assert.AreEqual(2, myBikes.Count);
+			Assert.IsTrue(myBikes.IsIdle);
+			Assert.IsTrue(myBikes.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			Assert.AreEqual("Rented since 28. November 13:06.", myBikes.FirstOrDefault(x => x.Id == "7").StateText);
+			Assert.AreEqual("Rented since 28. November 11:01.", myBikes.FirstOrDefault(x => x.Id == "8").StateText);
+
+			Assert.IsFalse(myBikes.IsNoBikesOccupiedVisible);
+			Assert.AreEqual(string.Empty, myBikes.NoBikesOccupiedText);
+		}
+
+		[Test]
+		public async Task TestTinkApp_GeneralPurposeError()
+		{
+			var locksService = Substitute.For<ILocksService>();
+			var timeOut = Substitute.For<ITimeOutProvider>();
+			var viewService = Substitute.For<IViewService>();
+			var permissions = Substitute.For<ILocationPermission>();
+			var bluetooth = Substitute.For<IBluetoothLE>();
+
+			locksService.TimeOut.Returns(timeOut);
+			timeOut.MultiConnect.Returns(new TimeSpan(0));
+			const string MERCH_ID = "MyMerchId";
+			var tinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: locksService.GetType().FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "4da3044c8657a04ba60e2eaa753bc51a", new List<string> { "TINK" })),
+								isConnectedFunc: () => false,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new TINK.Model.Connector.Connector(
+					uri,
+					new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+					null /*UI language */,
+					sessionCookie,
+					mail,
+					server: new CopriProviderHttps(
+						uri,
+						TinkApp.MerchantId,
+						new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+						null /*UI language */,
+						sessionCookie: sessionCookie,
+						cacheServer: new CopriCallsCacheMemory(MERCH_ID, sessionCookie: sessionCookie),
+						httpsServer: new ExceptionServer((msg) => new Exception(msg)))),
+				merchantId: MERCH_ID,
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: null,
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: locksService, // Cipher
+				device: new DeviceMock(), // Permissions.
+				specialFolder: new SpecialFolderMock(),
+				cipher: null, // Offline
+				theme: null,
+				postAction: (d, obj) => d(obj),
+				currentVersion: new Version(3, 2, 0, 115), // Current app version
+				lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
+				whatsNewShownInVersion: null); // Whats new page was never shown.
+
+			var myBikes = new MyBikesPageViewModel(
+				tinkApp.ActiveUser,
+				permissions, // Permissions,
+				bluetooth,
+				Device.iOS,
+				() => tinkApp.GetIsConnected(),
+				(isConnected) => tinkApp.GetConnector(isConnected),
+				new GeolocationMock(),
+				locksService,
+				tinkApp.Stations,
+				tinkApp.Polling,
+				(d, obj) => d(obj),
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				url => { })
+			{
+				IsReportLevelVerbose = true
+			};
+
+			await myBikes.OnAppearing();
+
+			Assert.AreEqual("Connection interrupted.", myBikes.StatusInfoText);
+
+			Assert.AreEqual(2, myBikes.Count);
+			Assert.IsTrue(myBikes.IsIdle);
+			Assert.IsTrue(myBikes.IsBikesListVisible, "If there are any bikes, list must be visible.");
+
+			Assert.AreEqual("Rented since 28. November 13:06.", myBikes.FirstOrDefault(x => x.Id == "7").StateText);
+			Assert.AreEqual("Rented since 28. November 11:01.", myBikes.FirstOrDefault(x => x.Id == "8").StateText);
+
+			Assert.IsFalse(myBikes.IsNoBikesOccupiedVisible);
+			Assert.AreEqual(string.Empty, myBikes.NoBikesOccupiedText);
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestViewModelHelper.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestViewModelHelper.cs
index f6545da..376ab2b 100644
--- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestViewModelHelper.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestViewModelHelper.cs
@@ -7,78 +7,78 @@ using TINK.ViewModel;
 namespace UITest.Fixtures.ObjectTests.ViewModel
 {
 
-    [TestFixture]
-    public class TestViewModelHelper
-    {
-        [Test]
-        public void TestGetDisplayName_DefinedTypes()
-        {
-            var l_oBike = MockRepository.GenerateStub<IBikeInfoMutable>();
-            l_oBike.Stub(x => x.WheelType).Return(WheelType.Two);
-            l_oBike.Stub(x => x.TypeOfBike).Return(TypeOfBike.City);
-            l_oBike.Stub(x => x.Description).Return("MeinStadtrad");
-            l_oBike.Stub(x => x.Id).Return("22");
-            Assert.AreEqual(
-                "MeinStadtrad",
-                l_oBike.GetDisplayName());
+	[TestFixture]
+	public class TestViewModelHelper
+	{
+		[Test]
+		public void TestGetDisplayName_DefinedTypes()
+		{
+			var l_oBike = MockRepository.GenerateStub<IBikeInfoMutable>();
+			l_oBike.Stub(x => x.WheelType).Return(WheelType.Two);
+			l_oBike.Stub(x => x.TypeOfBike).Return(TypeOfBike.City);
+			l_oBike.Stub(x => x.Description).Return("MeinStadtrad");
+			l_oBike.Stub(x => x.Id).Return("22");
+			Assert.AreEqual(
+				"MeinStadtrad",
+				l_oBike.GetDisplayName());
 
-            Assert.AreEqual(
-                "22",
-                l_oBike.GetDisplayId());
+			Assert.AreEqual(
+				"22",
+				l_oBike.GetDisplayId());
 
-            l_oBike = MockRepository.GenerateStub<IBikeInfoMutable>();
-            l_oBike.Stub(x => x.WheelType).Return(WheelType.Two);
-            l_oBike.Stub(x => x.TypeOfBike).Return(TypeOfBike.City);
-            l_oBike.Stub(x => x.Id).Return("22");
-            l_oBike.Stub(x => x.IsDemo).Return(true);
-            l_oBike.Stub(x => x.Description).Return("MeinStadtrad");
-            Assert.AreEqual(
-                "MeinStadtrad",
-                l_oBike.GetDisplayName());
-            Assert.AreEqual(
-                "22",
-                l_oBike.GetDisplayId());
+			l_oBike = MockRepository.GenerateStub<IBikeInfoMutable>();
+			l_oBike.Stub(x => x.WheelType).Return(WheelType.Two);
+			l_oBike.Stub(x => x.TypeOfBike).Return(TypeOfBike.City);
+			l_oBike.Stub(x => x.Id).Return("22");
+			l_oBike.Stub(x => x.IsDemo).Return(true);
+			l_oBike.Stub(x => x.Description).Return("MeinStadtrad");
+			Assert.AreEqual(
+				"MeinStadtrad",
+				l_oBike.GetDisplayName());
+			Assert.AreEqual(
+				"22",
+				l_oBike.GetDisplayId());
 
-            l_oBike = MockRepository.GenerateStub<IBikeInfoMutable>();
-            l_oBike.Stub(x => x.WheelType).Return(WheelType.Trike);
-            l_oBike.Stub(x => x.TypeOfBike).Return(TypeOfBike.Cargo);
-            l_oBike.Stub(x => x.Description).Return("MeinCargoDreiradl");
-            l_oBike.Stub(x => x.Id).Return("22");
-            Assert.AreEqual(
-                "MeinCargoDreiradl",
-                l_oBike.GetDisplayName());
-            Assert.AreEqual(
-                "22",
-                l_oBike.GetDisplayId());
+			l_oBike = MockRepository.GenerateStub<IBikeInfoMutable>();
+			l_oBike.Stub(x => x.WheelType).Return(WheelType.Trike);
+			l_oBike.Stub(x => x.TypeOfBike).Return(TypeOfBike.Cargo);
+			l_oBike.Stub(x => x.Description).Return("MeinCargoDreiradl");
+			l_oBike.Stub(x => x.Id).Return("22");
+			Assert.AreEqual(
+				"MeinCargoDreiradl",
+				l_oBike.GetDisplayName());
+			Assert.AreEqual(
+				"22",
+				l_oBike.GetDisplayId());
 
-            l_oBike = MockRepository.GenerateStub<IBikeInfoMutable>();
-            l_oBike.Stub(x => x.WheelType).Return(WheelType.Two);
-            l_oBike.Stub(x => x.TypeOfBike).Return(TypeOfBike.Cargo);
-            l_oBike.Stub(x => x.Description).Return("MeinCargoALololong");
-            l_oBike.Stub(x => x.Id).Return("22");
-            Assert.AreEqual(
-                "MeinCargoALololong",
-                l_oBike.GetDisplayName());
-            Assert.AreEqual(
-                "22",
-                l_oBike.GetDisplayId());
-        }
+			l_oBike = MockRepository.GenerateStub<IBikeInfoMutable>();
+			l_oBike.Stub(x => x.WheelType).Return(WheelType.Two);
+			l_oBike.Stub(x => x.TypeOfBike).Return(TypeOfBike.Cargo);
+			l_oBike.Stub(x => x.Description).Return("MeinCargoALololong");
+			l_oBike.Stub(x => x.Id).Return("22");
+			Assert.AreEqual(
+				"MeinCargoALololong",
+				l_oBike.GetDisplayName());
+			Assert.AreEqual(
+				"22",
+				l_oBike.GetDisplayId());
+		}
 
-        [Test]
-        public void TestGetDisplayName_UndefinedTypes()
-        {
-            var l_oBike = MockRepository.GenerateStub<IBikeInfoMutable>();
-            l_oBike.Stub(x => x.WheelType).Return(WheelType.Mono);
-            l_oBike.Stub(x => x.TypeOfBike).Return(TypeOfBike.Cargo);
-            l_oBike.Stub(x => x.Description).Return("SuperCargo");
-            l_oBike.Stub(x => x.Id).Return("22");
-            Assert.AreEqual(
-                "SuperCargo",
-                l_oBike.GetDisplayName());
+		[Test]
+		public void TestGetDisplayName_UndefinedTypes()
+		{
+			var l_oBike = MockRepository.GenerateStub<IBikeInfoMutable>();
+			l_oBike.Stub(x => x.WheelType).Return(WheelType.Mono);
+			l_oBike.Stub(x => x.TypeOfBike).Return(TypeOfBike.Cargo);
+			l_oBike.Stub(x => x.Description).Return("SuperCargo");
+			l_oBike.Stub(x => x.Id).Return("22");
+			Assert.AreEqual(
+				"SuperCargo",
+				l_oBike.GetDisplayName());
 
-            Assert.AreEqual(
-                "22",
-                l_oBike.GetDisplayId());
-        }
-    }
+			Assert.AreEqual(
+				"22",
+				l_oBike.GetDisplayId());
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/UseCases/ConnectedOffline/TestTinkApp.cs b/TestTINKLib/Fixtures/UseCases/ConnectedOffline/TestTinkApp.cs
index 77742aa..d35a9f6 100644
--- a/TestTINKLib/Fixtures/UseCases/ConnectedOffline/TestTinkApp.cs
+++ b/TestTINKLib/Fixtures/UseCases/ConnectedOffline/TestTinkApp.cs
@@ -6,43 +6,43 @@ using TINK.Repository;
 
 namespace TestTINKLib.Fixtures.UseCases.ConnectedOffline
 {
-    using NSubstitute;
-    using Plugin.BLE.Abstractions.Contracts;
-    using TestFramework.Model.Services.Geolocation;
-    using TestFramework.Model.User.Account;
-    using TestFramework.Services.BluetoothLock;
-    using TINK.Model.Connector;
-    using TINK.Services;
-    using TINK.Services.Geolocation;
-    using TINK.Services.Permissions;
-    using static TINK.Repository.CopriCallsMemory;
+	using NSubstitute;
+	using Plugin.BLE.Abstractions.Contracts;
+	using TestFramework.Model.Services.Geolocation;
+	using TestFramework.Model.User.Account;
+	using TestFramework.Services.BluetoothLock;
+	using TINK.Model.Connector;
+	using TINK.Services;
+	using TINK.Services.Geolocation;
+	using TINK.Services.Permissions;
+	using static TINK.Repository.CopriCallsMemory;
 
-    [TestFixture]
-    public class TestTinkApp
-    {
-        [Test, Explicit("Draft")]
-        public void TestConstruct()
-        {
-            const string MERCH_ID = "MyMerchId";
+	[TestFixture]
+	public class TestTinkApp
+	{
+		[Test, Explicit("Draft")]
+		public void TestConstruct()
+		{
+			const string MERCH_ID = "MyMerchId";
 
-            var l_oApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    activeLockService: typeof(LocksServiceMock).FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(),
-                                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.Set2, 1)),
-                merchantId: MERCH_ID,
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: new LocksServiceMock(), // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                currentVersion: new Version(3, 2, 0, 115), // Current app version                
-                lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to 
-        }
-    }
+			var l_oApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					activeLockService: typeof(LocksServiceMock).FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(),
+								isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.Set2, 1)),
+				merchantId: MERCH_ID,
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: new LocksServiceMock(), // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				currentVersion: new Version(3, 2, 0, 115), // Current app version                
+				lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to 
+		}
+	}
 }
diff --git a/TestTINKLib/Fixtures/UseCases/SelectStation/TestTinkApp.cs b/TestTINKLib/Fixtures/UseCases/SelectStation/TestTinkApp.cs
index 71e1ef8..213f6a9 100644
--- a/TestTINKLib/Fixtures/UseCases/SelectStation/TestTinkApp.cs
+++ b/TestTINKLib/Fixtures/UseCases/SelectStation/TestTinkApp.cs
@@ -19,64 +19,64 @@ using static TINK.Repository.CopriCallsMemory;
 namespace TestTINKLib.Fixtures.UseCases.SelectStation
 {
 
-    [TestFixture]
-    public class TestTinkApp
-    {
-        [Test]
-        public void TestBikesAtStation_AccountStoreMock_NoUser_CopriMock_Set2()
-        {
-            const string MERCH_ID = "MyMerchId";
+	[TestFixture]
+	public class TestTinkApp
+	{
+		[Test]
+		public void TestBikesAtStation_AccountStoreMock_NoUser_CopriMock_Set2()
+		{
+			const string MERCH_ID = "MyMerchId";
 
-            var l_oConnector = new ConnectorCache(
-                    new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)),
-                    null /*UI language */,
-                    string.Empty,
-                    string.Empty,
-                    new CopriCallsMemory(MERCH_ID, SampleSets.Set2, 1));
+			var l_oConnector = new ConnectorCache(
+					new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)),
+					null /*UI language */,
+					string.Empty,
+					string.Empty,
+					new CopriCallsMemory(MERCH_ID, SampleSets.Set2, 1));
 
-            var l_oTinkApp = new TinkApp(
-                new TINK.Model.Settings.Settings(
-                    new TINK.ViewModel.Map.GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On } }),
-                    new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
-                    new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
-                    new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
-                    Serilog.Events.LogEventLevel.Error,
-                    activeLockService: typeof(LocksServiceMock).FullName,
-                    activeGeolocationService: typeof(GeolocationMock).FullName),
-                new StoreMock(),
-                isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.Set2, 1)),
-                merchantId: MERCH_ID,
-                bluetoothService: Substitute.For<IBluetoothLE>(),
-                locationPermissionsService: Substitute.For<ILocationPermission>(),
-                locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
-                locksService: new LocksServiceMock(), // Cipher
-                device: new DeviceMock(),
-                specialFolder: new SpecialFolderMock(),
-                cipher: null,
-                theme: null,
-                currentVersion: new Version(3, 2, 0, 115),
-                lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to 
+			var l_oTinkApp = new TinkApp(
+				new TINK.Model.Settings.Settings(
+					new TINK.ViewModel.Map.GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On } }),
+					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
+					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
+					Serilog.Events.LogEventLevel.Error,
+					activeLockService: typeof(LocksServiceMock).FullName,
+					activeGeolocationService: typeof(GeolocationMock).FullName),
+				new StoreMock(),
+				isConnectedFunc: () => true,
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.Set2, 1)),
+				merchantId: MERCH_ID,
+				bluetoothService: Substitute.For<IBluetoothLE>(),
+				locationPermissionsService: Substitute.For<ILocationPermission>(),
+				locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
+				locksService: new LocksServiceMock(), // Cipher
+				device: new DeviceMock(),
+				specialFolder: new SpecialFolderMock(),
+				cipher: null,
+				theme: null,
+				currentVersion: new Version(3, 2, 0, 115),
+				lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to 
 
-            Assert.AreEqual(0, TestHelper.GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.Count);
+			Assert.AreEqual(0, TestHelper.GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.Count);
 
-            l_oTinkApp.SelectedStation = new TINK.Model.Station.Station("5", new List<string>(), null);
-            Assert.AreEqual(3, TestHelper.GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.Count);
-            Assert.AreEqual("25", TestHelper.GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.GetById("25").Id);
-            Assert.AreEqual("11", TestHelper.GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.GetById("11").Id);
-            Assert.AreEqual("2", TestHelper.GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.GetById("2").Id);
+			l_oTinkApp.SelectedStation = new TINK.Model.Station.Station("5", new List<string>(), null);
+			Assert.AreEqual(3, TestHelper.GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.Count);
+			Assert.AreEqual("25", TestHelper.GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.GetById("25").Id);
+			Assert.AreEqual("11", TestHelper.GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.GetById("11").Id);
+			Assert.AreEqual("2", TestHelper.GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.GetById("2").Id);
 
-            l_oTinkApp.SelectedStation = new TINK.Model.Station.Station("10", new List<string>(), null);
+			l_oTinkApp.SelectedStation = new TINK.Model.Station.Station("10", new List<string>(), null);
 
-            Assert.AreEqual(
-                1,
-                TestHelper.GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.Count);
+			Assert.AreEqual(
+				1,
+				TestHelper.GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.Count);
 
-            Assert.AreEqual("18", TestHelper.GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.GetById("18").Id);
+			Assert.AreEqual("18", TestHelper.GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.GetById("18").Id);
 
-            l_oTinkApp.SelectedStation = new TINK.Model.Station.Station("91345", new List<string>(), null);
+			l_oTinkApp.SelectedStation = new TINK.Model.Station.Station("91345", new List<string>(), null);
 
-            Assert.AreEqual(0, TestHelper.GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.Count);
-        }
-    }
+			Assert.AreEqual(0, TestHelper.GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.Count);
+		}
+	}
 }
\ No newline at end of file
diff --git a/TestTINKLib/Fixtures/UseCases/TestHelper.cs b/TestTINKLib/Fixtures/UseCases/TestHelper.cs
index 50e824e..982b4b6 100644
--- a/TestTINKLib/Fixtures/UseCases/TestHelper.cs
+++ b/TestTINKLib/Fixtures/UseCases/TestHelper.cs
@@ -7,24 +7,24 @@ using TINK.Model.User;
 
 namespace TestTINKLib.Fixtures.UseCases
 {
-    public class TestHelper
-    {
-        /// <summary>
-        /// Get all bikes at a given station from copri.
-        /// </summary>
-        public static async Task<BikeCollectionMutable> GetBikesAtStation(
-            User user,
-            TINK.Model.Connector.IConnector connector,
-            IEnumerable<IStation> stations,
-            string selectedStationId)
-        {
-            var l_oBikesAtStation = new BikeCollectionMutable();
+	public class TestHelper
+	{
+		/// <summary>
+		/// Get all bikes at a given station from copri.
+		/// </summary>
+		public static async Task<BikeCollectionMutable> GetBikesAtStation(
+			User user,
+			TINK.Model.Connector.IConnector connector,
+			IEnumerable<IStation> stations,
+			string selectedStationId)
+		{
+			var l_oBikesAtStation = new BikeCollectionMutable();
 
-            var l_oBikesAvailable = (await connector.Query.GetBikesAsync()).Response;
+			var l_oBikesAvailable = (await connector.Query.GetBikesAsync()).Response;
 
-            l_oBikesAtStation.Update(l_oBikesAvailable.GetAtStation(selectedStationId), stations);
+			l_oBikesAtStation.Update(l_oBikesAvailable.GetAtStation(selectedStationId), stations);
 
-            return l_oBikesAtStation;
-        }
-    }
+			return l_oBikesAtStation;
+		}
+	}
 }
diff --git a/TestTINKLib/Mocks/Bike/BikeCollectionMock.cs b/TestTINKLib/Mocks/Bike/BikeCollectionMock.cs
index b0a866b..3d201b0 100644
--- a/TestTINKLib/Mocks/Bike/BikeCollectionMock.cs
+++ b/TestTINKLib/Mocks/Bike/BikeCollectionMock.cs
@@ -6,21 +6,21 @@ using BikeInfoMutable = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable;
 
 namespace TestTINKLib.Mocks.Bike
 {
-    public class BikeCollectionMock : Collection<BikeInfoMutable>, IBikeDictionaryMutable<BikeInfoMutable>
-    {
-        public BikeInfoMutable GetById(string id)
-        {
-            return null;
-        }
+	public class BikeCollectionMock : Collection<BikeInfoMutable>, IBikeDictionaryMutable<BikeInfoMutable>
+	{
+		public BikeInfoMutable GetById(string id)
+		{
+			return null;
+		}
 
-        public void RemoveById(string id)
-        {
-            throw new NotSupportedException();
-        }
+		public void RemoveById(string id)
+		{
+			throw new NotSupportedException();
+		}
 
-        public bool ContainsKey(string id)
-        {
-            throw new NotSupportedException();
-        }
-    }
+		public bool ContainsKey(string id)
+		{
+			throw new NotSupportedException();
+		}
+	}
 }
diff --git a/TestTINKLib/Mocks/Connector/CopriCallsCacheMemory.cs b/TestTINKLib/Mocks/Connector/CopriCallsCacheMemory.cs
index de48bbc..79267fa 100644
--- a/TestTINKLib/Mocks/Connector/CopriCallsCacheMemory.cs
+++ b/TestTINKLib/Mocks/Connector/CopriCallsCacheMemory.cs
@@ -10,127 +10,127 @@ using static TINK.Repository.CopriCallsMemory;
 
 namespace TestTINKLib.Mocks.Connector
 {
-    /// <summary> Allows use of memory for retrieving defined respones.</summary>
-    public class CopriCallsCacheMemory : ICopriCache
-    {
-        private CopriCallsMemory server;
+	/// <summary> Allows use of memory for retrieving defined respones.</summary>
+	public class CopriCallsCacheMemory : ICopriCache
+	{
+		private CopriCallsMemory server;
 
-        public CopriCallsCacheMemory(
-            string merchantId,
-            SampleSets? sampleSet = null,
-            int? index = null,
-            string sessionCookie = null)
-        {
-            server = new CopriCallsMemory(merchantId, sampleSet, index, sessionCookie);
-        }
+		public CopriCallsCacheMemory(
+			string merchantId,
+			SampleSets? sampleSet = null,
+			int? index = null,
+			string sessionCookie = null)
+		{
+			server = new CopriCallsMemory(merchantId, sampleSet, index, sessionCookie);
+		}
 
-        public bool IsStationsExpired => true;
+		public bool IsStationsExpired => true;
 
-        public bool IsBikesAvailableExpired => true;
+		public bool IsBikesAvailableExpired => true;
 
-        public bool IsBikesOccupiedExpired => true;
+		public bool IsBikesOccupiedExpired => true;
 
-        public bool IsConnected => server.IsConnected;
+		public bool IsConnected => server.IsConnected;
 
-        public string SessionCookie => server.SessionCookie;
+		public string SessionCookie => server.SessionCookie;
 
-        public string MerchantId => server.MerchantId;
+		public string MerchantId => server.MerchantId;
 
-        public void AddToCache(StationsAvailableResponse stations)
-        {
-            return;
-        }
+		public void AddToCache(StationsAvailableResponse stations)
+		{
+			return;
+		}
 
-        public void AddToCache(BikesAvailableResponse bikes)
-        {
-            return;
-        }
+		public void AddToCache(BikesAvailableResponse bikes)
+		{
+			return;
+		}
 
-        public void AddToCache(BikesReservedOccupiedResponse bikes)
-        {
-            return;
-        }
+		public void AddToCache(BikesReservedOccupiedResponse bikes)
+		{
+			return;
+		}
 
-        public Task<AuthorizationResponse> DoAuthorizationAsync(string p_strMailAddress, string p_strPassword, string p_strDeviceId)
-        {
-            throw new NotImplementedException();
-        }
+		public Task<AuthorizationResponse> DoAuthorizationAsync(string p_strMailAddress, string p_strPassword, string p_strDeviceId)
+		{
+			throw new NotImplementedException();
+		}
 
-        public Task<AuthorizationoutResponse> DoAuthoutAsync()
-        {
-            throw new NotImplementedException();
-        }
+		public Task<AuthorizationoutResponse> DoAuthoutAsync()
+		{
+			throw new NotImplementedException();
+		}
 
-        public Task<ReservationBookingResponse> DoReserveAsync(string bikeId, Uri operatorUri)
-        {
-            throw new NotImplementedException();
-        }
+		public Task<ReservationBookingResponse> DoReserveAsync(string bikeId, Uri operatorUri)
+		{
+			throw new NotImplementedException();
+		}
 
-        public Task<ReservationCancelReturnResponse> DoCancelReservationAsync(string p_iBikeId, Uri operatorUri)
-        {
-            throw new NotImplementedException();
-        }
+		public Task<ReservationCancelReturnResponse> DoCancelReservationAsync(string p_iBikeId, Uri operatorUri)
+		{
+			throw new NotImplementedException();
+		}
 
-        public Task<ReservationBookingResponse> CalculateAuthKeysAsync(string bikeId, Uri operatorUri)
-            => throw new NotSupportedException();
+		public Task<ReservationBookingResponse> CalculateAuthKeysAsync(string bikeId, Uri operatorUri)
+			=> throw new NotSupportedException();
 
-        public Task<ResponseBase> StartReturningBike(
-            string bikeId,
-            Uri operatorUri)
-            => throw new NotImplementedException();
+		public Task<ResponseBase> StartReturningBike(
+			string bikeId,
+			Uri operatorUri)
+			=> throw new NotImplementedException();
 
-        public Task<ReservationBookingResponse> UpdateLockingStateAsync(
-            string bikeId,
-            lock_state state,
-            Uri operatorUri,
-            LocationDto geolocation,
-            double batteryPercentage)
-            => throw new NotImplementedException();
+		public Task<ReservationBookingResponse> UpdateLockingStateAsync(
+			string bikeId,
+			lock_state state,
+			Uri operatorUri,
+			LocationDto geolocation,
+			double batteryPercentage)
+			=> throw new NotImplementedException();
 
-        public Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
-            => throw new NotImplementedException();
+		public Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
+			=> throw new NotImplementedException();
 
-        public Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(string bikeId, Uri operatorUri)
-            => throw new NotImplementedException();
+		public Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(string bikeId, Uri operatorUri)
+			=> throw new NotImplementedException();
 
-        public Task<ReservationBookingResponse> BookReservedAndStartOpeningAsync(string bikeId, Uri operatorUri)
-            => throw new NotImplementedException();
+		public Task<ReservationBookingResponse> BookReservedAndStartOpeningAsync(string bikeId, Uri operatorUri)
+			=> throw new NotImplementedException();
 
-        public Task<DoReturnResponse> DoReturn(string bikeId, LocationDto location, ISmartDevice smartDevice, Uri operatorUri)
-            => throw new NotImplementedException();
+		public Task<DoReturnResponse> DoReturn(string bikeId, LocationDto location, ISmartDevice smartDevice, Uri operatorUri)
+			=> throw new NotImplementedException();
 
-        /// <summary> Returns a bike and starts closing. </summary>
-        /// <param name="bikeId">Id of the bike to return.</param>
-        /// <param name="smartDevice">Provides info about hard and software.</param>
-        /// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-        /// <returns>Response on returning request.</returns>
-        public Task<DoReturnResponse> ReturnAndStartClosingAsync(
-            string bikeId,
-            ISmartDevice smartDevice,
-            Uri operatorUri)
-            => throw new System.Exception("Rückgabe mit mit Schloss schließen Befehl Offlinemodus nicht möglich!");
+		/// <summary> Returns a bike and starts closing. </summary>
+		/// <param name="bikeId">Id of the bike to return.</param>
+		/// <param name="smartDevice">Provides info about hard and software.</param>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <returns>Response on returning request.</returns>
+		public Task<DoReturnResponse> ReturnAndStartClosingAsync(
+			string bikeId,
+			ISmartDevice smartDevice,
+			Uri operatorUri)
+			=> throw new System.Exception("Rückgabe mit mit Schloss schließen Befehl Offlinemodus nicht möglich!");
 
-        public Task<SubmitFeedbackResponse> DoSubmitFeedback(string bikeId, int? currentChargeBars, string message, bool isBikeBroken, Uri operatorUri)
-            => throw new NotImplementedException();
+		public Task<SubmitFeedbackResponse> DoSubmitFeedback(string bikeId, int? currentChargeBars, string message, bool isBikeBroken, Uri operatorUri)
+			=> throw new NotImplementedException();
 
-        /// <summary> Submits mini survey to copri server. </summary>
-        /// <param name="answers">Collection of answers.</param>
-        public Task<ResponseBase> DoSubmitMiniSurvey(IDictionary<string, string> answers)
-            => throw new NotImplementedException();
+		/// <summary> Submits mini survey to copri server. </summary>
+		/// <param name="answers">Collection of answers.</param>
+		public Task<ResponseBase> DoSubmitMiniSurvey(IDictionary<string, string> answers)
+			=> throw new NotImplementedException();
 
-        public Task<BikesAvailableResponse> GetBikesAvailableAsync()
-        {
-            return server.GetBikesAvailableAsync();
-        }
+		public Task<BikesAvailableResponse> GetBikesAvailableAsync()
+		{
+			return server.GetBikesAvailableAsync();
+		}
 
-        public Task<BikesReservedOccupiedResponse> GetBikesOccupiedAsync()
-        {
-            return server.GetBikesOccupiedAsync();
-        }
+		public Task<BikesReservedOccupiedResponse> GetBikesOccupiedAsync()
+		{
+			return server.GetBikesOccupiedAsync();
+		}
 
-        public Task<StationsAvailableResponse> GetStationsAsync()
-        {
-            return server.GetStationsAsync();
-        }
-    }
+		public Task<StationsAvailableResponse> GetStationsAsync()
+		{
+			return server.GetStationsAsync();
+		}
+	}
 }
diff --git a/TestTINKLib/Mocks/DateTimeMocker.cs b/TestTINKLib/Mocks/DateTimeMocker.cs
index 74be814..0c825ab 100644
--- a/TestTINKLib/Mocks/DateTimeMocker.cs
+++ b/TestTINKLib/Mocks/DateTimeMocker.cs
@@ -3,22 +3,22 @@ using System.Collections.Generic;
 
 namespace TestTINKLib
 {
-    public class DateTimeMocker
-    {
-        private static int m_iIndex;
-        private static IList<DateTime> m_oDateTimeSeries;
+	public class DateTimeMocker
+	{
+		private static int m_iIndex;
+		private static IList<DateTime> m_oDateTimeSeries;
 
-        public DateTimeMocker(IList<DateTime> p_oDateTimeSeries)
-        {
-            if (p_oDateTimeSeries.Count < 1)
-            {
-                throw new Exception("Can not initialize mock object. List must contain at least one date time.");
-            }
+		public DateTimeMocker(IList<DateTime> p_oDateTimeSeries)
+		{
+			if (p_oDateTimeSeries.Count < 1)
+			{
+				throw new Exception("Can not initialize mock object. List must contain at least one date time.");
+			}
 
-            m_iIndex = 0;
-            m_oDateTimeSeries = p_oDateTimeSeries;
-        }
+			m_iIndex = 0;
+			m_oDateTimeSeries = p_oDateTimeSeries;
+		}
 
-        public Func<DateTime> GetDateTime = () => m_oDateTimeSeries[m_iIndex < m_oDateTimeSeries.Count ? m_iIndex++ : m_iIndex = 0];
-    }
+		public Func<DateTime> GetDateTime = () => m_oDateTimeSeries[m_iIndex < m_oDateTimeSeries.Count ? m_iIndex++ : m_iIndex = 0];
+	}
 }
diff --git a/TestTINKLib/TestHelper.cs b/TestTINKLib/TestHelper.cs
index a119d2f..c8ee3a8 100644
--- a/TestTINKLib/TestHelper.cs
+++ b/TestTINKLib/TestHelper.cs
@@ -1,18 +1,18 @@
 namespace TestTINKLib
 {
-    /// <summary>
-    /// Provides helper functionality. Used in TestShareeLib and TestTINKLib.
-    /// </summary>
-    public static class TestHelper
-    {
-        /// <summary>
-        /// Eases comparison of xml- files.
-        /// </summary>
-        /// <param name="p_strXmlFile"></param>
-        /// <returns></returns>
-        public static string PrepareXmlForStringCompare(string p_strXmlFile)
-        {
-            return p_strXmlFile.Replace("\r\n", string.Empty).Replace("\t", string.Empty).Replace(" ", string.Empty);
-        }
-    }
+	/// <summary>
+	/// Provides helper functionality. Used in TestShareeLib and TestTINKLib.
+	/// </summary>
+	public static class TestHelper
+	{
+		/// <summary>
+		/// Eases comparison of xml- files.
+		/// </summary>
+		/// <param name="p_strXmlFile"></param>
+		/// <returns></returns>
+		public static string PrepareXmlForStringCompare(string p_strXmlFile)
+		{
+			return p_strXmlFile.Replace("\r\n", string.Empty).Replace("\t", string.Empty).Replace(" ", string.Empty);
+		}
+	}
 }