Added the remaining tests