Proper spacing
Add some tests for the basics