#3996 | Melanie/Vishnu | re- Skipping failing test, will look into it again