diff --git a/devdocs/todo.txt b/devdocs/todo.txt
index 2fbce0f7..d99505c5 100644
--- a/devdocs/todo.txt
+++ b/devdocs/todo.txt
@@ -7,13 +7,6 @@ Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOiIxNTQ0NTU5NzAwIiwiZXhwIjoi
 
 
 
-TESTING TODO - Are all tests viable with a huge dataset, try locally and rejig the tests as necessary to make them work properly with huge data if necessary
-TESTING TODO - All date ranges should be on exact boundaries to ensure that all boundary date code in criteria builder is correct
-SQL Criteria builder - Should it really be backing off a second for boundary edges?  That will mean items that are less than a second but more than zero seconds will 
-be included whenb they shouldn't.  If the sql server has 1 millesecond accuracy then it should be backed off one millisecond surely?
-TESTING TODO - Re-test v7 user import, I added some code for timezone and ui color etc needs to be confirmed wont' bomb on nulls etc
-
-
 
 INITIAL TESTING NOTES:
 	- Tested on iPad (safari, chrome), Pixel (chrome), samsung chrome and samsung browser, desktop chrome, firefox browsers, android table (looks good, works but very slow, good for testing)
@@ -96,7 +89,8 @@ TODO SERVER
 
 	- Trial route needs in xml comments for route to add the timezone info parameter so it shows in the api explorer as well as the current trial size
 	- Seeding huge 500 techs doesn't break the trial license which is for 100 techs, need some tech checks all over and also up the trial license to the max possible seeded techs
-
+	- AyaNova 7 import is NOT erasing the db before it does the import but it should be so what's up with that??
+		- Also isn't it supposed to respect if there is existing data and force user to erase db first??
 
 - Stage 2 AFTER POSTED TEST ROUND COMPLETED		
 	- Error handling at client (log? display?)
diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs
index 28ccea54..aa97b4d1 100644
--- a/server/AyaNova/biz/UserBiz.cs
+++ b/server/AyaNova/biz/UserBiz.cs
@@ -735,6 +735,10 @@ namespace AyaNova.Biz
 
                         //Copy values 
                         User i = new User();
+                        
+                        //default owner id is manager account in RAVEN
+                        i.OwnerId=1;
+
                         i.Name = j["FirstName"].Value<string>() + " " + j["LastName"].Value<string>();
                         var Temp = j["UserType"].Value<int>();
                         i.UserType = (UserType)Temp;
@@ -782,11 +786,14 @@ namespace AyaNova.Biz
                         }
 
                         //User options
+                        i.UserOptions=new UserOptions(i.OwnerId);
 
                         //TimeZone Offset
-                        var tzo = j["TimeZoneOffset"].Value<decimal>();
+                        //Note: can be null value if not set so need to check for that here specially
+                        var tzo = j["TimeZoneOffset"].Value<decimal?>() ?? 0;                       
                         i.UserOptions.TimeZoneOffset = tzo;
 
+
                         //Email address
                         i.UserOptions.EmailAddress = j["EmailAddress"].Value<string>();
 
diff --git a/server/AyaNova/models/User.cs b/server/AyaNova/models/User.cs
index 016aaa41..ed0fe75a 100644
--- a/server/AyaNova/models/User.cs
+++ b/server/AyaNova/models/User.cs
@@ -46,7 +46,7 @@ namespace AyaNova.Models
 
         public User()
         {
-            Tags = new List<string>();
+            Tags = new List<string>();           
         }
 
     }