Minimum for testing
Merge pull request #3 from AEHO/F_tests

Lots of things to improve