fix, split, rake, tests