Added remaining tests; got to add some stuff to them