Mixes fix
Added test cases
Update indentation