Fixed tests (see #143)