Unit Test Improvements

@muhammad-ammar Just go ahead and remove the lines then, rather than leaving them commented out.