Added and got rid of some tests

Changed some tests around.