diff --git a/src/acct/etc/acctd.conf b/src/acct/etc/acctd.conf
index 7b4e099817..c1c968a084 100644
--- a/src/acct/etc/acctd.conf
+++ b/src/acct/etc/acctd.conf
@@ -18,38 +18,16 @@
 :DB: sqlite:///tmp/test_one_acct.db
 
 # Duration of each daemon loop in seconds
-:STEP: 300 # 5 minutes
+:STEP: 2
 
-#-------------------------------------------------------------------------------
-# VM Monitoring
-#-------------------------------------------------------------------------------
+# Number of daemon loops until an accounting watch
+:ACCOUNTING_STEPS: 1
 
-:VM_MONITORING:
+# Number of daemon loops until a VM monitoring watch
+:VM_MONITORING_STEPS: 1
 
-    # Number of daemon loops until a VM monitoring watch
-    :STEPS: 1
-
-    # Number of VM records to preserve
-    :WINDOW_SIZE: 5
-
-#-------------------------------------------------------------------------------
-# HOST Monitoring
-#-------------------------------------------------------------------------------
-
-:HOST_MONITORING:
-
-    # Number of daemon loops until a Hosts monitoring watch
-    :STEPS: 3
-
-    # Number of HOST records to preserve
-    :WINDOW_SIZE: 5
-
-#-------------------------------------------------------------------------------
-# Accounting
-#-------------------------------------------------------------------------------
-
-:ACCOUNTING:
-
-    # Number of daemon loops until an accounting watch
-    :STEPS: 10
+# Number of daemon loops until a Hosts monitoring watch
+:HOST_MONITORING_STEPS: 1
 
+# Number of records to preserve
+:WINDOW_SIZE: 10
diff --git a/src/acct/test/1Vm1His.rb b/src/acct/test/1Vm1His.rb
index 0eb0284875..0dad640a1c 100644
--- a/src/acct/test/1Vm1His.rb
+++ b/src/acct/test/1Vm1His.rb
@@ -75,7 +75,7 @@ describe "1 Vm 1 History" do
         @watch_client.running_time(ts1, ts2).to_i.should eql(0)
 
         ts3 = 300
-        @accounting.set_mock_timestamp(ts2)
+        @accounting.set_mock_timestamp(ts3)
 
         values = {
             :uid => 2,
@@ -181,7 +181,7 @@ describe "1 Vm 1 History" do
         @watch_client.prolog_time(ts1, ts2).to_i.should eql(5)
 
         ts3 = 300
-        @accounting.set_mock_timestamp(ts2)
+        @accounting.set_mock_timestamp(ts3)
 
         values = {
             :uid => 2,
@@ -287,7 +287,7 @@ describe "1 Vm 1 History" do
         @watch_client.prolog_time(ts1, ts2).to_i.should eql(5)
 
         ts3 = 300
-        @accounting.set_mock_timestamp(ts2)
+        @accounting.set_mock_timestamp(ts3)
 
         values = {
             :uid => 2,
diff --git a/src/acct/test/1VmXHis.rb b/src/acct/test/1VmXHis.rb
index 76c8855bc5..d0a94a0840 100644
--- a/src/acct/test/1VmXHis.rb
+++ b/src/acct/test/1VmXHis.rb
@@ -51,7 +51,7 @@ describe "1 Vm X History" do
         @watch_client.running_time(ts1, ts2).to_i.should eql(sum)
 
         ts3 = 300
-        @accounting.set_mock_timestamp(ts2)
+        @accounting.set_mock_timestamp(ts3)
 
         values = {
             :uid => 2,