Solved issues with tests