Improved spec coverage, changes extraction setup