Tests updated and fixed