Tests and Coverage over 98