Added some minor testing