Test cases for remove section
Some tweaks for remove section and merged changes from develop