Put test back in (they had been commented out).
Another merge because didn't pull firust.
Merge branch 'master' of https://github.com/OpenFortranProject/ofp-sdf