diff --git a/tests/testdata/input_contracts/metacoin.sol b/tests/testdata/input_contracts/metacoin.sol
index e5efbf4d..8627c1d9 100644
--- a/tests/testdata/input_contracts/metacoin.sol
+++ b/tests/testdata/input_contracts/metacoin.sol
@@ -1,8 +1,8 @@
 pragma solidity ^0.4.17;
 
-contract metaCoin {
+contract MetaCoin {
 	mapping (address => uint) public balances;
-	function metaCoin() public {
+	function MetaCoin() public {
 		balances[msg.sender] = 10000;
 	}
 	
diff --git a/tests/testdata/outputs_expected/metacoin.sol.o.json b/tests/testdata/outputs_expected/metacoin.sol.o.json
index b0610b5f..237b1c1e 100644
--- a/tests/testdata/outputs_expected/metacoin.sol.o.json
+++ b/tests/testdata/outputs_expected/metacoin.sol.o.json
@@ -1 +1 @@
-{"error": null, "issues": [{"address": 498, "contract": "Unknown", "debug": "<DEBUG-DATA>", "description": "A possible integer overflow exists in the function `sendToken(address,uint256)`.\nThe addition or multiplication may result in a value higher than the maximum representable integer.", "function": "sendToken(address,uint256)", "title": "Integer Overflow", "type": "Warning"}], "success": true}
\ No newline at end of file
+{"error": null, "issues": [], "success": true}
\ No newline at end of file
diff --git a/tests/testdata/outputs_expected/metacoin.sol.o.markdown b/tests/testdata/outputs_expected/metacoin.sol.o.markdown
index e2495d49..321484fd 100644
--- a/tests/testdata/outputs_expected/metacoin.sol.o.markdown
+++ b/tests/testdata/outputs_expected/metacoin.sol.o.markdown
@@ -1,13 +1,3 @@
-# Analysis results for test-filename.sol
+# Analysis results for None
 
-## Integer Overflow
-
-- Type: Warning
-- Contract: Unknown
-- Function name: `sendToken(address,uint256)`
-- PC address: 498
-
-### Description
-
-A possible integer overflow exists in the function `sendToken(address,uint256)`.
-The addition or multiplication may result in a value higher than the maximum representable integer.
+The analysis was completed successfully. No issues were detected.
diff --git a/tests/testdata/outputs_expected/metacoin.sol.o.text b/tests/testdata/outputs_expected/metacoin.sol.o.text
index 69fbc811..729320d8 100644
--- a/tests/testdata/outputs_expected/metacoin.sol.o.text
+++ b/tests/testdata/outputs_expected/metacoin.sol.o.text
@@ -1,9 +1 @@
-==== Integer Overflow ====
-Type: Warning
-Contract: Unknown
-Function name: sendToken(address,uint256)
-PC address: 498
-A possible integer overflow exists in the function `sendToken(address,uint256)`.
-The addition or multiplication may result in a value higher than the maximum representable integer.
---------------------
-
+The analysis was completed successfully. No issues were detected.
diff --git a/tests/testdata/outputs_expected/suicide.sol.o.json b/tests/testdata/outputs_expected/suicide.sol.o.json
index 1b5818d1..a023d575 100644
--- a/tests/testdata/outputs_expected/suicide.sol.o.json
+++ b/tests/testdata/outputs_expected/suicide.sol.o.json
@@ -1 +1 @@
-{"error": null, "issues": [{"address": 146, "contract": "Unknown", "debug": "<DEBUG-DATA>", "description": "The function `_function_0xcbf0b0c0` executes the SUICIDE instruction. The remaining Ether is sent to an address provided as a function argument.\n\nIt seems that this function can be called without restrictions.", "function": "_function_0xcbf0b0c0", "title": "Unchecked SUICIDE", "type": "Warning"}], "success": true}
\ No newline at end of file
+{"error": null, "issues": [{"address": 146, "contract": "Unknown", "debug": "<DEBUG-DATA>", "description": "The function `_function_0xcbf0b0c0` executes the SUICIDE instruction. The remaining Ether is sent to an address provided as a function argument.\n", "function": "_function_0xcbf0b0c0", "title": "Unchecked SUICIDE", "type": "Warning"}], "success": true}
\ No newline at end of file
diff --git a/tests/testdata/outputs_expected/suicide.sol.o.markdown b/tests/testdata/outputs_expected/suicide.sol.o.markdown
index 16040475..0f51764f 100644
--- a/tests/testdata/outputs_expected/suicide.sol.o.markdown
+++ b/tests/testdata/outputs_expected/suicide.sol.o.markdown
@@ -10,5 +10,3 @@
 ### Description
 
 The function `_function_0xcbf0b0c0` executes the SUICIDE instruction. The remaining Ether is sent to an address provided as a function argument.
-
-It seems that this function can be called without restrictions.
diff --git a/tests/testdata/outputs_expected/suicide.sol.o.text b/tests/testdata/outputs_expected/suicide.sol.o.text
index d2ea8090..59710c11 100644
--- a/tests/testdata/outputs_expected/suicide.sol.o.text
+++ b/tests/testdata/outputs_expected/suicide.sol.o.text
@@ -5,6 +5,5 @@ Function name: _function_0xcbf0b0c0
 PC address: 146
 The function `_function_0xcbf0b0c0` executes the SUICIDE instruction. The remaining Ether is sent to an address provided as a function argument.
 
-It seems that this function can be called without restrictions.
 --------------------