be more flexible in input parsing (read: now works on both my macs :)) Fixes the tests again