Make class as tool, move the location
Fix the tests with the new class