Rename test file
Tidy code and update style a bit to match mine