Added required tests