Added testing coverage