Small bug fix and changing algorithm for another test.