Add .log suffix to the long test log file.
Begin refactoring the back-end