Completed testing
Added testing