Merge "Updated test cases for increased coverage" into devel/master