Fix whitespace and uncomment tests