+ Added some tests