Changes to make the test executable functional