Adjust test for latest data (better approach needed perhaps?)