Add remaining tests back