updated unit tests. updated files to suit unit tests