Added basic test & improved patch work package