Updated test based on changes to our singleton setup following chatting to Mike