fixed testling issues