Trying to fix testling issues