Updating unittest and adding more unit test to test whole application