Added changes to the test