Rename unit test file names to match class names
Update extractors to be more concise

Also auto-format code using Scalariform.