Added some automated tests