Removed commented out tests