Fixed remaining tests except 14th. I think 14th test wasn't succeeding even before