This is updated unit tests