Ashwin/Melanie | #3076 | fixing test