Clean up FDist and test