Adding remaining tests