add (slightly) more complex tests