Fixed issue and added onto previous test so that the issue can be tested...

....