Add  Log4Net and some unit test cleanup