Added a bunch of tests more