Remove final class to mock it and add units tests