Fix for miscellaneous unit tests