Revert "Bugfix + test error logging"

This reverts commit f41a2dafec26b4e519f854a686593081992539c3.