Added tests

Addresses #30
also EOF