Restored failing test, need to discover why this fails