Add remaining tests