Modified tests to pass non GUI version