[fx] some code cleaning + another test