Started moving unit tests out into separate files.