Fixed failing tests
Removed the stupid _computedNext