Commented out some test-points while investigating for bug fix (see
issue 9)