Get rid of multiples-of-2 restriction, write new tests