Refactoring
Fix initializers
Fix dynamic object tests