Added tests for this section