1) Skipping tests
2) Added logging