Added some structure for what would be needed in future unit tests