Work in progress.
Moving tests to a different file.