ex-144 (jebene) cleaned up functional test file structure