remove closure
Fix issue in mixture
Adding unit tests