Fixed tests'