More comprehensive tests