v2.0.3. Improvement
Fixed up tests