Changes of unit tests and Main -- loookkkk