Continue to improve test coverage
Keep layering in testing