Reactivated specflow tests / tidied up using statements