Added tests (see previous commit)