added another test & streamlined unit+integration testing
remove @After method & clear