Add more complex tests