Testing done

Testing results done. Should be safe to merge