Minor Tweaks to testship