Updated coverage tests
More testing