Re-instated unit test