split class and write new tests