Added a few tests + cleaned up some existing ones.