Bastion: Adding table tests and re-factoring to account for testability.
Bastion: removing unused template
Merge pull request #2549 from ehelms/bastion

Bastion: Adding table tests and re-factoring to account for testability.