Removed extra tests