Added various other tests