Added automated tests