Cleaned up test inputs