updated and added tests which fail