Added remaining tests