file test reorganisation for engine testing