ShellCheck tests have brought up a couple of issues, that I was not aware of needed to be taken care. This should fix the tests.