Removing defined() or die

Fix randomly failing unit test

Re-removing newlines to fix unit tests