Use variable to remove 80 char violation
Separate tests into integration and unit
Remove private method tests
Merge