Added and cleaned up a few tests