Cleanup of Built-in methods tests