Merge tests

Issue #2