refactoring - broke down several methods into smaller chunks. combined unit/integration tests into one file