Proper testing added