Foss testing refactor