Finished seperating out tests.