Removing unnecessary tests folder and some tidy up from formatting.