Many formatting changes
Remove some test files