Adding messiest back to unit tests although it may hang.