Add some more tests to ensure #262 is fixed