Add (currently failing tests for #5

These are at least the tests..