Fixes conflicting unit tests