Tests fixed after pull request