diff --git a/test/test_import.csv b/test/test_import.csv
new file mode 100644
index 0000000..1452c07
--- /dev/null
+++ b/test/test_import.csv
@@ -0,0 +1,3 @@
+name,group,protocol,host,login,password,port,comment
+test_name_csv,test_group_csv,test_protocol_csv,test_host_csv,test_login_csv,test_password_csv,44,test_comment_csv
+test_name_update_csv,test_group_update_csv,test_protocol_update_csv,test_host_update_csv,test_login_update_csv,test_password_update_csv,45,test_comment_update_csv
diff --git a/test/test_import.yml b/test/test_import.yml
new file mode 100644
index 0000000..e7fef00
--- /dev/null
+++ b/test/test_import.yml
@@ -0,0 +1,23 @@
+---
+XWas7vpy0HerhOYd:
+  id: XWas7vpy0HerhOYd
+  name: test_name
+  group: test_group
+  host: test_host
+  protocol: test_protocol
+  login: test_login
+  password: test_password
+  port: 42
+  comment: test_comment
+  date: 1419858983
+D7URyJENLa91jt0b:
+  id: D7URyJENLa91jt0b
+  name: test_name_update
+  group: test_group_update
+  host: test_host_update
+  protocol: test_protocol_update
+  login: test_login_update
+  password: test_password_update
+  port: 43
+  comment: test_comment_update
+  date: 1419858983
diff --git a/test/test_mpw.rb b/test/test_mpw.rb
index 2208c6c..9c5b87f 100644
--- a/test/test_mpw.rb
+++ b/test/test_mpw.rb
@@ -26,6 +26,85 @@ class TestMPW < Test::Unit::TestCase
 		assert(@mpw.decrypt)
 		assert_equal(0, @mpw.search.length)
 	end
+ 
+ 	def test_import_yaml
+		import_file = 'test_import.yml'
+
+		assert(@mpw.import(import_file, :yaml))
+		assert_equal(2, @mpw.search.length)
+
+		result = @mpw.search[0]
+		assert_equal(@fixtures['add']['name'],      result['name'])
+		assert_equal(@fixtures['add']['group'],     result['group'])
+		assert_equal(@fixtures['add']['host'],      result['host'])
+		assert_equal(@fixtures['add']['protocol'],  result['protocol'])
+		assert_equal(@fixtures['add']['login'],     result['login'])
+		assert_equal(@fixtures['add']['password'],  result['password'])
+		assert_equal(@fixtures['add']['port'].to_i, result['port'])
+		assert_equal(@fixtures['add']['comment'],   result['comment'])
+	end
+
+	def test_export_yaml
+		export_file = 'test_export.yml'
+
+		assert(@mpw.import(@fixture_file))
+		assert_equal(2, @mpw.search.length)
+		assert(@mpw.export(export_file, :yaml))
+		export = YAML::load_file(export_file)
+		assert_equal(2, export.length)
+
+		result = export.values[0]
+		assert_equal(@fixtures['add']['name'],      result['name'])
+		assert_equal(@fixtures['add']['group'],     result['group'])
+		assert_equal(@fixtures['add']['host'],      result['host'])
+		assert_equal(@fixtures['add']['protocol'],  result['protocol'])
+		assert_equal(@fixtures['add']['login'],     result['login'])
+		assert_equal(@fixtures['add']['password'],  result['password'])
+		assert_equal(@fixtures['add']['port'].to_i, result['port'])
+		assert_equal(@fixtures['add']['comment'],   result['comment'])
+
+		File.unlink(export_file)
+	end
+
+	def test_import_csv
+		import_file = 'test_import.csv'
+
+		assert(@mpw.import(import_file, :csv))
+		assert_equal(2, @mpw.search.length)
+
+		import = CSV.parse(File.read(import_file), headers: true)
+
+		result = @mpw.search[0]
+		assert_equal(import[0]['name'],      result['name'])
+		assert_equal(import[0]['group'],     result['group'])
+		assert_equal(import[0]['host'],      result['host'])
+		assert_equal(import[0]['protocol'],  result['protocol'])
+		assert_equal(import[0]['login'],     result['login'])
+		assert_equal(import[0]['password'],  result['password'])
+		assert_equal(import[0]['port'].to_i, result['port'])
+		assert_equal(import[0]['comment'],   result['comment'])
+	end
+
+	def test_export_csv
+		export_file = 'test_export.csv'
+		assert(@mpw.import(@fixture_file))
+		assert_equal(2, @mpw.search.length)
+		assert(@mpw.export(export_file, :csv))
+		export = CSV.parse(File.read(export_file), headers: true)
+		assert_equal(2, export.length)
+
+		result = export[0]
+		assert_equal(@fixtures['add']['name'],     result['name'])
+		assert_equal(@fixtures['add']['group'],    result['group'])
+		assert_equal(@fixtures['add']['host'],     result['host'])
+		assert_equal(@fixtures['add']['protocol'], result['protocol'])
+		assert_equal(@fixtures['add']['login'],    result['login'])
+		assert_equal(@fixtures['add']['password'], result['password'])
+		assert_equal(@fixtures['add']['port'],     result['port'])
+		assert_equal(@fixtures['add']['comment'],  result['comment'])
+
+		File.unlink(export_file)
+	end
 
 	def test_add
 		assert(@mpw.update(@fixtures['add']['name'], 
@@ -75,19 +154,12 @@ class TestMPW < Test::Unit::TestCase
 		assert_equal(0, @mpw.search.length)
 	end
 
-	def test_update
-		assert(@mpw.update(@fixtures['add']['name'], 
-		                   @fixtures['add']['group'], 
-		                   @fixtures['add']['host'],
-		                   @fixtures['add']['protocol'],
-		                   @fixtures['add']['login'],
-		                   @fixtures['add']['password'],
-		                   @fixtures['add']['port'],
-		                   @fixtures['add']['comment']))
+	def test_update_empty
+		assert(@mpw.import(@fixture_file, :yaml))
+		assert_equal(2, @mpw.search.length)
 
 		id = @mpw.search[0]['id']
 
-		# Test empty update
 		assert(@mpw.update('','', '','','','','', '', id))
 
 		result = @mpw.search_by_id(id)
@@ -99,9 +171,14 @@ class TestMPW < Test::Unit::TestCase
 		assert_equal(@fixtures['add']['password'],  result['password'])
 		assert_equal(@fixtures['add']['port'].to_i, result['port'])
 		assert_equal(@fixtures['add']['comment'],   result['comment'])
+	end
 
+	def test_update
+		assert(@mpw.import(@fixture_file, :yaml))
+		assert_equal(2, @mpw.search.length)
+
+		id = @mpw.search[0]['id']
 
-		# Test real update
 		assert(@mpw.update(@fixtures['update']['name'], 
 		                   @fixtures['update']['group'], 
 		                   @fixtures['update']['host'],
@@ -112,7 +189,7 @@ class TestMPW < Test::Unit::TestCase
 		                   @fixtures['update']['comment'],
 		                   id))
 
-		assert_equal(1, @mpw.search.length)
+		assert_equal(2, @mpw.search.length)
 
 		result = @mpw.search_by_id(id)
 		assert_equal(@fixtures['update']['name'],      result['name'])
@@ -124,75 +201,4 @@ class TestMPW < Test::Unit::TestCase
 		assert_equal(@fixtures['update']['port'].to_i, result['port'])
 		assert_equal(@fixtures['update']['comment'],   result['comment'])
 	end
- 
- 	def test_import_yaml
-		assert(@mpw.import(@fixture_file, :yaml))
-		assert_equal(2, @mpw.search.length)
-
-		result = @mpw.search[0]
-		assert_equal(@fixtures['add']['name'],      result['name'])
-		assert_equal(@fixtures['add']['group'],     result['group'])
-		assert_equal(@fixtures['add']['host'],      result['host'])
-		assert_equal(@fixtures['add']['protocol'],  result['protocol'])
-		assert_equal(@fixtures['add']['login'],     result['login'])
-		assert_equal(@fixtures['add']['password'],  result['password'])
-		assert_equal(@fixtures['add']['port'].to_i, result['port'])
-		assert_equal(@fixtures['add']['comment'],   result['comment'])
-	end
-
-	def test_export_yaml
-		assert(@mpw.import(@fixture_file))
-		assert_equal(2, @mpw.search.length)
-		assert(@mpw.export('export.yml', :yaml))
-		export = YAML::load_file('export.yml')
-		assert_equal(2, export.length)
-
-		result = export.values[0]
-		assert_equal(@fixtures['add']['name'],      result['name'])
-		assert_equal(@fixtures['add']['group'],     result['group'])
-		assert_equal(@fixtures['add']['host'],      result['host'])
-		assert_equal(@fixtures['add']['protocol'],  result['protocol'])
-		assert_equal(@fixtures['add']['login'],     result['login'])
-		assert_equal(@fixtures['add']['password'],  result['password'])
-		assert_equal(@fixtures['add']['port'].to_i, result['port'])
-		assert_equal(@fixtures['add']['comment'],   result['comment'])
-	end
-
-	def test_export_csv
-		assert(@mpw.import(@fixture_file))
-		assert_equal(2, @mpw.search.length)
-		assert(@mpw.export('export.csv', :csv))
-		export = CSV.parse(File.read('export.csv'), headers: true)
-		assert_equal(2, export.length)
-
-		result = export[0]
-		assert_equal(@fixtures['add']['name'],     result['name'])
-		assert_equal(@fixtures['add']['group'],    result['group'])
-		assert_equal(@fixtures['add']['host'],     result['host'])
-		assert_equal(@fixtures['add']['protocol'], result['protocol'])
-		assert_equal(@fixtures['add']['login'],    result['login'])
-		assert_equal(@fixtures['add']['password'], result['password'])
-		assert_equal(@fixtures['add']['port'],     result['port'])
-		assert_equal(@fixtures['add']['comment'],  result['comment'])
-
-	end
-
-	def test_import_csv
-		assert(@mpw.import(@fixture_file))
-		assert_equal(2, @mpw.search.length)
-		assert(@mpw.export('export.csv', :csv))
-		assert(@mpw.import('export.csv', :csv))
-		assert_equal(4, @mpw.search.length)
-
-		result = @mpw.search[2]
-		assert_equal(@fixtures['add']['name'],      result['name'])
-		assert_equal(@fixtures['add']['group'],     result['group'])
-		assert_equal(@fixtures['add']['host'],      result['host'])
-		assert_equal(@fixtures['add']['protocol'],  result['protocol'])
-		assert_equal(@fixtures['add']['login'],     result['login'])
-		assert_equal(@fixtures['add']['password'],  result['password'])
-		assert_equal(@fixtures['add']['port'].to_i, result['port'])
-		assert_equal(@fixtures['add']['comment'],   result['comment'])
-	
-	end
 end