BasicTests modified