Add more complex test (as requested)