added another test & streamlined unit+integration testing