final version with fatflow testsuit fixed