diff --git a/run_tests.sh b/run_tests.sh
index 85a76fe2cb9e29c3854e3a0572a10b85d1c7a886..1456826ec8962d9e51ac51aa75fea9805aa1ef0b 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -1,43 +1,5 @@
 #!/bin/bash
 
-. compilers.env
-
-export FSFLAG='-cpp -I'
-
-echo "#------------------#----------------------------------------------------------------------------------"
-echo "# FUnit testing... #"
-echo "#------------------#"
-FUNIT_SCRIPTS=connection_m
-cd src;
-for F in ${FUNIT_SCRIPTS}; do
-
-    TEST_STATUS=0;
-    funit ${F} || TEST_STATUS=1;
-
-    if [[ TEST_STATUS -gt 0 ]]; then
-        echo "ERROR: Unit test failed!"
-        exit -1;
-    fi
-done
-
-echo "#---------------------#-------------------------------------------------------------------------------"
-echo "# Memcheck testing... #"
-echo "#---------------------#"
-MEM_TEST_SCRIPTS=connection_m_mem_leak_test.out net_m_mem_leak_test.out
-
-cd ../build;
-
-for F in ${MEM_TEST_SCRIPTS}; do
-    echo "Running ${F}..."
-    TEST1_MEM_STATUS=`valgrind --leak-check=yes build/${F} 2>&1 | grep 'LEAK SUMMARY' | wc -l`
-
-    if [[ TEST1_MEM_STATUS -gt 0 ]]; then
-        echo "ERROR: Memory leaks detected in ${F}!"
-        exit -1
-    fi
-    echo "${F} OK"
+for f in build/bin/*_test; do
+    ${f}
 done
-
-echo "#---------------------------#"
-echo "# No memory leaks detected. #"
-echo "#---------------------------#"
diff --git a/src/Neuron/Neuron.cpp b/src/Neuron/Neuron.cpp
index 5f3bad2de5cfed67fa16231bdac5a296f351c2eb..dc2aeea03ffd8ec8d66907ee75ca4ea2e8e47d60 100644
--- a/src/Neuron/Neuron.cpp
+++ b/src/Neuron/Neuron.cpp
@@ -1,6 +1,8 @@
 
 #include "Neuron.h"
 
+//TODO write INIT method to allocate edges_in and edges_out, so
+// it doesn't have to be written in every inherited class
 Neuron::~Neuron() {
     if(this->activation_function_parameters){
         delete [] this->activation_function_parameters;
diff --git a/src/tests/NeuronLinear_test.cpp b/src/tests/NeuronLinear_test.cpp
index af9274c1004430452d5eed45e78f4e4a10834138..0fae847730526aab6bf45effaed7834e12c2cadc 100644
--- a/src/tests/NeuronLinear_test.cpp
+++ b/src/tests/NeuronLinear_test.cpp
@@ -18,7 +18,7 @@ BOOST_AUTO_TEST_SUITE(neuronLinear_test)
         NeuronLinear neuron(1.745, 784.4547);
 
         BOOST_CHECK_EQUAL(neuron.activation_function_get_parameter(0), 1.745);
-        BOOST_CHECK_EQUAL(neuron.activation_function_get_parameter(0), 784.4547);
+        BOOST_CHECK_EQUAL(neuron.activation_function_get_parameter(1), 784.4547);
 
 
     };
diff --git a/src/tests/neuron_test.cpp b/src/tests/neuron_test.cpp
index 1453d57d5bdb4769faba4e9d3473e772244c1a68..a28776a0e276faed722cd6c91fac93d63a45caa4 100644
--- a/src/tests/neuron_test.cpp
+++ b/src/tests/neuron_test.cpp
@@ -33,7 +33,7 @@ BOOST_AUTO_TEST_CASE(neuron_saturation_test) {
 /**
  * Test of potencial methods
  */
-BOOST_AUTO_TEST_CASE(neuron_potencial_test) {
+BOOST_AUTO_TEST_CASE(neuron_potential_test) {
         NeuronLinear neuron(0, 0);
 
         BOOST_CHECK_EQUAL(neuron.get_potential(), 0);