Move system for tests to own file