added some tests + addExtensions()
merged