Adds remaining tests