Add a ton of tests