Additional test methods to improve testing and coverage