Added changes to tests