finished b, solved a testing issues