Fixed existing tests (relating to #14).