Added a ton of tests