issue-14: Updatd tests again