added ability for more comprehensive testing