reenabled and fixed test