Remove some fns from export and re-organise tests