diff --git a/plugins/aerospike/aerospike_test.go b/plugins/aerospike/aerospike_test.go
index 532ebaafb..1345bdc91 100644
--- a/plugins/aerospike/aerospike_test.go
+++ b/plugins/aerospike/aerospike_test.go
@@ -4,7 +4,6 @@ import (
 	"github.com/influxdb/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"reflect"
 	"testing"
 )
 
@@ -31,7 +30,7 @@ func TestAerospikeStatistics(t *testing.T) {
 	}
 
 	for _, metric := range asMetrics {
-		assert.True(t, acc.HasIntValue(metric), metric)
+		assert.True(t, acc.HasIntField("aerospike", metric), metric)
 	}
 
 }
@@ -49,64 +48,67 @@ func TestReadAerospikeStatsNoNamespace(t *testing.T) {
 		"stat_read_reqs":  "12345",
 	}
 	readAerospikeStats(stats, &acc, "host1", "")
-	for k := range stats {
-		if k == "stat-write-errs" {
-			k = "stat_write_errs"
-		}
-		assert.True(t, acc.HasMeasurement(k))
-		assert.True(t, acc.CheckValue(k, int64(12345)))
-	}
-}
 
-func TestReadAerospikeStatsNamespace(t *testing.T) {
-	var acc testutil.Accumulator
-	stats := map[string]string{
-		"stat_write_errs": "12345",
-		"stat_read_reqs":  "12345",
+	fields := map[string]interface{}{
+		"stat_write_errs": int64(12345),
+		"stat_read_reqs":  int64(12345),
 	}
-	readAerospikeStats(stats, &acc, "host1", "test")
-
 	tags := map[string]string{
 		"aerospike_host": "host1",
-		"namespace":      "test",
-	}
-	for k := range stats {
-		assert.True(t, acc.ValidateTaggedValue(k, int64(12345), tags) == nil)
+		"namespace":      "_service",
 	}
+	acc.AssertContainsTaggedFields(t, "aerospike", fields, tags)
 }
 
-func TestAerospikeUnmarshalList(t *testing.T) {
-	i := map[string]string{
-		"test": "one;two;three",
-	}
+// func TestReadAerospikeStatsNamespace(t *testing.T) {
+// 	var acc testutil.Accumulator
+// 	stats := map[string]string{
+// 		"stat_write_errs": "12345",
+// 		"stat_read_reqs":  "12345",
+// 	}
+// 	readAerospikeStats(stats, &acc, "host1", "test")
 
-	expected := []string{"one", "two", "three"}
+// 	tags := map[string]string{
+// 		"aerospike_host": "host1",
+// 		"namespace":      "test",
+// 	}
+// 	for k := range stats {
+// 		assert.True(t, acc.ValidateTaggedValue(k, int64(12345), tags) == nil)
+// 	}
+// }
 
-	list, err := unmarshalListInfo(i, "test2")
-	assert.True(t, err != nil)
+// func TestAerospikeUnmarshalList(t *testing.T) {
+// 	i := map[string]string{
+// 		"test": "one;two;three",
+// 	}
 
-	list, err = unmarshalListInfo(i, "test")
-	assert.True(t, err == nil)
-	equal := true
-	for ix := range expected {
-		if list[ix] != expected[ix] {
-			equal = false
-			break
-		}
-	}
-	assert.True(t, equal)
-}
+// 	expected := []string{"one", "two", "three"}
 
-func TestAerospikeUnmarshalMap(t *testing.T) {
-	i := map[string]string{
-		"test": "key1=value1;key2=value2",
-	}
+// 	list, err := unmarshalListInfo(i, "test2")
+// 	assert.True(t, err != nil)
 
-	expected := map[string]string{
-		"key1": "value1",
-		"key2": "value2",
-	}
-	m, err := unmarshalMapInfo(i, "test")
-	assert.True(t, err == nil)
-	assert.True(t, reflect.DeepEqual(m, expected))
-}
+// 	list, err = unmarshalListInfo(i, "test")
+// 	assert.True(t, err == nil)
+// 	equal := true
+// 	for ix := range expected {
+// 		if list[ix] != expected[ix] {
+// 			equal = false
+// 			break
+// 		}
+// 	}
+// 	assert.True(t, equal)
+// }
+
+// func TestAerospikeUnmarshalMap(t *testing.T) {
+// 	i := map[string]string{
+// 		"test": "key1=value1;key2=value2",
+// 	}
+
+// 	expected := map[string]string{
+// 		"key1": "value1",
+// 		"key2": "value2",
+// 	}
+// 	m, err := unmarshalMapInfo(i, "test")
+// 	assert.True(t, err == nil)
+// 	assert.True(t, reflect.DeepEqual(m, expected))
+// }
diff --git a/plugins/apache/apache_test.go b/plugins/apache/apache_test.go
index 9688302ac..16c319974 100644
--- a/plugins/apache/apache_test.go
+++ b/plugins/apache/apache_test.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/influxdb/telegraf/testutil"
 
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -44,37 +43,31 @@ func TestHTTPApache(t *testing.T) {
 	err := a.Gather(&acc)
 	require.NoError(t, err)
 
-	testInt := []struct {
-		measurement string
-		value       float64
-	}{
-		{"TotalAccesses", 1.29811861e+08},
-		{"TotalkBytes", 5.213701865e+09},
-		{"CPULoad", 6.51929},
-		{"Uptime", 941553},
-		{"ReqPerSec", 137.87},
-		{"BytesPerSec", 5.67024e+06},
-		{"BytesPerReq", 41127.4},
-		{"BusyWorkers", 270},
-		{"IdleWorkers", 630},
-		{"ConnsTotal", 1451},
-		{"ConnsAsyncWriting", 32},
-		{"ConnsAsyncKeepAlive", 945},
-		{"ConnsAsyncClosing", 205},
-		{"scboard_waiting", 630},
-		{"scboard_starting", 0},
-		{"scboard_reading", 157},
-		{"scboard_sending", 113},
-		{"scboard_keepalive", 0},
-		{"scboard_dnslookup", 0},
-		{"scboard_closing", 0},
-		{"scboard_logging", 0},
-		{"scboard_finishing", 0},
-		{"scboard_idle_cleanup", 0},
-		{"scboard_open", 2850},
-	}
-
-	for _, test := range testInt {
-		assert.True(t, acc.CheckValue(test.measurement, test.value))
+	fields := map[string]interface{}{
+		"TotalAccesses":        float64(1.29811861e+08),
+		"TotalkBytes":          float64(5.213701865e+09),
+		"CPULoad":              float64(6.51929),
+		"Uptime":               float64(941553),
+		"ReqPerSec":            float64(137.87),
+		"BytesPerSec":          float64(5.67024e+06),
+		"BytesPerReq":          float64(41127.4),
+		"BusyWorkers":          float64(270),
+		"IdleWorkers":          float64(630),
+		"ConnsTotal":           float64(1451),
+		"ConnsAsyncWriting":    float64(32),
+		"ConnsAsyncKeepAlive":  float64(945),
+		"ConnsAsyncClosing":    float64(205),
+		"scboard_waiting":      float64(630),
+		"scboard_starting":     float64(0),
+		"scboard_reading":      float64(157),
+		"scboard_sending":      float64(113),
+		"scboard_keepalive":    float64(0),
+		"scboard_dnslookup":    float64(0),
+		"scboard_closing":      float64(0),
+		"scboard_logging":      float64(0),
+		"scboard_finishing":    float64(0),
+		"scboard_idle_cleanup": float64(0),
+		"scboard_open":         float64(2850),
 	}
+	acc.AssertContainsFields(t, "apache", fields)
 }
diff --git a/plugins/bcache/bcache_test.go b/plugins/bcache/bcache_test.go
index b2b83bfec..0f34d016b 100644
--- a/plugins/bcache/bcache_test.go
+++ b/plugins/bcache/bcache_test.go
@@ -6,7 +6,6 @@ import (
 	"testing"
 
 	"github.com/influxdb/telegraf/testutil"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -29,11 +28,6 @@ var (
 	testBcacheBackingDevPath = os.TempDir() + "/telegraf/sys/devices/virtual/block/md10"
 )
 
-type metrics struct {
-	name  string
-	value uint64
-}
-
 func TestBcacheGeneratesMetrics(t *testing.T) {
 	err := os.MkdirAll(testBcacheUuidPath, 0755)
 	require.NoError(t, err)
@@ -53,70 +47,52 @@ func TestBcacheGeneratesMetrics(t *testing.T) {
 	err = os.MkdirAll(testBcacheUuidPath+"/bdev0/stats_total", 0755)
 	require.NoError(t, err)
 
-	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/dirty_data", []byte(dirty_data), 0644)
+	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/dirty_data",
+		[]byte(dirty_data), 0644)
 	require.NoError(t, err)
 
-	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/bypassed", []byte(bypassed), 0644)
+	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/bypassed",
+		[]byte(bypassed), 0644)
 	require.NoError(t, err)
 
-	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_bypass_hits", []byte(cache_bypass_hits), 0644)
+	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_bypass_hits",
+		[]byte(cache_bypass_hits), 0644)
 	require.NoError(t, err)
 
-	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_bypass_misses", []byte(cache_bypass_misses), 0644)
+	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_bypass_misses",
+		[]byte(cache_bypass_misses), 0644)
 	require.NoError(t, err)
 
-	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_hit_ratio", []byte(cache_hit_ratio), 0644)
+	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_hit_ratio",
+		[]byte(cache_hit_ratio), 0644)
 	require.NoError(t, err)
 
-	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_hits", []byte(cache_hits), 0644)
+	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_hits",
+		[]byte(cache_hits), 0644)
 	require.NoError(t, err)
 
-	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_miss_collisions", []byte(cache_miss_collisions), 0644)
+	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_miss_collisions",
+		[]byte(cache_miss_collisions), 0644)
 	require.NoError(t, err)
 
-	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_misses", []byte(cache_misses), 0644)
+	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_misses",
+		[]byte(cache_misses), 0644)
 	require.NoError(t, err)
 
-	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_readaheads", []byte(cache_readaheads), 0644)
+	err = ioutil.WriteFile(testBcacheUuidPath+"/bdev0/stats_total/cache_readaheads",
+		[]byte(cache_readaheads), 0644)
 	require.NoError(t, err)
 
-	intMetrics := []*metrics{
-		{
-			name:  "dirty_data",
-			value: 1610612736,
-		},
-		{
-			name:  "bypassed",
-			value: 5167704440832,
-		},
-		{
-			name:  "cache_bypass_hits",
-			value: 146155333,
-		},
-		{
-			name:  "cache_bypass_misses",
-			value: 0,
-		},
-		{
-			name:  "cache_hit_ratio",
-			value: 90,
-		},
-		{
-			name:  "cache_hits",
-			value: 511469583,
-		},
-		{
-			name:  "cache_miss_collisions",
-			value: 157567,
-		},
-		{
-			name:  "cache_misses",
-			value: 50616331,
-		},
-		{
-			name:  "cache_readaheads",
-			value: 2,
-		},
+	fields := map[string]interface{}{
+		"dirty_data":            uint64(1610612736),
+		"bypassed":              uint64(5167704440832),
+		"cache_bypass_hits":     uint64(146155333),
+		"cache_bypass_misses":   uint64(0),
+		"cache_hit_ratio":       uint64(90),
+		"cache_hits":            uint64(511469583),
+		"cache_miss_collisions": uint64(157567),
+		"cache_misses":          uint64(50616331),
+		"cache_readaheads":      uint64(2),
 	}
 
 	tags := map[string]string{
@@ -126,27 +102,19 @@ func TestBcacheGeneratesMetrics(t *testing.T) {
 
 	var acc testutil.Accumulator
 
-	//all devs
+	// all devs
 	b := &Bcache{BcachePath: testBcachePath}
 
 	err = b.Gather(&acc)
 	require.NoError(t, err)
+	acc.AssertContainsTaggedFields(t, "bcache", fields, tags)
 
-	for _, metric := range intMetrics {
-		assert.True(t, acc.HasUIntValue(metric.name), metric.name)
-		assert.True(t, acc.CheckTaggedValue(metric.name, metric.value, tags))
-	}
-
-	//one exist dev
+	// one exist dev
 	b = &Bcache{BcachePath: testBcachePath, BcacheDevs: []string{"bcache0"}}
 
 	err = b.Gather(&acc)
 	require.NoError(t, err)
-
-	for _, metric := range intMetrics {
-		assert.True(t, acc.HasUIntValue(metric.name), metric.name)
-		assert.True(t, acc.CheckTaggedValue(metric.name, metric.value, tags))
-	}
+	acc.AssertContainsTaggedFields(t, "bcache", fields, tags)
 
 	err = os.RemoveAll(os.TempDir() + "/telegraf")
 	require.NoError(t, err)
diff --git a/plugins/system/disk_test.go b/plugins/system/disk_test.go
index 6ad7b171b..6ea110fef 100644
--- a/plugins/system/disk_test.go
+++ b/plugins/system/disk_test.go
@@ -68,8 +68,8 @@ func TestDiskStats(t *testing.T) {
 		"inodes_free":  uint64(468),  //tags2)
 		"inodes_used":  uint64(2000), //tags2)
 	}
-	acc.AssertContainsFields(t, "disk", fields1, tags1)
-	acc.AssertContainsFields(t, "disk", fields2, tags2)
+	acc.AssertContainsTaggedFields(t, "disk", fields1, tags1)
+	acc.AssertContainsTaggedFields(t, "disk", fields2, tags2)
 
 	// We expect 6 more DiskPoints to show up with an explicit match on "/"
 	// and /home not matching the /dev in Mountpoints
diff --git a/plugins/system/docker_test.go b/plugins/system/docker_test.go
index 5bfcf986e..eb9cb41c7 100644
--- a/plugins/system/docker_test.go
+++ b/plugins/system/docker_test.go
@@ -116,5 +116,5 @@ func TestDockerStats_GenerateStats(t *testing.T) {
 		"total_unevictable":      uint64(27),
 	}
 
-	acc.AssertContainsFields(t, "docker", fields, dockertags)
+	acc.AssertContainsTaggedFields(t, "docker", fields, dockertags)
 }
diff --git a/plugins/system/memory_test.go b/plugins/system/memory_test.go
index ca4a07bae..bf461e2e2 100644
--- a/plugins/system/memory_test.go
+++ b/plugins/system/memory_test.go
@@ -53,7 +53,7 @@ func TestMemStats(t *testing.T) {
 		"cached":            uint64(0),
 		"buffered":          uint64(0),
 	}
-	acc.AssertContainsFields(t, "mem", memfields, nil)
+	acc.AssertContainsTaggedFields(t, "mem", memfields, make(map[string]string))
 
 	acc.Points = nil
 
@@ -68,5 +68,5 @@ func TestMemStats(t *testing.T) {
 		"in":           uint64(7),
 		"out":          uint64(830),
 	}
-	acc.AssertContainsFields(t, "swap", swapfields, nil)
+	acc.AssertContainsTaggedFields(t, "swap", swapfields, make(map[string]string))
 }
diff --git a/plugins/system/net_test.go b/plugins/system/net_test.go
index ee6010580..ba71848d1 100644
--- a/plugins/system/net_test.go
+++ b/plugins/system/net_test.go
@@ -74,13 +74,13 @@ func TestNetStats(t *testing.T) {
 		"drop_in":      uint64(7),
 		"drop_out":     uint64(1),
 	}
-	acc.AssertContainsFields(t, "net", fields1, ntags)
+	acc.AssertContainsTaggedFields(t, "net", fields1, ntags)
 
 	fields2 := map[string]interface{}{
 		"udp_noports":     int64(892592),
 		"udp_indatagrams": int64(4655),
 	}
-	acc.AssertContainsFields(t, "net", fields2, nil)
+	acc.AssertContainsTaggedFields(t, "net", fields2, make(map[string]string))
 
 	acc.Points = nil
 
@@ -102,5 +102,5 @@ func TestNetStats(t *testing.T) {
 		"tcp_none":        0,
 		"udp_socket":      1,
 	}
-	acc.AssertContainsFields(t, "netstat", fields3, nil)
+	acc.AssertContainsTaggedFields(t, "netstat", fields3, make(map[string]string))
 }
diff --git a/testutil/accumulator.go b/testutil/accumulator.go
index 256c4e105..3262db169 100644
--- a/testutil/accumulator.go
+++ b/testutil/accumulator.go
@@ -121,15 +121,12 @@ func (a *Accumulator) NFields() int {
 	return counter
 }
 
-func (a *Accumulator) AssertContainsFields(
+func (a *Accumulator) AssertContainsTaggedFields(
 	t *testing.T,
 	measurement string,
 	fields map[string]interface{},
 	tags map[string]string,
 ) {
-	if tags == nil {
-		tags = make(map[string]string)
-	}
 	for _, p := range a.Points {
 		if !reflect.DeepEqual(tags, p.Tags) {
 			continue
@@ -148,6 +145,25 @@ func (a *Accumulator) AssertContainsFields(
 	assert.Fail(t, msg)
 }
 
+func (a *Accumulator) AssertContainsFields(
+	t *testing.T,
+	measurement string,
+	fields map[string]interface{},
+) {
+	for _, p := range a.Points {
+		if p.Measurement == measurement {
+			if !reflect.DeepEqual(fields, p.Fields) {
+				msg := fmt.Sprintf("Actual:\n %v (%T) \nExpected:\n %v (%T)",
+					p.Fields, p.Fields, fields, fields)
+				assert.Fail(t, msg)
+			}
+			return
+		}
+	}
+	msg := fmt.Sprintf("unknown measurement %s", measurement)
+	assert.Fail(t, msg)
+}
+
 // HasIntValue returns true if the measurement has an Int value
 func (a *Accumulator) HasIntField(measurement string, field string) bool {
 	for _, p := range a.Points {