Added more requirement tests