Implementing swap usage in InformationSystem
Refactoring the tests