Fixes #2 - Fix merging / adding more tests