Restored old unit test