fixing unit tests and end to end testing. Also, refactoring to support unit testing
fixing unit tests and end to end testing. Also, refactoring to support unit testing

evanlarsen/Forseti,evanlarsen/Forseti,evanlarsen/Forseti