Adding more comprehensive tests