Minor changes to make methods virtual for mock testing