Added coverage support
New tests to increase coverage