Solved tests issue