Added remaining tests. Need to comment now.