Tests updated to pass