Added UT and specflow