Adding a bazillion tests