tidy up formatting
seperated tests into unit and integration