Add some unit tests and additional verbose levels