Added some initial test work.