Fixed tests (make test)