Added --init tests
Naing improvements
log, variable declaration fix for tests