Fixed whitespace and test errors