Fixed the remaining tests