adding remaining tests