Fixed issue with test, to be continued