Removed outcommented tests
Updated the define mixingstep Test w.r.t. new code. Still doesn't pass however.