fixed testing issues