Move tests

Also some formatting and such