edited if statement
updated testing class
updated testing class
partial fix