Whitespace cleanup
Add tests