Added more comprehensive tests