Tests updated, passing