Some fixes for Unit Testing