Some cleanup, FingTest now builds.