Tests are improved, bugs are fixed in string