Updating tests to use FactCheck.jl and cleaning up includes