* Tests updated