Added more tests and implemented empty extension block