Formatting
More default implementations + silence unused var warnings
Reorganized tests