Removed broken unit tests