BS-7268, fix issues with next button being remove from parent. Add tests & light refactor.