Added some basic cases