Tests updated (not yet working)