Some tests were still using the temporary WorkingSet implementation