Added in missing tests