ticket:#1 Fixed tests