Expanded our unit testing here
Fix for an exception thrown in these unit tests