Foss testing refactor

Depends on #45 being merged first