Fixed single section issue
Updates and new tests