Merge pull request #15 from terryrankine/fix-tests

Fix tests  (Cheers Victor)