diff --git a/manifests/bindings.pp b/manifests/bindings.pp
index fa2c927..fa7b870 100644
--- a/manifests/bindings.pp
+++ b/manifests/bindings.pp
@@ -35,11 +35,11 @@ class mysql::bindings (
 
   case $::osfamily {
     'Archlinux': {
-      if $java_enable   { fatal("::mysql::bindings::java cannot be managed by puppet on ${::osfamily} as it is not in official repositories. Please disable java mysql binding.") }
+      if $java_enable   { fail("::mysql::bindings::java cannot be managed by puppet on ${::osfamily} as it is not in official repositories. Please disable java mysql binding.") }
       if $perl_enable   { include '::mysql::bindings::perl' }
-      if $php_enable    { warn("::mysql::bindings::php does not need to be managed by puppet on ${::osfamily} as it is included in mysql package by default.") }
+      if $php_enable    { warning("::mysql::bindings::php does not need to be managed by puppet on ${::osfamily} as it is included in mysql package by default.") }
       if $python_enable { include '::mysql::bindings::python' }
-      if $ruby_enable   { fatal("::mysql::bindings::ruby cannot be managed by puppet on ${::osfamily} as it is not in official repositories. Please disable ruby mysql binding.") }
+      if $ruby_enable   { fail("::mysql::bindings::ruby cannot be managed by puppet on ${::osfamily} as it is not in official repositories. Please disable ruby mysql binding.") }
     }
 
     default: {
diff --git a/tests/backup.pp b/tests/backup.pp
index cb669e6..4bdf804 100644
--- a/tests/backup.pp
+++ b/tests/backup.pp
@@ -1,7 +1,8 @@
 class { 'mysql::server':
-  config_hash => {'root_password' => 'password'}
+  root_password => 'password'
 }
-class { 'mysql::backup':
+
+class { 'mysql::server::backup':
   backupuser     => 'myuser',
   backuppassword => 'mypassword',
   backupdir      => '/tmp/backups',
diff --git a/tests/bindings.pp b/tests/bindings.pp
index 83af371..e4e325c 100644
--- a/tests/bindings.pp
+++ b/tests/bindings.pp
@@ -1,3 +1,3 @@
 class { 'mysql::bindings':
-  php_enable => 'true',
+  php_enable => true,
 }
diff --git a/tests/mysql_database.pp b/tests/mysql_database.pp
index 1ba24df..47a328c 100644
--- a/tests/mysql_database.pp
+++ b/tests/mysql_database.pp
@@ -1,16 +1,16 @@
 class { 'mysql::server':
-  config_hash => {'root_password' => 'password'}
+  root_password => 'password'
 }
-database{ ['test1', 'test2', 'test3']:
+mysql::db{ ['test1', 'test2', 'test3']:
   ensure  => present,
   charset => 'utf8',
   require => Class['mysql::server'],
 }
-database{ 'test4':
+mysql::db{ 'test4':
   ensure  => present,
   charset => 'latin1',
 }
-database{ 'test5':
+mysql::db{ 'test5':
   ensure  => present,
   charset => 'binary',
   collate => 'binary',
diff --git a/tests/mysql_db.pp b/tests/mysql_db.pp
index 1bb3592..43c619f 100644
--- a/tests/mysql_db.pp
+++ b/tests/mysql_db.pp
@@ -1,5 +1,5 @@
 class { 'mysql::server':
-  config_hash => {'root_password' => 'password'}
+  root_password => 'password'
 }
 mysql::db { 'mydb':
   user     => 'myuser',
diff --git a/tests/mysql_user.pp b/tests/mysql_user.pp
index 70a6e16..7490d33 100644
--- a/tests/mysql_user.pp
+++ b/tests/mysql_user.pp
@@ -1,9 +1,7 @@
 $mysql_root_pw = 'password'
 
 class { 'mysql::server':
-  config_hash => {
-    root_password => 'password',
-  }
+  root_password => 'password',
 }
 
 mysql_user{ 'redmine@localhost':
diff --git a/tests/perl.pp b/tests/perl.pp
index 87e9417..1bbd3ab 100644
--- a/tests/perl.pp
+++ b/tests/perl.pp
@@ -1 +1 @@
-include mysql::perl
+include mysql::bindings::perl
diff --git a/tests/python.pp b/tests/python.pp
index 04f7ffa..49ddddb 100644
--- a/tests/python.pp
+++ b/tests/python.pp
@@ -1 +1 @@
-class { 'mysql::python':}
+class { 'mysql::bindings::python':}
diff --git a/tests/ruby.pp b/tests/ruby.pp
index e84c046..6717256 100644
--- a/tests/ruby.pp
+++ b/tests/ruby.pp
@@ -1 +1 @@
-include mysql::ruby
+include mysql::bindings::ruby
diff --git a/tests/server/account_security.pp b/tests/server/account_security.pp
index de393cc..cb59f4f 100644
--- a/tests/server/account_security.pp
+++ b/tests/server/account_security.pp
@@ -1,4 +1,4 @@
 class { 'mysql::server':
-  config_hash => { 'root_password' => 'password', },
+  root_password => 'password',
 }
 class { 'mysql::server::account_security': }
diff --git a/tests/server/config.pp b/tests/server/config.pp
index fe8d86e..da97f27 100644
--- a/tests/server/config.pp
+++ b/tests/server/config.pp
@@ -1,11 +1,3 @@
 mysql::server::config { 'testfile':
-  settings => {
-    'mysqld' => {
-      'bind-address' => '0.0.0.0',
-      'read-only'    => true,
-    },
-    'client' => {
-      'port' => '3306'
-    }
-  }
+  
 }