REFACTOR: bad refactor, put them back into same file so tests won't diverge