Adding a bunch of tests