Added tests that will allow refactoring of phase 1 work.