Adding more comprehensive testing